[NAE-2463] Builder change localStorage sets

projects/nae-example-app/src/app/doc/builder-example/builder-tabbed-case-view/builder-tabbed-case-view.component.ts

@@ -11,10 +11,9 @@ import {
     SimpleFilter,
     AbstractTabbedCaseViewComponent,
     ViewIdService, NAE_DEFAULT_HEADERS,
-    NAE_BASE_FILTER, AllowedNetsServiceFactory, AllowedNetsService,  OverflowService
+    NAE_BASE_FILTER, AllowedNetsServiceFactory, AllowedNetsService,  OverflowService, Case
 } from '@netgrif/components-core';
 import {HeaderComponent} from '@netgrif/components';
-import {Case} from "../../../../../../netgrif-components-core/src/lib/resources/interface/case";
 import {TranslateService} from "@ngx-translate/core";
 
 const baseFilterFactory = (injectedData: InjectedTabbedCaseViewData) => {

projects/nae-example-app/src/app/doc/builder-example/builder-tabs-example.component.ts

@@ -1,4 +1,4 @@
-import {ChangeDetectionStrategy, Component, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
 import {NAE_TASK_FORCE_OPEN, NAE_VIEW_ID_SEGMENT, TabContent, ViewIdService} from '@netgrif/components-core';
 import {BuilderTabbedCaseViewComponent} from './builder-tabbed-case-view/builder-tabbed-case-view.component';
 import {
@@ -14,8 +14,7 @@ import {TranslateService} from "@ngx-translate/core";
         {provide: NAE_VIEW_ID_SEGMENT, useValue: 'all-cases'},
         {provide: NAE_TASK_FORCE_OPEN, useValue: false},
         ViewIdService
-    ],
-    changeDetection: ChangeDetectionStrategy.OnPush
+    ]
 })
 export class BuilderTabsExampleComponent implements OnInit {
 

projects/netgrif-components/src/lib/builder/builder.component.spec.ts

@@ -5,7 +5,7 @@ import {MatDialog} from '@angular/material/dialog';
 import {ActivatedRoute, Router} from '@angular/router';
 import {ImportService} from '@netgrif/petriflow';
 import {of} from 'rxjs';
-import {BuilderModeService} from './builder-mode.service';
+import {BuilderModeService} from './services/builder-mode.service';
 import {ArcFactory} from './modeler/edit-mode/domain/arc-builders/arc-factory.service';
 import {EditModeService} from './modeler/edit-mode/edit-mode.service';
 import {ExportService} from '@netgrif/petriflow';

projects/netgrif-components/src/lib/builder/builder.component.ts

@@ -1,5 +1,5 @@
-import {Component, Inject, Optional} from '@angular/core';
-import {BuilderMode, BuilderModeService} from "./builder-mode.service";
+import {ChangeDetectionStrategy, Component, Inject, Optional} from '@angular/core';
+import {BuilderMode, BuilderModeService} from "./services/builder-mode.service";
 import {ModelService} from "./modeler/services/model/model.service";
 import {ActivatedRoute, Router} from "@angular/router";
 import {MatDialog} from "@angular/material/dialog";
@@ -52,8 +52,9 @@
 import {BuilderPaginatorIntl} from './modeler/components/master-detail/main-master/builder-paginator-inpl';
 import {MAT_FORM_FIELD_DEFAULT_OPTIONS} from '@angular/material/form-field';
 import {I18nControlService} from './modeler/i18n-mode/i18n-control.service';
-import {BuilderIntegrationService} from "./builder-integration.service";
+import {BuilderIntegrationService} from "./services/builder-integration.service";
 import {TaskModeService} from "./modeler/task-mode/task-mode.service";
+import {LocalStorageService} from "./services/local-storage.service";
 
 @Component({
     selector: 'nc-builder',
@@ -108,7 +109,8 @@
         BuilderModeService,
         I18nControlService,
         BuilderIntegrationService,
-        TaskModeService
+        TaskModeService,
+        LocalStorageService
     ]
 })
 export class BuilderComponent {

projects/netgrif-components/src/lib/builder/dialogs/dialog-manage-roles/dialog-manage-roles.component.ts

@@ -9,6 +9,7 @@
 import {HistoryService} from '../../modeler/services/history/history.service';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {CanvasToolContext} from "../../modeler/edit-mode/services/modes/canvas-tool-context";
+import {LocalStorageService} from "../../services/local-storage.service";
 
 export enum RoleRefType {
     TRANSITION = 'transition',
@@ -25,6 +26,7 @@
     processUserRefs?: Array<ProcessPermissionRef>;
     modelService: ModelService;
     historyService: HistoryService;
+    localStorageService: LocalStorageService;
 }
 
 @Component({
@@ -50,12 +52,14 @@
 
     private modelService: ModelService;
     private historyService: HistoryService;
+    private _localStorageService: LocalStorageService;
 
     constructor(
-        @Inject(MAT_DIALOG_DATA) public data: ManagePermissionData,
+        @Inject(MAT_DIALOG_DATA) public data: ManagePermissionData
     ) {
         this.modelService = data.modelService;
         this.historyService = data.historyService;
+        this._localStorageService = data.localStorageService;
         if (this.data.type === RoleRefType.TRANSITION) {
             const arrayRoleRefs = [...this.data.rolesRefs];
             this.addDefaultRoleRefs(arrayRoleRefs);
@@ -127,12 +131,12 @@
         this.dataSource.sort = this.sort;
         this.usersDataSource.sort = this.userSort;
         this.sort.sort(({
-            id: localStorage.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_SORT),
-            start: localStorage.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_DIRECTION)
+            id: this._localStorageService.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_SORT),
+            start: this._localStorageService.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_DIRECTION)
         }) as MatSortable);
         this.userSort.sort(({
-            id: localStorage.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_SORT),
-            start: localStorage.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_DIRECTION)
+            id: this._localStorageService.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_SORT),
+            start: this._localStorageService.getItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_DIRECTION)
         }) as MatSortable);
     }
 
