From 1df734ac372ce40831fc3a267b9fbe29b8cdd99f Mon Sep 17 00:00:00 2001
From: Diogo Bastos <diogo.bastos@hyland.com>
Date: Thu, 15 Jun 2023 14:37:47 +0100
Subject: [PATCH] [AAE-15252] Update ADF ApplicationInstanceModel and
 Descriptor interfaces and AppsProcessCloudService service

---
 .../src/lib/app/mock/app-model.mock.ts        | 53 ++++++++++++++++---
 .../app/models/application-instance.model.ts  |  4 ++
 .../services/apps-process-cloud.service.ts    |  4 +-
 3 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/lib/process-services-cloud/src/lib/app/mock/app-model.mock.ts b/lib/process-services-cloud/src/lib/app/mock/app-model.mock.ts
index a6a4ca5272c..6dd62be15ed 100644
--- a/lib/process-services-cloud/src/lib/app/mock/app-model.mock.ts
+++ b/lib/process-services-cloud/src/lib/app/mock/app-model.mock.ts
@@ -19,13 +19,54 @@ import { fakeEnvironmentList } from '../../common/mock/environment.mock';
 import { ApplicationInstanceModel } from '../models/application-instance.model';
 
 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-3', createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending' }
+    {
+        name: 'application-new-1',
+        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[] = [
-    { 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-3', environmentId: fakeEnvironmentList[2].id,createdAt: '2018-09-21T12:31:39.000Z', status: 'Pending' }
+    {
+        name: 'application-new-1-env-id',
+        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'
+    }
 ];
diff --git a/lib/process-services-cloud/src/lib/app/models/application-instance.model.ts b/lib/process-services-cloud/src/lib/app/models/application-instance.model.ts
index bb13d972a58..c22fad3b848 100644
--- a/lib/process-services-cloud/src/lib/app/models/application-instance.model.ts
+++ b/lib/process-services-cloud/src/lib/app/models/application-instance.model.ts
@@ -20,6 +20,7 @@ export const DEFAULT_APP_INSTANCE_ICON = 'favorite_border';
 
 export interface ApplicationInstanceModel {
     name?: string;
+    displayName?: string;
     createdAt?: any;
     status?: string;
     theme?: string;
@@ -28,10 +29,12 @@ export interface ApplicationInstanceModel {
     connectors?: any;
     descriptor?: Descriptor;
     environmentId?: string;
+    environment?: string;
 }
 
 export interface Descriptor {
     name?: string;
+    displayName?: string;
     projectId?: string;
     releaseId?: string;
     releaseVersion?: number;
@@ -40,6 +43,7 @@ export interface Descriptor {
     variables?: DescriptorVariables;
     version?: string;
     runtimeBundleVersion?: string;
+    enableLocalDevelopment?: boolean;
 }
 
 export interface DescriptorSecurity {
diff --git a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts
index de3108b7115..387d757ab23 100644
--- a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts
+++ b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.ts
@@ -63,9 +63,9 @@ export class AppsProcessCloudService {
         const envName = environmentList?.find((env: Environment) => env.id === application.environmentId)?.name;
 
         if (application.environmentId && environmentList && envName) {
-            return `${application.name} (${envName})`;
+            return `${application.displayName} (${envName})`;
         } else {
-            return application.name;
+            return application.displayName;
         }
     }