[NAE-2454] View Configuration 2.0

projects/netgrif-components-core/src/assets/i18n/de.json

@@ -491,7 +491,14 @@
         "filterNotFound": "Diese Ansicht hat keinen Filter",
         "loadMoreItems": "Mehr",
         "ascending": "Aufsteigend",
-        "descending": "Absteigend"
+        "descending": "Absteigend",
+        "editModeOff": "Bearbeitungsmodus deaktivieren",
+        "editModeOn": "Bearbeitungsmodus aktivieren",
+        "createMenuItemBtn": "Neuen Menüpunkt erstellen",
+        "editMenuItem": "Bearbeiten",
+        "snackbar": {
+            "failedItemCreation": "Fehler beim Erstellen des Artikels"
+        }
     },
     "impersonation": {
         "user": {

projects/netgrif-components-core/src/assets/i18n/en.json

@@ -492,7 +492,14 @@
         "filterNotFound": "This view has no filter",
         "loadMoreItems": "More",
         "ascending": "Ascending",
-        "descending": "Descending"
+        "descending": "Descending",
+        "editModeOff": "Disable edit mode",
+        "editModeOn": "Enable edit mode",
+        "createMenuItemBtn": "Create new menu item",
+        "editMenuItem": "Edit",
+        "snackbar": {
+            "failedItemCreation": "Failed to create menu item"
+        }
     },
     "impersonation": {
         "user": {

projects/netgrif-components-core/src/assets/i18n/sk.json

@@ -491,7 +491,14 @@
         "filterNotFound": "Toto zobrazenie neobsahuje filter",
         "loadMoreItems": "Viac",
         "ascending": "Vzostupne",
-        "descending": "Zostupne"
+        "descending": "Zostupne",
+        "editModeOff": "Vypnutie editačného módu",
+        "editModeOn": "Zapnutie editačného módu",
+        "createMenuItemBtn": "Vytvoriť novú položku v menu",
+        "editMenuItem": "Upraviť",
+        "snackbar": {
+            "failedItemCreation": "Nastala chyba pri vytváraní položky"
+        }
     },
     "impersonation": {
         "user": {

projects/netgrif-components-core/src/lib/header/case-header/case-header.service.ts

@@ -1,15 +1,15 @@
 import {Inject, Injectable, OnDestroy, Optional} from '@angular/core';
 import {AbstractHeaderService} from '../abstract-header-service';
 import {HeaderType} from '../models/header-type';
-import {HeaderColumn, HeaderColumnType} from '../models/header-column';
-import {CaseMetaField} from './case-menta-enum';
+import {HeaderColumn} from '../models/header-column';
 import {UserPreferenceService} from '../../user/services/user-preference.service';
 import {LoggerService} from '../../logger/services/logger.service';
 import {NAE_DEFAULT_HEADERS} from '../models/default-headers-token';
 import {Subscription} from 'rxjs';
 import {OverflowService} from '../services/overflow.service';
 import {ViewIdService} from '../../user/services/view-id.service';
 import {AllowedNetsService} from '../../allowed-nets/services/allowed-nets.service';
+import {getCaseMetaHeaders} from "../models/meta-fields-factory";
 
 
 @Injectable()
@@ -36,15 +36,7 @@ export class CaseHeaderService extends AbstractHeaderService implements OnDestro
     }
 
     protected createMetaHeaders(): Array<HeaderColumn> {
-        return [
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.VISUAL_ID, 'headers.caseMeta.visualID', 'text'),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.MONGO_ID, 'headers.caseMeta.mongoID', 'text', false),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.TITLE, 'headers.caseMeta.title', 'text'),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.AUTHOR, 'headers.caseMeta.author', 'user'),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.CREATION_DATE, 'headers.caseMeta.creationDate', 'date'),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.PROCESS_IDENTIFIER, 'headers.caseMeta.processIdentifier', 'text'),
-            new HeaderColumn(HeaderColumnType.META, CaseMetaField.PETRI_NET_ID, 'headers.caseMeta.petriNetId', 'text'),
-        ];
+        return getCaseMetaHeaders();
     }
 
     ngOnDestroy(): void {

projects/netgrif-components-core/src/lib/header/header-modes/sort-mode/abstract-sort-mode.component.ts

@@ -13,7 +13,7 @@ export abstract class AbstractSortModeComponent extends AbstractHeaderModeCompon
     @Input()
     public headerService: AbstractHeaderService;
 
-    constructor() {
+    protected constructor() {
         super();
     }
 

projects/netgrif-components-core/src/lib/header/models/meta-fields-factory.ts

@@ -0,0 +1,42 @@
+import {HeaderColumn, HeaderColumnType} from "./header-column";
+import {CaseMetaField} from "../case-header/case-menta-enum";
+import {TaskMetaField} from "../task-header/task-meta-enum";
+import {WorkflowMetaField} from "../workflow-header/workflow-meta-enum";
+
+/** Returns meta-headers for case view */
+export function getCaseMetaHeaders(): HeaderColumn[] {
+    return [
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.VISUAL_ID, 'headers.caseMeta.visualID', 'text'),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.MONGO_ID, 'headers.caseMeta.mongoID', 'text', false),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.TITLE, 'headers.caseMeta.title', 'text'),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.AUTHOR, 'headers.caseMeta.author', 'user'),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.CREATION_DATE, 'headers.caseMeta.creationDate', 'date'),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.PROCESS_IDENTIFIER, 'headers.caseMeta.processIdentifier', 'text'),
+        new HeaderColumn(HeaderColumnType.META, CaseMetaField.PETRI_NET_ID, 'headers.caseMeta.petriNetId', 'text'),
+    ];
+}
+
+/** Returns meta-headers for task view */
+export function getTaskMetaHeaders(): HeaderColumn[] {
+    return [
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.CASE, 'headers.taskMeta.case', 'text'),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.CASE_ID, 'headers.taskMeta.caseID', 'text', false),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.TASK_ID, 'headers.taskMeta.taskID', 'text', false),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.TITLE, 'headers.caseMeta.title', 'text'),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.PRIORITY, 'headers.taskMeta.priority', 'enumeration'),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.USER, 'headers.taskMeta.user', 'text'),
+        new HeaderColumn(HeaderColumnType.META, TaskMetaField.ASSIGN_DATE, 'headers.taskMeta.assignDate', 'date'),
+    ];
+}
+
+/** Returns meta-headers for workflow view */
+export function getWorkflowMetaHeaders(): HeaderColumn[] {
+    return [
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.INITIALS, 'headers.workflowMeta.initials', 'text'),
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.TITLE, 'headers.workflowMeta.title', 'text'),
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.NET_ID, 'headers.workflowMeta.netId', 'text', false),
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.VERSION, 'headers.workflowMeta.version', 'text'),
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.AUTHOR, 'headers.workflowMeta.author', 'text'),
+        new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.CREATION_DATE, 'headers.workflowMeta.creationDate', 'date'),
+    ];
+}

