From 77d51a8465f885d3ec71fe105b3348453e951e91 Mon Sep 17 00:00:00 2001 From: baron_l Date: Tue, 26 Mar 2019 01:30:32 +0100 Subject: [PATCH] fix(storidge): display modifications + fix js errors --- .../storidgeSnapshotCreation.html | 2 +- .../volumeStoridgeInfo.html | 24 ++----------------- .../volumeStoridgeInfoController.js | 4 ---- app/extensions/storidge/filters/filters.js | 18 +++++++++++--- app/extensions/storidge/models/volume.js | 3 --- .../storidge/views/nodes/inspect/node.html | 8 +++---- app/portainer/filters/filters.js | 2 +- 7 files changed, 23 insertions(+), 38 deletions(-) diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html index 1c7318e62..ea4fd544c 100644 --- a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html @@ -4,7 +4,7 @@
- +
diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html index a115c1fe8..3fccb9174 100644 --- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html @@ -23,7 +23,7 @@ {{ $ctrl.volume.Name }} - Uuid + UUID {{ $ctrl.volume.Uuid }} @@ -66,10 +66,6 @@ Redundancy {{ $ctrl.volume.Redundancy }} - - Type - {{ $ctrl.volume.Type }} - Vdisk {{ $ctrl.volume.Vdisk }} @@ -83,17 +79,9 @@ {{ $ctrl.volume.Volume}} - DriveType + Drive Type {{ $ctrl.volume.DriveType}} - - Compression - {{ $ctrl.volume.Compression}} - - - Dedup - {{ $ctrl.volume.Dedup}} - Encryption {{ $ctrl.volume.Encryption}} @@ -142,14 +130,6 @@
- -
- -
- -
-
-
diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js index d63e3a4d9..65b637ef4 100644 --- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfoController.js @@ -31,7 +31,6 @@ function ($state, StoridgeVolumeService, Notifications) { IOPSMin: this.volume.IOPSMin, IOPSMax: this.volume.IOPSMax, Node: this.volume.Node, - NodeID: this.volume.NodeID, Capacity: this.volume.Capacity, BandwidthMin: this.volume.BandwidthMin, BandwidthMax: this.volume.BandwidthMax, @@ -62,9 +61,6 @@ function ($state, StoridgeVolumeService, Notifications) { if (volume.Node === data.Node || !volume.Node) { delete volume.Node; } - if (volume.NodeID === data.NodeID || !volume.NodeID) { - delete volume.NodeID; - } if (volume.Capacity === data.Capacity || !volume.Capacity) { delete volume.Capacity; } diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js index 8d323eeaf..a20d7948a 100644 --- a/app/extensions/storidge/filters/filters.js +++ b/app/extensions/storidge/filters/filters.js @@ -10,7 +10,7 @@ angular.module('extension.storidge') .filter('drivestatusbadge', function () { 'use strict'; return function (text) { - var status = _.toLower(text); + var status = text ? _.toLower(text) : ''; if (includeString(status, ['normal'])) { return 'success'; } else if (includeString(status, ['available'])) { @@ -24,7 +24,7 @@ angular.module('extension.storidge') .filter('nodeStatusBadge', function () { 'use strict'; return function (text) { - var status = _.toLower(text); + var status = text ? _.toLower(text) : ''; if (status === 'maintenance') { return 'orange-icon'; } @@ -34,10 +34,22 @@ angular.module('extension.storidge') .filter('clusterStatusBadge', function () { 'use strict'; return function (text) { - var status = _.toLower(text); + var status = text ? _.toLower(text) : ''; if (status === 'alert') { return 'red-icon'; } return 'green-icon'; }; +}).filter('bytes', function() { + return function(bytes, precision) { + bytes = parseFloat(bytes); + if (isNaN(bytes) || !isFinite(bytes)) return '-'; + if (!precision) precision = 1; + var units = ['B', 'kB', 'MB', 'GB', 'TB', 'PB']; + var number = Math.floor(Math.log(bytes) / Math.log(1024)); + if (bytes === 0) { + return ('0 B'); + } + return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number]; + } }); \ No newline at end of file diff --git a/app/extensions/storidge/models/volume.js b/app/extensions/storidge/models/volume.js index 9b6da95d5..ab8b1c14b 100644 --- a/app/extensions/storidge/models/volume.js +++ b/app/extensions/storidge/models/volume.js @@ -10,7 +10,6 @@ export function StoridgeVolumeModel(data) { this.NodeID = data.nodeid; this.Provisioning = data.provisioning; this.Redundancy = data.redundancy; - this.Type = data.type; this.Uuid = data.uuid; this.Vdisk = data.vdisk; this.Labels = data.labels; @@ -18,8 +17,6 @@ export function StoridgeVolumeModel(data) { this.IP = data.ipaddr; this.Volume = data.volume; this.DriveType = data.type; - this.Compression = data.compression; - this.Dedup = data.dedup; this.Encryption = data.encryption; this.Replication = data.replication; this.SnapshotEnabled = data.snapshot; diff --git a/app/extensions/storidge/views/nodes/inspect/node.html b/app/extensions/storidge/views/nodes/inspect/node.html index d1edbbc0b..33232c289 100644 --- a/app/extensions/storidge/views/nodes/inspect/node.html +++ b/app/extensions/storidge/views/nodes/inspect/node.html @@ -107,19 +107,19 @@ Free - {{ node.FreeCapacity }} + {{ node.FreeCapacity | bytes }} Used - {{ node.UsedCapacity }} + {{ node.UsedCapacity | bytes }} Provisioned - {{ node.ProvisionedCapacity }} + {{ node.ProvisionedCapacity | bytes }} Total - {{ node.TotalCapacity }} + {{ node.TotalCapacity | bytes }} diff --git a/app/portainer/filters/filters.js b/app/portainer/filters/filters.js index 83f2201ae..b100435c9 100644 --- a/app/portainer/filters/filters.js +++ b/app/portainer/filters/filters.js @@ -38,7 +38,7 @@ angular.module('portainer.app') .filter('capitalize', function () { 'use strict'; return function (text) { - return _.capitalize(text); + return text ? _.capitalize(text) : ''; }; }) .filter('stripprotocol', function() {