Skip to content

Commit

Permalink
Adds smartstate details
Browse files Browse the repository at this point in the history
Fixes component and card overflow behavior, adds translate where applicable
  • Loading branch information
AllenBW committed Sep 7, 2017
1 parent 8262020 commit 54d009d
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 163 deletions.
3 changes: 3 additions & 0 deletions client/app/services/resource-details/_resource-details.sass
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@
border-bottom: 1px solid $color-light-gray-approx
font-weight: bold
padding: 4px

.card-pf
overflow-x: auto
218 changes: 55 additions & 163 deletions client/app/services/resource-details/resource-details.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</div>
</div>
</div>
<div class="container-fluid">
<div class="container-fluid breadcrumb-content">
<div class="row">
<div class="col-md-2">
<pf-aggregate-status-card status="vm.test"></pf-aggregate-status-card>
Expand Down Expand Up @@ -62,7 +62,7 @@
<div class="row">
<div class="col-md-12">
<div class="card-pf">
<h2>Timeline</h2>
<h2 translate>Timeline</h2>
<timeline data="vm.tlData" options="vm.tlOptions"></timeline>
</div>
</div>
Expand All @@ -78,14 +78,14 @@ <h2>Timeline</h2>
<div class="row">
<div class="col-md-12">
<div class="card-pf">
<h2><i class="pficon-storage-domain"></i>Disk Usage</h2>
<h2 translate><i class="pficon-storage-domain"></i>Disk Usage</h2>
</div>
</div>
</div>
<div class="row">
<div class="col-md-12">
<div class="card-pf">
<h2>Disk I/O</h2>
<h2 translate>Disk I/O</h2>
</div>
</div>
</div>
Expand All @@ -94,176 +94,68 @@ <h2>Disk I/O</h2>
<div class="row">
<div class="col-md-4">
<div class="card-pf">
<h2><i class="fa fa-tags"></i>Tags</h2>
<h2 translate><i class="fa fa-tags"></i>Tags</h2>
<tagging-widget tags-of-item="vm.availableTags"
read-only="true"></tagging-widget>
</div>
</div>
<div class="col-md-4">
<div class="card-pf">
<h2># Custom Attributes</h2>
<h2 trasnlate># Custom Attributes</h2>
</div>
</div>
<div class="col-md-4">
<div class="card-pf">
<h2>Smart State Analysis</h2>
<h2 translate>Smart State Analysis</h2>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.users.length }}
</div>
<div class="col-xs-10 col-md-9" translate>
<i class="pficon pficon-user"></i> Users
</div>
</div>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.groups.length }}
</div>
<div class="col-xs-10 col-md-9" translate>
<i class="pficon pficon-users"></i> Groups
</div>
</div>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.instance.keyPairLabels.join(',') }}
</div>
<div class="col-xs-10 col-md-9" translate>
Key Pairs
</div>
</div>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.guest_applications.length }}
</div>
<div class="col-xs-10 col-md-9" translate>
<i class="ff ff-software-package"></i> Packages
</div>
</div>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.linux_initprocesses.length }}
</div>
<div class="col-xs-10 col-md-9" translate>
<i class="fa fa-cog"></i> Init Processes
</div>
</div>
<div class="row">
<div class="col-xs-2 col-md-3">
{{ vm.vmDetails.files.length }}
</div>
<div class="col-xs-10 col-md-9" translate>
<i class="fa fa-file-o"></i> Files
</div>
</div>
</div>
</div>
</div>
</div>
<!--<loading status="vm.loading"></loading>-->
<!--<div ng-if="vm.viewType === 'graphsView'" class="ss-details-wrapper usage-graphs-container">-->
<!--<usage-graphs cpu-chart="vm.cpuChart" memory-chart="vm.memoryChart" storage-chart="vm.storageChart"></usage-graphs>-->
<!--</div>-->
<!--<div ng-if="!vm.loading" ng-show="vm.viewType === 'detailsView'" class="well ss-details-wrapper vm-details-wrapper">-->
<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Properties'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="vm.vmDetails.retired" detail-title="Status" icon="pf pficon-warning-triangle-o"-->
<!--detail="{{ 'Retired' | translate }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Name" detail="{{ vm.vmDetails.name }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Hostnames" detail="{{ vm.vmDetails.hostnames.join(',') }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="IP Addresses" detail="{{ vm.vmDetails.ipaddresses.join(',') }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="MAC Address" detail="{{ vm.vmDetails.mac_addresses.join(',') }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Container" detail="{{ vm.vmDetails.containerSpecsText }}"></detail-reveal>-->
<!--<detail-reveal detail-title="Parent Host/Node Platform" detail="{{ vm.vmDetails.host.vmm_product }}"-->
<!--display-field="vm.vmDetails.host"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Platform Tools" detail="{{ vm.vmDetails.tools_status }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" 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"-->
<!--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 }}"-->
<!--display-field="vm.vmDetails.cloud===false"></detail-reveal>-->
<!--<detail-reveal detail-title="CPU Affinity" detail="{{ vm.vmDetails.cpu_affinity }}"-->
<!--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 display-field="true" detail-title="Advanced Settings" icon="fa fa-wrench fa-lg"-->
<!--detail="{{ vm.vmDetails.advanced_settings.length }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Resources" detail="{{ vm.vmDetails.resourceAvailability }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Management Engine GUID" detail="{{ vm.vmDetails.guid }}"></detail-reveal>-->
<!--<detail-reveal detail-title="Virtualization" detail="{{ vm.vmDetails.hardware.virtualization_type }}"-->
<!--display-field="vm.vmDetails.hardware.virtualization_type"></detail-reveal>-->
<!--<detail-reveal detail-title="Root Device Type" detail="{{ vm.vmDetails.hardware.root_device_type }}"-->
<!--display-field="vm.vmDetails.hardware.root_device_type"></detail-reveal>-->
<!--<detail-reveal detail-title="ID within Provider" detail="{{ vm.vmDetails.uid_ems }}"-->
<!--display-field="vm.vmDetails.uid_ems"></detail-reveal>-->
<!--</div>-->

