From 8b096e7f5c439bfbdc5fb4dd9431119803ef2a92 Mon Sep 17 00:00:00 2001
From: VitaliyHrabovych <vitaliihr@softwareplanet.group>
Date: Wed, 21 May 2025 18:29:44 +0300
Subject: [PATCH] Adjust filter preparation logic to correct its behaviour on
 the API types pages

---
 .../df-manage-services/df-manage-services-table.component.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts b/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts
index 845b070d..b36f3fb5 100644
--- a/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts
+++ b/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts
@@ -124,13 +124,10 @@ export class DfManageServicesTableComponent extends DfManageTableComponent<Servi
     refresh?: true
   ): void {
     if (this.serviceTypes && this.serviceTypes.length !== 0) {
-      filter = `${filter ? `${filter} and ` : ''}(type in ("${this.serviceTypes
+      filter = `${filter ? `(${filter}) and ` : ''}(type in ("${this.serviceTypes
         .map(src => src.name)
         .join('","')}"))`;
     }
-    filter = `${filter ? `${filter} and ` : ''}(created_by_id is${
-      !this.system ? ' not ' : ' '
-    }null)`;
 
     this.serviceService
       .getAll<GenericListResponse<Service>>({