feat(build): import all globals

.eslintrc.yml

@@ -4,7 +4,7 @@ env:
   node: true
   
 globals:
-  angular: true
+  # angular: true
 #   $: true
 #   _: true
 #   moment: true

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';

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';

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;

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) {

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) {

app/docker/components/volumesNFSForm/volumesNFSFormModel.js

@@ -1,4 +1,4 @@
-function VolumesNFSFormData() {
+export function VolumesNFSFormData() {
   this.useNFS = false;
   this.serverAddress = '';
   this.mountPoint = '';

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';

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);
 

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];

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;

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;
 }
 

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';

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) {

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';

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';

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) {

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) {

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',

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) {

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;
       }
     }
 

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);

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) {

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';

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';

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) {

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;

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) {

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';

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';