projects/netgrif-components-core/src/lib/header/models/public-api.ts

@@ -2,6 +2,7 @@ export * from './header-column';
 export * from './header-mode';
 export * from './header-type';
 export * from './default-headers-token';
+export * from './meta-fields-factory'
 
 export * from './user-changes/header-change';
 export * from './user-changes/header-change-description';

projects/netgrif-components-core/src/lib/header/task-header/task-header.service.ts

@@ -1,15 +1,15 @@
 import {Inject, Injectable, OnDestroy, Optional} from '@angular/core';
 import {AbstractHeaderService} from '../abstract-header-service';
 import {HeaderType} from '../models/header-type';
-import {HeaderColumn, HeaderColumnType} from '../models/header-column';
-import {TaskMetaField} from './task-meta-enum';
+import {HeaderColumn} from '../models/header-column';
 import {UserPreferenceService} from '../../user/services/user-preference.service';
 import {LoggerService} from '../../logger/services/logger.service';
 import {Subscription} from 'rxjs';
 import {NAE_DEFAULT_HEADERS} from '../models/default-headers-token';
 import {ViewIdService} from '../../user/services/view-id.service';
 import {AllowedNetsService} from '../../allowed-nets/services/allowed-nets.service';
 import {OverflowService} from '../services/overflow.service';
+import {getTaskMetaHeaders} from "../models/meta-fields-factory";
 
 
 @Injectable()
