Skip to content
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

Jump to bottom

BZ 1467569- in the self service portal after a little time displaying a vm, data changes to garbage data #842

Merged
merged 1 commit into from
Jul 12, 2017
Merged

BZ 1467569- in the self service portal after a little time displaying a vm, data changes to garbage data #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions client/app/services/detail-reveal/detail-reveal.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export const DetailRevealComponent = {
icon: '@',
translateTitle: '<',
rowClass: '@',
displayField: '<?',
},
transclude: true,
templateUrl,
Expand All @@ -21,6 +22,9 @@ function ComponentController($transclude) {
vm.$onInit = activate();

function activate() {
if (angular.isUndefined(vm.displayField)) {
vm.displayField = true;
}
vm.translateTitle = (angular.isUndefined(vm.translateTitle) ? true : vm.translateTitle);
vm.detailTitle = (vm.translateTitle === true ? __(vm.detailTitle) : vm.detailTitle);
vm.rowClass = (angular.isDefined(vm.rowClass) ? vm.rowClass : 'row detail-row');
Expand Down
4 changes: 2 additions & 2 deletions client/app/services/detail-reveal/detail-reveal.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="row detail-row" ng-click="vm.hasMoreDetails ? vm.toggleDetails = !vm.toggleDetails:''" ng-class="(vm.hasMoreDetails ? 'details-exist' : '') + ' ' + (vm.toggleDetails ? 'row-active':'') ">
<div class="row detail-row" ng-click="vm.hasMoreDetails ? vm.toggleDetails = !vm.toggleDetails:''" ng-class="(vm.hasMoreDetails ? 'details-exist' : '') + ' ' + (vm.toggleDetails ? 'row-active':'') " ng-if="vm.displayField">
<div class="col-xs-6 col-md-3">
<div class="detail-reveal-arrow-container" ng-class="vm.hasMoreDetails ? '' : 'no-details' ">
<i class="fa fa-lg detail-reveal-arrow" ng-class="(vm.toggleDetails===true ? 'fa-angle-down' : 'fa-angle-right')"></i>
Expand All @@ -18,4 +18,4 @@
<div ng-transclude class="detail-content">
</div>
</div>
</div>
</div>
66 changes: 33 additions & 33 deletions client/app/services/vm-details/vm-details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,37 +53,37 @@
<div class="row title">
<div>{{ 'Properties'|translate }}</div>
</div>
<detail-reveal ng-if="vm.vmDetails.retired" detail-title="Status" icon="pf pficon-warning-triangle-o"
<detail-reveal display-field="vm.vmDetails.retired" detail-title="Status" icon="pf pficon-warning-triangle-o"
detail="{{ 'Retired' | translate }}"></detail-reveal>
<detail-reveal detail-title="Name" detail="{{ vm.vmDetails.name }}"></detail-reveal>
<detail-reveal detail-title="Hostnames" detail="{{ vm.vmDetails.hostnames.join(',') }}"></detail-reveal>
<detail-reveal detail-title="IP Addresses" detail="{{ vm.vmDetails.ipaddresses.join(',') }}"></detail-reveal>
<detail-reveal detail-title="MAC Address" detail="{{ vm.vmDetails.mac_addresses.join(',') }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Container" detail="{{ vm.vmDetails.containerSpecsText }}"></detail-reveal>
<detail-reveal detail-title="Parent Host/Node Platform" detail="{{ vm.vmDetails.host.vmm_product }}"
ng-if="vm.vmDetails.host"></detail-reveal>
display-field="vm.vmDetails.host"></detail-reveal>
<detail-reveal detail-title="Platform Tools" detail="{{ vm.vmDetails.tools_status }}"></detail-reveal>
<detail-reveal detail-title="Operating System"
detail="{{ vm.vmDetails.hardware.guest_os_full_name }}"></detail-reveal>
<detail-reveal detail-title="Architecture" detail="{{ vm.vmDetails.hardware.bitness }} bit"
ng-if="vm.vmDetails.hardware.bitness"></detail-reveal>
display-field="vm.vmDetails.hardware.bitness"></detail-reveal>
<detail-reveal detail-title="Devices" icon="fa fa-hdd-o fa-lg" detail="{{ 3 + vm.vmDetails.num_disks }}"
ng-if="vm.vmDetails.cloud===false"></detail-reveal>
display-field="vm.vmDetails.cloud===false"></detail-reveal>
<detail-reveal detail-title="CPU Affinity" detail="{{ vm.vmDetails.cpu_affinity }}"
ng-if="vm.vmDetails.cloud===false"></detail-reveal>
<detail-reveal ng-if="vm.permissions.vm_snapshot_show_list" detail-title="Snapshots" icon="fa fa-camera fa-lg"
display-field="vm.vmDetails.cloud===false"></detail-reveal>
<detail-reveal display-field="vm.permissions.vm_snapshot_show_list" detail-title="Snapshots" icon="fa fa-camera fa-lg"
detail="{{ vm.vmDetails.v_total_snapshots }}"></detail-reveal>
<detail-reveal detail-title="Advanced Settings" icon="fa fa-wrench fa-lg"
detail="{{ vm.vmDetails.advanced_settings.length }}"></detail-reveal>
<detail-reveal detail-title="Resources" detail="{{ vm.vmDetails.resourceAvailability }}"></detail-reveal>
<detail-reveal detail-title="Management Engine GUID" detail="{{ vm.vmDetails.guid }}"></detail-reveal>
<detail-reveal detail-title="Virtualization" detail="{{ vm.vmDetails.hardware.virtualization_type }}"
ng-if="vm.vmDetails.hardware.virtualization_type"></detail-reveal>
display-field="vm.vmDetails.hardware.virtualization_type"></detail-reveal>
<detail-reveal detail-title="Root Device Type" detail="{{ vm.vmDetails.hardware.root_device_type }}"
ng-if="vm.vmDetails.hardware.root_device_type"></detail-reveal>
display-field="vm.vmDetails.hardware.root_device_type"></detail-reveal>
<detail-reveal detail-title="ID within Provider" detail="{{ vm.vmDetails.uid_ems }}"
ng-if="vm.vmDetails.uid_ems"></detail-reveal>
display-field="vm.vmDetails.uid_ems"></detail-reveal>
</div>

<div class="container-fluid vm-details-container">
Expand All @@ -106,52 +106,52 @@
<div>{{ 'Relationships'|translate }}</div>
</div>
<detail-reveal detail-title="Availability Zone" detail="{{ vm.vmDetails.instance.availabilityZone }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Cloud Tenants" detail="{{ vm.vmDetails.instance.cloudTenant }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Flavor" detail="{{ vm.vmDetails.instance.flavor.name }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="VM Template" detail="{{ vm.vmDetails.instance.miq_provision_template.name }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Infrastructure provider" detail="{{ vm.vmDetails.ext_management_system.name }}"
ng-if="vm.permissions.ems_infra_show && vm.vmDetails.ext_management_system.name"></detail-reveal>
display-field="vm.permissions.ems_infra_show && vm.vmDetails.ext_management_system.name"></detail-reveal>
<detail-reveal detail-title="{{ 'Cluster'|translate }} / {{ 'Deployment Role'|translate }}"
icon="fa fa-lg pficon pficon-cluster" detail="{{ vm.vmDetails.ems_cluster.name }}"
ng-if="vm.permissions.ems_cluster_show && vm.vmDetails.ems_cluster.name"></detail-reveal>
display-field="vm.permissions.ems_cluster_show && vm.vmDetails.ems_cluster.name"></detail-reveal>
<detail-reveal detail-title="Host / Node" icon="fa fa-lg pficon pficon-screen" detail="{{ vm.vmDetails.host.name }}"
ng-if="vm.permissions.host_show && vm.vmDetails.host.name"></detail-reveal>
display-field="vm.permissions.host_show && vm.vmDetails.host.name"></detail-reveal>
<detail-reveal detail-title="Resource Pool" icon="fa fa-lg pficon pficon-resource-pool"
detail="{{ vm.vmDetails.parent_resource_pool.name }}"
ng-if="vm.permissions.resource_pool_show && vm.vmDetails.parent_resource_pool"></detail-reveal>
display-field="vm.permissions.resource_pool_show && vm.vmDetails.parent_resource_pool"></detail-reveal>
<detail-reveal detail-title="Datastores" icon="fa fa-lg fa-database" detail="{{ vm.vmDetails.storages.length }}"
ng-if="vm.permissions.storage_show_list && vm.vmDetails.storages.length > 0"></detail-reveal>
display-field="vm.permissions.storage_show_list && vm.vmDetails.storages.length > 0"></detail-reveal>
<detail-reveal detail-title="Service" icon="fa fa-lg pficon pficon-service"
detail="{{ vm.vmDetails.service.name }}"></detail-reveal>
<detail-reveal detail-title="Virtual Private Cloud" detail="{{ vm.vmDetails.instance.cloud_networks[0].name }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance.cloud_networks.length > 0"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance.cloud_networks.length > 0"></detail-reveal>
<detail-reveal detail-title="Cloud Subnet" detail="{{ vm.vmDetails.instance.cloud_subnets[0].name }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance.cloud_subnets.length > 0"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance.cloud_subnets.length > 0"></detail-reveal>
<detail-reveal detail-title="Stack" detail="{{ vm.vmDetails.instance.orchestrationStack.name }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Cloud Networks" detail="{{ vm.vmDetails.instance.cloud_networks.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Cloud Subnets" detail="{{ vm.vmDetails.instance.cloud_subnets.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Network Routers" detail="{{ vm.vmDetails.instance.network_routers.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Security Groups" detail="{{ vm.vmDetails.security_groups.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Floating IPs" detail="{{ vm.vmDetails.instance.floating_ip_addresses.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Network Ports" detail="{{ vm.vmDetails.instance.network_ports.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Load Balancers" detail="{{ vm.vmDetails.instance.load_balancers.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Cloud Volumes" detail="{{ vm.vmDetails.instance.cloud_volumes.length }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
<detail-reveal detail-title="Genealogy" detail="{{ 'Show parent and child VMs'|translate }}"
ng-if="vm.vmDetails.cloud===false"></detail-reveal>
<detail-reveal ng-if="vm.permissions.vm_drift" detail-title="Drift History"
display-field="vm.vmDetails.cloud===false"></detail-reveal>
<detail-reveal display-field="vm.permissions.vm_drift" detail-title="Drift History"
detail="{{ vm.vmDetails.driftHistory }}"></detail-reveal>
<detail-reveal detail-title="Analysis History" detail="{{ vm.vmDetails.scanHistoryCount }}"></detail-reveal>
</div>
Expand Down Expand Up @@ -183,7 +183,7 @@
<detail-reveal detail-title="Groups" icon="fa fa-lg pficon pficon-users"
detail="{{ vm.vmDetails.groups.length }}"></detail-reveal>
<detail-reveal detail-title="Key Pairs" detail="{{ vm.vmDetails.instance.keyPairLabels.join(',') }}"
ng-if="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>
</div>
<div class="container-fluid vm-details-container">
<div class="row title">
Expand Down