From 815f816f8e17f84fed4234357e8bba7c30cd4e19 Mon Sep 17 00:00:00 2001 From: Maurizio Vitale Date: Wed, 6 Feb 2019 15:02:34 +0000 Subject: [PATCH] Align task/process filters docs (#4276) --- .../edit-process-filter-cloud.component.md | 9 ++- .../edit-task-filter-cloud.component.md | 8 +-- .../edit-process-filter-cloud.component.ts | 64 ++++++++----------- 3 files changed, 32 insertions(+), 49 deletions(-) diff --git a/docs/process-services-cloud/edit-process-filter-cloud.component.md b/docs/process-services-cloud/edit-process-filter-cloud.component.md index 0a2d659e63..5caee8dccb 100644 --- a/docs/process-services-cloud/edit-process-filter-cloud.component.md +++ b/docs/process-services-cloud/edit-process-filter-cloud.component.md @@ -75,17 +75,16 @@ given below: | Name | Description | | ---- | ----------- | | **_appName_** | Name of the app | +| **_processInstanceId_** | Process instance ID | +| **_processName_** | Process name. | | **_initiator_** | ID of the user who initiated the process | | **_state_** | Execution state of the process. | -| **_sort_** | Field on which the filter results will be sorted (doesn't participate in the filtering itself). Can be "id", "name", "status" or "startDate". | -| **_order_** | Sort ordering of the filter results (this doesn't participate in the filtering itself) | | **_processDefinitionId_** | Process definition ID | | **_processDefinitionKey_** | Process definition key | -| **_processInstanceId_** | Process instance ID | -| **_startDate_** | Date the process was started | -| **_lastModified_** | Date the process was last modified | | **_lastModifiedFrom_** | Finds processes modified _after_ this date | | **_lastModifiedTo_** | Finds processes modified _before_ this date | +| **_sort_** | Field on which the filter results will be sorted (doesn't participate in the filtering itself). Can be "id", "name", "status" or "startDate". | +| **_order_** | Sort ordering of the filter results (this doesn't participate in the filtering itself) | By default, the **_state_**, **_sort_** and **_order_** properties are displayed in the editor. However, you can also choose which properties diff --git a/docs/process-services-cloud/edit-task-filter-cloud.component.md b/docs/process-services-cloud/edit-task-filter-cloud.component.md index 8cd9aedf8f..41ac7e39d0 100644 --- a/docs/process-services-cloud/edit-task-filter-cloud.component.md +++ b/docs/process-services-cloud/edit-task-filter-cloud.component.md @@ -64,10 +64,7 @@ given below: | Name | Description | | -- | -- | | **_appName_** | Name of the app | -| **_initiator_** | ID of the user who initiated the process | | **_state_** | Execution state of the task. | -| **_sort_** | Field on which the filter results will be sorted (doesn't participate in the filtering itself). Can be "id", "name", "status" or "startDate". | -| **_order_** | Sort ordering of the filter results (this doesn't participate in the filtering itself) | | **_assignment_** | User the task is assigned to | | **_taskName_** | Name of the task | | **_parentTaskId_** | ID of the task's parent task | @@ -77,11 +74,10 @@ given below: | **_processDefinitionId_** | Process definition ID | | **_processDefinitionKey_** | Process definition key | | **_processInstanceId_** | Process instance ID | -| **_startDate_** | Date the task was started | -| **_lastModified_** | Date the task was last modified | | **_lastModifiedFrom_** | Finds tasks modified *after* this date | | **_lastModifiedTo_** | Finds tasks modified *before* this date | - +| **_sort_** | Field on which the filter results will be sorted (doesn't participate in the filtering itself). Can be "id", "name", "createdDate", "priority", "processDefinitionId". | +| **_order_** | Sort ordering of the filter results it can be ASC or DESC (doesn't participate in the filtering itself). | By default, the **_state_**, **_assignment_**, **_sort_** and **_order_** properties are displayed in the editor. However, you can also choose which properties diff --git a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts index 9d3f38bd70..cbdbc5e201 100644 --- a/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-filters/components/edit-process-filter-cloud.component.ts @@ -316,6 +316,18 @@ export class EditProcessFilterCloudComponent implements OnChanges { value: currentProcessFilter.appName || '', options: this.applicationNames }), + new ProcessFilterProperties({ + label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_INS_ID', + type: 'text', + key: 'processInstanceId', + value: '' + }), + new ProcessFilterProperties({ + label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_NAME', + type: 'text', + key: 'processName', + value: currentProcessFilter.processName || '' + }), new ProcessFilterProperties({ label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.INITIATOR', type: 'text', @@ -329,26 +341,6 @@ export class EditProcessFilterCloudComponent implements OnChanges { value: currentProcessFilter.state || this.status[0].value, options: this.status }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.SORT', - type: 'select', - key: 'sort', - value: currentProcessFilter.sort || this.columns[0].value, - options: this.columns - }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.DIRECTION', - type: 'select', - key: 'order', - value: currentProcessFilter.order || this.directions[0].value, - options: this.directions - }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_NAME', - type: 'text', - key: 'processName', - value: currentProcessFilter.processName || '' - }), new ProcessFilterProperties({ label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_DEF_ID', type: 'text', @@ -361,24 +353,6 @@ export class EditProcessFilterCloudComponent implements OnChanges { key: 'processDefinitionKey', value: currentProcessFilter.processDefinitionKey || '' }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.PROCESS_INS_ID', - type: 'text', - key: 'processInstanceId', - value: '' - }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.START_DATE', - type: 'date', - key: 'startDate', - value: '' - }), - new ProcessFilterProperties({ - label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.LAST_MODIFIED', - type: 'date', - key: 'lastModified', - value: '' - }), new ProcessFilterProperties({ label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.LAST_MODIFIED_DATE_FORM', type: 'date', @@ -390,6 +364,20 @@ export class EditProcessFilterCloudComponent implements OnChanges { type: 'date', key: 'lastModifiedTo', value: '' + }), + new ProcessFilterProperties({ + label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.SORT', + type: 'select', + key: 'sort', + value: currentProcessFilter.sort || this.columns[0].value, + options: this.columns + }), + new ProcessFilterProperties({ + label: 'ADF_CLOUD_EDIT_PROCESS_FILTER.LABEL.DIRECTION', + type: 'select', + key: 'order', + value: currentProcessFilter.order || this.directions[0].value, + options: this.directions }) ]; }