diff --git a/src/app/app.module.ts b/src/app/app.module.ts index a136d3fb..10de137c 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -15,7 +15,7 @@ import { AppComponent } from 'src/app/app.component'; import { ImportDomainStoryService } from 'src/app/tools/import/services/import-domain-story.service'; import { LabelDictionaryService } from 'src/app/tools/label-dictionary/services/label-dictionary.service'; import { ElementRegistryService } from 'src/app/domain/services/element-registry.service'; -import { IconSetConfigurationService } from 'src/app/tools/icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from 'src/app/tools/icon-set-config/services/icon-set-import-export.service'; import { UntypedFormBuilder } from '@angular/forms'; import { IconDictionaryService } from 'src/app/tools/icon-set-config/services/icon-dictionary.service'; import { AutosaveService } from './tools/autosave/services/autosave.service'; @@ -72,7 +72,7 @@ import { DragDirective } from './tools/import/directive/dragDrop.directive'; deps: [ DirtyFlagService, IconDictionaryService, - IconSetConfigurationService, + IconSetImportExportService, ElementRegistryService, LabelDictionaryService, ], @@ -98,7 +98,7 @@ export class AppModule implements DoBootstrap { function initialize( dirtyFlagService: DirtyFlagService, iconDictionaryService: IconDictionaryService, - configurationService: IconSetConfigurationService, + importExportService: IconSetImportExportService, elementRegistryService: ElementRegistryService, labelDictionaryService: LabelDictionaryService, ) { diff --git a/src/app/tools/autosave/services/autosave.service.spec.ts b/src/app/tools/autosave/services/autosave.service.spec.ts index 5dcf04ef..575975b3 100644 --- a/src/app/tools/autosave/services/autosave.service.spec.ts +++ b/src/app/tools/autosave/services/autosave.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { AutosaveService } from './autosave.service'; import { MockProviders } from 'ng-mocks'; import { RendererService } from '../../modeler/services/renderer.service'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { ExportService } from '../../export/services/export.service'; import { AutosaveConfigurationService } from './autosave-configuration.service'; import { Draft } from '../domain/draft'; @@ -19,7 +19,7 @@ describe('AutosaveService', () => { let rendererServiceSpy: jasmine.SpyObj; let autosaveStateSpy: jasmine.SpyObj; let storageServiceSpy: jasmine.SpyObj; - let iconSetConfigurationService: jasmine.SpyObj; + let iconSetConfigurationService: jasmine.SpyObj; beforeEach(() => { const renderServiceMock = jasmine.createSpyObj(RendererService.name, [ @@ -36,7 +36,7 @@ describe('AutosaveService', () => { 'set', ]); const iconSetConfigurationServiceMock = jasmine.createSpyObj( - IconSetConfigurationService.name, + IconSetImportExportService.name, ['createIconSetConfiguration'], ); @@ -55,7 +55,7 @@ describe('AutosaveService', () => { useValue: storageServiceMock, }, { - priovide: IconSetConfigurationService, + priovide: IconSetImportExportService, useValue: iconSetConfigurationServiceMock, }, MockProviders(ExportService, MatSnackBar), @@ -71,8 +71,8 @@ describe('AutosaveService', () => { StorageService, ) as jasmine.SpyObj; iconSetConfigurationService = TestBed.inject( - IconSetConfigurationService, - ) as jasmine.SpyObj; + IconSetImportExportService, + ) as jasmine.SpyObj; service = TestBed.inject(AutosaveService); }); diff --git a/src/app/tools/autosave/services/autosave.service.ts b/src/app/tools/autosave/services/autosave.service.ts index 90246124..3a2b2e64 100644 --- a/src/app/tools/autosave/services/autosave.service.ts +++ b/src/app/tools/autosave/services/autosave.service.ts @@ -17,7 +17,7 @@ import { SNACKBAR_INFO, } from '../../../domain/entities/constants'; import { MatSnackBar } from '@angular/material/snack-bar'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; @Injectable({ providedIn: 'root', @@ -34,7 +34,7 @@ export class AutosaveService { private snackbar: MatSnackBar, private storageService: StorageService, private titleService: TitleService, - private iconSetConfigurationService: IconSetConfigurationService, + private iconSetConfigurationService: IconSetImportExportService, ) { this.autosaveConfiguration.configuration$.subscribe((configuration) => this.updateConfiguration(configuration), diff --git a/src/app/tools/export/services/export.service.spec.ts b/src/app/tools/export/services/export.service.spec.ts index e037d24f..05facdbd 100644 --- a/src/app/tools/export/services/export.service.spec.ts +++ b/src/app/tools/export/services/export.service.spec.ts @@ -3,7 +3,7 @@ import { TestBed } from '@angular/core/testing'; import { ExportService } from 'src/app/tools/export/services/export.service'; import { HtmlPresentationService } from './html-presentation.service'; import { MockModule, MockService } from 'ng-mocks'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { PngService } from './png.service'; import { SvgService } from './svg.service'; import { RendererService } from '../../modeler/services/renderer.service'; @@ -21,8 +21,8 @@ describe('ExportService', () => { useValue: MockService(HtmlPresentationService), }, { - provide: IconSetConfigurationService, - useValue: MockService(IconSetConfigurationService), + provide: IconSetImportExportService, + useValue: MockService(IconSetImportExportService), }, { provide: PngService, diff --git a/src/app/tools/export/services/export.service.ts b/src/app/tools/export/services/export.service.ts index a3d47f38..f0c90d83 100644 --- a/src/app/tools/export/services/export.service.ts +++ b/src/app/tools/export/services/export.service.ts @@ -1,5 +1,5 @@ import { Injectable, OnDestroy } from '@angular/core'; -import { IconSetConfigurationService } from 'src/app/tools/icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from 'src/app/tools/icon-set-config/services/icon-set-import-export.service'; import { sanitizeForDesktop } from 'src/app/utils/sanitizer'; import { TitleService } from 'src/app/tools/title/services/title.service'; import { ConfigAndDST } from 'src/app/tools/export/domain/export/configAndDst'; @@ -37,7 +37,7 @@ export class ExportService implements OnDestroy { description = ''; constructor( - private configurationService: IconSetConfigurationService, + private importExportService: IconSetImportExportService, private titleService: TitleService, private dirtyFlagService: DirtyFlagService, private pngService: PngService, @@ -71,7 +71,7 @@ export class ExportService implements OnDestroy { createConfigAndDST(DomainStory: any): ConfigAndDST { return new ConfigAndDST( - this.configurationService.getCurrentConfigurationForExport(), + this.importExportService.getCurrentConfigurationForExport(), DomainStory, ); } diff --git a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.spec.ts b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.spec.ts index 77088b4b..dcd4d42a 100644 --- a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.spec.ts +++ b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.spec.ts @@ -2,7 +2,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { IconSetConfigurationComponent } from 'src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component'; import { MockModule, MockProvider, MockProviders } from 'ng-mocks'; -import { IconSetConfigurationService } from '../../services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../services/icon-set-import-export.service'; import { IconDictionaryService } from '../../services/icon-dictionary.service'; import { IconSetCustomizationService } from '../../services/icon-set-customization.service'; import { BehaviorSubject } from 'rxjs'; @@ -27,7 +27,7 @@ describe(IconSetConfigurationComponent.name, () => { imports: [MockModule(MaterialModule)], declarations: [IconSetConfigurationComponent, IconSetDetailsComponent], providers: [ - MockProviders(IconSetConfigurationService), + MockProviders(IconSetImportExportService), MockProvider(IconDictionaryService, { getFullDictionary(): Dictionary { return new Dictionary(); diff --git a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.ts b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.ts index b145636e..479ed1b5 100644 --- a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.ts +++ b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { BehaviorSubject } from 'rxjs'; import { Dictionary } from 'src/app/domain/entities/dictionary'; -import { IconSetConfigurationService } from 'src/app/tools/icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from 'src/app/tools/icon-set-config/services/icon-set-import-export.service'; import { ICON_PREFIX, IconDictionaryService, @@ -31,7 +31,7 @@ export class IconSetConfigurationComponent implements OnInit { allFilteredIconNames = new BehaviorSubject([]); constructor( - private iconSetConfigurationService: IconSetConfigurationService, + private iconSetConfigurationService: IconSetImportExportService, private iconDictionaryService: IconDictionaryService, private iconSetCustomizationService: IconSetCustomizationService, private elementRegistryService: ElementRegistryService, diff --git a/src/app/tools/icon-set-config/presentation/icon-set-details/icon-set-details.component.ts b/src/app/tools/icon-set-config/presentation/icon-set-details/icon-set-details.component.ts index b07609ee..62165cc3 100644 --- a/src/app/tools/icon-set-config/presentation/icon-set-details/icon-set-details.component.ts +++ b/src/app/tools/icon-set-config/presentation/icon-set-details/icon-set-details.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { Observable } from 'rxjs'; import { IconSetCustomizationService } from 'src/app/tools/icon-set-config/services/icon-set-customization.service'; -import { IconSetConfigurationService } from 'src/app/tools/icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from 'src/app/tools/icon-set-config/services/icon-set-import-export.service'; import { IconListItem } from 'src/app/tools/icon-set-config/domain/iconListItem'; @Component({ @@ -20,9 +20,9 @@ export class IconSetDetailsComponent implements OnInit { constructor( private customizationService: IconSetCustomizationService, - private configurationService: IconSetConfigurationService, + private importExportService: IconSetImportExportService, ) { - this.iconSetName = configurationService.iconSetName$; + this.iconSetName = importExportService.iconSetName$; } ngOnInit(): void {} @@ -68,6 +68,6 @@ export class IconSetDetailsComponent implements OnInit { } exportIconSet(): void { - this.configurationService.exportConfiguration(); + this.importExportService.exportConfiguration(); } } diff --git a/src/app/tools/icon-set-config/services/icon-set-configuration.service.spec.ts b/src/app/tools/icon-set-config/services/icon-set-configuration.service.spec.ts deleted file mode 100644 index 3fa48e7e..00000000 --- a/src/app/tools/icon-set-config/services/icon-set-configuration.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { IconSetConfigurationService } from 'src/app/tools/icon-set-config/services/icon-set-configuration.service'; - -describe(IconSetConfigurationService.name, () => { - let service: IconSetConfigurationService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(IconSetConfigurationService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/tools/icon-set-config/services/icon-set-customization.service.ts b/src/app/tools/icon-set-config/services/icon-set-customization.service.ts index 6a3f5eca..8b7f7833 100644 --- a/src/app/tools/icon-set-config/services/icon-set-customization.service.ts +++ b/src/app/tools/icon-set-config/services/icon-set-customization.service.ts @@ -13,7 +13,7 @@ import { import { Dictionary } from '../../../domain/entities/dictionary'; import { ElementTypes } from '../../../domain/entities/elementTypes'; import { IconListItem } from '../domain/iconListItem'; -import { IconSetConfigurationService } from './icon-set-configuration.service'; +import { IconSetImportExportService } from './icon-set-import-export.service'; import { IconDictionaryService } from './icon-dictionary.service'; import { IconSet } from '../../../domain/entities/iconSet'; import { CustomIconSetConfiguration } from '../../../domain/entities/custom-icon-set-configuration'; @@ -42,7 +42,7 @@ export class IconSetCustomizationService { private changedIconSetConfiguration: IconSet | undefined; constructor( - private iconSetConfigurationService: IconSetConfigurationService, + private iconSetConfigurationService: IconSetImportExportService, private iconDictionaryService: IconDictionaryService, iconSetChangedService: IconSetChangedService, private elementRegistryService: ElementRegistryService, diff --git a/src/app/tools/icon-set-config/services/icon-set-import-export.service.spec.ts b/src/app/tools/icon-set-config/services/icon-set-import-export.service.spec.ts new file mode 100644 index 00000000..276fde01 --- /dev/null +++ b/src/app/tools/icon-set-config/services/icon-set-import-export.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { IconSetImportExportService } from 'src/app/tools/icon-set-config/services/icon-set-import-export.service'; + +describe(IconSetImportExportService.name, () => { + let service: IconSetImportExportService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(IconSetImportExportService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/tools/icon-set-config/services/icon-set-configuration.service.ts b/src/app/tools/icon-set-config/services/icon-set-import-export.service.ts similarity index 99% rename from src/app/tools/icon-set-config/services/icon-set-configuration.service.ts rename to src/app/tools/icon-set-config/services/icon-set-import-export.service.ts index fecc4e5a..7f2c5f54 100644 --- a/src/app/tools/icon-set-config/services/icon-set-configuration.service.ts +++ b/src/app/tools/icon-set-config/services/icon-set-import-export.service.ts @@ -24,7 +24,7 @@ export interface FileConfiguration { @Injectable({ providedIn: 'root', }) -export class IconSetConfigurationService { +export class IconSetImportExportService { private iconSetNameSubject = new BehaviorSubject( INITIAL_ICON_SET_NAME, ); diff --git a/src/app/tools/import/services/import-domain-story.service.ts b/src/app/tools/import/services/import-domain-story.service.ts index 50917762..47cccbe7 100644 --- a/src/app/tools/import/services/import-domain-story.service.ts +++ b/src/app/tools/import/services/import-domain-story.service.ts @@ -19,7 +19,7 @@ import { SNACKBAR_INFO, SNACKBAR_SUCCESS, } from '../../../domain/entities/constants'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { MatSnackBar } from '@angular/material/snack-bar'; import { IconSet } from '../../../domain/entities/iconSet'; import { IconSetChangedService } from '../../icon-set-config/services/icon-set-customization.service'; @@ -48,7 +48,7 @@ export class ImportDomainStoryService private titleService: TitleService, private rendererService: RendererService, private dialogService: DialogService, - private iconSetConfigurationService: IconSetConfigurationService, + private iconSetConfigurationService: IconSetImportExportService, private modelerService: ModelerService, private snackbar: MatSnackBar, ) { diff --git a/src/app/tools/modeler/services/modeler.service.spec.ts b/src/app/tools/modeler/services/modeler.service.spec.ts index 6fc6cca6..677875b1 100644 --- a/src/app/tools/modeler/services/modeler.service.spec.ts +++ b/src/app/tools/modeler/services/modeler.service.spec.ts @@ -4,7 +4,7 @@ import { ModelerService } from 'src/app/tools/modeler/services/modeler.service'; import { InitializerService } from './initializer.service'; import { ElementRegistryService } from '../../../domain/services/element-registry.service'; import { IconDictionaryService } from '../../icon-set-config/services/icon-dictionary.service'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { createTestCanvasObjects } from '../../../utils/testHelpers.spec'; import { BusinessObject } from '../../../domain/entities/businessObject'; import { INITIAL_ICON_SET_NAME } from '../../../domain/entities/constants'; @@ -18,7 +18,7 @@ describe('ModelerService', () => { let elementRegistrySpy: jasmine.SpyObj; let iconDictionarySpy: jasmine.SpyObj; - let iconSetConfigurationSpy: jasmine.SpyObj; + let iconSetConfigurationSpy: jasmine.SpyObj; let initializerSpy: jasmine.SpyObj; let testDomainStory: BusinessObject[] = createTestCanvasObjects(1).map( @@ -47,7 +47,7 @@ describe('ModelerService', () => { ['setCustomConfiguration', 'createIconConfiguration'], ); const iconSetConfigurationMock = jasmine.createSpyObj( - IconSetConfigurationService.name, + IconSetImportExportService.name, [ 'loadConfiguration', 'getStoredIconSetConfiguration', @@ -76,7 +76,7 @@ describe('ModelerService', () => { useValue: iconDictionaryMock, }, { - provide: IconSetConfigurationService, + provide: IconSetImportExportService, useValue: iconSetConfigurationMock, }, ], @@ -93,8 +93,8 @@ describe('ModelerService', () => { IconDictionaryService, ) as jasmine.SpyObj; iconSetConfigurationSpy = TestBed.inject( - IconSetConfigurationService, - ) as jasmine.SpyObj; + IconSetImportExportService, + ) as jasmine.SpyObj; initializerSpy = TestBed.inject( InitializerService, ) as jasmine.SpyObj; diff --git a/src/app/tools/modeler/services/modeler.service.ts b/src/app/tools/modeler/services/modeler.service.ts index 5ed09e2c..31da558f 100644 --- a/src/app/tools/modeler/services/modeler.service.ts +++ b/src/app/tools/modeler/services/modeler.service.ts @@ -4,7 +4,7 @@ import DomainStoryModeler from 'src/app/tools/modeler/diagram-js'; import { InitializerService } from './initializer.service'; import { ElementRegistryService } from '../../../domain/services/element-registry.service'; import { IconDictionaryService } from '../../icon-set-config/services/icon-dictionary.service'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { BusinessObject } from '../../../domain/entities/businessObject'; import { ActivityBusinessObject } from '../../../domain/entities/activityBusinessObject'; import { updateMultipleNumberRegistry } from 'src/app/tools/modeler/diagram-js/features/numbering/numbering'; @@ -26,7 +26,7 @@ export class ModelerService { private initializerService: InitializerService, private elementRegistryService: ElementRegistryService, private iconDictionaryService: IconDictionaryService, - private iconSetConfigurationService: IconSetConfigurationService, + private iconSetConfigurationService: IconSetImportExportService, private storageService: StorageService, private snackbar: MatSnackBar, ) {} diff --git a/src/app/tools/modeler/services/renderer.service.spec.ts b/src/app/tools/modeler/services/renderer.service.spec.ts index 491d9921..07d72195 100644 --- a/src/app/tools/modeler/services/renderer.service.spec.ts +++ b/src/app/tools/modeler/services/renderer.service.spec.ts @@ -2,7 +2,7 @@ import { TestBed } from '@angular/core/testing'; import { RendererService } from './renderer.service'; import { ModelerService } from './modeler.service'; import { ElementRegistryService } from '../../../domain/services/element-registry.service'; -import { IconSetConfigurationService } from '../../icon-set-config/services/icon-set-configuration.service'; +import { IconSetImportExportService } from '../../icon-set-config/services/icon-set-import-export.service'; import { DirtyFlagService } from '../../../domain/services/dirty-flag.service'; import { Dictionary } from 'src/app/domain/entities/dictionary'; import { IconSet } from '../../../domain/entities/iconSet'; @@ -29,7 +29,7 @@ describe('RendererService', () => { 'makeClean', ]); const iconSetConfigurationServiceMock = jasmine.createSpyObj( - IconSetConfigurationService.name, + IconSetImportExportService.name, ['getNewIconConfiguration'], );