From fa3005e9dfe7ff391676ea62ee6ab685b01cf47e Mon Sep 17 00:00:00 2001 From: baron_l Date: Mon, 25 Mar 2019 23:12:06 +0100 Subject: [PATCH] refactor(storidge): webpack migration --- app/extensions/storidge/__module.js | 8 ++++---- .../drives-datatable/storidgeDrivesDatatable.js | 2 +- .../snapshot-creation/storidgeSnapshotCreation.js | 2 +- .../storidgeSnapshotCreationController.js | 4 ++-- .../snapshots-datatable/storidgeSnapshotsDatatable.js | 2 +- .../components/volume-storidge-info/volumeStoridgeInfo.js | 2 +- app/extensions/storidge/filters/filters.js | 8 ++++++++ app/extensions/storidge/models/drive.js | 2 +- app/extensions/storidge/models/node.js | 2 +- app/extensions/storidge/models/snapshot.js | 2 +- app/extensions/storidge/models/volume.js | 4 ++-- app/extensions/storidge/services/driveService.js | 2 ++ app/extensions/storidge/services/nodeService.js | 2 +- app/extensions/storidge/services/snapshotService.js | 2 ++ app/extensions/storidge/services/volumeService.js | 2 ++ app/extensions/storidge/views/drives/drivesController.js | 2 +- 16 files changed, 31 insertions(+), 17 deletions(-) diff --git a/app/extensions/storidge/__module.js b/app/extensions/storidge/__module.js index 298bb86a4..f22b28f94 100644 --- a/app/extensions/storidge/__module.js +++ b/app/extensions/storidge/__module.js @@ -37,7 +37,7 @@ angular.module('extension.storidge', []) url: '/drives', views: { 'content@': { - templateUrl: 'app/extensions/storidge/views/drives/drives.html', + templateUrl: './views/drives/drives.html', controller: 'StoridgeDrivesController' } } @@ -48,7 +48,7 @@ angular.module('extension.storidge', []) url: '/:id', views: { 'content@': { - templateUrl: 'app/extensions/storidge/views/drives/inspect/drive.html', + templateUrl: './views/drives/inspect/drive.html', controller: 'StoridgeDriveController' } } @@ -59,7 +59,7 @@ angular.module('extension.storidge', []) url: '/:snapshotId', views: { 'content@': { - templateUrl: 'app/extensions/storidge/views/snapshots/inspect/snapshot.html', + templateUrl: './views/snapshots/inspect/snapshot.html', controller: 'StoridgeSnapshotController' } } @@ -95,7 +95,7 @@ angular.module('extension.storidge', []) url: '/:name', views: { 'content@': { - templateUrl: 'app/extensions/storidge/views/nodes/inspect/node.html', + templateUrl: './views/nodes/inspect/node.html', controller: 'StoridgeNodeController' } } diff --git a/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js index 170e724f8..67c7fb28e 100644 --- a/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js +++ b/app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.js @@ -1,5 +1,5 @@ angular.module('extension.storidge').component('storidgeDrivesDatatable', { - templateUrl: 'app/extensions/storidge/components/drives-datatable/storidgeDrivesDatatable.html', + templateUrl: './storidgeDrivesDatatable.html', controller: 'StoridgeDrivesDatatableController', bindings: { titleText: '@', diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js index ad8fc4e0d..ebd1aed11 100644 --- a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.js @@ -1,5 +1,5 @@ angular.module('portainer.docker').component('storidgeSnapshotCreation', { - templateUrl: 'app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreation.html', + templateUrl: './storidgeSnapshotCreation.html', controller: 'StoridgeSnapshotCreationController', bindings: { volumeId: '<' diff --git a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js index 5cc8c9686..f8d82c682 100644 --- a/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js +++ b/app/extensions/storidge/components/snapshot-creation/storidgeSnapshotCreationController.js @@ -1,6 +1,6 @@ angular.module('portainer.docker') -.controller('StoridgeSnapshotCreationController', ['StoridgeSnapshotService', 'Notifications', -function (StoridgeSnapshotService, Notifications) { +.controller('StoridgeSnapshotCreationController', ['StoridgeSnapshotService', 'Notifications', '$state', +function (StoridgeSnapshotService, Notifications, $state) { var ctrl = this; this.formValues = {}; diff --git a/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js index 85e7f7d8f..5f3c145e9 100644 --- a/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js +++ b/app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.js @@ -1,5 +1,5 @@ angular.module('extension.storidge').component('storidgeSnapshotsDatatable', { - templateUrl: 'app/extensions/storidge/components/snapshots-datatable/storidgeSnapshotsDatatable.html', + templateUrl: './storidgeSnapshotsDatatable.html', controller: 'StoridgeSnapshotsDatatableController', bindings: { titleText: '@', diff --git a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js index 1e4dfb677..67b5f8829 100644 --- a/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js +++ b/app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.js @@ -1,5 +1,5 @@ angular.module('portainer.docker').component('volumeStoridgeInfo', { - templateUrl: 'app/extensions/storidge/components/volume-storidge-info/volumeStoridgeInfo.html', + templateUrl: './volumeStoridgeInfo.html', controller: 'VolumeStoridgeInfoController', bindings: { volume: '<' diff --git a/app/extensions/storidge/filters/filters.js b/app/extensions/storidge/filters/filters.js index ffbe38147..8d323eeaf 100644 --- a/app/extensions/storidge/filters/filters.js +++ b/app/extensions/storidge/filters/filters.js @@ -1,3 +1,11 @@ +import _ from 'lodash-es'; + +function includeString(text, values) { + return values.some(function(val){ + return text.indexOf(val) !== -1; + }); +} + angular.module('extension.storidge') .filter('drivestatusbadge', function () { 'use strict'; diff --git a/app/extensions/storidge/models/drive.js b/app/extensions/storidge/models/drive.js index 32f20fa5c..715165095 100644 --- a/app/extensions/storidge/models/drive.js +++ b/app/extensions/storidge/models/drive.js @@ -1,4 +1,4 @@ -function StoridgeDriveModel(data) { +export function StoridgeDriveModel(data) { this.Id = data.driveid; this.Node = data.node; this.Use = data.use; diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js index 6ad1563ed..8af053d3b 100644 --- a/app/extensions/storidge/models/node.js +++ b/app/extensions/storidge/models/node.js @@ -5,7 +5,7 @@ export function StoridgeNodeModel(name, data) { this.Status = data.status; } -function StoridgeNodeDetailedModel(name, properties) { +export function StoridgeNodeDetailedModel(name, properties) { this.Name = name; this.Domain = properties.domain; this.DomainID = properties.domainID; diff --git a/app/extensions/storidge/models/snapshot.js b/app/extensions/storidge/models/snapshot.js index d259bbef7..3ee5d62ca 100644 --- a/app/extensions/storidge/models/snapshot.js +++ b/app/extensions/storidge/models/snapshot.js @@ -1,4 +1,4 @@ -function StoridgeSnapshotModel(data) { +export function StoridgeSnapshotModel(data) { this.Id = data.identifier; this.Date = data.date; this.Description = data.description; diff --git a/app/extensions/storidge/models/volume.js b/app/extensions/storidge/models/volume.js index adb8ab4b2..9b6da95d5 100644 --- a/app/extensions/storidge/models/volume.js +++ b/app/extensions/storidge/models/volume.js @@ -1,4 +1,4 @@ -function StoridgeVolumeModel(data) { +export function StoridgeVolumeModel(data) { this.Allocated = data['alloc percent']; this.Capacity = data.capacity; this.Directory = data.directory; @@ -28,7 +28,7 @@ function StoridgeVolumeModel(data) { this.Filesystem = data.filesystem; } -function StoridgeVolumeUpdateModel(data) { +export function StoridgeVolumeUpdateModel(data) { this.name = data.Name; this.opts = { node: data.Node, diff --git a/app/extensions/storidge/services/driveService.js b/app/extensions/storidge/services/driveService.js index 0479a5e57..8daa9d358 100644 --- a/app/extensions/storidge/services/driveService.js +++ b/app/extensions/storidge/services/driveService.js @@ -1,3 +1,5 @@ +import { StoridgeDriveModel } from '../models/drive'; + angular.module('extension.storidge') .factory('StoridgeDriveService', ['$q', 'Storidge', function StoridgeDriveServiceFactory($q, Storidge) { 'use strict'; diff --git a/app/extensions/storidge/services/nodeService.js b/app/extensions/storidge/services/nodeService.js index 914c0f231..de960224f 100644 --- a/app/extensions/storidge/services/nodeService.js +++ b/app/extensions/storidge/services/nodeService.js @@ -1,4 +1,4 @@ -import { StoridgeNodeModel } from '../models/node'; +import { StoridgeNodeModel, StoridgeNodeDetailedModel } from '../models/node'; angular.module('extension.storidge') .factory('StoridgeNodeService', ['$q', 'Storidge', function StoridgeNodeServiceFactory($q, Storidge) { diff --git a/app/extensions/storidge/services/snapshotService.js b/app/extensions/storidge/services/snapshotService.js index 77921b86a..605e932f5 100644 --- a/app/extensions/storidge/services/snapshotService.js +++ b/app/extensions/storidge/services/snapshotService.js @@ -1,3 +1,5 @@ +import { StoridgeSnapshotModel } from '../models/snapshot' + angular.module('extension.storidge') .factory('StoridgeSnapshotService', ['$q', 'Storidge', function StoridgeSnapshotServiceFactory($q, Storidge) { 'use strict'; diff --git a/app/extensions/storidge/services/volumeService.js b/app/extensions/storidge/services/volumeService.js index d534b2d04..a0da586c3 100644 --- a/app/extensions/storidge/services/volumeService.js +++ b/app/extensions/storidge/services/volumeService.js @@ -1,3 +1,5 @@ +import { StoridgeVolumeModel, StoridgeVolumeUpdateModel } from '../models/volume'; + angular.module('extension.storidge') .factory('StoridgeVolumeService', ['$q', 'Storidge', function StoridgeVolumeServiceFactory($q, Storidge) { 'use strict'; diff --git a/app/extensions/storidge/views/drives/drivesController.js b/app/extensions/storidge/views/drives/drivesController.js index dacc7642d..5d4714f10 100644 --- a/app/extensions/storidge/views/drives/drivesController.js +++ b/app/extensions/storidge/views/drives/drivesController.js @@ -64,7 +64,7 @@ function ($q, $scope, $state, Notifications, ModalService, StoridgeDriveService) .then(function sucess() { $state.reload(); }) - .catch(function error() { + .catch(function error(err) { Notifications.error('Failure', err, 'Unable to scan drives'); }); };