diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json index ad4ec33a2f..c5897a9ad5 100644 --- a/demo-shell/resources/i18n/en.json +++ b/demo-shell/resources/i18n/en.json @@ -174,6 +174,7 @@ "TASKS-TAB": "Tasks", "PROCESSES-TAB": "Process", "REPORTS-TAB": "Reports", + "SETTINGS-TAB": "Settings", "START-TASK": "Start task", "START-PROCESS": "Start process", "PROCESS-AUDIT-LOG": "Process Audit log", diff --git a/demo-shell/src/app/components/process-service/process-service.component.html b/demo-shell/src/app/components/process-service/process-service.component.html index f66f6c5619..67ebe4737a 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.html +++ b/demo-shell/src/app/components/process-service/process-service.component.html @@ -1,17 +1,19 @@ - +
- - arrow_drop_down -
- -
+ + arrow_drop_down +
+ +
@@ -20,7 +22,7 @@ @@ -28,16 +30,9 @@
-
- - {{ 'PS-TAB.TASK-SHOW-HEADER'| translate }} -
-
+
+ [debugMode]="true" + [taskId]="currentTaskId" + [fieldValidators]="fieldValidators" + [showHeaderContent]="showHeaderContent" + (formCompleted)="onFormCompleted($event)" + (formContentClicked)="onContentClick($event)" + (taskCreated)="onTaskCreated($event)" + (assignTask)="onAssignTask()" + (taskDeleted)="onTaskDeleted($event)">
@@ -96,7 +92,7 @@
- +
@@ -111,15 +107,17 @@
+ label="{{'PS-TAB.PROCESSES-TAB' | translate}}">
- - arrow_drop_down + + arrow_drop_down
- @@ -133,7 +131,7 @@ #activitiprocessfilter [appId]="appId" [filterParam]="filterSelected" - [showIcon]="false" + [showIcon]="showProcessFilterIcon" (filterClick)="onProcessFilterChange($event)" (filterSelected)="onProcessFilterChange($event)" (success)="onSuccessProcessFilterList($event)"> @@ -141,7 +139,8 @@
-
- +
@@ -213,7 +213,7 @@
+ label="{{'PS-TAB.REPORTS-TAB' | translate}}">
Report List
 @@ -241,4 +241,23 @@
+ +
+
+

Settings Menu

 +