<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Lifecycle'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="true"-->
<!--detail-title="Discovered on"-->
<!--detail="{{ vm.vmDetails.created_on | date:'medium' }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Last Analyzed" icon="fa fa-search fa-lg"-->
<!--detail="{{ vm.vmDetails.lastSyncOn | date:'medium' }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Retirement Date" icon="fa fa-clock-o fa-lg"-->
<!--detail="{{ vm.vmDetails.retiresOn | date:'medium' }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Provisioned On"-->
<!--detail="{{ vm.vmDetails.provisionDate | date:'medium' }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Owner" detail="{{ vm.vmDetails.evm_owner.name }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Group" detail="{{ vm.vmDetails.miq_group.description }}"></detail-reveal>-->
<!--</div>-->
<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Relationships'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal detail-title="Availability Zone" detail="{{ vm.vmDetails.instance.availabilityZone }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Cloud Tenants" detail="{{ vm.vmDetails.instance.cloudTenant }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Flavor" detail="{{ vm.vmDetails.instance.flavor.name }}"-->
<!--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 }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Infrastructure provider" detail="{{ vm.vmDetails.ext_management_system.name }}"-->
<!--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 }}"-->
<!--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 }}"-->
<!--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 }}"-->
<!--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 }}"-->
<!--display-field="vm.permissions.storage_show_list && vm.vmDetails.storages.length > 0"></detail-reveal>-->
<!--<detail-reveal display-field="true" 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 }}"-->
<!--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 }}"-->
<!--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 }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Cloud Networks" detail="{{ vm.vmDetails.instance.cloud_networks.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Cloud Subnets" detail="{{ vm.vmDetails.instance.cloud_subnets.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Network Routers" detail="{{ vm.vmDetails.instance.network_routers.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Security Groups" detail="{{ vm.vmDetails.security_groups.length }}"-->
<!--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 }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Network Ports" detail="{{ vm.vmDetails.instance.network_ports.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Load Balancers" detail="{{ vm.vmDetails.instance.load_balancers.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Cloud Volumes" detail="{{ vm.vmDetails.instance.cloud_volumes.length }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--<detail-reveal detail-title="Genealogy" detail="{{ 'Show parent and child VMs'|translate }}"-->
<!--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 display-field="true" detail-title="Analysis History" detail="{{ vm.vmDetails.scanHistoryCount }}"></detail-reveal>-->
<!--</div>-->
<!--<div ng-if="vm.permissions.vm_check_compliance" class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Compliance'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="true" detail-title="Status" detail="{{ vm.vmDetails.lastComplianceStatus }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="History" detail="{{ vm.vmDetails.complianceHistory }}"></detail-reveal>-->
<!--</div>-->

<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Power Management'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="true" detail-title="Power State" detail="{{ vm.vmDetails.power_state }}"></detail-reveal>-->
<!--<detail-reveal display-field="true"-->
<!--detail-title="Last Boot Time"-->
<!--detail="{{ vm.vmDetails.boot_time | date:'medium' }}"></detail-reveal>-->
<!--<detail-reveal display-field="true"-->
<!--detail-title="State Changed On"-->
<!--detail="{{ vm.vmDetails.state_changed_on | date:'medium' }}"></detail-reveal>-->
<!--</div>-->

<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Security'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="true" detail-title="Users" icon="fa fa-lg pficon pficon-user"-->
<!--detail="{{ vm.vmDetails.users.length }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" 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(',') }}"-->
<!--display-field="vm.permissions.instance_show && vm.vmDetails.instance"></detail-reveal>-->
<!--</div>-->
<!--<div class="container-fluid vm-details-container">-->
<!--<div class="row title">-->
<!--<div>{{ 'Configuration'|translate }}</div>-->
<!--</div>-->
<!--<detail-reveal display-field="true" detail-title="Packages" detail="{{ vm.vmDetails.guest_applications.length }}"></detail-reveal>-->
<!--<detail-reveal display-field="true"-->
<!--detail-title="Init Processes"-->
<!--detail="{{ vm.vmDetails.linux_initprocesses.length }}"></detail-reveal>-->
<!--<detail-reveal display-field="true" detail-title="Files" detail="{{ vm.vmDetails.files.length }}"></detail-reveal>-->
<!--</div>-->
<!--</div>-->
4 changes: 4 additions & 0 deletions client/assets/sass/breadcrumbs.sass
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@
.breadcrumb-actions
margin-left: auto
padding: 5px 15px

.breadcrumb-content
height: calc(100vh - 150px)
overflow-y: auto

0 comments on commit 54d009d

Please sign in to comment.