* feat(toolbox): parent-children between catalog and catalogBrowser (#…

…405) * blad * nhj * feat/ui (search-assemblage): panel de détails, bouton add/remove layer, cleanFeature * <feat/ui>(sidenav) : scrollable vs scroll button, zoom button (tablet), expansion panel (mobile) * ui(sidenav): scroll button * feat(toolbox): parent-children between catalog and catalogBrowser * package
infra-geo-ouverte · Sep 11, 2019 · e6e53a2 · e6e53a2
1 parent 6e8c62e
commit e6e53a2
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 3 deletions.
diff --git a/packages/common/src/lib/tool/shared/tool.interface.ts b/packages/common/src/lib/tool/shared/tool.interface.ts
@@ -7,6 +7,9 @@ export interface Tool {
   tooltip?: string;
   options?: { [key: string]: any };
 
+  parent?: string;
+  children?: string[];
+
   // This is still used with the API but should be removed ultimately
   id?: string;
 }

diff --git a/packages/common/src/lib/tool/shared/toolbox.ts b/packages/common/src/lib/tool/shared/toolbox.ts
@@ -117,6 +117,40 @@ export class Toolbox {
     this.activateTool(previous);
   }
 
+  /**
+   * Activate the tool below, if any
+   */
+  /* activateBelowTool() {
+    const arrayTools = this.getToolbar();
+    const index = arrayTools.findIndex(t => t === this.activeTool$.getValue().name);
+    if (arrayTools[index + 1] !== undefined) {
+      this.deactivateTool();
+      const below = arrayTools[index + 1];
+      this.activateTool(below);
+    } else {
+      this.deactivateTool();
+      const below = arrayTools[0];
+      this.activateTool(below);
+    }
+  } */
+
+  /**
+   * Activate the tool above, if any
+   */
+  /* activateAboveTool() {
+    const arrayTools = this.getToolbar();
+    const index = arrayTools.findIndex(t => t === this.activeTool$.getValue().name);
+    if (arrayTools[index - 1] !== undefined) {
+      this.deactivateTool();
+      const above = arrayTools[index - 1];
+      this.activateTool(above);
+    } else {
+      this.deactivateTool();
+      const above = arrayTools[arrayTools.length - 1];
+      this.activateTool(above);
+    }
+  } */
+
   /**
    * Deactivate the active tool
    */

diff --git a/packages/common/src/lib/tool/toolbox/toolbox.component.scss b/packages/common/src/lib/tool/toolbox/toolbox.component.scss
@@ -53,6 +53,10 @@ igo-actionbar ::ng-deep igo-actionbar-item.tool-actived ::ng-deep mat-list-item
   background-color: #e0e0e0;
 }
 
+igo-actionbar ::ng-deep igo-actionbar-item.children-tool-actived ::ng-deep mat-list-item {
+  background-color: #e0e0e0;
+}
+
 igo-dynamic-outlet {
   overflow: auto;
 }
diff --git a/packages/common/src/lib/tool/toolbox/toolbox.component.ts b/packages/common/src/lib/tool/toolbox/toolbox.component.ts
@@ -3,7 +3,8 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  ChangeDetectionStrategy
+  ChangeDetectionStrategy,
+  Output
 } from '@angular/core';
 
 import { Subscription, BehaviorSubject } from 'rxjs';
@@ -137,8 +138,12 @@ export class ToolboxComponent implements OnInit, OnDestroy {
     return (tool: Tool) => {
       if (!this.toolbox.activeTool$.value) {
         return;
+      } else {
+        if (this.toolbox.activeTool$.value.parent) {
+          return { 'children-tool-actived': tool.id === this.toolbox.activeTool$.value.parent };
+        }
+        return { 'tool-actived': tool.id === this.toolbox.activeTool$.value.name };
       }
-      return { 'tool-actived': tool.id === this.toolbox.activeTool$.value.name };
     };
   }
 

diff --git a/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts b/packages/integration/src/lib/catalog/catalog-browser-tool/catalog-browser-tool.component.ts
@@ -27,7 +27,8 @@ import { CatalogState } from '../catalog.state';
 @ToolComponent({
   name: 'catalogBrowser',
   title: 'igo.integration.tools.catalog',
-  icon: 'photo-browser'
+  icon: 'photo-browser',
+  parent: 'catalog'
 })
 @Component({
   selector: 'igo-catalog-browser-tool',

diff --git a/packages/integration/src/lib/context/context.state.ts b/packages/integration/src/lib/context/context.state.ts
@@ -64,6 +64,14 @@ export class ContextState {
       tools.push(tool);
     });
 
+    tools.forEach(tool => {
+      if (tool.parent) {
+        const parentIndex = tools.findIndex(el => el.name === tool.parent);
+        tools[parentIndex].children = [];
+        tools[parentIndex].children.push(tool.name);
+      }
+    });
+
     toolbox.setTools(tools);
     toolbox.setToolbar(context.toolbar || []);