Cleanup

codex-team · May 15, 2022 · ebe55e6 · ebe55e6
1 parent 22259eb
commit ebe55e6
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/components/tools/base.ts b/src/components/tools/base.ts
@@ -78,10 +78,6 @@ export enum InternalBlockToolSettings {
    * Tool Toolbox config
    */
   Toolbox = 'toolbox',
-  /**
-   * Current active toolbox item
-   */
-  ToolboxItem = 'toolboxItem',
   /**
    * Tool conversion config
    */

diff --git a/src/components/tools/block.ts b/src/components/tools/block.ts
@@ -76,10 +76,9 @@ export default class BlockTool extends BaseTool<IBlockTool> {
     const toolToolboxSettings = this.constructable[InternalBlockToolSettings.Toolbox] as ToolboxConfig;
 
     if (Array.isArray(toolToolboxSettings)) {
-      return toolToolboxSettings.map(item => this.getActualToolboxSettings(item)).map(item => ({
-        ...item,
-        id: _.getHash(item.icon + item.title),
-      }));
+      return toolToolboxSettings
+        .map(item => this.getActualToolboxSettings(item))
+        .map(item => this.addIdToToolboxConfig(item));
     } else {
       return this.getActualToolboxSettings(toolToolboxSettings);
     }
@@ -183,4 +182,17 @@ export default class BlockTool extends BaseTool<IBlockTool> {
 
     return Object.assign({}, toolboxItemSettings, userToolboxSettings);
   }
+
+  /**
+   * Returns toolbox config entry with apended id field which is used later for
+   * identifying an entry in case the tool has multiple toolbox entries configured.
+   *
+   * @param config - toolbox config entry
+   */
+  private addIdToToolboxConfig(config: ToolboxConfig): ToolboxConfig {
+    return {
+      ...config,
+      id: _.getHash(config.icon + config.title),
+    };
+  }
 }