fix typos, renaming

WPS · Dec 6, 2024 · f9e748d · f9e748d
1 parent 3157b2a
commit f9e748d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 28 deletions.
diff --git a/src/app/domain/entities/dictionary.ts b/src/app/domain/entities/dictionary.ts
@@ -51,8 +51,8 @@ export class Dictionary {
     });
   }
 
-  addBuildInIcons(buildInIcons: Dictionary): void {
-    buildInIcons.entries.forEach((entry) => {
+  addBuiltInIcons(builtInIcons: Dictionary): void {
+    builtInIcons.entries.forEach((entry) => {
       if (!this.has(entry.key)) {
         this.entries.push(entry);
       }

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
@@ -172,14 +172,12 @@ describe('IconDictionaryService', () => {
       service.updateIconRegistries(actors, workObjects, config);
 
       expect(service.getActorsDictionary().keysArray()).toContain('Person');
-      expect(service.getCustomIconsDictionary().keysArray()).toContain(
-        'TestCustomActor',
-      );
+      expect(service.getCustomIcons().keysArray()).toContain('TestCustomActor');
 
       expect(service.getWorkObjectsDictionary().keysArray()).toContain(
         'Document',
       );
-      expect(service.getCustomIconsDictionary().keysArray()).toContain(
+      expect(service.getCustomIcons().keysArray()).toContain(
         'TestCustomWorkObject',
       );
     });

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
@@ -32,7 +32,7 @@ export class IconDictionaryService {
   private readonly iconConfig: IconConfiguration;
 
   constructor() {
-    this.builtInIconsDictionary.addBuildInIcons(builtInIcons);
+    this.builtInIconsDictionary.addBuiltInIcons(builtInIcons);
     this.iconConfig = new IconConfiguration(this.builtInIconsDictionary);
   }
 
@@ -45,8 +45,8 @@ export class IconDictionaryService {
     }
 
     const allTypes = new Dictionary();
-    allTypes.addBuildInIcons(builtInIcons);
-    allTypes.appendDict(this.getCustomIconsDictionary());
+    allTypes.addBuiltInIcons(builtInIcons);
+    allTypes.appendDict(this.getCustomIcons());
 
     this.initDictionary(
       actors,
@@ -63,14 +63,14 @@ export class IconDictionaryService {
   }
 
   private initDictionary(
-    keys: string[],
-    allTypes: Dictionary,
+    selectedIconNames: string[],
+    allIcons: Dictionary,
     dictionary: Dictionary,
     elementType: ElementTypes,
   ) {
     dictionary.clear();
-    for (const key of keys) {
-      dictionary.add(allTypes.get(key), key);
+    for (const key of selectedIconNames) {
+      dictionary.add(allIcons.get(key), key);
     }
 
     dictionary.keysArray().forEach((name) => {
@@ -123,7 +123,7 @@ export class IconDictionaryService {
     }
 
     const allTypes = new Dictionary();
-    allTypes.addBuildInIcons(builtInIcons);
+    allTypes.addBuiltInIcons(builtInIcons);
     allTypes.appendDict(customIcons);
 
     iconTypes.forEach((name) => {
@@ -308,11 +308,11 @@ export class IconDictionaryService {
   getFullDictionary(): Dictionary {
     const fullDictionary = new Dictionary();
     fullDictionary.appendDict(this.builtInIconsDictionary);
-    fullDictionary.appendDict(this.getCustomIconsDictionary());
+    fullDictionary.appendDict(this.getCustomIcons());
     return fullDictionary;
   }
 
-  getCustomIconsDictionary(): Dictionary {
+  getCustomIcons(): Dictionary {
     const appendedDict = new Dictionary();
     customIcons.keysArray().forEach((key) => {
       if (!this.builtInIconsDictionary.has(key)) {

diff --git a/src/app/tools/modeler/bpmn/modeler/change-icon/replaceOptions.js b/src/app/tools/modeler/bpmn/modeler/change-icon/replaceOptions.js
@@ -7,14 +7,12 @@ export function initializeReplaceOptions(iconDictionary) {
 }
 
 export function actorReplaceOptions(name) {
-  const actorTypes = iconDictionaryService.getIconsAssignedAs(
-    ElementTypes.ACTOR,
-  );
+  const actors = iconDictionaryService.getIconsAssignedAs(ElementTypes.ACTOR);
 
   let replaceOption = {};
   let i = 0;
 
-  actorTypes.keysArray().forEach((actorType) => {
+  actors.keysArray().forEach((actorType) => {
     if (!name.includes(actorType)) {
       const typeName = actorType;
       replaceOption[i] = {
@@ -35,14 +33,14 @@ export function actorReplaceOptions(name) {
 }
 
 export function workObjectReplaceOptions(name) {
-  const workObjectTypes = iconDictionaryService.getIconsAssignedAs(
+  const workObjects = iconDictionaryService.getIconsAssignedAs(
     ElementTypes.WORKOBJECT,
   );
 
   let replaceOption = {};
   let i = 0;
 
-  workObjectTypes.keysArray().forEach((workObjectType) => {
+  workObjects.keysArray().forEach((workObjectType) => {
     if (!name.includes(workObjectType)) {
       const typeName = workObjectType;
       replaceOption[i] = {

diff --git a/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js b/src/app/tools/modeler/bpmn/modeler/context-pad/domainStoryContextPadProvider.js
@@ -204,10 +204,10 @@ export default function DomainStoryContextPadProvider(
   }
 
   function addWorkObjects(appendAction, actions) {
-    let workObjectTypes = iconDictionaryService.getIconsAssignedAs(
+    let workObjects = iconDictionaryService.getIconsAssignedAs(
       ElementTypes.WORKOBJECT,
     );
-    workObjectTypes.keysArray().forEach((workObjectType) => {
+    workObjects.keysArray().forEach((workObjectType) => {
       let name = workObjectType;
       let icon = iconDictionaryService.getIconForBPMN(
         ElementTypes.WORKOBJECT,
@@ -225,10 +225,8 @@ export default function DomainStoryContextPadProvider(
   }
 
   function addActors(appendAction, actions) {
-    let actorTypes = iconDictionaryService.getIconsAssignedAs(
-      ElementTypes.ACTOR,
-    );
-    actorTypes.keysArray().forEach((actorType) => {
+    let actors = iconDictionaryService.getIconsAssignedAs(ElementTypes.ACTOR);
+    actors.keysArray().forEach((actorType) => {
       let name = actorType;
       let icon = iconDictionaryService.getIconForBPMN(
         ElementTypes.ACTOR,