Fix tests and linting

Author: geertplaisier

projects/admin-core/src/lib/catalog/catalog.module.ts

@@ -42,7 +42,7 @@ import { CatalogShortcutButtonsComponent } from './catalog-shortcut-buttons/cata
 import { FeatureTypeTemplateComponent } from './feature-type-template/feature-type-template.component';
 import { ProjectionAvailabilityComponent } from './projection-availability/projection-availability.component';
 import {
-  FeatureTypeAttachmentAttributesComponent
+  FeatureTypeAttachmentAttributesComponent,
 } from './feature-type-attachment-attributes/feature-type-attachment-attributes.component';
 
 

projects/admin-core/src/lib/catalog/feature-type-details/feature-type-details.component.spec.ts

@@ -15,6 +15,10 @@ import { SaveButtonComponent } from '../../shared/components/save-button/save-bu
 import { FeatureTypeFormComponent } from '../feature-type-form/feature-type-form.component';
 import { SpinnerButtonComponent } from '@tailormap-viewer/shared';
 import { CatalogExtendedTypeEnum } from '../models/catalog-extended.model';
+import {
+  FeatureTypeAttachmentAttributesComponent
+} from '../feature-type-attachment-attributes/feature-type-attachment-attributes.component';
+import { MatIconTestingModule } from '@angular/material/icon/testing';
 
 const setup = async () => {
   const activeRoute = {
@@ -37,6 +41,7 @@ const setup = async () => {
     originalId: 'ft_1',
     featureSourceId: '1',
     catalogNodeId: 'node-1',
+    featureSourceProtocol: FeatureSourceProtocolEnum.JDBC,
   };
   const featureSourceModel: ExtendedFeatureSourceModel = {
     ...getFeatureSource({ id: '1', title: 'JDBC source', protocol: FeatureSourceProtocolEnum.JDBC }),
@@ -60,8 +65,14 @@ const setup = async () => {
   };
   const store = createMockStore({ initialState: { [catalogStateKey]: catalogState } });
   await render(FeatureTypeDetailsComponent, {
-    declarations: [ FeatureTypeFormComponent, FeatureTypeAttributesComponent, SaveButtonComponent, SpinnerButtonComponent ],
-    imports: [SharedModule],
+    declarations: [
+      FeatureTypeFormComponent,
+      FeatureTypeAttributesComponent,
+      FeatureTypeAttachmentAttributesComponent,
+      SaveButtonComponent,
+      SpinnerButtonComponent,
+    ],
+    imports: [ SharedModule, MatIconTestingModule ],
     providers: [
       { provide: ActivatedRoute, useValue: activeRoute },
       { provide: FeatureSourceService, useValue: featureSourceService },

projects/admin-core/src/lib/catalog/feature-type-form/feature-type-form.component.spec.ts

@@ -1,34 +1,44 @@
 import { render, screen } from '@testing-library/angular';
 import { FeatureTypeFormComponent } from './feature-type-form.component';
 import { of } from 'rxjs';
-import { getFeatureTypeSummary } from '@tailormap-admin/admin-api';
+import { FeatureTypeModel } from '@tailormap-admin/admin-api';
 import { SharedModule } from '@tailormap-viewer/shared';
-import { ExtendedFeatureTypeModel } from '../models/extended-feature-type.model';
 import { FeatureSourceService } from '../services/feature-source.service';
 import { FeatureTypeAttributesComponent } from '../feature-type-attributes/feature-type-attributes.component';
 import { SaveButtonComponent } from '../../shared/components/save-button/save-button.component';
 import { SpinnerButtonComponent } from '@tailormap-viewer/shared';
-import { CatalogExtendedTypeEnum } from '../models/catalog-extended.model';
 import { createMockStore } from '@ngrx/store/testing';
 import { catalogStateKey, initialCatalogState } from '../state/catalog.state';
 import { Store } from '@ngrx/store';
+import {
+  FeatureTypeAttachmentAttributesComponent,
+} from '../feature-type-attachment-attributes/feature-type-attachment-attributes.component';
+import { MatIconTestingModule } from '@angular/material/icon/testing';
 
 const setup = async () => {
   const featureSourceService = { updateFeatureSource$: jest.fn(() => of({})) };
-  const featureTypeModel: ExtendedFeatureTypeModel = {
-    ...getFeatureTypeSummary({ name: 'ft_1', title: 'some table' }),
+  const featureTypeModel: FeatureTypeModel = {
+    attributes: [],
+    defaultGeometryAttribute: null,
+    primaryKeyAttribute: null,
+    settings: {
+      attributeSettings: {},
+    },
     id: '1_ft_1',
-    originalId: 'ft_1',
-    featureSourceId: '1',
-    catalogNodeId: 'node-1',
-    type: CatalogExtendedTypeEnum.FEATURE_TYPE_TYPE,
+    name: 'ft_1',
+    title: 'some table',
   };
   const mockStore = createMockStore({
     initialState: { [catalogStateKey]: { ...initialCatalogState } },
   });
   await render(FeatureTypeFormComponent, {
-    declarations: [ FeatureTypeAttributesComponent, SaveButtonComponent, SpinnerButtonComponent ],
-    imports: [SharedModule],
+    declarations: [
+      FeatureTypeAttributesComponent,
+      FeatureTypeAttachmentAttributesComponent,
+      SaveButtonComponent,
+      SpinnerButtonComponent,
+    ],
+    imports: [ SharedModule, MatIconTestingModule ],
     inputs: {
       featureType: featureTypeModel,
     },