@@ -250,13 +254,13 @@
     }
 
     sortRoleRefs(sort: Sort): void {
-        localStorage.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_SORT, sort.active);
-        localStorage.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_DIRECTION, sort.direction);
+        this._localStorageService.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_SORT, sort.active);
+        this._localStorageService.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.ROLE_DIRECTION, sort.direction);
     }
 
     sortUserRefs(sort: Sort): void {
-        localStorage.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_SORT, sort.active);
-        localStorage.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_DIRECTION, sort.direction);
+        this._localStorageService.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_SORT, sort.active);
+        this._localStorageService.setItem(ModelerConfig.LOCALSTORAGE.PERMISSION_DIALOG.USER_REF_DIRECTION, sort.direction);
     }
 
     ngOnDestroy(): void {

projects/netgrif-components/src/lib/builder/dialogs/dialog-model-edit/dialog-model-edit.component.ts

@@ -8,9 +8,10 @@
 import {ModelChange} from '../../modeler/history-mode/model/model/model-change';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {DialogManageRolesComponent, RoleRefType} from '../dialog-manage-roles/dialog-manage-roles.component';
-import {BuilderModeService, BuilderMode} from "../../builder-mode.service";
+import {BuilderModeService, BuilderMode} from "../../services/builder-mode.service";
 import {HistoryService} from "../../modeler/services/history/history.service";
 import {CanvasToolContext} from "../../modeler/edit-mode/services/modes/canvas-tool-context";
+import {LocalStorageService} from '../../services/local-storage.service';
 
 export interface ModelEditData {
     model: ModelChange;
@@ -36,6 +37,7 @@
     private _processTool: ProcessActionsTool;
     private _builderModeService: BuilderModeService;
     private historyService: HistoryService;
+    private _localStorageService: LocalStorageService;
 
     constructor(
         @Inject(MAT_DIALOG_DATA) public data: ModelEditData,
@@ -47,6 +49,7 @@
         this._processTool = data.context.processTool;
         this._builderModeService = data.context.builderModeService;
         this.historyService = data.context.editModeService.historyService;
+        this._localStorageService = data.context.localStorageService;
 
         this.idCtrl = new FormControl('', [Validators.required]);
         this.versionCtrl = new FormControl('', [
@@ -68,7 +71,8 @@
                 processUserRefs: this.modelService.model.getUserRefs(),
                 userLists: this.modelService.model.getDataSet().filter(item => item.type === DataType.USER_LIST),
                 modelService: this.modelService,
-                historyService: this.historyService
+                historyService: this.historyService,
+                localStorageService: this._localStorageService
             }
         });
     }

projects/netgrif-components/src/lib/builder/dialogs/dialog-transition-edit/dialog-transition-edit.component.ts

@@ -9,9 +9,10 @@
 import {ModelService} from '../../modeler/services/model/model.service';
 import {DialogManageRolesComponent, RoleRefType} from '../dialog-manage-roles/dialog-manage-roles.component';
 import {ChangedTransition} from './changed-transition';
-import {BuilderModeService, BuilderMode} from '../../builder-mode.service';
+import {BuilderModeService, BuilderMode} from '../../services/builder-mode.service';
 import {HistoryService} from "../../modeler/services/history/history.service";
 import {CanvasToolContext} from "../../modeler/edit-mode/services/modes/canvas-tool-context";
+import {LocalStorageService} from '../../services/local-storage.service';
 
 export interface TransitionEditData {
     transitionId: string;
@@ -37,6 +38,7 @@
     private _actionsMasterDetail: ActionsMasterDetailService;
     private _builderModeService: BuilderModeService;
     private _historyService: HistoryService;
+    private _localStorageService: LocalStorageService;
 
     constructor(
         @Inject(MAT_DIALOG_DATA) public data: TransitionEditData,
@@ -49,6 +51,7 @@
         this._actionsMasterDetail = data.context.actionsMasterDetail;
         this._builderModeService = data.context.builderModeService;
         this._historyService = data.context.editModeService.historyService;
+        this._localStorageService = data.context.localStorageService;
 
         this.transition = new ChangedTransition(undefined, this._modelService.model.getTransition(data.transitionId).clone());
         this.form = new FormControl('', [
@@ -96,7 +99,8 @@
                 userRefs: this.transition.transition.userRefs,
                 userLists: this._modelService.model.getDataSet().filter(item => item.type === DataType.USER_LIST),
                 modelService: this._modelService,
-                historyService: this._historyService
+                historyService: this._historyService,
+                localStorageService: this._localStorageService
             }
         });
     }

projects/netgrif-components/src/lib/builder/form-builder/edit-panel/edit-panel.component.spec.ts

@@ -2,7 +2,7 @@ import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {MatDialog} from '@angular/material/dialog';
 import {Router} from '@angular/router';
-import {BuilderModeService} from '../../builder-mode.service';
+import {BuilderModeService} from '../../services/builder-mode.service';
 import {ArcFactory} from '../../modeler/edit-mode/domain/arc-builders/arc-factory.service';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {SelectedTransitionService} from '../../modeler/selected-transition.service';

projects/netgrif-components/src/lib/builder/form-builder/edit-panel/edit-panel.component.ts

@@ -36,7 +36,7 @@ import {ModelService} from '../../modeler/services/model/model.service';
 import {DataFieldUtils} from '../data-field-utils';
 import {ComponentDef, DataRefDef, FieldListService, PropertyDef} from '../field-list/field-list.service';
 import {GridsterService} from '../gridster/gridster.service';
-import {BuilderModeService, BuilderMode} from "../../builder-mode.service";
+import {BuilderModeService, BuilderMode} from "../../services/builder-mode.service";
 
 @Component({
     selector: 'nc-builder-edit-panel',

projects/netgrif-components/src/lib/builder/form-builder/field-list/field-list.component.spec.ts

@@ -4,7 +4,7 @@ import {MatDialog} from '@angular/material/dialog';
 import {MatSnackBar} from '@angular/material/snack-bar';
 import {Router} from '@angular/router';
 import {PetriNet} from '@netgrif/petriflow';
-import {BuilderModeService} from '../../builder-mode.service';
+import {BuilderModeService} from '../../services/builder-mode.service';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {SelectedTransitionService} from '../../modeler/selected-transition.service';
 import {GridsterService} from '../gridster/gridster.service';

projects/netgrif-components/src/lib/builder/form-builder/field-list/field-list.component.ts

@@ -11,7 +11,7 @@ import {SelectedTransitionService} from '../../modeler/selected-transition.servi
 import {ModelService} from '../../modeler/services/model/model.service';
 import {GridsterService} from '../gridster/gridster.service';
 import {ComponentDef, FieldListService} from './field-list.service';
-import {BuilderModeService, BuilderMode} from "../../builder-mode.service";
+import {BuilderModeService, BuilderMode} from "../../services/builder-mode.service";
 
 export interface Data {
     title: string;

projects/netgrif-components/src/lib/builder/form-builder/form-builder.component.spec.ts

@@ -1,11 +1,11 @@
 import {CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {PetriNet} from '@netgrif/petriflow';
-import {BuilderModeService} from '../builder-mode.service';
+import {BuilderModeService} from '../services/builder-mode.service';
 import {ModelService} from '../modeler/services/model/model.service';
 import {SelectedTransitionService} from '../modeler/selected-transition.service';
 import {FormBuilderComponent} from './form-builder.component';
-import {BuilderIntegrationService} from "../builder-integration.service";
+import {BuilderIntegrationService} from "../services/builder-integration.service";
 import {HistoryService} from "../modeler/services/history/history.service";
 import {HttpClientTestingModule} from "@angular/common/http/testing";
 import {RouterTestingModule} from "@angular/router/testing";

projects/netgrif-components/src/lib/builder/form-builder/form-builder.component.ts

@@ -5,8 +5,8 @@ import {ModelerConfig} from '../modeler/modeler-config';
 import {ModelerUtils} from '../modeler/modeler-utils';
 import {SelectedTransitionService} from '../modeler/selected-transition.service';
 import {ModelService} from '../modeler/services/model/model.service';
-import {BuilderMode, BuilderModeService} from "../builder-mode.service";
-import {BuilderIntegrationService} from "../builder-integration.service";
+import {BuilderMode, BuilderModeService} from "../services/builder-mode.service";
+import {BuilderIntegrationService} from "../services/builder-integration.service";
 
 @Component({
     selector: 'nc-builder-form-builder',

projects/netgrif-components/src/lib/builder/form-builder/gridster/gridster.component.spec.ts

@@ -1,7 +1,7 @@
 import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
 import {Router} from '@angular/router';
-import {BuilderModeService} from '../../builder-mode.service';
+import {BuilderModeService} from '../../services/builder-mode.service';
 import {ArcFactory} from '../../modeler/edit-mode/domain/arc-builders/arc-factory.service';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {SelectedTransitionService} from '../../modeler/selected-transition.service';
@@ -10,6 +10,7 @@ import {ExportService} from '@netgrif/petriflow';
 import {GridsterService} from './gridster.service';
 import {FieldListService} from '../field-list/field-list.service';
 import {GridsterComponent} from './gridster.component';
+import {LocalStorageService} from "../../services/local-storage.service";
 
 describe('GridsterComponent', () => {
     beforeEach(() => {
@@ -24,6 +25,7 @@ describe('GridsterComponent', () => {
                 BuilderModeService,
                 HistoryService,
                 ExportService,
+                LocalStorageService,
                 {provide: Router, useValue: {}},
             ],
             schemas: [NO_ERRORS_SCHEMA],

projects/netgrif-components/src/lib/builder/form-builder/gridster/gridster.component.ts

@@ -7,7 +7,7 @@ import {ModelService} from '../../modeler/services/model/model.service';
 import {FieldListService} from '../field-list/field-list.service';
 import {GridsterDataField} from './classes/gridster-data-field';
 import {GridsterService} from './gridster.service';
-import {BuilderModeService, BuilderMode} from "../../builder-mode.service";
+import {BuilderModeService, BuilderMode} from "../../services/builder-mode.service";
 
 @Component({
     selector: 'nc-builder-gridster-component',

projects/netgrif-components/src/lib/builder/form-builder/info-label/info-label.component.spec.ts

@@ -1,6 +1,6 @@
 import {NO_ERRORS_SCHEMA} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {BuilderModeService} from '../../builder-mode.service';
+import {BuilderModeService} from '../../services/builder-mode.service';
 import {ArcFactory} from '../../modeler/edit-mode/domain/arc-builders/arc-factory.service';
 import {ModelService} from '../../modeler/services/model/model.service';
 import {SelectedTransitionService} from '../../modeler/selected-transition.service';

projects/netgrif-components/src/lib/builder/form-builder/info-label/info-label.component.ts

@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {PetriNet, Transition} from '@netgrif/petriflow';
 import {SelectedTransitionService} from '../../modeler/selected-transition.service';
 import {ModelService} from '../../modeler/services/model/model.service';
-import {BuilderModeService, BuilderMode} from "../../builder-mode.service";
+import {BuilderModeService, BuilderMode} from "../../services/builder-mode.service";
 
 @Component({
     selector: 'nc-builder-info-label',