@@ -36,15 +36,7 @@ export class TaskHeaderService extends AbstractHeaderService implements OnDestro
     }
 
     protected createMetaHeaders(): Array<HeaderColumn> {
-        return [
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.CASE, 'headers.taskMeta.case', 'text'),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.CASE_ID, 'headers.taskMeta.caseID', 'text', false),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.TASK_ID, 'headers.taskMeta.taskID', 'text', false),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.TITLE, 'headers.caseMeta.title', 'text'),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.PRIORITY, 'headers.taskMeta.priority', 'enumeration'),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.USER, 'headers.taskMeta.user', 'text'),
-            new HeaderColumn(HeaderColumnType.META, TaskMetaField.ASSIGN_DATE, 'headers.taskMeta.assignDate', 'date'),
-        ];
+        return getTaskMetaHeaders();
     }
 
     protected saveState() {

projects/netgrif-components-core/src/lib/header/workflow-header/workflow-header.service.ts

@@ -1,12 +1,12 @@
 import {Injectable, OnDestroy, Optional} from '@angular/core';
 import {AbstractHeaderService} from '../abstract-header-service';
 import {HeaderType} from '../models/header-type';
-import {HeaderColumn, HeaderColumnType} from '../models/header-column';
+import {HeaderColumn} from '../models/header-column';
 import {UserPreferenceService} from '../../user/services/user-preference.service';
 import {LoggerService} from '../../logger/services/logger.service';
-import {WorkflowMetaField} from './workflow-meta-enum';
 import {ViewIdService} from '../../user/services/view-id.service';
 import {OverflowService} from '../services/overflow.service';
+import {getWorkflowMetaHeaders} from "../models/meta-fields-factory";
 
 @Injectable()
 export class WorkflowHeaderService extends AbstractHeaderService implements OnDestroy {
@@ -21,14 +21,7 @@ export class WorkflowHeaderService extends AbstractHeaderService implements OnDe
     }
 
     protected createMetaHeaders(): Array<HeaderColumn> {
-        return [
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.INITIALS, 'headers.workflowMeta.initials', 'text'),
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.TITLE, 'headers.workflowMeta.title', 'text'),
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.NET_ID, 'headers.workflowMeta.netId', 'text', false),
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.VERSION, 'headers.workflowMeta.version', 'text'),
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.AUTHOR, 'headers.workflowMeta.author', 'text'),
-            new HeaderColumn(HeaderColumnType.META, WorkflowMetaField.CREATION_DATE, 'headers.workflowMeta.creationDate', 'date'),
-        ];
+        return getWorkflowMetaHeaders();
     }
 
     ngOnDestroy(): void {

projects/netgrif-components-core/src/lib/navigation/model/group-navigation-constants.ts

@@ -182,9 +182,9 @@ export enum GroupNavigationConstants {
     ITEM_FIELD_ID_NODE_PATH = 'nodePath',
 
     /**
-     * Boolean field, that is true if item contains child items
+     * Boolean field, that is true if the item represents a folder
      * */
-    ITEM_FIELD_ID_HAS_CHILDREN = 'hasChildren',
+    ITEM_FIELD_ID_IS_FOLDER = 'is_folder',
 
     /**
      * CaseField containing stringIds of child instances of process preference_item
@@ -246,6 +246,26 @@ export enum GroupNavigationConstants {
      */
     ITEM_FIELD_TASK_INHERIT_ALLOWED_NETS = "task_inherit_allowed_nets",
 
+    /**
+     * Text field, which contains identifier of active column in header for sorting
+     */
+    ITEM_FIELD_CASE_HEADERS_SORT_MODE_ACTIVE = "case_headers_sort_mode_active",
+
+    /**
+     * Enumeration map field, which contains default direction for sorting
+     */
+    ITEM_FIELD_CASE_HEADERS_SORT_MODE_DIRECTION = "case_headers_sort_mode_direction",
+
+    /**
+     * Text field, which contains identifier of active column in header for sorting
+     */
+    ITEM_FIELD_TASK_HEADERS_SORT_MODE_ACTIVE = "task_headers_sort_mode_active",
+
+    /**
+     * Enumeration map field, which contains default direction for sorting
+     */
+    ITEM_FIELD_TASK_HEADERS_SORT_MODE_DIRECTION = "task_headers_sort_mode_direction",
+
     /**
      * Transition ID, which contains all configuration data
      */

projects/netgrif-components-core/src/lib/navigation/navigation-double-drawer/abstract-navigation-double-drawer.spec.ts

@@ -1,7 +1,7 @@
 import {BreakpointObserver} from '@angular/cdk/layout';
 import {CommonModule} from '@angular/common';
 import {HttpClientTestingModule} from '@angular/common/http/testing';
-import {Component, CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
+import {Component, CUSTOM_ELEMENTS_SCHEMA, Injector} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 import {FlexLayoutModule, FlexModule} from '@ngbracket/ngx-layout';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
@@ -40,6 +40,9 @@ import {CaseResourceService} from "../../resources/engine-endpoint/case-resource
 import {MockCaseResourceService} from "../../utility/tests/mocks/mock-case-resource.service";
 import {DoubleDrawerNavigationService} from "./service/double-drawer-navigation.service";
 import {RedirectService} from "../../routing/redirect-service/redirect.service";
+import {ProcessService} from "../../process/process.service";
+import {SnackBarService} from "../../snack-bar/services/snack-bar.service";
+import {MatDialog} from "@angular/material/dialog";
 
 xdescribe('AbstractNavigationDoubleDrawerComponent', () => {
     let component: TestDrawerComponent;
@@ -150,15 +153,19 @@ class TestDrawerComponent extends AbstractNavigationDoubleDrawerComponent {
                 _log: LoggerService,
                 _config: ConfigurationService,
                 _uriService: UriService,
+                _processService: ProcessService,
                 _caseResourceService: CaseResourceService,
                 _impersonationUserSelect: ImpersonationUserSelectService,
                 _impersonation: ImpersonationService,
                 _dynamicRouteProviderService: DynamicNavigationRouteProviderService,
                 _redirectService: RedirectService,
+                _snackBarService: SnackBarService,
+                _dialog: MatDialog,
+                _injector: Injector,
                 _navigationService: DoubleDrawerNavigationService) {
         super(_router, _activatedRoute, _breakpoint, _languageService, _translateService, _userService, _accessService,
-            _log, _config, _uriService, _caseResourceService, _impersonationUserSelect, _impersonation,
-            _dynamicRouteProviderService, _redirectService, _navigationService);
+            _log, _config, _uriService, _processService, _caseResourceService, _impersonationUserSelect, _impersonation,
+            _dynamicRouteProviderService, _redirectService, _snackBarService, _dialog, _injector, _navigationService);
     }
 }