Merge pull request #5098 from anynines/feature/modify_search_filter_to_cover_tags_too

Merging into Develop

Author: krutten

.gitignore

@@ -143,6 +143,7 @@ website/versions-repo
 
 # Npm package builds
 /npm_pkg
+.npmrc
 
 /scan_tmp
 

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-data-source.ts

@@ -1,5 +1,6 @@
 import { Store } from '@ngrx/store';
 import { getRowMetadata } from '@stratosui/store';
+import { getDataFunctionList } from '../../../../../../../core/src/shared/components/list/data-sources-controllers/local-filtering-sorting';
 
 import { CFAppState } from '../../../../../../../cloud-foundry/src/cf-app-state';
 import { serviceEntityType } from '../../../../../../../cloud-foundry/src/cf-entity-types';
@@ -29,9 +30,22 @@ export class CfServicesDataSource extends ListDataSource<APIResource> {
       paginationKey,
       isLocal: true,
       transformEntities: [
-        {
-          type: 'filter',
-          field: 'entity.label'
+        (entities: APIResource[], paginationState: PaginationEntityState) => {
+          const [filterByLabel, filterByTags] = getDataFunctionList(
+            [{
+              type: 'filter',
+              field: 'entity.label'
+            },
+            {
+              type: 'filter',
+              field: 'entity.tags'
+            }]
+          )
+
+          const labels = filterByLabel(entities, paginationState)
+          const tags = filterByTags(entities, paginationState)
+
+          return [...labels, ...tags]
         },
         (entities: APIResource[], paginationState: PaginationEntityState) => {
           const cfGuid = paginationState.clientPagination.filter.items.cf;

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-services/cf-services-list-config.service.ts

@@ -77,7 +77,7 @@ export class CfServicesListConfigService implements IListConfig<APIResource> {
   multiFilterConfigs: IListMultiFilterConfig[] = [];
   text: ITableText = {
     title: null,
-    filter: 'Search by name',
+    filter: 'Search by name and tags',
     noEntries: 'There are no services',
     maxedResults: {
       icon: 'store',

src/frontend/packages/core/src/shared/components/list/data-sources-controllers/local-filtering-sorting.ts

@@ -21,7 +21,7 @@ function getFieldArray(def: DataFunctionDefinition) {
   return def.field.split('.');
 }
 
-function getFilterFunction(def: DataFunctionDefinition): DataFunction<any> {
+export function getFilterFunction(def: DataFunctionDefinition): DataFunction<any> {
   const fieldArray = getFieldArray(def);
   return (entities, paginationState) => {
     const upperCaseFilter = paginationState.clientPagination.filter.string.toUpperCase();
@@ -30,10 +30,14 @@ function getFilterFunction(def: DataFunctionDefinition): DataFunction<any> {
     }
     return entities.filter(e => {
       e = extractActualListEntity(e);
-      const value = getValue(e, fieldArray, 0, true);
+      let value = getValue(e, fieldArray, 0, true);
       if (!value) {
         return false;
       }
+      if (Array.isArray(value)) {
+        value = value.join(",")
+      }
+
       return value.toUpperCase().includes(upperCaseFilter);
     });
   };

src/frontend/packages/core/src/shared/components/list/list.component.spec.ts

@@ -3,6 +3,7 @@ import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/t
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
 import { createBasicStoreModule } from '@stratosui/store/testing';
+import { PaginationEntityState } from 'frontend/packages/store/src/types/pagination.types';
 import { BehaviorSubject, of as observableOf } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
@@ -16,6 +17,7 @@ import { CoreTestingModule } from '../../../../test-framework/core-test.modules'
 import { CoreModule } from '../../../core/core.module';
 import { CurrentUserPermissionsService } from '../../../core/permissions/current-user-permissions.service';
 import { SharedModule } from '../../shared.module';
+import { getFilterFunction } from './data-sources-controllers/local-filtering-sorting';
 import { EndpointCardComponent } from './list-types/endpoint/endpoint-card/endpoint-card.component';
 import { EndpointListHelper } from './list-types/endpoint/endpoint-list.helpers';
 import { EndpointsListConfigService } from './list-types/endpoint/endpoints-list-config.service';
@@ -320,6 +322,74 @@ describe('ListComponent', () => {
       expect(noEntriesMessage.hidden).toBeFalsy();
     });
 
+    describe('getFilterFunction filters entities ', () => {
+      const paginationState: PaginationEntityState = {
+        currentPage: 1,
+        totalResults: 2,
+        pageCount: 1,
+        ids: {},
+        params: {},
+        pageRequests: {},
+        clientPagination: {
+          pageSize: 10,
+          currentPage: 1,
+          filter: {
+            string: 'hello', // Filtering for 'hello'
+            items: {}
+          },
+          totalResults: 2
+        },
+        maxedState: {},
+        isListPagination: false
+      };
+
+      it ('by label', () => {
+        const filterbyLabel = getFilterFunction({
+          type: 'filter',
+          field: 'entity.label'
+        },)
+
+        const entities: APIResource[] = [
+          {
+            metadata: { created_at: '2025-02-02', guid: '1', updated_at: '2025-02-03', url: '/url1' },
+            entity: {label: 'hello'}
+          },
+          {
+            metadata: { created_at: '2022-01-02', guid: '2', updated_at: '2022-01-03', url: '/url2' },
+            entity: {label: 'world' }
+          },
+        ]
+
+        const result = filterbyLabel(entities, paginationState)
+
+        expect(result.length).toBe(1);
+        expect(result[0].entity.label).toEqual('hello');
+      })
+
+      it ('by tags', () => {
+        const filterbyTags = getFilterFunction({
+          type: 'filter',
+          field: 'entity.tags'
+        })
+
+        const entities: APIResource[] = [
+          {
+            metadata: { created_at: '2025-02-02', guid: '1', updated_at: '2025-02-03', url: '/url1' },
+            entity: { tags: ['hello', 'world'] }
+          },
+          {
+            metadata: { created_at: '2022-01-02', guid: '2', updated_at: '2022-01-03', url: '/url2' },
+            entity: { tags: ['bye', 'world'] }
+          },
+        ]
+
+        const result = filterbyTags(entities, paginationState)
+
+        expect(result.length).toBe(1);
+        expect(result[0].entity.tags).toEqual(['hello', 'world']);
+      })
+    })
+
   });
 
 });