From ada337915fea1ba5f1726798907d651493106008 Mon Sep 17 00:00:00 2001 From: Sockenklaus Date: Sun, 7 Nov 2021 15:35:38 +0100 Subject: [PATCH] simplesearch now accepts empty querystring correctly --- app/Controllers/Http/EmployeesController.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Controllers/Http/EmployeesController.ts b/app/Controllers/Http/EmployeesController.ts index 5b2c24f..e6bd2fc 100644 --- a/app/Controllers/Http/EmployeesController.ts +++ b/app/Controllers/Http/EmployeesController.ts @@ -4,6 +4,7 @@ import UpdateEmployeeValidator from 'App/Validators/UpdateEmployeeValidator' import CreateEmployeeValidator from 'App/Validators/CreateEmployeeValidator' import Database from '@ioc:Adonis/Lucid/Database' +import Logger from '@ioc:Adonis/Core/Logger' type ResultShow = { id: number, @@ -34,7 +35,7 @@ export default class EmployeesController { employees.from('employees') employees.select(select) - if(simpleSearch) { + if(simpleSearch && simpleSearch.query !== '') { simpleSearch.columns.forEach(column => { employees.orWhere(column, 'like', `%${simpleSearch.query}%`) }) @@ -158,9 +159,9 @@ export default class EmployeesController { private async simpleSearch(qs : string): Promise<{query: string, columns: string[]} | false>{ if (!qs) return false - const regex = /([\w@.]+)(?:\((\w+(?:,\w+)*)\))*/i + const regex = /([\w@.]*)(?:\((\w+(?:,\w+)*)\))*/i const columns = await Database.connection().columnsInfo('employees') - + const match = qs.match(regex) ?? [] let result: {