diff --git a/app/__module.js b/app/__module.js index 9d83066eb..5683be035 100644 --- a/app/__module.js +++ b/app/__module.js @@ -1,5 +1,5 @@ import '../assets/css/app.css'; - +import angular from 'angular'; import './agent/_module'; import './azure/_module'; diff --git a/app/agent/_module.js b/app/agent/_module.js index c74f4eda2..140612a42 100644 --- a/app/agent/_module.js +++ b/app/agent/_module.js @@ -1 +1,3 @@ +import angular from 'angular'; + angular.module('portainer.agent', []); diff --git a/app/agent/components/file-uploader/file-uploader-controller.js b/app/agent/components/file-uploader/file-uploader-controller.js index e6516c67c..8ec266908 100644 --- a/app/agent/components/file-uploader/file-uploader-controller.js +++ b/app/agent/components/file-uploader/file-uploader-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').controller('FileUploaderController', [ '$q', function FileUploaderController($q) { diff --git a/app/agent/components/file-uploader/file-uploader.js b/app/agent/components/file-uploader/file-uploader.js index 6427bae4a..d331c8bea 100644 --- a/app/agent/components/file-uploader/file-uploader.js +++ b/app/agent/components/file-uploader/file-uploader.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').component('fileUploader', { templateUrl: './file-uploader.html', controller: 'FileUploaderController', diff --git a/app/agent/components/files-datatable/files-datatable-controller.js b/app/agent/components/files-datatable/files-datatable-controller.js index 9e34929ea..581807a3a 100644 --- a/app/agent/components/files-datatable/files-datatable-controller.js +++ b/app/agent/components/files-datatable/files-datatable-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular .module('portainer.agent') .controller('FilesDatatableController', [ diff --git a/app/agent/components/files-datatable/files-datatable.js b/app/agent/components/files-datatable/files-datatable.js index d1735cf48..a2a3f9cba 100644 --- a/app/agent/components/files-datatable/files-datatable.js +++ b/app/agent/components/files-datatable/files-datatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').component('filesDatatable', { templateUrl: './files-datatable.html', controller: 'GenericDatatableController', diff --git a/app/agent/components/host-browser/host-browser.js b/app/agent/components/host-browser/host-browser.js index d702255eb..aff2ef665 100644 --- a/app/agent/components/host-browser/host-browser.js +++ b/app/agent/components/host-browser/host-browser.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').component('hostBrowser', { controller: 'HostBrowserController', templateUrl: './host-browser.html', diff --git a/app/agent/components/node-selector/node-selector.js b/app/agent/components/node-selector/node-selector.js index 0d9c93ed3..cc6ded4c0 100644 --- a/app/agent/components/node-selector/node-selector.js +++ b/app/agent/components/node-selector/node-selector.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').component('nodeSelector', { templateUrl: './nodeSelector.html', controller: 'NodeSelectorController', diff --git a/app/agent/components/node-selector/nodeSelectorController.js b/app/agent/components/node-selector/nodeSelectorController.js index be2f6ce92..3e047e790 100644 --- a/app/agent/components/node-selector/nodeSelectorController.js +++ b/app/agent/components/node-selector/nodeSelectorController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent') .controller('NodeSelectorController', ['AgentService', 'Notifications', function (AgentService, Notifications) { var ctrl = this; diff --git a/app/agent/components/volume-browser/volume-browser.js b/app/agent/components/volume-browser/volume-browser.js index bea11e61a..3a4370e8b 100644 --- a/app/agent/components/volume-browser/volume-browser.js +++ b/app/agent/components/volume-browser/volume-browser.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').component('volumeBrowser', { templateUrl: './volumeBrowser.html', controller: 'VolumeBrowserController', diff --git a/app/agent/rest/agent.js b/app/agent/rest/agent.js index 522296c3a..2d3b29a0a 100644 --- a/app/agent/rest/agent.js +++ b/app/agent/rest/agent.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent') .factory('Agent', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'StateManager', function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) { diff --git a/app/agent/rest/host.js b/app/agent/rest/host.js index f184d2544..c6a75b96a 100644 --- a/app/agent/rest/host.js +++ b/app/agent/rest/host.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').factory('Host', [ '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'StateManager', function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) { diff --git a/app/agent/rest/ping.js b/app/agent/rest/ping.js index 7eeb93f2e..cb940c756 100644 --- a/app/agent/rest/ping.js +++ b/app/agent/rest/ping.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').factory('AgentPing', [ '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', function AgentPingFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) { diff --git a/app/agent/rest/v1/agent.js b/app/agent/rest/v1/agent.js index a78755b35..f20fc385a 100644 --- a/app/agent/rest/v1/agent.js +++ b/app/agent/rest/v1/agent.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent') .factory('AgentVersion1', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { 'use strict'; diff --git a/app/agent/services/hostBrowserService.js b/app/agent/services/hostBrowserService.js index 6f292c36a..d256cb72c 100644 --- a/app/agent/services/hostBrowserService.js +++ b/app/agent/services/hostBrowserService.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').factory('HostBrowserService', [ 'Browse', 'Upload', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', 'StateManager', function HostBrowserServiceFactory(Browse, Upload, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q, StateManager) { diff --git a/app/agent/services/pingService.js b/app/agent/services/pingService.js index 765d47a5f..573bef373 100644 --- a/app/agent/services/pingService.js +++ b/app/agent/services/pingService.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').service('AgentPingService', [ 'AgentPing', function AgentPingService(AgentPing) { diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js index a4ffdbf9d..e5c43f418 100644 --- a/app/agent/services/volumeBrowserService.js +++ b/app/agent/services/volumeBrowserService.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.agent').factory('VolumeBrowserService', [ 'StateManager', 'Browse', 'BrowseVersion1', '$q', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'Upload', function VolumeBrowserServiceFactory(StateManager, Browse, BrowseVersion1, $q, API_ENDPOINT_ENDPOINTS, EndpointProvider, Upload) { diff --git a/app/app.js b/app/app.js index 3c54bc3bf..209d61717 100644 --- a/app/app.js +++ b/app/app.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer') .run(['$rootScope', '$state', 'Authentication', 'authManager', 'StateManager', 'EndpointProvider', 'Notifications', 'Analytics', 'cfpLoadingBar', '$transitions', 'HttpRequestHelper', function ($rootScope, $state, Authentication, authManager, StateManager, EndpointProvider, Notifications, Analytics, cfpLoadingBar, $transitions, HttpRequestHelper) { diff --git a/app/azure/_module.js b/app/azure/_module.js index 663f2c511..a6944b450 100644 --- a/app/azure/_module.js +++ b/app/azure/_module.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure', ['portainer.app']) .config(['$stateRegistryProvider', function ($stateRegistryProvider) { 'use strict'; diff --git a/app/azure/components/azure-endpoint-config/azure-endpoint-config.js b/app/azure/components/azure-endpoint-config/azure-endpoint-config.js index 2909d3853..241726653 100644 --- a/app/azure/components/azure-endpoint-config/azure-endpoint-config.js +++ b/app/azure/components/azure-endpoint-config/azure-endpoint-config.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure').component('azureEndpointConfig', { bindings: { applicationId: '=', diff --git a/app/azure/components/azure-sidebar-content/azure-sidebar-content.js b/app/azure/components/azure-sidebar-content/azure-sidebar-content.js index 68401cc1e..744e3880b 100644 --- a/app/azure/components/azure-sidebar-content/azure-sidebar-content.js +++ b/app/azure/components/azure-sidebar-content/azure-sidebar-content.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure').component('azureSidebarContent', { templateUrl: './azureSidebarContent.html' }); diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js index eb7c68601..2ad5b0e7c 100644 --- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js +++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure').component('containergroupsDatatable', { templateUrl: './containerGroupsDatatable.html', controller: 'GenericDatatableController', diff --git a/app/azure/rest/azure.js b/app/azure/rest/azure.js index 2621c7d50..bb1b76901 100644 --- a/app/azure/rest/azure.js +++ b/app/azure/rest/azure.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('Azure', ['$http', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function AzureFactory($http, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/rest/container_group.js b/app/azure/rest/container_group.js index 76ed5c4dc..6dbb527e2 100644 --- a/app/azure/rest/container_group.js +++ b/app/azure/rest/container_group.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('ContainerGroup', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function ContainerGroupFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/rest/location.js b/app/azure/rest/location.js index 9516761c6..e2422f34e 100644 --- a/app/azure/rest/location.js +++ b/app/azure/rest/location.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('Location', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function LocationFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/rest/provider.js b/app/azure/rest/provider.js index e1a848182..53b8d102d 100644 --- a/app/azure/rest/provider.js +++ b/app/azure/rest/provider.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('Provider', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function ProviderFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/rest/resource_group.js b/app/azure/rest/resource_group.js index 2147682e3..a75221790 100644 --- a/app/azure/rest/resource_group.js +++ b/app/azure/rest/resource_group.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('ResourceGroup', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function ResourceGroupFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/rest/subscription.js b/app/azure/rest/subscription.js index 5b30974c6..05fd71f7b 100644 --- a/app/azure/rest/subscription.js +++ b/app/azure/rest/subscription.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('Subscription', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function SubscriptionFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { diff --git a/app/azure/services/azureService.js b/app/azure/services/azureService.js index d0fa0468c..adfb86faa 100644 --- a/app/azure/services/azureService.js +++ b/app/azure/services/azureService.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .factory('AzureService', ['$q', 'Azure', 'SubscriptionService', 'ResourceGroupService', 'ContainerGroupService', 'ProviderService', function AzureServiceFactory($q, Azure, SubscriptionService, ResourceGroupService, ContainerGroupService, ProviderService) { diff --git a/app/azure/views/containerinstances/containerInstancesController.js b/app/azure/views/containerinstances/containerInstancesController.js index ecf2c40cd..6a4c7e06c 100644 --- a/app/azure/views/containerinstances/containerInstancesController.js +++ b/app/azure/views/containerinstances/containerInstancesController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .controller('AzureContainerInstancesController', ['$scope', '$state', 'AzureService', 'Notifications', function ($scope, $state, AzureService, Notifications) { diff --git a/app/azure/views/dashboard/dashboardController.js b/app/azure/views/dashboard/dashboardController.js index f24ff4e29..bdce2db78 100644 --- a/app/azure/views/dashboard/dashboardController.js +++ b/app/azure/views/dashboard/dashboardController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.azure') .controller('AzureDashboardController', ['$scope', 'AzureService', 'Notifications', function ($scope, AzureService, Notifications) { diff --git a/app/constants.js b/app/constants.js index b20d44649..045767930 100644 --- a/app/constants.js +++ b/app/constants.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer') .constant('API_ENDPOINT_AUTH', 'api/auth') .constant('API_ENDPOINT_DOCKERHUB', 'api/dockerhub') diff --git a/app/docker/components/container-capabilities/container-capabilities.js b/app/docker/components/container-capabilities/container-capabilities.js index 4bf04ba6f..2e48cf6bd 100644 --- a/app/docker/components/container-capabilities/container-capabilities.js +++ b/app/docker/components/container-capabilities/container-capabilities.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('containerCapabilities', { templateUrl: './containerCapabilities.html', bindings: { diff --git a/app/docker/components/container-restart-policy/container-restart-policy-controller.js b/app/docker/components/container-restart-policy/container-restart-policy-controller.js index 64a8604fc..47981f366 100644 --- a/app/docker/components/container-restart-policy/container-restart-policy-controller.js +++ b/app/docker/components/container-restart-policy/container-restart-policy-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular .module('portainer.docker') .controller('ContainerRestartPolicyController', [function ContainerRestartPolicyController() { diff --git a/app/docker/components/container-restart-policy/container-restart-policy.js b/app/docker/components/container-restart-policy/container-restart-policy.js index 60e4f0c4b..49e17088a 100644 --- a/app/docker/components/container-restart-policy/container-restart-policy.js +++ b/app/docker/components/container-restart-policy/container-restart-policy.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .component('containerRestartPolicy', { templateUrl: './container-restart-policy.html', diff --git a/app/docker/components/dashboard-cluster-agent-info/dashboard-cluster-agent-info.js b/app/docker/components/dashboard-cluster-agent-info/dashboard-cluster-agent-info.js index 88aae5cec..d4b1558f9 100644 --- a/app/docker/components/dashboard-cluster-agent-info/dashboard-cluster-agent-info.js +++ b/app/docker/components/dashboard-cluster-agent-info/dashboard-cluster-agent-info.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('dashboardClusterAgentInfo', { templateUrl: './dashboardClusterAgentInfo.html', controller: 'DashboardClusterAgentInfoController' diff --git a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfoController.js b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfoController.js index 7ba6f7f08..723e03f59 100644 --- a/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfoController.js +++ b/app/docker/components/dashboard-cluster-agent-info/dashboardClusterAgentInfoController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('DashboardClusterAgentInfoController', ['AgentService', 'Notifications', function (AgentService, Notifications) { diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.js b/app/docker/components/datatables/configs-datatable/configsDatatable.js index b7294eb2a..19c0b2eb2 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.js +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('configsDatatable', { templateUrl: './configsDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js index 7ac1b5580..b7cab4aea 100644 --- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js +++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('containerNetworksDatatable', { templateUrl: './containerNetworksDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js index 1a0abdc3a..151d1b616 100644 --- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js +++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('containerProcessesDatatable', { templateUrl: './containerProcessesDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActions.js b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActions.js index 2f82916a1..baf3774b7 100644 --- a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActions.js +++ b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActions.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('containersDatatableActions', { templateUrl: './containersDatatableActions.html', controller: 'ContainersDatatableActionsController', diff --git a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js index efacb89e7..af3a0f60d 100644 --- a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js +++ b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('ContainersDatatableActionsController', ['$state', 'ContainerService', 'ModalService', 'Notifications', 'HttpRequestHelper', function ($state, ContainerService, ModalService, Notifications, HttpRequestHelper) { diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.js b/app/docker/components/datatables/containers-datatable/containersDatatable.js index a1a57325b..4f6fb0b4f 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('containersDatatable', { templateUrl: './containersDatatable.html', controller: 'ContainersDatatableController', diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.js b/app/docker/components/datatables/events-datatable/eventsDatatable.js index 54afd6665..59447d168 100644 --- a/app/docker/components/datatables/events-datatable/eventsDatatable.js +++ b/app/docker/components/datatables/events-datatable/eventsDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('eventsDatatable', { templateUrl: './eventsDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js index 741e25148..14ec727d8 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('jobsDatatable', { templateUrl: './jobsDatatable.html', controller: 'JobsDatatableController', diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.js b/app/docker/components/datatables/images-datatable/imagesDatatable.js index 455ab8866..88c7e28ff 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('imagesDatatable', { templateUrl: './imagesDatatable.html', controller: 'ImagesDatatableController', diff --git a/app/docker/components/datatables/images-datatable/imagesDatatableController.js b/app/docker/components/datatables/images-datatable/imagesDatatableController.js index f5254a47b..cedaccae6 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatableController.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatableController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('ImagesDatatableController', ['PaginationService', 'DatatableService', function (PaginationService, DatatableService) { diff --git a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.js b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.js index 340808226..22dd2ed7e 100644 --- a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.js +++ b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('macvlanNodesDatatable', { templateUrl: './macvlanNodesDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.js b/app/docker/components/datatables/networks-datatable/networksDatatable.js index 6631a07ad..9288db030 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.js +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('networksDatatable', { templateUrl: './networksDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js index e76a209c0..fd16b535c 100644 --- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js +++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('nodeTasksDatatable', { templateUrl: './nodeTasksDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js index a36fb2e40..e19b97691 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('nodesDatatable', { templateUrl: './nodesDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js index 091cafe49..7c3b9a069 100644 --- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js +++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('secretsDatatable', { templateUrl: './secretsDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.js b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.js index b93bbb957..8e118f8f2 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.js +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('serviceTasksDatatable', { templateUrl: './serviceTasksDatatable.html', controller: 'ServiceTasksDatatableController', diff --git a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.js b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.js index 310b63751..e63cb233d 100644 --- a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.js +++ b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActions.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('servicesDatatableActions', { templateUrl: './servicesDatatableActions.html', controller: 'ServicesDatatableActionsController', diff --git a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActionsController.js b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActionsController.js index 2f5ce7ce4..2165e4f5f 100644 --- a/app/docker/components/datatables/services-datatable/actions/servicesDatatableActionsController.js +++ b/app/docker/components/datatables/services-datatable/actions/servicesDatatableActionsController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('ServicesDatatableActionsController', ['$q', '$state', 'ServiceService', 'ServiceHelper', 'Notifications', 'ModalService', 'ImageHelper','WebhookService','EndpointProvider', function ($q, $state, ServiceService, ServiceHelper, Notifications, ModalService, ImageHelper, WebhookService, EndpointProvider) { diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.js b/app/docker/components/datatables/services-datatable/servicesDatatable.js index a7491a861..94ed147f2 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('servicesDatatable', { templateUrl: './servicesDatatable.html', controller: 'ServicesDatatableController', diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js index 6236905fd..92285f71b 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('tasksDatatable', { templateUrl: './tasksDatatable.html', controller: 'GenericDatatableController', diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js index 36b1b4b12..b95c8be97 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('volumesDatatable', { templateUrl: './volumesDatatable.html', controller: 'VolumesDatatableController', diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js index 38b3ebbff..1deb8d5ca 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('VolumesDatatableController', ['PaginationService', 'DatatableService', function (PaginationService, DatatableService) { diff --git a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js index 015aea129..c2ce30ab2 100644 --- a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js +++ b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('dockerSidebarContent', { templateUrl: './dockerSidebarContent.html', bindings: { diff --git a/app/docker/components/host-overview/host-overview-controller.js b/app/docker/components/host-overview/host-overview-controller.js index e5d0d56be..18cd32718 100644 --- a/app/docker/components/host-overview/host-overview-controller.js +++ b/app/docker/components/host-overview/host-overview-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular .module('portainer.docker') .controller('HostOverviewController', [function HostOverviewController() {}]); diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js index a0421d4b5..138a03daf 100644 --- a/app/docker/components/host-overview/host-overview.js +++ b/app/docker/components/host-overview/host-overview.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('hostOverview', { templateUrl: './host-overview.html', bindings: { diff --git a/app/docker/components/host-view-panels/devices-panel/devices-panel.js b/app/docker/components/host-view-panels/devices-panel/devices-panel.js index 1bd32e1f6..247177786 100644 --- a/app/docker/components/host-view-panels/devices-panel/devices-panel.js +++ b/app/docker/components/host-view-panels/devices-panel/devices-panel.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('devicesPanel', { templateUrl: 'app/docker/components/host-view-panels/devices-panel/devices-panel.html', diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.js b/app/docker/components/host-view-panels/disks-panel/disks-panel.js index ae96224ee..6db6db495 100644 --- a/app/docker/components/host-view-panels/disks-panel/disks-panel.js +++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('disksPanel', { templateUrl: 'app/docker/components/host-view-panels/disks-panel/disks-panel.html', diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel-controller.js b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel-controller.js index de3077f0e..bebd3dd40 100644 --- a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel-controller.js +++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular .module('portainer.docker') .controller('EngineDetailsPanelController', [ diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js index 666dd5254..2e02f0445 100644 --- a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js +++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('engineDetailsPanel', { templateUrl: 'app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html', diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js index c64c41a26..0e1928ab7 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker') .controller('HostDetailsPanelController', [function HostDetailsPanelController(){ diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js index 5d25a626e..6d9eee39e 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('hostDetailsPanel', { templateUrl: './host-details-panel.html', bindings: { diff --git a/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js b/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js index 52df40cd6..13708bdab 100644 --- a/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js +++ b/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular .module('portainer.docker') .controller('NodeAvailabilitySelectController', [ diff --git a/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js index b09730f37..39e3de548 100644 --- a/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js +++ b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('nodeAvailabilitySelect', { templateUrl: 'app/docker/components/host-view-panels/node-availability-select/node-availability-select.html', diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js b/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js index a9ad8ab58..1f1995aff 100644 --- a/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js +++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').controller('NodeLabelsTableController', [ function NodeLabelsTableController() { var ctrl = this; diff --git a/app/docker/views/host/host-browser-view/host-browser-view-controller.js b/app/docker/views/host/host-browser-view/host-browser-view-controller.js index 3f45fcc48..8eb41096e 100644 --- a/app/docker/views/host/host-browser-view/host-browser-view-controller.js +++ b/app/docker/views/host/host-browser-view/host-browser-view-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').controller('HostBrowserViewController', [ 'SystemService', 'Notifications', function HostBrowserViewController(SystemService, Notifications) { diff --git a/app/docker/views/host/host-browser-view/host-browser-view.js b/app/docker/views/host/host-browser-view/host-browser-view.js index 8d2bd1a20..a0f1f95fa 100644 --- a/app/docker/views/host/host-browser-view/host-browser-view.js +++ b/app/docker/views/host/host-browser-view/host-browser-view.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('hostBrowserView', { templateUrl: './host-browser-view.html', controller: 'HostBrowserViewController' diff --git a/app/docker/views/host/host-job/host-job-controller.js b/app/docker/views/host/host-job/host-job-controller.js index 811509f7b..46afb26d8 100644 --- a/app/docker/views/host/host-job/host-job-controller.js +++ b/app/docker/views/host/host-job/host-job-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').controller('HostJobController', [ 'SystemService', 'Notifications', function HostJobController(SystemService, Notifications) { diff --git a/app/docker/views/host/host-job/host-job.js b/app/docker/views/host/host-job/host-job.js index 2436075ec..2a76c0524 100644 --- a/app/docker/views/host/host-job/host-job.js +++ b/app/docker/views/host/host-job/host-job.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('hostJobView', { templateUrl: './host-job.html', controller: 'HostJobController' diff --git a/app/docker/views/nodes/node-job/node-job-controller.js b/app/docker/views/nodes/node-job/node-job-controller.js index 9f1173d09..c225e6b35 100644 --- a/app/docker/views/nodes/node-job/node-job-controller.js +++ b/app/docker/views/nodes/node-job/node-job-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').controller('NodeJobController', [ '$stateParams', 'NodeService', 'HttpRequestHelper', 'Notifications', function NodeJobController($stateParams, NodeService, HttpRequestHelper, Notifications) { diff --git a/app/docker/views/nodes/node-job/node-job.js b/app/docker/views/nodes/node-job/node-job.js index 334752fff..8106d3ecf 100644 --- a/app/docker/views/nodes/node-job/node-job.js +++ b/app/docker/views/nodes/node-job/node-job.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.docker').component('nodeJobView', { templateUrl: './node-job.html', controller: 'NodeJobController' diff --git a/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js b/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js index 8e3b3d196..19f5fe246 100644 --- a/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js +++ b/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.app') .controller('JobFormController', ['$state', 'LocalStorage', 'EndpointService', 'EndpointProvider', 'Notifications', function ($state, LocalStorage, EndpointService, EndpointProvider, Notifications) { diff --git a/app/portainer/components/forms/execute-job-form/execute-job-form.js b/app/portainer/components/forms/execute-job-form/execute-job-form.js index a1840d789..8eb18bbfe 100644 --- a/app/portainer/components/forms/execute-job-form/execute-job-form.js +++ b/app/portainer/components/forms/execute-job-form/execute-job-form.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.app').component('executeJobForm', { templateUrl: './execute-job-form.html', controller: 'JobFormController',