Fixed route issue with mydspace page

atarix83 · atarix83 · commit 303e8ac6f4a9 · 2018-05-25T18:42:38.000+02:00
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-group/dynamic-group.components.ts
@@ -74,7 +74,7 @@ export class DsDynamicGroupComponent implements OnDestroy, OnInit {
 
     this.formId = this.formService.getUniqueId(this.model.id);
     this.formModel = this.formBuilderService.modelFromConfiguration(config, this.model.scopeUUID, {});
-    this.chips = new Chips(this.model.value, 'value', this.model.mandatoryField);
+    this.chips = new Chips(this.model.value, 'value', this.model.mandatoryField, this.EnvConfig.submission.metadata.icons);
     this.subs.push(
       this.chips.chipsItems
         .subscribe((subItems: any[]) => {
diff --git a/src/app/shared/services/route.service.ts b/src/app/shared/services/route.service.ts
@@ -42,7 +42,7 @@ export class RouteService {
     return this.route.queryParamMap.map((map) => {
       const snapshot: RouterStateSnapshot = this.router.routerState.snapshot;
       // Due to an Angular bug, sometimes change of QueryParam is not detected so double checks with route snapshot
-      if (!isEqual(map.keys, snapshot.root.queryParamMap.keys)) {
+      if (!isEqual(map, snapshot.root.queryParamMap)) {
         return snapshot.root.queryParamMap;
       } else {
         return map;
diff --git a/yarn.lock b/yarn.lock
@@ -77,7 +77,7 @@
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@angularclass/bootloader/-/bootloader-1.0.1.tgz#75de7cf3901b445900a419c2aeca44181d465060"
 
-"@ng-bootstrap/ng-bootstrap@^1.0.0":
+"@ng-bootstrap/ng-bootstrap@1.1.2":
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-1.1.2.tgz#276b1c488687ca3e53d1694b63835fd57ca552ca"
 