+
+
+ Show task filters icons +
+
+ Show process filters icons +
+
+ {{ 'PS-TAB.TASK-SHOW-HEADER'| translate }} +
+
+
+ diff --git a/demo-shell/src/app/components/process-service/process-service.component.scss b/demo-shell/src/app/components/process-service/process-service.component.scss index 7a125726c3..db18b63af2 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.scss +++ b/demo-shell/src/app/components/process-service/process-service.component.scss @@ -94,6 +94,10 @@ } } + mat-slide-toggle { + margin: 10px; + } + @media screen and ($mat-small) { container-widget .grid-list { flex-direction: column; diff --git a/demo-shell/src/app/components/process-service/process-service.component.ts b/demo-shell/src/app/components/process-service/process-service.component.ts index 77cc65b012..140f436f71 100644 --- a/demo-shell/src/app/components/process-service/process-service.component.ts +++ b/demo-shell/src/app/components/process-service/process-service.component.ts @@ -144,6 +144,9 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit showTaskTab: boolean; showProcessTab: boolean; + showProcessFilterIcon: boolean; + showTaskFilterIcon: boolean; + fieldValidators = [ ...FORM_FIELD_VALIDATORS, new DemoFieldValidator() @@ -491,4 +494,10 @@ export class ProcessServiceComponent implements AfterViewInit, OnDestroy, OnInit this.currentTaskId = null; } + changeTaskFilterIcon() { + this.showTaskFilterIcon = !this.showTaskFilterIcon; + } + changeProcessFilterIcon() { + this.showProcessFilterIcon = !this.showProcessFilterIcon; + } } diff --git a/e2e/pages/adf/process_services/appNavigationBarPage.js b/e2e/pages/adf/process_services/appNavigationBarPage.js index 0eee6dc981..ea43ee270a 100644 --- a/e2e/pages/adf/process_services/appNavigationBarPage.js +++ b/e2e/pages/adf/process_services/appNavigationBarPage.js @@ -22,6 +22,7 @@ var AppNavigationBarPage = function () { var tasksButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Tasks")).first(); var processButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Process")).first(); var reportsButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Reports")).first(); + var settingsButton = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div", "Settings")).first(); var reportsButtonSelected = element.all(by.cssContainingText("div[class*='mat-tab-label'] .mat-tab-labels div[aria-selected='true']", "Reports")).first(); this.clickTasksButton = function () { @@ -33,6 +34,10 @@ var AppNavigationBarPage = function () { return processButton.click(); }; + this.clickSettingsButton = function () { + return settingsButton.click(); + }; + this.clickReportsButton = function () { Util.waitUntilElementIsVisible(reportsButton); reportsButton.click(); diff --git a/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js b/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js index 42d57c44f9..356ff28e0b 100644 --- a/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js +++ b/e2e/pages/adf/process_services/dialog/taskDetailsToggles.js @@ -20,8 +20,8 @@ var ToggleState = require('../../core/toggleState'); var TaskDetailsToggles = function () { var toggleState = new ToggleState(); - - var showDetailsHeaderToggle = element(by.id("showHeaderToggle-input")); + + var showDetailsHeaderToggle = element(by.id('adf-show-header-input')); this.enableShowHeader = function () { toggleState.enableToggle(showDetailsHeaderToggle); diff --git a/e2e/process-services/start_task_custom_app.e2e.ts b/e2e/process-services/start_task_custom_app.e2e.ts index e6d5cd773f..582b2567ed 100644 --- a/e2e/process-services/start_task_custom_app.e2e.ts +++ b/e2e/process-services/start_task_custom_app.e2e.ts @@ -21,7 +21,7 @@ import LoginPage = require('../pages/adf/loginPage'); import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage'); import TasksPage = require('../pages/adf/process_services/tasksPage'); import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; -import CONSTANTS = require('../util/constants'); +import AppNavigationBarPage = require('../pages/adf/process_services/appNavigationBarPage'); import Task = require('../models/APS/Task'); import Tenant = require('../models/APS/Tenant'); @@ -39,12 +39,18 @@ import AlfrescoApi = require('alfresco-js-api-node'); import { AppsActions } from '../actions/APS/apps.actions'; import { UsersActions } from '../actions/users.actions'; +import CONSTANTS = require('../util/constants'); + describe('Start Task - Custom App', () => { let TASKDATAFORMAT = 'mmm dd yyyy'; + let loginPage = new LoginPage(); let processServicesPage = new ProcessServicesPage(); let attachmentListPage = new AttachmentListPage(); + let appNavigationBarPage = new AppNavigationBarPage(); + + let processUserModel, assigneeUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let formTextField = app.form_fields.form_fieldId; @@ -212,10 +218,16 @@ describe('Start Task - Custom App', () => { taskPage.createNewTask().addName(showHeaderTask).clickStartButton(); taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask); + appNavigationBarPage.clickSettingsButton(); taskPage.usingTaskDetails().usingTaskDetailsToggles().disableShowHeader(); + appNavigationBarPage.clickTasksButton(); + taskPage.usingTaskDetails().taskInfoDrawerIsNotDisplayed(); + appNavigationBarPage.clickSettingsButton(); taskPage.usingTaskDetails().usingTaskDetailsToggles().enableShowHeader(); + appNavigationBarPage.clickTasksButton(); + taskPage.usingTaskDetails().taskInfoDrawerIsDisplayed(); }); diff --git a/e2e/process-services/start_task_task_app.e2e.ts b/e2e/process-services/start_task_task_app.e2e.ts index d8dad1a543..61fa429944 100644 --- a/e2e/process-services/start_task_task_app.e2e.ts +++ b/e2e/process-services/start_task_task_app.e2e.ts @@ -21,6 +21,7 @@ import LoginPage = require('../pages/adf/loginPage'); import ProcessServicesPage = require('../pages/adf/process_services/processServicesPage'); import TasksPage = require('../pages/adf/process_services/tasksPage'); import { AttachmentListPage } from '../pages/adf/process_services/attachmentListPage'; +import AppNavigationBarPage = require('../pages/adf/process_services/appNavigationBarPage'); import CONSTANTS = require('../util/constants'); @@ -43,9 +44,12 @@ import path = require('path'); describe('Start Task - Task App', () => { let TASKDATAFORMAT = 'mmm dd yyyy'; + let loginPage = new LoginPage(); let processServicesPage = new ProcessServicesPage(); let attachmentListPage = new AttachmentListPage(); + let appNavigationBarPage = new AppNavigationBarPage(); + let processUserModel, assigneeUserModel; let app = resources.Files.SIMPLE_APP_WITH_USER_FORM; let formTextField = app.form_fields.form_fieldId; @@ -215,10 +219,16 @@ describe('Start Task - Task App', () => { taskPage.usingFiltersPage().goToFilter(CONSTANTS.TASKFILTERS.MY_TASKS); taskPage.usingTasksListPage().checkTaskIsDisplayedInTasksList(showHeaderTask).selectTaskFromTasksList(showHeaderTask); + appNavigationBarPage.clickSettingsButton(); taskPage.usingTaskDetails().usingTaskDetailsToggles().disableShowHeader(); + appNavigationBarPage.clickTasksButton(); + taskPage.usingTaskDetails().taskInfoDrawerIsNotDisplayed(); + appNavigationBarPage.clickSettingsButton(); taskPage.usingTaskDetails().usingTaskDetailsToggles().enableShowHeader(); + appNavigationBarPage.clickTasksButton(); + taskPage.usingTaskDetails().taskInfoDrawerIsDisplayed(); }); diff --git a/lib/process-services/process-list/components/process-filters.component.spec.ts b/lib/process-services/process-list/components/process-filters.component.spec.ts index 6428d7ea82..5d9c9afb55 100644 --- a/lib/process-services/process-list/components/process-filters.component.spec.ts +++ b/lib/process-services/process-list/components/process-filters.component.spec.ts @@ -77,6 +77,7 @@ describe('ProcessFiltersComponent', () => { processFilterService = TestBed.get(ProcessFilterService); appsProcessService = TestBed.get(AppsProcessService); + filterList = new ProcessFiltersComponent(processFilterService, appsProcessService); }); afterEach(() => {