diff --git a/docs/process-services-cloud/process-list-cloud.component.md b/docs/process-services-cloud/process-list-cloud.component.md index 8414c5fb35..b74f43f212 100644 --- a/docs/process-services-cloud/process-list-cloud.component.md +++ b/docs/process-services-cloud/process-list-cloud.component.md @@ -62,10 +62,6 @@ when the process list is empty: | processDefinitionKey | `string` | "" | Filter the processes to display only the ones with this process definition key. | | selectFirstRow | `boolean` | true | Toggles default selection of the first row | | selectionMode | `string` | "single" | Row selection mode. Can be "none", "single" or "multiple". For multiple mode, you can use Cmd (macOS) or Ctrl (Win) modifier key to toggle selection for multiple rows. | -| serviceFullName | `string` | "" | Filter the processes to display only the ones with this serviceFullName value. | -| serviceName | `string` | "" | Filter the processes to display only the ones with this serviceName value. | -| serviceType | `string` | "" | Filter the processes to display only the ones with this serviceType value. | -| serviceVersion | `string` | "" | Filter the processes to display only the ones with this serviceVersion value. | | sorting | [`ProcessListCloudSortingModel`](../../lib/process-services-cloud/src/lib/process/process-list/models/process-list-sorting.model.ts)`[]` | | Array of objects specifying the sort order and direction for the list. The sort parameters are for BE sorting. | | status | `string` | "" | Filter the processes to display only the ones with this status. | @@ -91,7 +87,7 @@ You can define a custom schema for the list in the `app.config.json` file and ac "key": "name", "type": "text", "title": "name", - "sortable": true + "sortable": true }], "default": [ { diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index 7b502d7fd0..94a4d76cc0 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -129,12 +129,8 @@ describe('ProcessListCloudComponent', () => { expect(res).toBeDefined(); expect(component.rows).toBeDefined(); expect(component.rows.length).toEqual(3); - expect(component.rows[0].entry['serviceName']).toEqual('simple-app-rb'); - expect(component.rows[0].entry['serviceFullName']).toEqual('simple-app-rb'); - expect(component.rows[0].entry['serviceVersion']).toBe(''); expect(component.rows[0].entry['appName']).toBe('easy-peasy-japanesey'); expect(component.rows[0].entry['appVersion']).toBe(''); - expect(component.rows[0].entry['serviceType']).toBeNull(); expect(component.rows[0].entry['id']).toBe('69eddfa7-d781-11e8-ae24-0a58646001fa'); expect(component.rows[0].entry['name']).toEqual('starring'); expect(component.rows[0].entry['description']).toBeNull(); diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts index 2fcd67c4c1..cb1e8bb327 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts @@ -67,22 +67,6 @@ export class ProcessListCloudComponent extends DataTableSchema implements OnChan @Input() processDefinitionKey: string = ''; - /** Filter the processes to display only the ones with this serviceFullName value. */ - @Input() - serviceFullName: string = ''; - - /** Filter the processes to display only the ones with this serviceName value. */ - @Input() - serviceName: string = ''; - - /** Filter the processes to display only the ones with this serviceType value. */ - @Input() - serviceType: string = ''; - - /** Filter the processes to display only the ones with this serviceVersion value. */ - @Input() - serviceVersion: string = ''; - /** Filter the processes to display only the ones with this status. */ @Input() status: string = ''; @@ -282,10 +266,6 @@ export class ProcessListCloudComponent extends DataTableSchema implements OnChan name: this.name, processDefinitionId: this.processDefinitionId, processDefinitionKey: this.processDefinitionKey, - serviceFullName: this.serviceFullName, - serviceName: this.serviceName, - serviceType: this.serviceType, - serviceVersion: this.serviceVersion, status: this.status, businessKey: this.businessKey, sorting: this.sorting diff --git a/lib/process-services-cloud/src/lib/process/process-list/mock/process-list-service.mock.ts b/lib/process-services-cloud/src/lib/process/process-list/mock/process-list-service.mock.ts index bc66529a61..7669c3da2e 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/mock/process-list-service.mock.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/mock/process-list-service.mock.ts @@ -22,12 +22,8 @@ export const fakeProcessCloudList = { entries: [ { entry: { - serviceName: 'simple-app-rb', - serviceFullName: 'simple-app-rb', - serviceVersion: '', appName: 'easy-peasy-japanesey', appVersion: '', - serviceType: null, id: '69eddfa7-d781-11e8-ae24-0a58646001fa', name: 'starring', description: null, @@ -44,12 +40,8 @@ export const fakeProcessCloudList = { }, { entry: { - serviceName: 'simple-app-rb', - serviceFullName: 'simple-app-rb', - serviceVersion: '', appName: 'easy-peasy-japanesey', appVersion: '', - serviceType: null, id: '8b3f625f-d781-11e8-ae24-0a58646001fa', name: null, description: null, @@ -66,12 +58,8 @@ export const fakeProcessCloudList = { }, { entry: { - serviceName: 'simple-app-rb', - serviceFullName: 'simple-app-rb', - serviceVersion: '', appName: 'easy-peasy-japanesey', appVersion: '', - serviceType: null, id: '87c12637-d783-11e8-ae24-0a58646001fa', name: null, description: null, diff --git a/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts b/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts index 96c63096be..7fc3d52b13 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/models/process-cloud-query-request.model.ts @@ -26,10 +26,6 @@ export class ProcessQueryCloudRequestModel { name?: string; processDefinitionId?: string; processDefinitionKey?: string; - serviceFullName?: string; - serviceName?: string; - serviceType?: string; - serviceVersion?: string; status?: string; startDate?: string; businessKey?: string; @@ -49,10 +45,6 @@ export class ProcessQueryCloudRequestModel { this.name = obj.name; this.processDefinitionId = obj.processDefinitionId; this.processDefinitionKey = obj.processDefinitionKey; - this.serviceFullName = obj.serviceFullName; - this.serviceName = obj.serviceName; - this.serviceType = obj.serviceType; - this.serviceVersion = obj.serviceVersion; this.status = obj.status; this.startDate = obj.startDate; this.businessKey = obj.businessKey; diff --git a/lib/process-services-cloud/src/lib/process/start-process/mock/start-process.component.mock.ts b/lib/process-services-cloud/src/lib/process/start-process/mock/start-process.component.mock.ts index 5098dae02f..37698127a7 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/mock/start-process.component.mock.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/mock/start-process.component.mock.ts @@ -22,10 +22,6 @@ import { ProcessDefinitionCloud } from '../models/process-definition-cloud.model export let fakeProcessInstance = new ProcessInstanceCloud({ appName: 'simple-app', appVersion: '', - serviceName: 'simple-app-rb', - serviceFullName: 'simple-app-rb', - serviceType: 'runtime-bundle', - serviceVersion: '', id: 'd0b30377-dc5a-11e8-ae24-0a58646001fa', name: 'My Process Name', startDate: '2018-10-30T15:45:24.136+0000', @@ -41,22 +37,14 @@ export let fakeProcessDefinitions: ProcessDefinitionCloud[] = [ appVersion: 0, id: 'NewProcess:1', key: 'NewProcess 1', - name: 'NewProcess 1', - serviceFullName: 'myApp-rb', - serviceName: 'myApp-rb', - serviceType: 'runtime-bundle', - serviceVersion: null + name: 'NewProcess 1' }), new ProcessDefinitionCloud({ appName: 'myApp', appVersion: 0, id: 'NewProcess:2', key: 'NewProcess 2', - name: 'NewProcess 2', - serviceFullName: 'myApp-rb', - serviceName: 'myApp-rb', - serviceType: 'runtime-bundle', - serviceVersion: null + name: 'NewProcess 2' }) ]; diff --git a/lib/process-services-cloud/src/lib/process/start-process/models/process-definition-cloud.model.ts b/lib/process-services-cloud/src/lib/process/start-process/models/process-definition-cloud.model.ts index 41d6a19356..e70a63b75f 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/models/process-definition-cloud.model.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/models/process-definition-cloud.model.ts @@ -22,10 +22,6 @@ export class ProcessDefinitionCloud { appVersion: number; version: number; name: string; - serviceFullName: string; - serviceName: string; - serviceType: string; - serviceVersion: string; constructor(obj?: any) { this.id = obj && obj.id || null; @@ -34,9 +30,5 @@ export class ProcessDefinitionCloud { this.key = obj && obj.key || null; this.version = obj && obj.version || 0; this.appVersion = obj && obj.appVersion || 0; - this.serviceFullName = obj && obj.serviceFullName || null; - this.serviceType = obj && obj.serviceType || null; - this.serviceName = obj && obj.serviceName || null; - this.serviceVersion = obj && obj.serviceVersion || null; } } diff --git a/lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts b/lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts index bd56601794..edefbb1f67 100644 --- a/lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts +++ b/lib/process-services-cloud/src/lib/task/start-task/models/task-details-cloud.model.ts @@ -36,12 +36,8 @@ export class TaskDetailsCloudModel { priority: number; processDefinitionId: string; processInstanceId: string; - serviceType: any; status: string; standAlone: boolean; - serviceName: string; - serviceFullName: string; - serviceVersion: string; managerOfCandidateGroup: boolean; memberOfCandidateGroup: boolean; memberOfCandidateUsers: boolean; @@ -66,13 +62,8 @@ export class TaskDetailsCloudModel { this.priority = obj.priority || null; this.processDefinitionId = obj.processDefinitionId || null; this.processInstanceId = obj.processInstanceId || null; - this.serviceType = obj.serviceType || null; this.status = obj.status || null; this.standAlone = obj.standAlone || null; - this.serviceName = obj.serviceName || null; - this.serviceName = obj.serviceName || null; - this.serviceFullName = obj.serviceFullName || null; - this.serviceVersion = obj.serviceVersion || null; this.managerOfCandidateGroup = obj.managerOfCandidateGroup || null; this.memberOfCandidateGroup = obj.memberOfCandidateGroup || null; this.memberOfCandidateUsers = obj.memberOfCandidateUsers || null; diff --git a/lib/process-services-cloud/src/lib/task/task-header/mocks/fake-task-details-response.mock.ts b/lib/process-services-cloud/src/lib/task/task-header/mocks/fake-task-details-response.mock.ts index 38c84b7280..3a79dfa03c 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/mocks/fake-task-details-response.mock.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/mocks/fake-task-details-response.mock.ts @@ -17,12 +17,8 @@ export const fakeTaskDetailsCloud = { 'entry': { - 'serviceName': 'task-app-rb', - 'serviceFullName': 'task-app-rb', - 'serviceVersion': '', 'appName': 'task-app', 'appVersion': '', - 'serviceType': null, 'id': '68d54a8f', 'assignee': 'Phil Woods', 'name': 'This is a new task ', diff --git a/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts b/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts index 4ed01973db..fe8a4ff855 100644 --- a/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts +++ b/lib/process-services-cloud/src/lib/task/task-header/mocks/task-details-cloud.mock.ts @@ -19,12 +19,8 @@ import { TaskDetailsCloudModel } from '../../start-task/models/task-details-clou export const taskDetailsCloudMock = new TaskDetailsCloudModel( { - 'serviceName': 'task-app-rb', - 'serviceFullName': 'task-app-rb', - 'serviceVersion': '', 'appName': 'task-app', 'appVersion': '', - 'serviceType': null, 'id': '68d54a8f-01f3-11e9-8e36-0a58646002ad', 'assignee': 'Wilbur Adams', 'name': 'This is a new task ', diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts index b56ce41745..2d2cf90abd 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.spec.ts @@ -133,12 +133,8 @@ describe('TaskListCloudComponent', () => { expect(component.rows).toBeDefined(); expect(component.isListEmpty()).not.toBeTruthy(); expect(component.rows.length).toEqual(1); - expect(component.rows[0].entry['serviceName']).toEqual('test-ciprian2-rb'); - expect(component.rows[0].entry['serviceFullName']).toEqual('test-ciprian2-rb'); - expect(component.rows[0].entry['serviceVersion']).toBe(''); expect(component.rows[0].entry['appName']).toBe('test-ciprian2'); expect(component.rows[0].entry['appVersion']).toBe(''); - expect(component.rows[0].entry['serviceType']).toBeNull(); expect(component.rows[0].entry['id']).toBe('11fe013d-c263-11e8-b75b-0a5864600540'); expect(component.rows[0].entry['assignee']).toBeNull(); expect(component.rows[0].entry['name']).toEqual('standalone-subtask'); diff --git a/lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts b/lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts index a69bc4d62d..1a481ddb78 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/mock/fakeTaskResponseMock.ts @@ -22,12 +22,8 @@ export const fakeTaskCloudList = { entries: [ { entry: { - serviceName: 'maurizio-test-rb', - serviceFullName: 'maurizio-test-rb', - serviceVersion: '', appName: 'save-the-cheerleader', appVersion: '', - serviceType: null, id: '890b0e1c-c252-11e8-b5c5-0a58646004c7', assignee: null, name: 'SimpleStandaloneTask', @@ -50,12 +46,8 @@ export const fakeTaskCloudList = { }, { entry: { - serviceName: 'maurizio-test-rb', - serviceFullName: 'maurizio-test-rb', - serviceVersion: '', appName: 'save-the-cheerleader', appVersion: '', - serviceType: null, id: '8962cb0e-c252-11e8-b5c5-0a58646004c7', assignee: null, name: 'SimpleStandaloneTask', @@ -92,12 +84,8 @@ export let fakeGlobalTask = { entries: [ { entry: { - serviceName: 'test-ciprian2-rb', - serviceFullName: 'test-ciprian2-rb', - serviceVersion: '', appName: 'test-ciprian2', appVersion: '', - serviceType: null, id: '11fe013d-c263-11e8-b75b-0a5864600540', assignee: null, name: 'standalone-subtask', diff --git a/lib/process-services-cloud/src/lib/task/task-list/models/filter-cloud-model.ts b/lib/process-services-cloud/src/lib/task/task-list/models/filter-cloud-model.ts index 78896c6e31..29706df99e 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/models/filter-cloud-model.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/models/filter-cloud-model.ts @@ -32,10 +32,6 @@ export class TaskQueryCloudRequestModel { priority?: number; processDefinitionId?: string; processInstanceId?: string; - serviceFullName?: string; - serviceName?: string; - serviceType?: string; - serviceVersion?: string; status?: string; maxItems: number; skipCount: number; @@ -57,10 +53,6 @@ export class TaskQueryCloudRequestModel { this.priority = obj.priority; this.processDefinitionId = obj.processDefinitionId; this.processInstanceId = obj.processInstanceId; - this.serviceFullName = obj.serviceFullName; - this.serviceName = obj.serviceName; - this.serviceType = obj.serviceType; - this.serviceVersion = obj.serviceVersion; this.status = obj.status; this.maxItems = obj.maxItems; this.skipCount = obj.skipCount;