From dde82f3d9621df3ba8f80fb64928575fd16bb14b Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 14 Oct 2018 13:27:48 +0300 Subject: [PATCH] feat(build): import all globals --- .eslintrc.yml | 2 +- app/__module.js | 7 ------- app/azure/services/subscriptionService.js | 3 +++ .../containers-datatable/containersDatatableController.js | 6 +++++- .../services-datatable/servicesDatatableController.js | 3 +++ .../components/imageRegistry/porImageRegistryController.js | 3 +++ .../components/volumesNFSForm/volumesNFSFormModel.js | 2 +- app/docker/helpers/infoHelper.js | 3 +++ app/docker/models/container.js | 3 +++ app/docker/models/containerCapabilities.js | 2 +- app/docker/models/service.js | 2 ++ app/docker/rest/response/handlers.js | 6 +++++- app/docker/services/secretService.js | 3 +++ app/docker/services/serviceService.js | 4 ++++ app/docker/services/swarmService.js | 3 +++ app/docker/services/systemService.js | 3 +++ app/docker/views/configs/create/createConfigController.js | 4 ++++ .../views/containers/console/containerConsoleController.js | 3 +++ .../views/containers/create/createContainerController.js | 4 +++- .../views/containers/stats/containerStatsController.js | 3 +++ app/docker/views/images/imagesController.js | 5 ++++- app/docker/views/services/edit/serviceController.js | 7 +++++-- app/docker/views/volumes/create/createVolumeController.js | 4 ++++ app/extensions/storidge/services/chartService.js | 4 ++++ app/extensions/storidge/services/profileService.js | 7 +++++++ .../views/profiles/create/createProfileController.js | 3 +++ app/portainer/models/stack.js | 2 ++ app/portainer/services/api/groupService.js | 7 +++++++ app/portainer/services/api/motdService.js | 3 +++ app/portainer/services/api/registryService.js | 3 +++ 30 files changed, 98 insertions(+), 16 deletions(-) diff --git a/.eslintrc.yml b/.eslintrc.yml index 79350f78f..4bb7c0136 100644 --- a/.eslintrc.yml +++ b/.eslintrc.yml @@ -4,7 +4,7 @@ env: node: true globals: - angular: true + # angular: true # $: true # _: true # moment: true diff --git a/app/__module.js b/app/__module.js index 392434fd4..32e3c9e0c 100644 --- a/app/__module.js +++ b/app/__module.js @@ -2,13 +2,6 @@ import '../assets/css/vendor.css'; import '../assets/css/app.css'; import angular from 'angular'; -window.angular = angular; // FIX - -import moment from 'moment'; -window.moment = moment; - -import filesize from 'filesize'; -window.filesize = filesize; import 'angular-ui-bootstrap'; import '@uirouter/angularjs'; diff --git a/app/azure/services/subscriptionService.js b/app/azure/services/subscriptionService.js index f468e1c8e..07c6e6ef4 100644 --- a/app/azure/services/subscriptionService.js +++ b/app/azure/services/subscriptionService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { SubscriptionViewModel } from '../models/subscription'; + angular.module('portainer.azure') .factory('SubscriptionService', ['$q', 'Subscription', function SubscriptionServiceFactory($q, Subscription) { 'use strict'; diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index 7151e5d64..6fe707e23 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -1,3 +1,7 @@ +import angular from 'angular'; +import _ from 'lodash'; + + angular.module('portainer.docker') .controller('ContainersDatatableController', ['PaginationService', 'DatatableService', 'EndpointProvider', function (PaginationService, DatatableService, EndpointProvider) { @@ -193,7 +197,7 @@ function (PaginationService, DatatableService, EndpointProvider) { for (var i = 0; i < datasetFilters.length; i++) { var filter = datasetFilters[i]; - existingFilter = _.find(storedFilters, ['label', filter.label]); + var existingFilter = _.find(storedFilters, ['label', filter.label]); if (existingFilter && !existingFilter.display) { filter.display = existingFilter.display; this.filters.state.enabled = true; diff --git a/app/docker/components/datatables/services-datatable/servicesDatatableController.js b/app/docker/components/datatables/services-datatable/servicesDatatableController.js index 38c39947b..7d12606d8 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatableController.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatableController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import _ from 'lodash'; + angular.module('portainer.docker') .controller('ServicesDatatableController', ['PaginationService', 'DatatableService', 'EndpointProvider', function (PaginationService, DatatableService, EndpointProvider) { diff --git a/app/docker/components/imageRegistry/porImageRegistryController.js b/app/docker/components/imageRegistry/porImageRegistryController.js index fbf0df70b..7e5a51a77 100644 --- a/app/docker/components/imageRegistry/porImageRegistryController.js +++ b/app/docker/components/imageRegistry/porImageRegistryController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import _ from 'lodash'; + angular.module('portainer.docker') .controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'ImageService', 'Notifications', function ($q, RegistryService, DockerHubService, ImageService, Notifications) { diff --git a/app/docker/components/volumesNFSForm/volumesNFSFormModel.js b/app/docker/components/volumesNFSForm/volumesNFSFormModel.js index a1204dccb..30be7b9c2 100644 --- a/app/docker/components/volumesNFSForm/volumesNFSFormModel.js +++ b/app/docker/components/volumesNFSForm/volumesNFSFormModel.js @@ -1,4 +1,4 @@ -function VolumesNFSFormData() { +export function VolumesNFSFormData() { this.useNFS = false; this.serverAddress = ''; this.mountPoint = ''; diff --git a/app/docker/helpers/infoHelper.js b/app/docker/helpers/infoHelper.js index 4582cc821..4f9e13509 100644 --- a/app/docker/helpers/infoHelper.js +++ b/app/docker/helpers/infoHelper.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import _ from 'lodash'; + angular.module('portainer.docker') .factory('InfoHelper', [function InfoHelperFactory() { 'use strict'; diff --git a/app/docker/models/container.js b/app/docker/models/container.js index 4b3239c1f..5d1cfa4db 100644 --- a/app/docker/models/container.js +++ b/app/docker/models/container.js @@ -1,3 +1,6 @@ +import _ from 'lodash'; +import { ResourceControlViewModel } from '../../portainer/models/resourceControl'; + function createStatus(statusText) { var status = _.toLower(statusText); diff --git a/app/docker/models/containerCapabilities.js b/app/docker/models/containerCapabilities.js index 5826d65bf..61706cc51 100644 --- a/app/docker/models/containerCapabilities.js +++ b/app/docker/models/containerCapabilities.js @@ -83,7 +83,7 @@ export function ContainerCapabilities() { }); } -function ContainerCapability(cap, allowed) { +export function ContainerCapability(cap, allowed) { this.capability = cap; this.allowed = allowed; this.description = capDesc[cap]; diff --git a/app/docker/models/service.js b/app/docker/models/service.js index 0454d5385..7bfd68d6c 100644 --- a/app/docker/models/service.js +++ b/app/docker/models/service.js @@ -1,3 +1,5 @@ +import { ResourceControlViewModel } from '../../portainer/models/resourceControl'; + export function ServiceViewModel(data, runningTasks, allTasks) { this.Model = data; this.Id = data.ID; diff --git a/app/docker/rest/response/handlers.js b/app/docker/rest/response/handlers.js index 75b77f21a..f9c286b01 100644 --- a/app/docker/rest/response/handlers.js +++ b/app/docker/rest/response/handlers.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + function isJSONArray(jsonString) { return Object.prototype.toString.call(jsonString) === '[object Array]'; } @@ -9,7 +11,9 @@ function isJSON(jsonString) { return o; } } - catch (e) { } + catch (e) { + //empty + } return false; } diff --git a/app/docker/services/secretService.js b/app/docker/services/secretService.js index 460f6ef5c..c4a58f8ec 100644 --- a/app/docker/services/secretService.js +++ b/app/docker/services/secretService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { SecretViewModel } from '../models/secret'; + angular.module('portainer.docker') .factory('SecretService', ['$q', 'Secret', function SecretServiceFactory($q, Secret) { 'use strict'; diff --git a/app/docker/services/serviceService.js b/app/docker/services/serviceService.js index 94e8fa7bf..baaa503f8 100644 --- a/app/docker/services/serviceService.js +++ b/app/docker/services/serviceService.js @@ -1,3 +1,7 @@ +import angular from 'angular'; +import { ServiceViewModel } from '../models/service'; + + angular.module('portainer.docker') .factory('ServiceService', ['$q', 'Service', 'ServiceHelper', 'TaskService', 'ResourceControlService', 'LogHelper', function ServiceServiceFactory($q, Service, ServiceHelper, TaskService, ResourceControlService, LogHelper) { diff --git a/app/docker/services/swarmService.js b/app/docker/services/swarmService.js index 5f1955a22..e2cd6ffa5 100644 --- a/app/docker/services/swarmService.js +++ b/app/docker/services/swarmService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { SwarmViewModel } from '../models/swarm'; + angular.module('portainer.docker') .factory('SwarmService', ['$q', 'Swarm', function SwarmServiceFactory($q, Swarm) { 'use strict'; diff --git a/app/docker/services/systemService.js b/app/docker/services/systemService.js index 9b2731b91..c174ce0bb 100644 --- a/app/docker/services/systemService.js +++ b/app/docker/services/systemService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { EventViewModel } from '../models/event'; + angular.module('portainer.docker') .factory('SystemService', ['$q', 'System', function SystemServiceFactory($q, System) { 'use strict'; diff --git a/app/docker/views/configs/create/createConfigController.js b/app/docker/views/configs/create/createConfigController.js index c2f70685c..9ac6a6399 100644 --- a/app/docker/views/configs/create/createConfigController.js +++ b/app/docker/views/configs/create/createConfigController.js @@ -1,3 +1,7 @@ +import angular from 'angular'; +import _ from 'lodash'; +import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel'; + angular.module('portainer.docker') .controller('CreateConfigController', ['$scope', '$state', '$transition$', 'Notifications', 'ConfigService', 'Authentication', 'FormValidator', 'ResourceControlService', function ($scope, $state, $transition$, Notifications, ConfigService, Authentication, FormValidator, ResourceControlService) { diff --git a/app/docker/views/containers/console/containerConsoleController.js b/app/docker/views/containers/console/containerConsoleController.js index 812e5b567..4a89f56d8 100644 --- a/app/docker/views/containers/console/containerConsoleController.js +++ b/app/docker/views/containers/console/containerConsoleController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { Terminal } from 'xterm'; + angular.module('portainer.docker') .controller('ContainerConsoleController', ['$scope', '$transition$', 'ContainerService', 'ImageService', 'EndpointProvider', 'Notifications', 'ContainerHelper', 'ExecService', 'HttpRequestHelper', 'LocalStorage', 'CONSOLE_COMMANDS_LABEL_PREFIX', function ($scope, $transition$, ContainerService, ImageService, EndpointProvider, Notifications, ContainerHelper, ExecService, HttpRequestHelper, LocalStorage, CONSOLE_COMMANDS_LABEL_PREFIX) { diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js index 70f510e52..cb1260294 100644 --- a/app/docker/views/containers/create/createContainerController.js +++ b/app/docker/views/containers/create/createContainerController.js @@ -1,7 +1,9 @@ import angular from 'angular'; import _ from 'lodash'; -import { ContainerCapabilities } from '../../../models/containerCapabilities'; +import { ContainerCapabilities, ContainerCapability } from '../../../models/containerCapabilities'; import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel'; +import { ContainerDetailsViewModel } from '../../../models/container'; + angular.module('portainer.docker') .controller('CreateContainerController', ['$q', '$scope', '$state', '$timeout', '$transition$', '$filter', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'NetworkService', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'FormValidator', 'ModalService', 'RegistryService', 'SystemService', 'SettingsService', 'HttpRequestHelper', diff --git a/app/docker/views/containers/stats/containerStatsController.js b/app/docker/views/containers/stats/containerStatsController.js index ed161c8d1..ba189bdc0 100644 --- a/app/docker/views/containers/stats/containerStatsController.js +++ b/app/docker/views/containers/stats/containerStatsController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import moment from 'moment'; + angular.module('portainer.docker') .controller('ContainerStatsController', ['$q', '$scope', '$transition$', '$document', '$interval', 'ContainerService', 'ChartService', 'Notifications', 'HttpRequestHelper', function ($q, $scope, $transition$, $document, $interval, ContainerService, ChartService, Notifications, HttpRequestHelper) { diff --git a/app/docker/views/images/imagesController.js b/app/docker/views/images/imagesController.js index f495f4185..49b8cdf56 100644 --- a/app/docker/views/images/imagesController.js +++ b/app/docker/views/images/imagesController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import _ from 'lodash'; + angular.module('portainer.docker') .controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService', 'HttpRequestHelper', 'FileSaver', 'Blob', function ($scope, $state, ImageService, Notifications, ModalService, HttpRequestHelper, FileSaver, Blob) { @@ -51,7 +54,7 @@ function ($scope, $state, ImageService, Notifications, ModalService, HttpRequest if (untagged) { Notifications.warning('', 'Cannot download a untagged image'); - return false; + return false; } } diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js index 882e9c4cd..99eee6daf 100644 --- a/app/docker/views/services/edit/serviceController.js +++ b/app/docker/views/services/edit/serviceController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('ServiceController', ['$q', '$scope', '$transition$', '$state', '$location', '$timeout', '$anchorScroll', 'ServiceService', 'ConfigService', 'ConfigHelper', 'SecretService', 'ImageService', 'SecretHelper', 'Service', 'ServiceHelper', 'LabelHelper', 'TaskService', 'NodeService', 'ContainerService', 'TaskHelper', 'Notifications', 'ModalService', 'PluginService', 'Authentication', 'SettingsService', 'VolumeService', 'ImageHelper', 'WebhookService', 'EndpointProvider', 'clipboard','WebhookHelper', function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll, ServiceService, ConfigService, ConfigHelper, SecretService, ImageService, SecretHelper, Service, ServiceHelper, LabelHelper, TaskService, NodeService, ContainerService, TaskHelper, Notifications, ModalService, PluginService, Authentication, SettingsService, VolumeService, ImageHelper, WebhookService, EndpointProvider, clipboard, WebhookHelper) { @@ -542,12 +544,13 @@ function ($q, $scope, $transition$, $state, $location, $timeout, $anchorScroll, }); } - $scope.updateServiceAttribute = function updateServiceAttribute(service, name) { + $scope.updateServiceAttribute = updateServiceAttribute; + function updateServiceAttribute(service, name) { if (service[name] !== originalService[name] || !(name in originalService)) { service.hasChanges = true; } previousServiceValues.push(name); - }; + } function updateServiceArray(service, name) { previousServiceValues.push(name); diff --git a/app/docker/views/volumes/create/createVolumeController.js b/app/docker/views/volumes/create/createVolumeController.js index ef5fc60ca..1faabf93a 100644 --- a/app/docker/views/volumes/create/createVolumeController.js +++ b/app/docker/views/volumes/create/createVolumeController.js @@ -1,3 +1,7 @@ +import angular from 'angular'; +import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel'; +import { VolumesNFSFormData } from '../../../components/volumesNFSForm/volumesNFSFormModel'; + angular.module('portainer.docker') .controller('CreateVolumeController', ['$q', '$scope', '$state', 'VolumeService', 'PluginService', 'ResourceControlService', 'Authentication', 'Notifications', 'FormValidator', 'HttpRequestHelper', function ($q, $scope, $state, VolumeService, PluginService, ResourceControlService, Authentication, Notifications, FormValidator, HttpRequestHelper) { diff --git a/app/extensions/storidge/services/chartService.js b/app/extensions/storidge/services/chartService.js index 7dd468a38..bcc12bc7e 100644 --- a/app/extensions/storidge/services/chartService.js +++ b/app/extensions/storidge/services/chartService.js @@ -1,3 +1,7 @@ +import angular from 'angular'; +import Chart from 'chart.js'; +import filesize from 'filesize'; + angular.module('extension.storidge') .factory('StoridgeChartService', [function StoridgeChartService() { 'use strict'; diff --git a/app/extensions/storidge/services/profileService.js b/app/extensions/storidge/services/profileService.js index 3770ab056..36026cc3c 100644 --- a/app/extensions/storidge/services/profileService.js +++ b/app/extensions/storidge/services/profileService.js @@ -1,3 +1,10 @@ +import angular from 'angular'; +import { + StoridgeCreateProfileRequest, + StoridgeProfileListModel, + StoridgeProfileModel +} from '../models/profile'; + angular.module('extension.storidge') .factory('StoridgeProfileService', ['$q', 'Storidge', function StoridgeProfileServiceFactory($q, Storidge) { 'use strict'; diff --git a/app/extensions/storidge/views/profiles/create/createProfileController.js b/app/extensions/storidge/views/profiles/create/createProfileController.js index 0246d1716..f5482c9ee 100644 --- a/app/extensions/storidge/views/profiles/create/createProfileController.js +++ b/app/extensions/storidge/views/profiles/create/createProfileController.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { StoridgeProfileDefaultModel } from '../../../models/profile'; + angular.module('extension.storidge') .controller('StoridgeCreateProfileController', ['$scope', '$state', '$transition$', 'Notifications', 'StoridgeProfileService', function ($scope, $state, $transition$, Notifications, StoridgeProfileService) { diff --git a/app/portainer/models/stack.js b/app/portainer/models/stack.js index 4c8c07340..2e4a25baf 100644 --- a/app/portainer/models/stack.js +++ b/app/portainer/models/stack.js @@ -1,3 +1,5 @@ +import { ResourceControlViewModel } from '../../portainer/models/resourceControl'; + export function StackViewModel(data) { this.Id = data.Id; this.Type = data.Type; diff --git a/app/portainer/services/api/groupService.js b/app/portainer/services/api/groupService.js index ac60f787d..3f90b7c52 100644 --- a/app/portainer/services/api/groupService.js +++ b/app/portainer/services/api/groupService.js @@ -1,3 +1,10 @@ +import angular from 'angular'; +import { + EndpointGroupModel, + EndpointGroupCreateRequest, + EndpointGroupUpdateRequest +} from '../../models/group'; + angular.module('portainer.app') .factory('GroupService', ['$q', 'EndpointGroups', function GroupService($q, EndpointGroups) { diff --git a/app/portainer/services/api/motdService.js b/app/portainer/services/api/motdService.js index 3ea5dcf73..91730f080 100644 --- a/app/portainer/services/api/motdService.js +++ b/app/portainer/services/api/motdService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { MotdViewModel } from '../../models/motd'; + angular.module('portainer.app') .factory('MotdService', ['$q', 'Motd', function MotdServiceFactory($q, Motd) { 'use strict'; diff --git a/app/portainer/services/api/registryService.js b/app/portainer/services/api/registryService.js index ff5d00f18..ab2ba5a46 100644 --- a/app/portainer/services/api/registryService.js +++ b/app/portainer/services/api/registryService.js @@ -1,3 +1,6 @@ +import angular from 'angular'; +import { RegistryViewModel } from '../../models/registry'; + angular.module('portainer.app') .factory('RegistryService', ['$q', 'Registries', 'DockerHubService', 'RegistryHelper', 'ImageHelper', function RegistryServiceFactory($q, Registries, DockerHubService, RegistryHelper, ImageHelper) { 'use strict';