diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js index bbaf97832..c44f1b07c 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js +++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js @@ -62,7 +62,7 @@ disResrc.init=function () { if(fltrObj && fltrObj.provider && fltrObj.provider.id) { disResrc.getAllTagNames(); - + $scope.instLoader=true; $timeout(function () { console.log( $scope.TagName); disResrc.gridOptionInstances = { @@ -109,6 +109,42 @@ }; disResrc.gridOptionInstances.data = []; if($rootScope.organNewEnt.instanceType === 'Managed') { + disResrc.gridOptionInstances.columnDefs=[ + {name: 'InstanceId', field: 'platformId',enableCellEditOnFocus: false, + enableCellEdit: false,enableFiltering: true}, + {name: 'os', enableFiltering: true,displayName: 'OS', enableCellEdit: false, type: 'number',enableCellEditOnFocus: false}, + {name: 'privateIpAddress',enableFiltering: true, displayName: 'IP Address',enableCellEditOnFocus: false, + enableCellEdit: false}, + {name: 'state',enableFiltering: true, displayName: 'Status',enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'Region',enableFiltering: true, + displayName: 'Region', + field: 'providerData.region_name', + cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + {name: 'orgName', enableFiltering: true,displayName: 'Org Name', field: 'orgName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false}, + { + name: 'bgName', + displayName: 'BG Name',enableFiltering: true, + field: 'bgName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + { + name: 'projectName',enableFiltering: true, + displayName: 'Project Name', + field: 'projectName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + }, + { + name: 'environmentName',enableFiltering: true, + displayName: 'Env Name', + field: 'environmentName', cellTooltip: true,enableCellEditOnFocus: false, + enableCellEdit: false + } + ]; $scope.instanceType= 'managedInstances'; } else if($rootScope.organNewEnt.instanceType === 'Assigned'){ disResrc.gridOptionInstances.enableFiltering=true; @@ -211,6 +247,7 @@ $scope.instanceType= 'unassigned-instances'; } var param = { + inlineLoader:true, url: '/providers/' + fltrObj.provider.id + '/' + $scope.instanceType }; genSevs.promiseGet(param).then(function (instResult) { @@ -229,6 +266,7 @@ } }; }); + $scope.instLoader=false; }, 1000); } }; diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html index 4ec836139..4fedf8987 100644 --- a/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html +++ b/client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html @@ -10,9 +10,9 @@ Import - -
No Data Found!
-
+ +
+
No Data Found!