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-15252] Update ADF interfaces to reflect update from BE (#8672)

Browse Source 
* [AAE-15252] Update ADF ApplicationInstanceModel and Descriptor interfaces and AppsProcessCloudService service

* [AAE-15252] Update app.config.json file
This commit is contained in:
Diogo Bastos
2023-06-27 10:45:52 +01:00
committed by GitHub
parent f0d2456f42
commit 3f4fe2a898
4 changed files with 59 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1433,13 +1433,16 @@
], ],
"alfresco-deployed-apps": [ "alfresco-deployed-apps": [
{ {
"name": "candidatebaseapp" "name": "candidatebaseapp",
"displayName": "candidatebaseapp"
}, },
{ {
"name": "simpleapp" "name": "simpleapp",
"displayName": "simpleapp"
}, },
{ {
"name": "subprocessapp" "name": "subprocessapp",
"displayName": "subprocessapp"
} }
], ],
"aspect-visible": { "aspect-visible": {

53
lib/process-services-cloud/src/lib/app/mock/app-model.mock.ts
View File

@@ -19,13 +19,54 @@ import { fakeEnvironmentList } from '../../common/mock/environment.mock';
import { ApplicationInstanceModel } from '../models/application-instance.model'; import { ApplicationInstanceModel } from '../models/application-instance.model';
export const fakeApplicationInstance: ApplicationInstanceModel[] = [ export const fakeApplicationInstance: ApplicationInstanceModel[] = [
{ name: 'application-new-1', createdAt: '2018-09-21T12:31:39.000Z', status: 'Running', theme: 'theme-2', icon: 'favorite_border' }, {
{ name: 'application-new-2', createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending', theme: 'theme-2', icon: 'favorite_border' }, name: 'application-new-1',
{ name: 'application-new-3', createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending' } displayName: 'application-new-1',
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Running',
theme: 'theme-2',
icon: 'favorite_border'
},
{
name: 'application-new-2',
displayName: 'application-new-2',
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Pending',
theme: 'theme-2',
icon: 'favorite_border'
},
{
name: 'application-new-3',
displayName: 'application-new-3',
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Pending'
}
]; ];
export const fakeApplicationInstanceWithEnvironment: ApplicationInstanceModel[] = [ export const fakeApplicationInstanceWithEnvironment: ApplicationInstanceModel[] = [
{ name: 'application-new-1', environmentId: fakeEnvironmentList[0].id, createdAt: '2018-09-21T12:31:39.000Z', status: 'Running', theme: 'theme-2', icon: 'favorite_border' }, {
{ name: 'application-new-2', environmentId: fakeEnvironmentList[1].id,createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending', theme: 'theme-2', icon: 'favorite_border' }, name: 'application-new-1-env-id',
{ name: 'application-new-3', environmentId: fakeEnvironmentList[2].id,createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending' } displayName: 'application-new-1',
environmentId: fakeEnvironmentList[0].id,
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Running',
theme: 'theme-2',
icon: 'favorite_border'
},
{
name: 'application-new-2-env-id',
displayName: 'application-new-2',
environmentId: fakeEnvironmentList[1].id,
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Pending',
theme: 'theme-2',
icon: 'favorite_border'
},
{
name: 'application-new-3-env-id',
displayName: 'application-new-3',
environmentId: fakeEnvironmentList[2].id,
createdAt: '2018-09-21T12:31:39.000Z',
status: 'Pending'
}
]; ];

4
lib/process-services-cloud/src/lib/app/models/application-instance.model.ts
View File

@@ -20,6 +20,7 @@ export const DEFAULT_APP_INSTANCE_ICON = 'favorite_border';
export interface ApplicationInstanceModel { export interface ApplicationInstanceModel {
name?: string; name?: string;
displayName?: string;
createdAt?: any; createdAt?: any;
status?: string; status?: string;
theme?: string; theme?: string;
@@ -28,10 +29,12 @@ export interface ApplicationInstanceModel {
connectors?: any; connectors?: any;
descriptor?: Descriptor; descriptor?: Descriptor;
environmentId?: string; environmentId?: string;
environment?: string;
} }
export interface Descriptor { export interface Descriptor {
name?: string; name?: string;
displayName?: string;
projectId?: string; projectId?: string;
releaseId?: string; releaseId?: string;
releaseVersion?: number; releaseVersion?: number;
@@ -40,6 +43,7 @@ export interface Descriptor {
variables?: DescriptorVariables; variables?: DescriptorVariables;
version?: string; version?: string;
runtimeBundleVersion?: string; runtimeBundleVersion?: string;
enableLocalDevelopment?: boolean;
} }
export interface DescriptorSecurity { export interface DescriptorSecurity {

4
lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts
View File

@@ -63,9 +63,9 @@ export class AppsProcessCloudService {
const envName = environmentList?.find((env: Environment) => env.id === application.environmentId)?.name; const envName = environmentList?.find((env: Environment) => env.id === application.environmentId)?.name;
if (application.environmentId && environmentList && envName) { if (application.environmentId && environmentList && envName) {
return `${application.name} (${envName})`; return `${application.displayName} (${envName})`;
} else { } else {
return application.name; return application.displayName;
} }
} }