From 10dfde0bff0f329e7b69fd9b149104a0cf26115b Mon Sep 17 00:00:00 2001 From: hofstef Date: Thu, 5 Sep 2024 14:33:27 +0200 Subject: [PATCH] removed unused code and lots of renaming for more clarity --- .../tools/icon-set-config/domain/allIcons.ts | 20 +++-------- .../domain/iconConfiguration.ts | 35 +++++++------------ .../icon-set-config/domain/iconFilterEnum.ts | 6 ---- .../domain/iconFilterOptions.ts | 6 ++++ .../icon-set-configuration.component.html | 6 ++-- .../icon-set-configuration.component.ts | 32 ++++++++--------- .../services/icon-dictionary.service.spec.ts | 6 ++-- .../services/icon-dictionary.service.ts | 23 ++++++------ .../icon-set-configuration.service.ts | 2 +- .../domainStoryContextPadProvider.js | 2 -- 10 files changed, 58 insertions(+), 80 deletions(-) delete mode 100644 src/app/tools/icon-set-config/domain/iconFilterEnum.ts create mode 100644 src/app/tools/icon-set-config/domain/iconFilterOptions.ts diff --git a/src/app/tools/icon-set-config/domain/allIcons.ts b/src/app/tools/icon-set-config/domain/allIcons.ts index e56dd6e7..4a68ad3c 100644 --- a/src/app/tools/icon-set-config/domain/allIcons.ts +++ b/src/app/tools/icon-set-config/domain/allIcons.ts @@ -1,9 +1,9 @@ import { Dictionary } from 'src/app/domain/entities/dictionary'; -export let appendedIcons = new Dictionary(); +export let customIcons = new Dictionary(); // These SVGs are used to render the actors/work objects on the canvas and in the iconset configuration. For palette and context pad, icons.css is used. -export const allIcons = { +export const builtInIcons = { Person: '', Group: @@ -230,20 +230,8 @@ export const allIcons = { '', }; -export function getAllStandardIconKeys(): string[] { - const allIconsDict = new Dictionary(); - - allIconsDict.addEach(allIcons); - - return allIconsDict.keysArray(); -} - -export function overrideAppendedIcons(newIcons: Dictionary): void { - appendedIcons = newIcons; -} - -export function updateAppendedIcons(newIcons: Dictionary): void { +export function addCustomIcons(newIcons: Dictionary): void { for (const key in newIcons.keysArray().entries()) { - appendedIcons.add(newIcons.get(key), key); + customIcons.add(newIcons.get(key), key); } } diff --git a/src/app/tools/icon-set-config/domain/iconConfiguration.ts b/src/app/tools/icon-set-config/domain/iconConfiguration.ts index 0bf06e3d..d33220e5 100644 --- a/src/app/tools/icon-set-config/domain/iconConfiguration.ts +++ b/src/app/tools/icon-set-config/domain/iconConfiguration.ts @@ -1,14 +1,11 @@ import { Dictionary } from 'src/app/domain/entities/dictionary'; -import { - overrideAppendedIcons, - updateAppendedIcons, -} from 'src/app/tools/icon-set-config/domain/allIcons'; +import { addCustomIcons } from 'src/app/tools/icon-set-config/domain/allIcons'; import { Configuration } from 'src/app/domain/entities/configuration'; import { INITIAL_ICON_SET_NAME } from '../../../domain/entities/constants'; import { IconSetConfiguration } from '../../../domain/entities/icon-set-configuration'; export class IconConfiguration { - domainName = INITIAL_ICON_SET_NAME; + iconSetName = INITIAL_ICON_SET_NAME; private allIconDictionary: Dictionary; @@ -16,51 +13,45 @@ export class IconConfiguration { this.allIconDictionary = allIconDictionary; } - /** - * Select the Iconset which you want to use - */ getDefaultConf(): Configuration { return defaultConf; } - updateAllIconRegistry(allIconDictionary: Dictionary): void { - this.allIconDictionary = allIconDictionary; - } - - appendSRCFile( + addCustomIcons( actors: string[], actorsDict: Dictionary, workObjects: string[], workObjectsDict: Dictionary, ): void { - const newAppendedIcons: { [key: string]: any } = {}; + const newCustomIcons: { [key: string]: any } = {}; actors.forEach((name: string) => { if (!this.allIconDictionary.has(name)) { - newAppendedIcons[name] = actorsDict.get(name); + newCustomIcons[name] = actorsDict.get(name); } }); workObjects.forEach((name: string) => { if (!this.allIconDictionary.has(name)) { - newAppendedIcons[name] = workObjectsDict.get(name); + newCustomIcons[name] = workObjectsDict.get(name); } }); - const appen = new Dictionary(); - Object.keys(newAppendedIcons).forEach((key) => { - appen.set(key, newAppendedIcons[key]); + + const customIcons = new Dictionary(); + Object.keys(newCustomIcons).forEach((key) => { + customIcons.set(key, newCustomIcons[key]); }); - updateAppendedIcons(appen); + addCustomIcons(customIcons); } createCustomConf(iconSetConfiguration: IconSetConfiguration): Configuration { - this.domainName = iconSetConfiguration.name; + this.iconSetName = iconSetConfiguration.name; let actors = iconSetConfiguration.actors; let workObjects = iconSetConfiguration.workObjects; - this.appendSRCFile( + this.addCustomIcons( actors.keysArray(), actors, workObjects.keysArray(), diff --git a/src/app/tools/icon-set-config/domain/iconFilterEnum.ts b/src/app/tools/icon-set-config/domain/iconFilterEnum.ts deleted file mode 100644 index ea590148..00000000 --- a/src/app/tools/icon-set-config/domain/iconFilterEnum.ts +++ /dev/null @@ -1,6 +0,0 @@ -export enum IconFilterEnum { - ICON_FILTER_ACTOR = 'ICON_FILTER_ACTOR', - ICON_FILTER_WORKOBJECT = 'ICON_FILTER_WORKOBJECT', - ICON_FILTER_UNASSIGNED = 'ICON_FILTER_UNASSIGNED', - ICON_FILTER_NONE = 'ICON_FILTER_NONE', -} diff --git a/src/app/tools/icon-set-config/domain/iconFilterOptions.ts b/src/app/tools/icon-set-config/domain/iconFilterOptions.ts new file mode 100644 index 00000000..c5937369 --- /dev/null +++ b/src/app/tools/icon-set-config/domain/iconFilterOptions.ts @@ -0,0 +1,6 @@ +export enum IconFilterOptions { + ONLY_ACTORS = 'ICON_FILTER_ACTOR', + ONLY_WORKOBJECTS = 'ICON_FILTER_WORKOBJECT', + ONLY_UNASSIGNED = 'ICON_FILTER_UNASSIGNED', + NO_FILTER = '', +} diff --git a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.html b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.html index e81cff61..2ef040ec 100644 --- a/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.html +++ b/src/app/tools/icon-set-config/presentation/icon-set-configuration/icon-set-configuration.component.html @@ -14,7 +14,7 @@ (IconFilterEnum.ICON_FILTER_NONE); + filter = new BehaviorSubject(IconFilterOptions.NO_FILTER); selectedActors = new BehaviorSubject([]); selectedWorkobjects = new BehaviorSubject([]); @@ -151,26 +151,26 @@ export class IconSetConfigurationComponent implements OnInit { /** Filter **/ filterForActors(): void { - if (this.filter.value !== IconFilterEnum.ICON_FILTER_ACTOR) { - this.filter.next(IconFilterEnum.ICON_FILTER_ACTOR); + if (this.filter.value !== IconFilterOptions.ONLY_ACTORS) { + this.filter.next(IconFilterOptions.ONLY_ACTORS); } else { - this.filter.next(IconFilterEnum.ICON_FILTER_NONE); + this.filter.next(IconFilterOptions.NO_FILTER); } } filterForWorkobjects(): void { - if (this.filter.value !== IconFilterEnum.ICON_FILTER_WORKOBJECT) { - this.filter.next(IconFilterEnum.ICON_FILTER_WORKOBJECT); + if (this.filter.value !== IconFilterOptions.ONLY_WORKOBJECTS) { + this.filter.next(IconFilterOptions.ONLY_WORKOBJECTS); } else { - this.filter.next(IconFilterEnum.ICON_FILTER_NONE); + this.filter.next(IconFilterOptions.NO_FILTER); } } filterForUnassigned(): void { - if (this.filter.value !== IconFilterEnum.ICON_FILTER_UNASSIGNED) { - this.filter.next(IconFilterEnum.ICON_FILTER_UNASSIGNED); + if (this.filter.value !== IconFilterOptions.ONLY_UNASSIGNED) { + this.filter.next(IconFilterOptions.ONLY_UNASSIGNED); } else { - this.filter.next(IconFilterEnum.ICON_FILTER_NONE); + this.filter.next(IconFilterOptions.NO_FILTER); } } @@ -183,23 +183,23 @@ export class IconSetConfigurationComponent implements OnInit { this.allFilteredIconNames.next(filteredByNameAndType.sort(this.sortByName)); } - private getFilteredNamesForType(type: IconFilterEnum): string[] { + private getFilteredNamesForType(type: IconFilterOptions): string[] { let allFiltered: string[] = []; switch (type) { - case IconFilterEnum.ICON_FILTER_NONE: + case IconFilterOptions.NO_FILTER: allFiltered = this.allIconNames.value; break; - case IconFilterEnum.ICON_FILTER_ACTOR: + case IconFilterOptions.ONLY_ACTORS: allFiltered = this.allIconNames.value.filter((name) => this.iconSetCustomizationService.isIconActor(name), ); break; - case IconFilterEnum.ICON_FILTER_WORKOBJECT: + case IconFilterOptions.ONLY_WORKOBJECTS: allFiltered = this.allIconNames.value.filter((name) => this.iconSetCustomizationService.isIconWorkObject(name), ); break; - case IconFilterEnum.ICON_FILTER_UNASSIGNED: + case IconFilterOptions.ONLY_UNASSIGNED: allFiltered = this.allIconNames.value.filter( (name) => !this.iconSetCustomizationService.isIconActor(name) && diff --git a/src/app/tools/icon-set-config/services/icon-dictionary.service.spec.ts b/src/app/tools/icon-set-config/services/icon-dictionary.service.spec.ts index 7565fb23..2bb3b3ad 100644 --- a/src/app/tools/icon-set-config/services/icon-dictionary.service.spec.ts +++ b/src/app/tools/icon-set-config/services/icon-dictionary.service.spec.ts @@ -9,7 +9,7 @@ import { BusinessObject, testBusinessObject, } from '../../../domain/entities/businessObject'; -import { allIcons } from '../domain/allIcons'; +import { builtInIcons } from '../domain/allIcons'; import { IconSetConfiguration } from '../../../domain/entities/icon-set-configuration'; describe('IconDictionaryService', () => { @@ -129,7 +129,7 @@ describe('IconDictionaryService', () => { service.registerIconForType( ElementTypes.WORKOBJECT, 'Hotel', - allIcons['Hotel'], + builtInIcons['Hotel'], ); expect(service.getWorkObjectsDictionary().has('Hotel')).toBeTruthy(); @@ -139,7 +139,7 @@ describe('IconDictionaryService', () => { service.registerIconForType( ElementTypes.ACTOR, 'Hotel', - allIcons['Hotel'], + builtInIcons['Hotel'], ); expect(service.getActorsDictionary().has('Hotel')).toBeTruthy(); diff --git a/src/app/tools/icon-set-config/services/icon-dictionary.service.ts b/src/app/tools/icon-set-config/services/icon-dictionary.service.ts index d85c0ee4..0d94b994 100644 --- a/src/app/tools/icon-set-config/services/icon-dictionary.service.ts +++ b/src/app/tools/icon-set-config/services/icon-dictionary.service.ts @@ -8,8 +8,8 @@ import { IconConfiguration, } from 'src/app/tools/icon-set-config/domain/iconConfiguration'; import { - allIcons, - appendedIcons, + builtInIcons, + customIcons, } from 'src/app/tools/icon-set-config/domain/allIcons'; import { sanitizeIconName } from '../../../utils/sanitizer'; import getIconId = ElementTypes.getIconId; @@ -32,10 +32,11 @@ export class IconDictionaryService { private readonly iconConfig: IconConfiguration; constructor() { - this.allIconDictionary.addEach(allIcons); + this.allIconDictionary.addEach(builtInIcons); this.iconConfig = new IconConfiguration(this.allIconDictionary); } + // TODO: only used in tests initTypeDictionaries(actors: string[], workObjects: string[]): void { if (!actors || actors.length == 0) { actors = defaultConf.actors; @@ -45,7 +46,7 @@ export class IconDictionaryService { } const allTypes = new Dictionary(); - allTypes.addEach(allIcons); + allTypes.addEach(builtInIcons); allTypes.appendDict(this.getAppendedIconDictionary()); this.initDictionary( @@ -123,8 +124,8 @@ export class IconDictionaryService { } const allTypes = new Dictionary(); - allTypes.addEach(allIcons); - allTypes.appendDict(appendedIcons); + allTypes.addEach(builtInIcons); + allTypes.appendDict(customIcons); iconTypes.forEach((name) => { if (!collection.has(name)) { @@ -276,7 +277,7 @@ export class IconDictionaryService { } addIMGToIconDictionary(input: string, name: string): void { - appendedIcons.set(name, input); + customIcons.set(name, input); } addIconsToCss(customIcons: Dictionary) { @@ -314,9 +315,9 @@ export class IconDictionaryService { getAppendedIconDictionary(): Dictionary { const appendedDict = new Dictionary(); - appendedIcons.keysArray().forEach((key) => { + customIcons.keysArray().forEach((key) => { if (!this.allIconDictionary.has(key)) { - appendedDict.set(key, appendedIcons.get(key)); + appendedDict.set(key, customIcons.get(key)); } }); return appendedDict; @@ -351,8 +352,8 @@ export class IconDictionaryService { getIconSource(name: string): string | null { if (this.allIconDictionary.has(name)) { return this.allIconDictionary.get(name); - } else if (appendedIcons.has(name)) { - return appendedIcons.get(name); + } else if (customIcons.has(name)) { + return customIcons.get(name); } return null; } 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-configuration.service.ts index 3050b184..8589be8a 100644 --- a/src/app/tools/icon-set-config/services/icon-set-configuration.service.ts +++ b/src/app/tools/icon-set-config/services/icon-set-configuration.service.ts @@ -83,7 +83,7 @@ export class IconSetConfigurationService { this.iconDictionaryService .getIconConfiguration() - .appendSRCFile(actorKeys, actorDict, workObjectKeys, workObjectDict); + .addCustomIcons(actorKeys, actorDict, workObjectKeys, workObjectDict); this.iconDictionaryService.addIconsFromIconSetConfiguration( ElementTypes.ACTOR, diff --git a/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js b/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js index 78447b2f..8c50cc9b 100644 --- a/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js +++ b/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js @@ -7,7 +7,6 @@ import ContextPadProvider from "bpmn-js/lib/features/context-pad/ContextPadProvi import { assign, bind } from "min-dash"; import { generateAutomaticNumber } from "../numbering/numbering"; import { ElementTypes } from "src/app/domain/entities/elementTypes"; -import { getAllStandardIconKeys } from "src/app/tools/icon-set-config/domain/allIcons"; import { hexToRGBA, isHexWithAlpha, @@ -68,7 +67,6 @@ export default function DomainStoryContextPadProvider( }), ); - const allStandardIconKeys = getAllStandardIconKeys(); let actions = cached(element); startConnect = function (event, element, autoActivate) {