Merge pull request #42 from solace-iot-team/feat-ucs-1

ricardojosegomezulmke · web-flow · commit 91f879666bf6 · 2022-07-01T08:13:08.000+02:00
Feat ucs 1
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .devel
 gh-pages
 .DS_Store
+.vscode
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,21 @@
 
 Solace Async API Management.
 
+## Version 0.3.4
+  * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.3.4
+  * [API-M Server OpenAPI](https://github.com/solace-iot-team/async-apim/blob/main/apim-server/server/common/api.yml): 0.3.1
+  * [API-M Server](https://github.com/solace-iot-team/async-apim/tree/main/apim-server): 0.3.2
+  * [API-M Connector OpenAPI](https://github.com/solace-iot-team/platform-api): 0.7.19
+
+**Enhancements:**
+- **App: Connection Endpoints**
+  - added the message vpn. required for smf/s connections.
+
+**Releases:**
+- **APIM Portal:Docker Image**
+  - runs in unprivileged mode
+
+
 ## Version 0.3.3
   * [API-M Admin & Developer Portal](https://github.com/solace-iot-team/async-apim/tree/main/apim-portal): 0.3.3
   * [API-M Server OpenAPI](https://github.com/solace-iot-team/async-apim/blob/main/apim-server/server/common/api.yml): 0.3.1
diff --git a/apim-portal/package.json b/apim-portal/package.json
@@ -1,6 +1,6 @@
 {
   "name": "async-apim-portal",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Solace Async API Management Portal",
   "repository": {
     "type": "git",
diff --git a/apim-portal/src/admin-portal/displayServices/APAdminPortalAppsDisplayService.ts b/apim-portal/src/admin-portal/displayServices/APAdminPortalAppsDisplayService.ts
@@ -28,6 +28,7 @@ import {
   TAPTopicSyntax
 } from '../../displayServices/APAppsDisplayService/APAppsDisplayService';
 import APBusinessGroupsDisplayService, { TAPBusinessGroupDisplay, TAPBusinessGroupDisplayList } from '../../displayServices/APBusinessGroupsDisplayService';
+import APEnvironmentsDisplayService, { TAPEnvironmentDisplayList } from '../../displayServices/APEnvironmentsDisplayService';
 import APRbacDisplayService from '../../displayServices/APRbacDisplayService';
 import APOrganizationUsersDisplayService, { 
   TAPCheckOrganizationUserIdExistsResult, TAPOrganizationUserDisplay, TAPOrganizationUserDisplayList
@@ -170,6 +171,7 @@ class APAdminPortalAppsDisplayService extends APAppsDisplayService {
     apApp_ApiProduct_DisplayList,
     apApp_Api_DisplayList,
     apOrganizationAppSettings,
+    complete_ApEnvironmentDisplayList,
   }: {
     apAppMeta: TAPAppMeta;
     apAdminPortalApp_Status: EAPAdminPortalApp_Status;
@@ -179,6 +181,7 @@ class APAdminPortalAppsDisplayService extends APAppsDisplayService {
     apApp_ApiProduct_DisplayList: TAPDeveloperPortalAppApiProductDisplayList;
     apApp_Api_DisplayList: TAPAppApiDisplayList;
     apOrganizationAppSettings: TAPOrganizationAppSettings;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): TAPAdminPortalAppDisplay {
 
     const apAppDisplay: IAPAppDisplay = this.create_ApAppDisplay_From_ApiEntities({
@@ -188,7 +191,8 @@ class APAdminPortalAppsDisplayService extends APAppsDisplayService {
       connectorAppResponse_mqtt: connectorAppResponse_mqtt,
       apAppApiProductDisplayList: apApp_ApiProduct_DisplayList,
       apAppApiDisplayList: apApp_Api_DisplayList,
-      apOrganizationAppSettings: apOrganizationAppSettings
+      apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_ApEnvironmentDisplayList
     });
 
     const apAdminPortalAppDisplay: TAPAdminPortalAppDisplay = {
@@ -359,6 +363,11 @@ class APAdminPortalAppsDisplayService extends APAppsDisplayService {
     // TEST upstream error handling
     // throw new Error(`${logName}: test error handling`);
 
+    // get the complete env list for reference
+    const complete_apEnvironmentDisplayList: TAPEnvironmentDisplayList = await APEnvironmentsDisplayService.apiGetList_ApEnvironmentDisplay({
+      organizationId: organizationId
+    });
+    
     const connectorAppResponseGeneric: AppResponseGeneric = await AppsService.getApp({
       organizationName: organizationId,
       appName: appId
@@ -413,7 +422,8 @@ class APAdminPortalAppsDisplayService extends APAppsDisplayService {
       connectorAppConnectionStatus: connectorAppConnectionStatus,
       apApp_ApiProduct_DisplayList: apAppApiProductDisplayList,
       apApp_Api_DisplayList: apAppApiDisplayList,
-      apOrganizationAppSettings: apOrganizationAppSettings
+      apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_apEnvironmentDisplayList
     });
 
     return apAdminPortalAppDisplay;
diff --git a/apim-portal/src/components/APDisplayDeveloperPortalApp/APDisplayDeveloperPortalApp_Endpoints.tsx b/apim-portal/src/components/APDisplayDeveloperPortalApp/APDisplayDeveloperPortalApp_Endpoints.tsx
@@ -42,8 +42,15 @@ export const APDisplayDeveloperPortalAppEndpoints: React.FC<IAPDisplayDeveloperP
   }
 
   const rowGroupHeaderTemplate = (row: TAPEnvironmentEndpointDisplay) => {
+    // let header = row.apEntityId.displayName;
+    // if(row.messageVpnName) header += ` - Message Vpn: ${row.messageVpnName}`;
     return(
-      <span className="p-text-bold">Environment: {row.apEntityId.displayName}</span>
+      <div>
+        <div className="p-text-bold">Environment: {row.apEntityId.displayName}</div>
+        {row.messageVpnName &&
+          <div className="p-ml-2">Message Vpn: {row.messageVpnName}</div>
+        }
+      </div>
     );
   }
 
diff --git a/apim-portal/src/developer-portal/displayServices/APDeveloperPortalAppsDisplayService.ts b/apim-portal/src/developer-portal/displayServices/APDeveloperPortalAppsDisplayService.ts
@@ -69,6 +69,7 @@ export abstract class APDeveloperPortalAppsDisplayService extends APAppsDisplayS
     apDeveloperPortalApp_ApiProductDisplayList,
     apAppApiDisplayList,
     apOrganizationAppSettings,
+    complete_ApEnvironmentDisplayList,
   }: {
     ownerId: string;
     connectorAppResponse_smf: AppResponse;
@@ -77,6 +78,7 @@ export abstract class APDeveloperPortalAppsDisplayService extends APAppsDisplayS
     apDeveloperPortalApp_ApiProductDisplayList: TAPDeveloperPortalAppApiProductDisplayList;
     apAppApiDisplayList: TAPAppApiDisplayList;
     apOrganizationAppSettings: TAPOrganizationAppSettings;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): TAPDeveloperPortalAppDisplay {
 
     const apAppDisplay: IAPAppDisplay = this.create_ApAppDisplay_From_ApiEntities({
@@ -86,7 +88,8 @@ export abstract class APDeveloperPortalAppsDisplayService extends APAppsDisplayS
       connectorAppResponse_mqtt: connectorAppResponse_mqtt,
       apAppApiProductDisplayList: apDeveloperPortalApp_ApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
-      apOrganizationAppSettings: apOrganizationAppSettings
+      apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_ApEnvironmentDisplayList
     });
 
     return apAppDisplay;
@@ -170,7 +173,8 @@ export abstract class APDeveloperPortalAppsDisplayService extends APAppsDisplayS
         connectorAppResponse_mqtt: undefined,
         apDeveloperPortalApp_ApiProductDisplayList: apDeveloperPortalApp_ApiProductDisplayList,
         apAppApiDisplayList: [],
-        apOrganizationAppSettings: apOrganizationAppSettings
+        apOrganizationAppSettings: apOrganizationAppSettings,
+        complete_ApEnvironmentDisplayList: complete_apEnvironmentDisplayList
       });
 
       const apDeveloperPortalAppListDisplay: IAPDeveloperPortalAppListDisplay = {
diff --git a/apim-portal/src/developer-portal/displayServices/APDeveloperPortalTeamAppsDisplayService.ts b/apim-portal/src/developer-portal/displayServices/APDeveloperPortalTeamAppsDisplayService.ts
@@ -15,6 +15,7 @@ import {
   TAPAppMeta, 
   TAPOrganizationAppSettings
 } from '../../displayServices/APAppsDisplayService/APAppsDisplayService';
+import APEnvironmentsDisplayService, { TAPEnvironmentDisplayList } from '../../displayServices/APEnvironmentsDisplayService';
 import { APClientConnectorOpenApi } from '../../utils/APClientConnectorOpenApi';
 import APSearchContentService, { IAPSearchContent } from '../../utils/APSearchContentService';
 import { 
@@ -76,6 +77,7 @@ class APDeveloperPortalTeamAppsDisplayService extends APDeveloperPortalAppsDispl
     apDeveloperPortalApp_ApiProductDisplayList,
     apAppApiDisplayList,
     apOrganizationAppSettings,
+    complete_ApEnvironmentDisplayList,
   }: {
     teamId: string;
     connectorAppResponse_smf: AppResponse;
@@ -84,6 +86,7 @@ class APDeveloperPortalTeamAppsDisplayService extends APDeveloperPortalAppsDispl
     apDeveloperPortalApp_ApiProductDisplayList: TAPDeveloperPortalAppApiProductDisplayList;
     apAppApiDisplayList: TAPAppApiDisplayList;
     apOrganizationAppSettings: TAPOrganizationAppSettings;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): TAPDeveloperPortalTeamAppDisplay {
 
     const apDeveloperPortalAppDisplay: TAPDeveloperPortalAppDisplay = this.create_ApDeveloperPortalAppDisplay_From_ApiEntities({
@@ -93,7 +96,8 @@ class APDeveloperPortalTeamAppsDisplayService extends APDeveloperPortalAppsDispl
       connectorAppResponse_mqtt: connectorAppResponse_mqtt,
       apDeveloperPortalApp_ApiProductDisplayList: apDeveloperPortalApp_ApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
-      apOrganizationAppSettings: apOrganizationAppSettings
+      apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_ApEnvironmentDisplayList
     });
 
     const apDeveloperPortalTeamAppDisplay: TAPDeveloperPortalTeamAppDisplay = {
@@ -153,6 +157,11 @@ class APDeveloperPortalTeamAppsDisplayService extends APDeveloperPortalAppsDispl
     });
     if(!exists_teamId) throw new Error(`${logName}: !exists_teamId`);
 
+    // get the complete env list for reference
+    const complete_apEnvironmentDisplayList: TAPEnvironmentDisplayList = await APEnvironmentsDisplayService.apiGetList_ApEnvironmentDisplay({
+      organizationId: organizationId
+    });
+    
     const connectorAppResponse_smf: AppResponse = await AppsService.getTeamApp({
       organizationName: organizationId,
       teamName: teamId,
@@ -194,6 +203,7 @@ class APDeveloperPortalTeamAppsDisplayService extends APDeveloperPortalAppsDispl
       apDeveloperPortalApp_ApiProductDisplayList: apDeveloperPortalApp_ApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
       apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_apEnvironmentDisplayList
     });
 
     return apDeveloperPortalTeamAppDisplay;
diff --git a/apim-portal/src/developer-portal/displayServices/APDeveloperPortalUserAppsDisplayService.ts b/apim-portal/src/developer-portal/displayServices/APDeveloperPortalUserAppsDisplayService.ts
@@ -18,6 +18,7 @@ import {
   TAPAppMeta, 
   TAPOrganizationAppSettings
 } from '../../displayServices/APAppsDisplayService/APAppsDisplayService';
+import APEnvironmentsDisplayService, { TAPEnvironmentDisplayList } from '../../displayServices/APEnvironmentsDisplayService';
 import { APClientConnectorOpenApi } from '../../utils/APClientConnectorOpenApi';
 import APSearchContentService, { IAPSearchContent } from '../../utils/APSearchContentService';
 import APDeveloperPortalAppApiProductsDisplayService, { 
@@ -73,6 +74,7 @@ class APDeveloperPortalUserAppsDisplayService extends APDeveloperPortalAppsDispl
     apDeveloperPortalUserApp_ApiProductDisplayList,
     apAppApiDisplayList,
     apOrganizationAppSettings,
+    complete_ApEnvironmentDisplayList,
   }: {
     userId: string;
     connectorAppResponse_smf: AppResponse;
@@ -81,6 +83,7 @@ class APDeveloperPortalUserAppsDisplayService extends APDeveloperPortalAppsDispl
     apDeveloperPortalUserApp_ApiProductDisplayList: TAPDeveloperPortalAppApiProductDisplayList;
     apAppApiDisplayList: TAPAppApiDisplayList;
     apOrganizationAppSettings: TAPOrganizationAppSettings;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): TAPDeveloperPortalUserAppDisplay {
 
     const apAppDisplay: IAPAppDisplay = this.create_ApAppDisplay_From_ApiEntities({
@@ -91,6 +94,7 @@ class APDeveloperPortalUserAppsDisplayService extends APDeveloperPortalAppsDispl
       apAppApiProductDisplayList: apDeveloperPortalUserApp_ApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
       apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_ApEnvironmentDisplayList,
     });
 
     const apDeveloperPortalUserAppDisplay: TAPDeveloperPortalUserAppDisplay = {
@@ -157,6 +161,11 @@ class APDeveloperPortalUserAppsDisplayService extends APDeveloperPortalAppsDispl
     });
     if(!exists_userId) throw new Error(`${logName}: !exists_userId`);
 
+    // get the complete env list for reference
+    const complete_apEnvironmentDisplayList: TAPEnvironmentDisplayList = await APEnvironmentsDisplayService.apiGetList_ApEnvironmentDisplay({
+      organizationId: organizationId
+    });
+    
     const connectorAppResponse_smf: AppResponse = await AppsService.getDeveloperApp({
       organizationName: organizationId,
       developerUsername: userId,
@@ -198,6 +207,7 @@ class APDeveloperPortalUserAppsDisplayService extends APDeveloperPortalAppsDispl
       apDeveloperPortalUserApp_ApiProductDisplayList: apDeveloperPortalUserApp_ApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
       apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_apEnvironmentDisplayList
     });
 
     return apDeveloperPortalUserAppDisplay;
diff --git a/apim-portal/src/displayServices/APAppsDisplayService/APAppEnvironmentsDisplayService.ts b/apim-portal/src/displayServices/APAppsDisplayService/APAppEnvironmentsDisplayService.ts
@@ -8,6 +8,7 @@ import {
   IAPEntityIdDisplay, 
   TAPEntityId
 } from '../../utils/APEntityIdsService';
+import { TAPEnvironmentDisplay, TAPEnvironmentDisplayList } from '../APEnvironmentsDisplayService';
 
 export enum E_ApEndpoint_Properties {
   SECURE_AND_COMPRESSED = "secure+compressed",
@@ -20,7 +21,8 @@ export type TAPEndpointDisplay = {
   protocol: Protocol;
   transport: string;
   properties: E_ApEndpoint_Properties;
-  uri: string;  
+  uri: string;
+  messageVpnName?: string;
 };
 export type TAPEndpointDisplayList = Array<TAPEndpointDisplay>;
 
@@ -107,8 +109,9 @@ export class APAppEnvironmentsDisplayService {
     return E_ApEndpoint_Properties.PLAIN;
   }
 
-  private create_ApEndpointDisplayList_From_ApiEntities({ endpoints }:{
+  private create_ApEndpointDisplayList_From_ApiEntities({ endpoints, apEnvironmentDisplay }:{
     endpoints?: Array<Endpoint>;
+    apEnvironmentDisplay: TAPEnvironmentDisplay;
   }): TAPEndpointDisplayList {
     const funcName = 'create_ApEndpointDisplayList_From_ApiEntities';
     const logName = `${this.BaseComponentName}.${funcName}()`;
@@ -121,15 +124,17 @@ export class APAppEnvironmentsDisplayService {
         protocol: endpoint.protocol,
         transport: endpoint.transport,
         uri: endpoint.uri,
-        properties: this.create_ApEndpoint_Properties({ secure: endpoint.secure, compressed: endpoint.compressed })
+        properties: this.create_ApEndpoint_Properties({ secure: endpoint.secure, compressed: endpoint.compressed }),
+        messageVpnName: apEnvironmentDisplay.connectorEnvironmentResponse.msgVpnName
       } 
       return apEndpointDisplay;
     });
   }
 
-  public create_ApAppEnvironmentDisplay_From_ApiEntities({ connectorAppEnvironment_smf, connectorAppEnvironment_mqtt }: {
+  public create_ApAppEnvironmentDisplay_From_ApiEntities({ connectorAppEnvironment_smf, connectorAppEnvironment_mqtt, apEnvironmentDisplay }: {
     connectorAppEnvironment_smf: AppEnvironment;
     connectorAppEnvironment_mqtt?: AppEnvironment;
+    apEnvironmentDisplay: TAPEnvironmentDisplay;
   }): IAPAppEnvironmentDisplay {
     const funcName = 'create_ApAppEnvironmentDisplay_From_ApiEntities';
     const logName = `${this.BaseComponentName}.${funcName}()`;
@@ -156,7 +161,7 @@ export class APAppEnvironmentsDisplayService {
     };
     const apAppEnvironmentDisplay: IAPAppEnvironmentDisplay = {
       apEntityId: apEnvironmentEntityId,
-      apEndpointList: this.create_ApEndpointDisplayList_From_ApiEntities({ endpoints: connectorAppEnvironment_smf.messagingProtocols }),
+      apEndpointList: this.create_ApEndpointDisplayList_From_ApiEntities({ endpoints: connectorAppEnvironment_smf.messagingProtocols, apEnvironmentDisplay: apEnvironmentDisplay }),
       apChannelPermissions_smf: {
         apSubscribePermissionList: apSubscribePermissionList_smf,
         apPublishPermissionList: apPublishPermissionList_smf,  
@@ -173,13 +178,22 @@ export class APAppEnvironmentsDisplayService {
 
   }
 
-  public create_ApAppEnvironmentDisplayList_From_ApiEntities({  connectorAppEnvironments_smf, connectorAppEnvironments_mqtt }: {
+  public create_ApAppEnvironmentDisplayList_From_ApiEntities({  connectorAppEnvironments_smf, connectorAppEnvironments_mqtt, complete_ApEnvironmentDisplayList }: {
     connectorAppEnvironments_smf?: Array<AppEnvironment>;
     connectorAppEnvironments_mqtt?: Array<AppEnvironment>;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): TAPAppEnvironmentDisplayList {
+    const funcName = 'create_ApAppEnvironmentDisplayList_From_ApiEntities';
+    const logName = `${this.BaseComponentName}.${funcName}()`;
+
     if(connectorAppEnvironments_smf === undefined) return [];
     const apAppEnvironmentDisplayList: TAPAppEnvironmentDisplayList = [];
     for(const connectorAppEnvironment_smf of connectorAppEnvironments_smf) {
+      // find the complete environment
+      const apEnvironmentDisplay: TAPEnvironmentDisplay | undefined = complete_ApEnvironmentDisplayList.find( (_apEnvironmentDisplay: TAPEnvironmentDisplay) => {
+        return connectorAppEnvironment_smf.name === _apEnvironmentDisplay.apEntityId.id;
+      });
+      if(apEnvironmentDisplay === undefined) throw new Error(`${logName}: apEnvironmentDisplay === undefined`);
       // find the corresponding mqtt environment
       let connectorAppEnvironment_mqtt: AppEnvironment | undefined = undefined;
       if(connectorAppEnvironments_mqtt !== undefined) {
@@ -190,7 +204,8 @@ export class APAppEnvironmentsDisplayService {
       }
       apAppEnvironmentDisplayList.push(this.create_ApAppEnvironmentDisplay_From_ApiEntities({
         connectorAppEnvironment_smf: connectorAppEnvironment_smf,
-        connectorAppEnvironment_mqtt: connectorAppEnvironment_mqtt
+        connectorAppEnvironment_mqtt: connectorAppEnvironment_mqtt,
+        apEnvironmentDisplay: apEnvironmentDisplay,
       }));
     }
     return apAppEnvironmentDisplayList;
diff --git a/apim-portal/src/displayServices/APAppsDisplayService/APAppsDisplayService.ts b/apim-portal/src/displayServices/APAppsDisplayService/APAppsDisplayService.ts
@@ -324,6 +324,7 @@ export class APAppsDisplayService {
     apAppApiProductDisplayList,
     apAppApiDisplayList,
     apOrganizationAppSettings,
+    complete_ApEnvironmentDisplayList,
   }: {
     connectorAppResponse_smf: AppResponse;
     connectorAppResponse_mqtt?: AppResponse;
@@ -332,6 +333,7 @@ export class APAppsDisplayService {
     apAppApiProductDisplayList: TAPDeveloperPortalAppApiProductDisplayList;
     apAppApiDisplayList: TAPAppApiDisplayList;
     apOrganizationAppSettings: TAPOrganizationAppSettings;
+    complete_ApEnvironmentDisplayList: TAPEnvironmentDisplayList;
   }): IAPAppDisplay {
 
     const appCredentials: TAPAppCredentialsDisplay = this.create_ApAppCredentials_From_ApiEntities({ connectorAppResponse: connectorAppResponse_smf, apOrganizationAppSettings: apOrganizationAppSettings });
@@ -368,7 +370,8 @@ export class APAppsDisplayService {
       apAppCredentials: appCredentials,
       apAppEnvironmentDisplayList: APAppEnvironmentsDisplayService.create_ApAppEnvironmentDisplayList_From_ApiEntities({
         connectorAppEnvironments_smf: connectorAppResponse_smf.environments,
-        connectorAppEnvironments_mqtt: connectorAppResponse_mqtt?.environments
+        connectorAppEnvironments_mqtt: connectorAppResponse_mqtt?.environments,
+        complete_ApEnvironmentDisplayList: complete_ApEnvironmentDisplayList,
       }),
       apAppApiProductDisplayList: apAppApiProductDisplayList,
       apAppApiDisplayList: apAppApiDisplayList,
@@ -532,6 +535,11 @@ export class APAppsDisplayService {
       connectorAppResponse: connectorAppResponse_smf,
     });
 
+    // get the complete env list for reference
+    const complete_apEnvironmentDisplayList: TAPEnvironmentDisplayList = await APEnvironmentsDisplayService.apiGetList_ApEnvironmentDisplay({
+      organizationId: organizationId
+    });
+    
     // // create the app api display list
     // const apAppApiDisplayList: TAPAppApiDisplayList = await APAppApisDisplayService.apiGetList_ApAppApiDisplay({
     //   organizationId: organizationId,
@@ -546,7 +554,8 @@ export class APAppsDisplayService {
       connectorAppResponse_mqtt: undefined,
       apAppApiProductDisplayList: apDeveloperPortalUserApp_ApiProductDisplayList,
       apAppApiDisplayList: [],
-      apOrganizationAppSettings: apOrganizationAppSettings
+      apOrganizationAppSettings: apOrganizationAppSettings,
+      complete_ApEnvironmentDisplayList: complete_apEnvironmentDisplayList
     });
 
     return apAppDisplay;
diff --git a/release/apim-portal/apim-admin-portal/docker/Dockerfile b/release/apim-portal/apim-admin-portal/docker/Dockerfile

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .devel
 gh-pages
 .DS_Store
 +.vscode
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "async-apim-portal",`
`3`		`- "version": "0.3.3",`
	`3`	`+ "version": "0.3.4",`
`4`	`4`	`"description": "Solace Async API Management Portal",`
`5`	`5`	`"repository": {`
`6`	`6`	`"type": "git",`