diff --git a/core/libs/editor/src/lib/editor-toolbar/components/generate-open-api/generate-open-api.component.ts b/core/libs/editor/src/lib/editor-toolbar/components/generate-open-api/generate-open-api.component.ts index 9d394ebe..ca1a9076 100644 --- a/core/libs/editor/src/lib/editor-toolbar/components/generate-open-api/generate-open-api.component.ts +++ b/core/libs/editor/src/lib/editor-toolbar/components/generate-open-api/generate-open-api.component.ts @@ -20,7 +20,7 @@ import {EditorDialogValidators} from '../../../editor-dialog'; import {finalize, first} from 'rxjs/operators'; import {map, Subscription} from 'rxjs'; import {saveAs} from 'file-saver'; -import {EditorService, GenerateService} from '../../../services'; +import {GenerateService} from '../../../services'; import {ModelService} from '@ame/rdf/services'; import {LanguageTranslationService} from '@ame/translation'; import {NotificationsService} from '@ame/shared'; diff --git a/core/libs/editor/src/lib/helpers/index.ts b/core/libs/editor/src/lib/helpers/index.ts index e69de29b..eb6bf101 100644 --- a/core/libs/editor/src/lib/helpers/index.ts +++ b/core/libs/editor/src/lib/helpers/index.ts @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2024 Robert Bosch Manufacturing Solutions GmbH + * + * See the AUTHORS file(s) distributed with this work for + * additional information regarding authorship. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. + * + * SPDX-License-Identifier: MPL-2.0 + */ + +export * from './form-field.helper'; diff --git a/core/libs/migrator/src/lib/components/version-migration/version-migration.component.spec.ts b/core/libs/migrator/src/lib/components/version-migration/version-migration.component.spec.ts index f5c2816c..78ee18a2 100644 --- a/core/libs/migrator/src/lib/components/version-migration/version-migration.component.spec.ts +++ b/core/libs/migrator/src/lib/components/version-migration/version-migration.component.spec.ts @@ -11,9 +11,9 @@ * SPDX-License-Identifier: MPL-2.0 */ import {MigratorApiService, ModelApiService} from '@ame/api'; -import {EditorService} from '@ame/editor'; +import {LoadAspectModelService} from '@ame/editor'; import {RdfService} from '@ame/rdf/services'; -import {APP_CONFIG} from '@ame/shared'; +import {APP_CONFIG, ElectronTunnelService} from '@ame/shared'; import {ComponentFixture, TestBed} from '@angular/core/testing'; import {MatDialogModule} from '@angular/material/dialog'; import {MatIconModule} from '@angular/material/icon'; @@ -21,7 +21,6 @@ import {MatProgressSpinnerModule} from '@angular/material/progress-spinner'; import {RouterTestingModule} from '@angular/router/testing'; import {provideMockObject} from 'jest-helpers'; import {of} from 'rxjs'; -import {ElectronTunnelService} from '@ame/shared'; import {VersionMigrationComponent} from './version-migration.component'; import {TranslateModule} from '@ngx-translate/core'; @@ -31,6 +30,7 @@ describe('VersionMigrationComponent', () => { let component: VersionMigrationComponent; let fixture: ComponentFixture; let modelApiService: ModelApiService; + let loadAspectModelService: LoadAspectModelService; beforeEach(() => { TestBed.configureTestingModule({ @@ -67,10 +67,9 @@ describe('VersionMigrationComponent', () => { useValue: provideMockObject(ModelApiService), }, { - provide: EditorService, + provide: LoadAspectModelService, useValue: { settings: {}, - loadExternalModels: jest.fn(() => of()), }, }, { @@ -80,6 +79,9 @@ describe('VersionMigrationComponent', () => { ], }); + loadAspectModelService = TestBed.inject(LoadAspectModelService); + loadAspectModelService.loadExternalModels = jest.fn(() => of([])); + modelApiService = TestBed.inject(ModelApiService); modelApiService.getNamespacesStructure = jest.fn(() => of([]));