fix(context): toolbar is replaced instead of merge

infra-geo-ouverte · Nov 19, 2019 · 4a808bf · 4a808bf
1 parent dc30fc2
commit 4a808bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -150,7 +150,6 @@
     "tslint": "^5.12.1",
     "typescript": "~3.2.4",
     "wait-on": "^3.2.0",
-    "webdriver-manager": "^12.1.6",
-    "webpack": "^4.41.2"
+    "webdriver-manager": "^12.1.6"
   }
 }
diff --git a/packages/context/src/lib/context-manager/shared/context.service.ts b/packages/context/src/lib/context-manager/shared/context.service.ts
@@ -236,11 +236,7 @@ export class ContextService {
                   !l.id || self.findIndex(l2 => l2.id === l.id) === index
               )
               .reverse();
-            resMerge.toolbar = [
-              ...(new Set(
-                (resBase.toolbar || []).concat(res.toolbar || []).reverse()
-              ) as any)
-            ].reverse();
+            resMerge.toolbar = res.toolbar  || resBase.toolbar;
             resMerge.tools = (res.tools || [])
               .concat(resBase.tools || [])
               .filter(