refactor(filters): Move type to types folder

projects/hslayers/common/filters/add-filter-button/add-filter-button.component.ts

@@ -13,7 +13,7 @@ import {
   ComparisonOperatorType,
   FilterType,
   LogicalOperatorType,
-} from '../filter.type';
+} from 'hslayers-ng/types';
 import {HsFiltersService} from '../filters.service';
 import {NgbDropdownModule} from '@ng-bootstrap/ng-bootstrap';
 import {TranslateCustomPipe} from 'hslayers-ng/services/language';

projects/hslayers/common/filters/comparison-filter/comparison-filter.component.ts

@@ -31,7 +31,7 @@ import {
 import {Vector as VectorSource} from 'ol/source';
 import {WfsFeatureAttribute} from 'hslayers-ng/types';
 
-import {Filter} from '../filter.type';
+import {Filter} from 'hslayers-ng/types';
 import {FilterRangeInputComponent} from '../filter-range-input/filter-range-input.component';
 import {HsFiltersService} from '../filters.service';
 import {HsLayerUtilsService} from 'hslayers-ng/services/utils';

projects/hslayers/common/filters/filter.component.ts

@@ -1,6 +1,6 @@
 import {CommonModule} from '@angular/common';
 import {Component, Input, inject} from '@angular/core';
-import {Filter} from './filter.type';
+import {Filter} from 'hslayers-ng/types';
 import {HsAddFilterButtonComponent} from './add-filter-button/add-filter-button.component';
 import {HsComparisonFilterComponent} from './comparison-filter/comparison-filter.component';
 import {HsFiltersService} from './filters.service';

projects/hslayers/common/filters/filters.component.ts

@@ -1,6 +1,6 @@
 import {Component, Input, inject, viewChild} from '@angular/core';
 
-import {FilterType} from './filter.type';
+import {FilterType} from 'hslayers-ng/types';
 import {HsAddFilterButtonComponent} from './add-filter-button/add-filter-button.component';
 import {HsComparisonFilterComponent} from './comparison-filter/comparison-filter.component';
 import {HsFilterComponent} from './filter.component';

projects/hslayers/common/filters/filters.service.ts

@@ -12,7 +12,7 @@ import {HsToastService} from 'hslayers-ng/common/toast';
 import {HsUtilsService} from 'hslayers-ng/services/utils';
 import {getName, getWfsUrl} from 'hslayers-ng/common/extensions';
 
-import {Filter, FilterType, LogicalOperatorType} from './filter.type';
+import {Filter, FilterType, LogicalOperatorType} from 'hslayers-ng/types';
 
 @Injectable({
   providedIn: 'root',

projects/hslayers/test/common/filters/comparison-filter.spec.ts

@@ -11,6 +11,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
 import VectorLayer from 'ol/layer/Vector';
 import VectorSource from 'ol/source/Vector';
 import {Feature} from 'ol';
+import {Filter} from 'hslayers-ng/types';
 import {
   HsComparisonFilterComponent,
   HsFiltersService,
@@ -64,6 +65,12 @@ class MockHsFiltersService {
       return a - b;
     });
   }
+
+  removeFilter(parent: Filter, filter: Filter): boolean {
+    const index = parent.findIndex((item) => item === filter);
+    parent.splice(index, 1);
+    return true;
+  }
 }
 
 class MockHsLayerUtilsService {
@@ -154,7 +161,11 @@ describe('HsComparisonFilterComponent', () => {
     }));
 
     it('should remove filter when remove() is called', () => {
-      const parentMock = ['&&', component.filter, ['==', 'attr2', 'value2']];
+      const parentMock = [
+        '&&',
+        component.filter,
+        ['==', 'attr2', 'value2'],
+      ] as Filter;
       component.parent = parentMock;
       spyOn(component, 'emitChange');
       component.remove();

projects/hslayers/types/public-api.ts

@@ -59,3 +59,5 @@ export * from './query/widget-item.type';
 
 export * from './extensions/layer-extensions.type';
 export * from './wfs-filter/wfs-attributes.type';
+
+export * from './filters/filter-types';