inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AAE-3638] - update priority option (#6423)

Browse Source
This commit is contained in:
Silviu Popa
2020-12-04 19:42:34 +02:00
committed by GitHub
parent 31bac2da24
commit f39997b98b
8 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demo-shell/src/app.config.json
View File

@@ -1169,7 +1169,7 @@
{ {
"key": "0", "key": "0",
"value": "0", "value": "0",
"label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NOT_SET" "label": "ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE"
}, },
{ {
"key": "1", "key": "1",

8
e2e/process-services-cloud/task-header-cloud.e2e.ts
View File

@@ -68,7 +68,7 @@ describe('Task Header cloud component', () => {
let groupInfo: any; let groupInfo: any;
let testUser: any; let testUser: any;
let unclaimedTask: any; let unclaimedTask: any;
const priority = 0; // Not set const priority = 0;
const description = 'descriptionTask'; const description = 'descriptionTask';
const formatDate = 'MMM D, YYYY'; const formatDate = 'MMM D, YYYY';
const dateTimeFormat = 'MMM D, Y, H:mm'; const dateTimeFormat = 'MMM D, Y, H:mm';
@@ -146,7 +146,7 @@ describe('Task Header cloud component', () => {
await expect(await taskHeaderCloudPage.getDescription()) await expect(await taskHeaderCloudPage.getDescription())
.toEqual(isValueInvalid(basicCreatedTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : basicCreatedTask.entry.description); .toEqual(isValueInvalid(basicCreatedTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : basicCreatedTask.entry.description);
await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED'); await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED');
await expect(await taskHeaderCloudPage.getPriority()).toEqual('Not set'); await expect(await taskHeaderCloudPage.getPriority()).toEqual('None');
await expect(await taskHeaderCloudPage.getCategory()).toEqual(!basicCreatedTask.entry.category ? await expect(await taskHeaderCloudPage.getCategory()).toEqual(!basicCreatedTask.entry.category ?
CONSTANTS.TASK_DETAILS.NO_CATEGORY : basicCreatedTask.entry.category); CONSTANTS.TASK_DETAILS.NO_CATEGORY : basicCreatedTask.entry.category);
await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(basicCreatedTask.entry.dueDate) ? await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(basicCreatedTask.entry.dueDate) ?
@@ -170,7 +170,7 @@ describe('Task Header cloud component', () => {
await expect(await taskHeaderCloudPage.getDescription()) await expect(await taskHeaderCloudPage.getDescription())
.toEqual(isValueInvalid(completedTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : completedTask.entry.description); .toEqual(isValueInvalid(completedTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : completedTask.entry.description);
await expect(await taskHeaderCloudPage.getStatus()).toEqual('COMPLETED'); await expect(await taskHeaderCloudPage.getStatus()).toEqual('COMPLETED');
await expect(await taskHeaderCloudPage.getReadonlyPriority()).toEqual('Not set'); await expect(await taskHeaderCloudPage.getReadonlyPriority()).toEqual('None');
await expect(await taskHeaderCloudPage.getCategory()).toEqual(!completedTask.entry.category ? await expect(await taskHeaderCloudPage.getCategory()).toEqual(!completedTask.entry.category ?
CONSTANTS.TASK_DETAILS.NO_CATEGORY : completedTask.entry.category); CONSTANTS.TASK_DETAILS.NO_CATEGORY : completedTask.entry.category);
await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(completedTask.entry.dueDate) ? await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(completedTask.entry.dueDate) ?
@@ -194,7 +194,7 @@ describe('Task Header cloud component', () => {
await expect(await taskHeaderCloudPage.getDescription()) await expect(await taskHeaderCloudPage.getDescription())
.toEqual(isValueInvalid(subTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : subTask.entry.description); .toEqual(isValueInvalid(subTask.entry.description) ? CONSTANTS.TASK_DETAILS.NO_DESCRIPTION : subTask.entry.description);
await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED'); await expect(await taskHeaderCloudPage.getStatus()).toEqual('ASSIGNED');
await expect(await taskHeaderCloudPage.getPriority()).toEqual('Not set'); await expect(await taskHeaderCloudPage.getPriority()).toEqual('None');
await expect(await taskHeaderCloudPage.getCategory()).toEqual(!subTask.entry.category ? await expect(await taskHeaderCloudPage.getCategory()).toEqual(!subTask.entry.category ?
CONSTANTS.TASK_DETAILS.NO_CATEGORY : subTask.entry.category); CONSTANTS.TASK_DETAILS.NO_CATEGORY : subTask.entry.category);
await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(subTask.entry.dueDate) ? CONSTANTS.TASK_DETAILS.NO_DATE : subTaskCreatedDate); await expect(await taskHeaderCloudPage.getDueDate()).toEqual(isValueInvalid(subTask.entry.dueDate) ? CONSTANTS.TASK_DETAILS.NO_DATE : subTaskCreatedDate);

1
lib/core/assets/images/dynamic_feed-24px.svg
View File

@@ -12,3 +12,4 @@
</g> </g>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 775 B

After

Width:  |  Height:  |  Size: 776 B

2
lib/process-services-cloud/src/lib/i18n/en.json
View File

@@ -95,7 +95,7 @@
"JSON_CELL": "Json", "JSON_CELL": "Json",
"COMPLETED_BY": "Completed By", "COMPLETED_BY": "Completed By",
"PRIORITY_VALUES": { "PRIORITY_VALUES": {
"NOT_SET": "Not set", "NONE": "None",
"LOW": "Low", "LOW": "Low",
"NORMAL": "Normal", "NORMAL": "Normal",
"HIGH": "High" "HIGH": "High"

2
lib/process-services-cloud/src/lib/task/models/task.model.ts
View File

@@ -27,7 +27,7 @@ export interface TaskPriorityOption {
} }
export const DEFAULT_TASK_PRIORITIES: TaskPriorityOption[] = [ export const DEFAULT_TASK_PRIORITIES: TaskPriorityOption[] = [
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NOT_SET', value: '0', key: '0' }, { label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE', value: '0', key: '0' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW', value: '1', key: '1' }, { label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW', value: '1', key: '1' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL', value: '2', key: '2' }, { label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL', value: '2', key: '2' },
{ label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH', value: '3', key: '3' } { label: 'ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH', value: '3', key: '3' }

3
lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/base-edit-task-filter-cloud.component.html
View File

@@ -95,7 +95,8 @@
</mat-checkbox> </mat-checkbox>
</div> </div>
<adf-cloud-date-range-filter *ngIf="taskFilterProperty.type === 'date-range'" <adf-cloud-date-range-filter #dateRange
*ngIf="taskFilterProperty.type === 'date-range'"
[processFilterProperty]="taskFilterProperty" [processFilterProperty]="taskFilterProperty"
[options]="taskFilterProperty.dateFilterOptions" [options]="taskFilterProperty.dateFilterOptions"
(dateTypeChange)="onDateTypeChange($event, taskFilterProperty)" (dateTypeChange)="onDateTypeChange($event, taskFilterProperty)"

2
lib/process-services-cloud/src/lib/task/task-header/components/task-header-cloud.component.spec.ts
View File

@@ -135,7 +135,7 @@ describe('TaskHeaderCloudComponent', () => {
fixture.detectChanges(); fixture.detectChanges();
const options: any = fixture.debugElement.queryAll(By.css('mat-option')); const options: any = fixture.debugElement.queryAll(By.css('mat-option'));
expect(options[0].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NOT_SET'); expect(options[0].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NONE');
expect(options[1].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW'); expect(options[1].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.LOW');
expect(options[2].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL'); expect(options[2].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.NORMAL');
expect(options[3].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH'); expect(options[3].nativeElement.innerText).toEqual('ADF_CLOUD_TASK_LIST.PROPERTIES.PRIORITY_VALUES.HIGH');

4
lib/testing/src/lib/core/pages/data-table-component.page.ts
View File

@@ -187,12 +187,12 @@ export class DataTableComponentPage {
return 0; return 0;
} }
if (a.toLocaleLowerCase() === 'not set') { if (a.toLocaleLowerCase() === 'none') {
return -1; return -1;
} }
if (a.toLocaleLowerCase() === 'low') { if (a.toLocaleLowerCase() === 'low') {
if (b === 'not set') { if (b === 'none') {
return 1; return 1;
} else { } else {
return -1; return -1;