Skip to content

loader added for instance #1090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 30, 2016
Merged

loader added for instance #1090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15b3a45
loader added
Dec 30, 2016
f761749
loader added
Dec 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion client/cat3/src/partials/sections/dashboard/analytics/controller/discoveryResourcesCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -229,6 +266,7 @@
}
};
});
$scope.instLoader=false;
}, 1000);
}
};
Expand Down
6 changes: 3 additions & 3 deletions client/cat3/src/partials/sections/dashboard/analytics/view/discoveryResources.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<i class="fa fa-plus white"></i> Import
</button>
</span>

<div ng-if="disResrc.gridOptionInstances.data.length === 0" class="alert alert-info text-center"> No Data Found!</div>
<div ng-if="disResrc.gridOptionInstances.data.length > 0" ui-grid="disResrc.gridOptionInstances" ui-grid-pagination ui-grid-selection ui-grid-edit ui-grid-cellNav class="grid"></div>
<loading size="large" name="instLoader" type="block"></loading>
<div ng-if="!instLoader && disResrc.gridOptionInstances.data.length > 0" ui-grid="disResrc.gridOptionInstances" ui-grid-pagination ui-grid-selection ui-grid-edit ui-grid-cellNav class="grid"></div>
<div ng-if="!instLoader && disResrc.gridOptionInstances.data.length === 0" class="alert alert-info text-center"> No Data Found!</div>
</accordion-group>


Expand Down