Change attribute filter service to a helper

Author: steinkobben

projects/core/src/lib/components/filter/filter-list/filter-list.component.spec.ts

@@ -8,7 +8,7 @@ import { FilterListItemComponent } from '../filter-list-item/filter-list-item.co
 import { selectFilterGroupsWithLayers } from '../../../state/filter-state/filter.selectors';
 import { MatIconTestingModule } from '@angular/material/icon/testing';
 import { FilterDescriptionComponent } from '../../../filter/filter-description/filter-description.component';
-import { AttributeFilterService } from '../../../services/attribute-filter.service';
+import { AttributeFilterHelper } from '../../../filter/helpers/attribute-filter.helper';
 import { of } from 'rxjs';
 
 describe('FilterListComponent', () => {
@@ -34,7 +34,7 @@ describe('FilterListComponent', () => {
             },
           ],
         }),
-        { provide: AttributeFilterService, useValue: mockAttributeFilterService },
+        { provide: AttributeFilterHelper, useValue: mockAttributeFilterService },
       ],
     });
     expect(screen.queryByText('Attribute filter')).not.toBeInTheDocument();
@@ -59,7 +59,7 @@ describe('FilterListComponent', () => {
     await render(FilterListComponent, {
       providers: [
         store,
-        { provide: AttributeFilterService, useValue: mockAttributeFilterService },
+        { provide: AttributeFilterHelper, useValue: mockAttributeFilterService },
       ],
       declarations: [ FilterListItemComponent, FilterDescriptionComponent ],
       imports: [ SharedImportsModule, MatIconTestingModule ],

projects/core/src/lib/services/attribute-filter.service.ts renamed to projects/core/src/lib/filter/helpers/attribute-filter.helper.ts

@@ -1,14 +1,10 @@
 import {
   AttributeFilterModel, FilterConditionEnum, FilterGroupModel, FilterToolEnum, FilterTypeEnum,
 } from '@tailormap-viewer/api';
-import { Injectable } from '@angular/core';
 
-@Injectable({
-  providedIn: 'root',
-})
-export class AttributeFilterService {
+export class AttributeFilterHelper {
 
-  public separateSubstringFiltersInCheckboxFilters(
+  public static separateSubstringFiltersInCheckboxFilters(
     filterGroups: FilterGroupModel<AttributeFilterModel>[],
   ): FilterGroupModel<AttributeFilterModel>[] {
     return filterGroups.map(group => {

projects/core/src/lib/state/core.effects.spec.ts

@@ -7,7 +7,7 @@ import { AttributeFilterModel, FilterGroupModel, getViewerResponseData } from '@
 import { Location } from '@angular/common';
 import { Router } from '@angular/router';
 import * as CoreActions from './core.actions';
-import { AttributeFilterService } from '../services/attribute-filter.service';
+import { AttributeFilterHelper } from '../filter/helpers/attribute-filter.helper';
 
 describe('CoreEffects', () => {
 
@@ -32,7 +32,7 @@ describe('CoreEffects', () => {
         { provide: LoadViewerService, useValue: loadViewerServiceMock },
         { provide: Location, useValue: locationMock },
         { provide: Router, useValue: routerMock },
-        { provide: AttributeFilterService, useValue: attributeFilterServiceMock },
+        { provide: AttributeFilterHelper, useValue: attributeFilterServiceMock },
       ],
     });
     const effects = TestBed.inject(CoreEffects);

projects/core/src/lib/state/core.effects.ts

@@ -7,7 +7,7 @@ import { LoadViewerService } from '../services/load-viewer.service';
 import { Location } from '@angular/common';
 import { Router } from '@angular/router';
 import { UrlHelper } from '@tailormap-viewer/shared';
-import { AttributeFilterService } from '../services/attribute-filter.service';
+import { AttributeFilterHelper } from '../filter/helpers/attribute-filter.helper';
 
 @Injectable()
 export class CoreEffects {
@@ -17,8 +17,6 @@ export class CoreEffects {
   private router = inject(Router);
 
 
-  private attributeFilterService = inject(AttributeFilterService);
-
   public loadViewer$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(CoreActions.loadViewer),
@@ -43,7 +41,7 @@ export class CoreEffects {
     return this.actions$.pipe(
       ofType(CoreActions.loadViewerSuccess),
       map(action => action.viewer.filterGroups || []),
-      map(groups => this.attributeFilterService.separateSubstringFiltersInCheckboxFilters(groups)),
+      map(groups => AttributeFilterHelper.separateSubstringFiltersInCheckboxFilters(groups)),
       map(filterGroups => FilterActions.addAllFilterGroupsInConfig({ filterGroups })),
     );
   });