common changes for application-onboarding, application-catalog

Change-Id: I2a05dca6c32e95bcb00c8f2edd62e6126b99a9a6
Issue-ID: PORTAL-909
Signed-off-by: rachitha.ramappa@att.com

diff --git a/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts b/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts
index f571dca..4d919b4 100644 (file)
--- a/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts
+++ b/portal-FE-common/src/app/pages/application-catalog/application-catalog.component.ts
@@ -101,6 +101,7 @@ export class ApplicationCatalogComponent implements OnInit {
       this.appCatalogData = data;
       for (let entry of this.appCatalogData) {
         //console.log("Check the URL" + environment.api.appThumbnail);
+               if(entry.applicationType != "3"){
         var appCatalog = {
           x: -1,
           y: -1,
@@ -108,7 +109,7 @@ export class ApplicationCatalogComponent implements OnInit {
           name: entry.name,
           mlAppName: entry.mlAppName,
           imageLink: environment.api.appThumbnail.replace(':appId', <string><any>entry.id),
-          restricted: entry.restricted,
+          applicationType: entry.applicationType,
           select: entry.select,
           access: entry.access,
           pending: entry.pending,
@@ -116,6 +117,7 @@ export class ApplicationCatalogComponent implements OnInit {
         };
         this.applicationCatalogService.addItem(appCatalog);
       }
+         }
     }, error => {
       console.log('getAppCatalogServices Error Object' + error);
     });
@@ -148,7 +150,7 @@ export class ApplicationCatalogComponent implements OnInit {
   };
   openAddRoleModal(item: any) {
     //console.log("OpenModal check" + item.id);
-    if ((!item.restricted) && (item.mlproperty)) {
+    if ((item.applicationType == "1") && (item.mlproperty)) {
       this.modal.open(CatalogModalComponent);
     }
   }

diff --git a/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts b/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
index be4c09e..f8a80bb 100644 (file)
--- a/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
+++ b/portal-FE-common/src/app/pages/dashboard-application-catalog/dashboard-application-catalog.component.ts
@@ -169,6 +169,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
         this.applicationCatalogService.layout = [];
         for (let entry of data) {
           //console.log("Check the URL" + environment.api.appThumbnail);
+                 if(entry.applicationType != '3'){
           var appCatalog = {
             x: -1,
             y: -1,
@@ -176,7 +177,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
             name: entry.name,
             subHeaderText: entry.notes,
             imageLink: environment.api.appThumbnail.replace(':appId', <string><any>entry.id),
-            restrictedApp: entry.restrictedApp,
+            applicationType: entry.applicationType,
             select: entry.select,
             access: entry.access,
             pending: entry.pending,
@@ -186,6 +187,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
           };
           this.applicationCatalogService.addItem(appCatalog);
         }
+               }
       }
     }, error => {
       console.log('getAppCatalogServices Error Object' + error);
@@ -199,7 +201,7 @@ export class DashboardApplicationCatalogComponent implements OnInit {
 
   openAddRoleModal(item: any) {
     //console.log("OpenModal check" + item.id+" "+item.url);
-    if (item.restrictedApp) {
+    if (item.applicationType =='2') {
       // Link-based apps open in their own browser tab
       window.open(item.url, '_blank');
     } else{

diff --git a/portal-FE-common/src/app/shared/model/application-catalog.model.ts b/portal-FE-common/src/app/shared/model/application-catalog.model.ts
index a0f368c..46344b7 100644 (file)
--- a/portal-FE-common/src/app/shared/model/application-catalog.model.ts
+++ b/portal-FE-common/src/app/shared/model/application-catalog.model.ts
@@ -41,7 +41,7 @@ export interface IApplicationCatalog {
     mlAppName: string;
     imageUrl: string;
     url: string;
-    restricted: boolean;
+    applicationType: string;
     open: boolean;
     access: boolean;
     select: boolean;

diff --git a/portal-FE-common/src/app/shared/model/applications-onboarding/applications.ts b/portal-FE-common/src/app/shared/model/applications-onboarding/applications.ts
index bc0ce42..895e4ea 100644 (file)
--- a/portal-FE-common/src/app/shared/model/applications-onboarding/applications.ts
+++ b/portal-FE-common/src/app/shared/model/applications-onboarding/applications.ts
@@ -37,34 +37,40 @@
  */
 
 export interface IApplications {
-    id ?: any;
-    name ?: any;
-    imageUrl ?: any;
-    imageLink ?: any;
-    description ?: any;
-    notes ?: any;
-    url ?: any
-    alternateUrl ?: any;
-    restUrl ?: any;
-    isOpen ?: any;
-    isEnabled ?: any;
-    motsId ?: any;
-    myLoginsAppName ?: any;
-    myLoginsAppOwner ?: any;
-    username ?: any;
-    appPassword ?: any;
-    thumbnail ?: any;
-    uebTopicName ?: any;
-    uebKey ?: any;
-    uebSecret ?: any;
+    id?: any;
+    appName?: any;
+    imageUrl?: any;
+    imageLink?: any;
+    appDescription?: any;
+    appNotes?: any;
+    landingPage?: any
+    alternateUrl?: any;
+    restUrl?: any;
+    isOpen?: any;
+    isEnabled?: any;
+    motsId?: any;
+    myLoginsAppName?: any;
+    myLoginsAppOwner?: any;
+    appBasicAuthUsername?: any;
+    appBasicAuthPassword?: any;
+    thumbnail?: any;
+    uebTopicName?: any;
+    uebKey?: any;
+    uebSecret?: any;
+    applicationType?: any;
+    rolesInAAF?: any;
     // ---- start ----to be removed
-    restrictedApp ?: any;
-    isCentralAuth ?: any;
+    restrictedApp?: any;
+    name?: any;
+    isCentralAuth?: any;
+    description?: any;
+    notes?: any;
+    url?: any;
+    username?: any;
+    appPassword?: any;
     // ---- end ----to be removed
-    applicationType ?: any;
-    rolesInAAF ?: any;
-    nameSpace ?: any;
-    usesCadi ?: any;
-    modeOfIntegration ?: any;
-    appAck ?: any;
+    nameSpace?: any;
+    usesCadi?: any;
+    modeOfIntegration?: any;
+    appAck?: any;
 }
\ No newline at end of file