diff --git a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatableController.js b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatableController.js index 8ba5bdc19..9b7b2a836 100644 --- a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatableController.js +++ b/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatableController.js @@ -1,6 +1,6 @@ import angular from 'angular'; -class AssociatedEndpointsDatatableController { +export class AssociatedEndpointsDatatableController { constructor($scope, $controller, DatatableService, PaginationService) { this.extendGenericController($controller, $scope); this.DatatableService = DatatableService; @@ -98,6 +98,3 @@ class AssociatedEndpointsDatatableController { }); } } - -angular.module('portainer.edge').controller('AssociatedEndpointsDatatableController', AssociatedEndpointsDatatableController); -export default AssociatedEndpointsDatatableController; diff --git a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.js b/app/edge/components/associated-endpoints-datatable/index.js similarity index 61% rename from app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.js rename to app/edge/components/associated-endpoints-datatable/index.js index 93d4b748f..7defaa58a 100644 --- a/app/edge/components/associated-endpoints-datatable/associatedEndpointsDatatable.js +++ b/app/edge/components/associated-endpoints-datatable/index.js @@ -1,6 +1,10 @@ +import angular from 'angular'; + +import { AssociatedEndpointsDatatableController } from './associatedEndpointsDatatableController'; + angular.module('portainer.edge').component('associatedEndpointsDatatable', { templateUrl: './associatedEndpointsDatatable.html', - controller: 'AssociatedEndpointsDatatableController', + controller: AssociatedEndpointsDatatableController, bindings: { titleText: '@', titleIcon: '@', diff --git a/app/edge/components/edge-groups-selector/edge-groups-selector.html b/app/edge/components/edge-groups-selector/edgeGroupsSelector.html similarity index 100% rename from app/edge/components/edge-groups-selector/edge-groups-selector.html rename to app/edge/components/edge-groups-selector/edgeGroupsSelector.html diff --git a/app/edge/components/edge-groups-selector/edge-groups-selector.js b/app/edge/components/edge-groups-selector/index.js similarity index 61% rename from app/edge/components/edge-groups-selector/edge-groups-selector.js rename to app/edge/components/edge-groups-selector/index.js index 66f8c429d..0a7f7cbb3 100644 --- a/app/edge/components/edge-groups-selector/edge-groups-selector.js +++ b/app/edge/components/edge-groups-selector/index.js @@ -1,5 +1,7 @@ +import angular from 'angular'; + angular.module('portainer.edge').component('edgeGroupsSelector', { - templateUrl: './edge-groups-selector.html', + templateUrl: './edgeGroupsSelector.html', bindings: { model: '=', items: '<', diff --git a/app/edge/components/edge-job-form/edgeJobFormController.js b/app/edge/components/edge-job-form/edgeJobFormController.js index cbf491187..52eabb5f6 100644 --- a/app/edge/components/edge-job-form/edgeJobFormController.js +++ b/app/edge/components/edge-job-form/edgeJobFormController.js @@ -1,8 +1,7 @@ -import angular from 'angular'; import _ from 'lodash-es'; import moment from 'moment'; -class EdgeJobFormController { +export class EdgeJobFormController { /* @ngInject */ constructor() { this.state = { @@ -102,6 +101,3 @@ function datetimeToCron(datetime) { var date = moment(datetime); return [date.minutes(), date.hours(), date.date(), date.month() + 1, '*'].join(' '); } - -angular.module('portainer.edge').controller('EdgeJobFormController', EdgeJobFormController); -export default EdgeJobFormController; diff --git a/app/edge/components/edge-job-form/edgeJobForm.js b/app/edge/components/edge-job-form/index.js similarity index 77% rename from app/edge/components/edge-job-form/edgeJobForm.js rename to app/edge/components/edge-job-form/index.js index bc987d696..58c34cefd 100644 --- a/app/edge/components/edge-job-form/edgeJobForm.js +++ b/app/edge/components/edge-job-form/index.js @@ -1,4 +1,6 @@ -import EdgeJobFormController from './edgeJobFormController'; +import angular from 'angular'; + +import { EdgeJobFormController } from './edgeJobFormController'; angular.module('portainer.edge').component('edgeJobForm', { templateUrl: './edgeJobForm.html', diff --git a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatableController.js b/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatableController.js index a66aaee35..92217e3cd 100644 --- a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatableController.js +++ b/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatableController.js @@ -1,6 +1,7 @@ +import angular from 'angular'; import _ from 'lodash-es'; -export default class EdgeJobResultsDatatableController { +export class EdgeJobResultsDatatableController { /* @ngInject */ constructor($controller, $scope, $state) { this.$state = $state; diff --git a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.js b/app/edge/components/edge-job-results-datatable/index.js similarity index 84% rename from app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.js rename to app/edge/components/edge-job-results-datatable/index.js index 96bd8094a..132690633 100644 --- a/app/edge/components/edge-job-results-datatable/edgeJobResultsDatatable.js +++ b/app/edge/components/edge-job-results-datatable/index.js @@ -1,5 +1,6 @@ import angular from 'angular'; -import EdgeJobResultsDatatableController from './edgeJobResultsDatatableController'; + +import { EdgeJobResultsDatatableController } from './edgeJobResultsDatatableController'; import './edgeJobResultsDatatable.css'; angular.module('portainer.edge').component('edgeJobResultsDatatable', { diff --git a/app/edge/components/edge-jobs-datatable/edgeJobsDatatable.js b/app/edge/components/edge-jobs-datatable/index.js similarity index 100% rename from app/edge/components/edge-jobs-datatable/edgeJobsDatatable.js rename to app/edge/components/edge-jobs-datatable/index.js diff --git a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js index dec0c08ed..59113c793 100644 --- a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js +++ b/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatableController.js @@ -1,6 +1,6 @@ import angular from 'angular'; -class EdgeStackEndpointsDatatableController { +export class EdgeStackEndpointsDatatableController { constructor($async, $scope, $controller, DatatableService, PaginationService, Notifications) { this.extendGenericController($controller, $scope); this.DatatableService = DatatableService; @@ -106,6 +106,3 @@ class EdgeStackEndpointsDatatableController { } } } - -angular.module('portainer.edge').controller('EdgeStackEndpointsDatatableController', EdgeStackEndpointsDatatableController); -export default EdgeStackEndpointsDatatableController; diff --git a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.js b/app/edge/components/edge-stack-endpoints-datatable/index.js similarity index 60% rename from app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.js rename to app/edge/components/edge-stack-endpoints-datatable/index.js index 85783034d..a0dbac847 100644 --- a/app/edge/components/edge-stack-endpoints-datatable/edgeStackEndpointsDatatable.js +++ b/app/edge/components/edge-stack-endpoints-datatable/index.js @@ -1,6 +1,10 @@ +import angular from 'angular'; + +import { EdgeStackEndpointsDatatableController } from './edgeStackEndpointsDatatableController'; + angular.module('portainer.edge').component('edgeStackEndpointsDatatable', { templateUrl: './edgeStackEndpointsDatatable.html', - controller: 'EdgeStackEndpointsDatatableController', + controller: EdgeStackEndpointsDatatableController, bindings: { titleText: '@', titleIcon: '@', diff --git a/app/edge/components/edge-stack-status/edgeStackStatusController.js b/app/edge/components/edge-stack-status/edgeStackStatusController.js index 7ce46ebb8..002af88be 100644 --- a/app/edge/components/edge-stack-status/edgeStackStatusController.js +++ b/app/edge/components/edge-stack-status/edgeStackStatusController.js @@ -1,12 +1,10 @@ -import angular from 'angular'; - const statusMap = { 1: 'ok', 2: 'error', 3: 'acknowledged', }; -class EdgeStackStatusController { +export class EdgeStackStatusController { $onChanges({ stackStatus }) { if (!stackStatus || !stackStatus.currentValue) { return; @@ -20,6 +18,3 @@ class EdgeStackStatusController { this.status = aggregateStatus; } } - -angular.module('portainer.edge').controller('EdgeStackStatusController', EdgeStackStatusController); -export default EdgeStackStatusController; diff --git a/app/edge/components/edge-stack-status/edgeStackStatus.js b/app/edge/components/edge-stack-status/index.js similarity index 65% rename from app/edge/components/edge-stack-status/edgeStackStatus.js rename to app/edge/components/edge-stack-status/index.js index a0ac9be38..11af09332 100644 --- a/app/edge/components/edge-stack-status/edgeStackStatus.js +++ b/app/edge/components/edge-stack-status/index.js @@ -1,10 +1,11 @@ import angular from 'angular'; +import { EdgeStackStatusController } from './edgeStackStatusController'; import './edgeStackStatus.css'; angular.module('portainer.edge').component('edgeStackStatus', { templateUrl: './edgeStackStatus.html', - controller: 'EdgeStackStatusController', + controller: EdgeStackStatusController, bindings: { stackStatus: '<', }, diff --git a/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.js b/app/edge/components/edge-stacks-datatable/index.js similarity index 91% rename from app/edge/components/edge-stacks-datatable/edgeStacksDatatable.js rename to app/edge/components/edge-stacks-datatable/index.js index 6d05005fe..dcc6b01a6 100644 --- a/app/edge/components/edge-stacks-datatable/edgeStacksDatatable.js +++ b/app/edge/components/edge-stacks-datatable/index.js @@ -1,3 +1,5 @@ +import angular from 'angular'; + angular.module('portainer.edge').component('edgeStacksDatatable', { templateUrl: './edgeStacksDatatable.html', controller: 'GenericDatatableController', diff --git a/app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js b/app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js index 0c836db04..a35a7ed4e 100644 --- a/app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js +++ b/app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js @@ -1,6 +1,4 @@ -import angular from 'angular'; - -class EditEdgeStackFormController { +export class EditEdgeStackFormController { constructor() { this.editorUpdate = this.editorUpdate.bind(this); } @@ -9,6 +7,3 @@ class EditEdgeStackFormController { this.model.StackFileContent = cm.getValue(); } } - -angular.module('portainer.edge').controller('EditEdgeStackFormController', EditEdgeStackFormController); -export default EditEdgeStackFormController; diff --git a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.js b/app/edge/components/edit-edge-stack-form/index.js similarity index 58% rename from app/edge/components/edit-edge-stack-form/editEdgeStackForm.js rename to app/edge/components/edit-edge-stack-form/index.js index 479a6876e..f0456524d 100644 --- a/app/edge/components/edit-edge-stack-form/editEdgeStackForm.js +++ b/app/edge/components/edit-edge-stack-form/index.js @@ -1,6 +1,10 @@ +import angular from 'angular'; + +import { EditEdgeStackFormController } from './editEdgeStackFormController'; + angular.module('portainer.edge').component('editEdgeStackForm', { templateUrl: './editEdgeStackForm.html', - controller: 'EditEdgeStackFormController', + controller: EditEdgeStackFormController, bindings: { model: '<', actionInProgress: '<', diff --git a/app/edge/components/group-form/groupFormController.js b/app/edge/components/group-form/groupFormController.js index 8b9c325bc..7b2283647 100644 --- a/app/edge/components/group-form/groupFormController.js +++ b/app/edge/components/group-form/groupFormController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EdgeGroupFormController { +export class EdgeGroupFormController { /* @ngInject */ constructor(EndpointService, $async, $scope) { this.EndpointService = EndpointService; @@ -59,6 +58,3 @@ class EdgeGroupFormController { this.endpoints.state.totalCount = totalCount; } } - -angular.module('portainer.edge').controller('EdgeGroupFormController', EdgeGroupFormController); -export default EdgeGroupFormController; diff --git a/app/edge/components/group-form/groupForm.js b/app/edge/components/group-form/index.js similarity index 66% rename from app/edge/components/group-form/groupForm.js rename to app/edge/components/group-form/index.js index 2b5f66091..98316f88e 100644 --- a/app/edge/components/group-form/groupForm.js +++ b/app/edge/components/group-form/index.js @@ -1,6 +1,10 @@ +import angular from 'angular'; + +import { EdgeGroupFormController } from './groupFormController'; + angular.module('portainer.edge').component('edgeGroupForm', { templateUrl: './groupForm.html', - controller: 'EdgeGroupFormController', + controller: EdgeGroupFormController, bindings: { model: '<', groups: '<', diff --git a/app/edge/components/groups-datatable/groupsDatatableController.js b/app/edge/components/groups-datatable/groupsDatatableController.js index afe9468d7..f3371692c 100644 --- a/app/edge/components/groups-datatable/groupsDatatableController.js +++ b/app/edge/components/groups-datatable/groupsDatatableController.js @@ -1,6 +1,6 @@ import angular from 'angular'; -class EdgeGroupsDatatableController { +export class EdgeGroupsDatatableController { constructor($scope, $controller) { const allowSelection = this.allowSelection; angular.extend(this, $controller('GenericDatatableController', { $scope: $scope })); @@ -14,6 +14,3 @@ class EdgeGroupsDatatableController { return !item.HasEdgeStack; } } - -angular.module('portainer.edge').controller('EdgeGroupsDatatableController', EdgeGroupsDatatableController); -export default EdgeGroupsDatatableController; diff --git a/app/edge/components/groups-datatable/groupsDatatable.js b/app/edge/components/groups-datatable/index.js similarity index 71% rename from app/edge/components/groups-datatable/groupsDatatable.js rename to app/edge/components/groups-datatable/index.js index 3749e8eb6..409551a94 100644 --- a/app/edge/components/groups-datatable/groupsDatatable.js +++ b/app/edge/components/groups-datatable/index.js @@ -1,8 +1,10 @@ import angular from 'angular'; +import { EdgeGroupsDatatableController } from './groupsDatatableController'; + angular.module('portainer.edge').component('edgeGroupsDatatable', { templateUrl: './groupsDatatable.html', - controller: 'EdgeGroupsDatatableController', + controller: EdgeGroupsDatatableController, bindings: { dataset: '<', titleIcon: '@', diff --git a/app/edge/views/groups/create/createEdgeGroupView.html b/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupView.html similarity index 100% rename from app/edge/views/groups/create/createEdgeGroupView.html rename to app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupView.html diff --git a/app/edge/views/groups/create/createEdgeGroupViewController.js b/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js similarity index 86% rename from app/edge/views/groups/create/createEdgeGroupViewController.js rename to app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js index 401f4c814..ffa6a8a2c 100644 --- a/app/edge/views/groups/create/createEdgeGroupViewController.js +++ b/app/edge/views/edge-groups/createEdgeGroupView/createEdgeGroupViewController.js @@ -1,6 +1,4 @@ -import angular from 'angular'; - -class CreateEdgeGroupController { +export class CreateEdgeGroupController { /* @ngInject */ constructor(EdgeGroupService, GroupService, TagService, Notifications, $state, $async) { this.EdgeGroupService = EdgeGroupService; @@ -51,6 +49,3 @@ class CreateEdgeGroupController { } } } - -angular.module('portainer.edge').controller('CreateEdgeGroupController', CreateEdgeGroupController); -export default CreateEdgeGroupController; diff --git a/app/edge/views/edge-groups/createEdgeGroupView/index.js b/app/edge/views/edge-groups/createEdgeGroupView/index.js new file mode 100644 index 000000000..c7c22d3ef --- /dev/null +++ b/app/edge/views/edge-groups/createEdgeGroupView/index.js @@ -0,0 +1,8 @@ +import angular from 'angular'; + +import { CreateEdgeGroupController } from './createEdgeGroupViewController'; + +angular.module('portainer.edge').component('createEdgeGroupView', { + templateUrl: './createEdgeGroupView.html', + controller: CreateEdgeGroupController, +}); diff --git a/app/edge/views/groups/edgeGroupsView.html b/app/edge/views/edge-groups/edgeGroupsView/edgeGroupsView.html similarity index 100% rename from app/edge/views/groups/edgeGroupsView.html rename to app/edge/views/edge-groups/edgeGroupsView/edgeGroupsView.html diff --git a/app/edge/views/groups/edgeGroupsViewController.js b/app/edge/views/edge-groups/edgeGroupsView/edgeGroupsViewController.js similarity index 87% rename from app/edge/views/groups/edgeGroupsViewController.js rename to app/edge/views/edge-groups/edgeGroupsView/edgeGroupsViewController.js index 1d7f6fc32..3bc259fcf 100644 --- a/app/edge/views/groups/edgeGroupsViewController.js +++ b/app/edge/views/edge-groups/edgeGroupsView/edgeGroupsViewController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EdgeGroupsController { +export class EdgeGroupsController { /* @ngInject */ constructor($async, $state, EdgeGroupService, Notifications) { this.$async = $async; @@ -41,5 +40,3 @@ class EdgeGroupsController { this.$state.reload(); } } - -angular.module('portainer.edge').controller('EdgeGroupsController', EdgeGroupsController); diff --git a/app/edge/views/groups/edgeGroupsView.js b/app/edge/views/edge-groups/edgeGroupsView/index.js similarity index 57% rename from app/edge/views/groups/edgeGroupsView.js rename to app/edge/views/edge-groups/edgeGroupsView/index.js index 09f0202af..2c511421b 100644 --- a/app/edge/views/groups/edgeGroupsView.js +++ b/app/edge/views/edge-groups/edgeGroupsView/index.js @@ -1,6 +1,8 @@ import angular from 'angular'; +import { EdgeGroupsController } from './edgeGroupsViewController'; + angular.module('portainer.edge').component('edgeGroupsView', { templateUrl: './edgeGroupsView.html', - controller: 'EdgeGroupsController', + controller: EdgeGroupsController, }); diff --git a/app/edge/views/groups/edit/editEdgeGroupView.html b/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupView.html similarity index 100% rename from app/edge/views/groups/edit/editEdgeGroupView.html rename to app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupView.html diff --git a/app/edge/views/groups/edit/editEdgeGroupViewController.js b/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js similarity index 88% rename from app/edge/views/groups/edit/editEdgeGroupViewController.js rename to app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js index 1685fbb50..c3c6bc3f4 100644 --- a/app/edge/views/groups/edit/editEdgeGroupViewController.js +++ b/app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js @@ -1,6 +1,4 @@ -import angular from 'angular'; - -class EditEdgeGroupController { +export class EditEdgeGroupController { /* @ngInject */ constructor(EdgeGroupService, GroupService, TagService, Notifications, $state, $async, EndpointService, EndpointHelper) { this.EdgeGroupService = EdgeGroupService; @@ -51,6 +49,3 @@ class EditEdgeGroupController { } } } - -angular.module('portainer.edge').controller('EditEdgeGroupController', EditEdgeGroupController); -export default EditEdgeGroupController; diff --git a/app/edge/views/edge-groups/editEdgeGroupView/index.js b/app/edge/views/edge-groups/editEdgeGroupView/index.js new file mode 100644 index 000000000..24c63736e --- /dev/null +++ b/app/edge/views/edge-groups/editEdgeGroupView/index.js @@ -0,0 +1,8 @@ +import angular from 'angular'; + +import { EditEdgeGroupController } from './editEdgeGroupViewController'; + +angular.module('portainer.edge').component('editEdgeGroupView', { + templateUrl: './editEdgeGroupView.html', + controller: EditEdgeGroupController, +}); diff --git a/app/edge/views/edge-jobs/create/createEdgeJobView.html b/app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobView.html similarity index 100% rename from app/edge/views/edge-jobs/create/createEdgeJobView.html rename to app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobView.html diff --git a/app/edge/views/edge-jobs/create/createEdgeJobViewController.js b/app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobViewController.js similarity index 89% rename from app/edge/views/edge-jobs/create/createEdgeJobViewController.js rename to app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobViewController.js index 155958b55..2380c1dff 100644 --- a/app/edge/views/edge-jobs/create/createEdgeJobViewController.js +++ b/app/edge/views/edge-jobs/createEdgeJobView/createEdgeJobViewController.js @@ -1,6 +1,4 @@ -import angular from 'angular'; - -class CreateEdgeJobController { +export class CreateEdgeJobViewController { constructor($async, $q, $state, EdgeJobService, GroupService, Notifications, TagService) { this.state = { actionInProgress: false, @@ -63,6 +61,3 @@ class CreateEdgeJobController { } } } - -angular.module('portainer.edge').controller('CreateEdgeJobController', CreateEdgeJobController); -export default CreateEdgeJobController; diff --git a/app/edge/views/edge-jobs/create/createEdgeJobView.js b/app/edge/views/edge-jobs/createEdgeJobView/index.js similarity index 70% rename from app/edge/views/edge-jobs/create/createEdgeJobView.js rename to app/edge/views/edge-jobs/createEdgeJobView/index.js index 4daa6dae9..ecddfb5ae 100644 --- a/app/edge/views/edge-jobs/create/createEdgeJobView.js +++ b/app/edge/views/edge-jobs/createEdgeJobView/index.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import CreateEdgeJobViewController from './createEdgeJobViewController'; +import { CreateEdgeJobViewController } from './createEdgeJobViewController'; angular.module('portainer.edge').component('createEdgeJobView', { templateUrl: './createEdgeJobView.html', diff --git a/app/edge/views/edge-jobs/edit/edgeJob.html b/app/edge/views/edge-jobs/edgeJob/edgeJob.html similarity index 100% rename from app/edge/views/edge-jobs/edit/edgeJob.html rename to app/edge/views/edge-jobs/edgeJob/edgeJob.html diff --git a/app/edge/views/edge-jobs/edit/edgeJobController.js b/app/edge/views/edge-jobs/edgeJob/edgeJobController.js similarity index 96% rename from app/edge/views/edge-jobs/edit/edgeJobController.js rename to app/edge/views/edge-jobs/edgeJob/edgeJobController.js index 41e757f10..ab5c84dab 100644 --- a/app/edge/views/edge-jobs/edit/edgeJobController.js +++ b/app/edge/views/edge-jobs/edgeJob/edgeJobController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EdgeJobController { +export class EdgeJobController { constructor($async, $q, $state, EdgeJobService, EndpointService, FileSaver, GroupService, HostBrowserService, Notifications, TagService) { this.state = { actionInProgress: false, @@ -154,6 +153,3 @@ class EdgeJobController { } } } - -angular.module('portainer.edge').controller('EdgeJobController', EdgeJobController); -export default EdgeJobController; diff --git a/app/edge/views/edge-jobs/edit/edgeJob.js b/app/edge/views/edge-jobs/edgeJob/index.js similarity index 73% rename from app/edge/views/edge-jobs/edit/edgeJob.js rename to app/edge/views/edge-jobs/edgeJob/index.js index f2395289f..d23dac592 100644 --- a/app/edge/views/edge-jobs/edit/edgeJob.js +++ b/app/edge/views/edge-jobs/edgeJob/index.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import EdgeJobController from './edgeJobController'; +import { EdgeJobController } from './edgeJobController'; angular.module('portainer.edge').component('edgeJobView', { templateUrl: './edgeJob.html', diff --git a/app/edge/views/edge-jobs/edgeJobsView.html b/app/edge/views/edge-jobs/edgeJobsView/edgeJobsView.html similarity index 100% rename from app/edge/views/edge-jobs/edgeJobsView.html rename to app/edge/views/edge-jobs/edgeJobsView/edgeJobsView.html diff --git a/app/edge/views/edge-jobs/edgeJobsViewController.js b/app/edge/views/edge-jobs/edgeJobsView/edgeJobsViewController.js similarity index 88% rename from app/edge/views/edge-jobs/edgeJobsViewController.js rename to app/edge/views/edge-jobs/edgeJobsView/edgeJobsViewController.js index 85a4394d1..3e6fb611e 100644 --- a/app/edge/views/edge-jobs/edgeJobsViewController.js +++ b/app/edge/views/edge-jobs/edgeJobsView/edgeJobsViewController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EdgeJobsController { +export class EdgeJobsViewController { constructor($async, $state, EdgeJobService, ModalService, Notifications) { this.$async = $async; this.$state = $state; @@ -51,6 +50,3 @@ class EdgeJobsController { } } } - -angular.module('portainer.edge').controller('EdgeJobsController', EdgeJobsController); -export default EdgeJobsController; diff --git a/app/edge/views/edge-jobs/edgeJobsView.js b/app/edge/views/edge-jobs/edgeJobsView/index.js similarity index 72% rename from app/edge/views/edge-jobs/edgeJobsView.js rename to app/edge/views/edge-jobs/edgeJobsView/index.js index c87dd4023..124b6e666 100644 --- a/app/edge/views/edge-jobs/edgeJobsView.js +++ b/app/edge/views/edge-jobs/edgeJobsView/index.js @@ -1,5 +1,5 @@ import angular from 'angular'; -import EdgeJobsViewController from './edgeJobsViewController'; +import { EdgeJobsViewController } from './edgeJobsViewController'; angular.module('portainer.edge').component('edgeJobsView', { templateUrl: './edgeJobsView.html', diff --git a/app/edge/views/edge-stacks/create/createEdgeStackView.js b/app/edge/views/edge-stacks/create/createEdgeStackView.js deleted file mode 100644 index 5b5403337..000000000 --- a/app/edge/views/edge-stacks/create/createEdgeStackView.js +++ /dev/null @@ -1,4 +0,0 @@ -angular.module('portainer.edge').component('createEdgeStackView', { - templateUrl: './createEdgeStackView.html', - controller: 'CreateEdgeStackViewController', -}); diff --git a/app/edge/views/edge-stacks/create/createEdgeStackView.html b/app/edge/views/edge-stacks/createEdgeStackView/createEdgeStackView.html similarity index 100% rename from app/edge/views/edge-stacks/create/createEdgeStackView.html rename to app/edge/views/edge-stacks/createEdgeStackView/createEdgeStackView.html diff --git a/app/edge/views/edge-stacks/create/createEdgeStackViewController.js b/app/edge/views/edge-stacks/createEdgeStackView/createEdgeStackViewController.js similarity index 95% rename from app/edge/views/edge-stacks/create/createEdgeStackViewController.js rename to app/edge/views/edge-stacks/createEdgeStackView/createEdgeStackViewController.js index aff2e517d..e9f11dcf9 100644 --- a/app/edge/views/edge-stacks/create/createEdgeStackViewController.js +++ b/app/edge/views/edge-stacks/createEdgeStackView/createEdgeStackViewController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class CreateEdgeStackViewController { +export class CreateEdgeStackViewController { constructor($state, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async) { Object.assign(this, { $state, EdgeStackService, EdgeGroupService, EdgeTemplateService, Notifications, FormHelper, $async }); @@ -151,6 +150,3 @@ class CreateEdgeStackViewController { this.formValues.StackFileContent = cm.getValue(); } } - -angular.module('portainer.edge').controller('CreateEdgeStackViewController', CreateEdgeStackViewController); -export default CreateEdgeStackViewController; diff --git a/app/edge/views/edge-stacks/createEdgeStackView/index.js b/app/edge/views/edge-stacks/createEdgeStackView/index.js new file mode 100644 index 000000000..29206fe54 --- /dev/null +++ b/app/edge/views/edge-stacks/createEdgeStackView/index.js @@ -0,0 +1,8 @@ +import angular from 'angular'; + +import { CreateEdgeStackViewController } from './createEdgeStackViewController'; + +angular.module('portainer.edge').component('createEdgeStackView', { + templateUrl: './createEdgeStackView.html', + controller: CreateEdgeStackViewController, +}); diff --git a/app/edge/views/edge-stacks/edgeStacksView.js b/app/edge/views/edge-stacks/edgeStacksView.js deleted file mode 100644 index 27e58493c..000000000 --- a/app/edge/views/edge-stacks/edgeStacksView.js +++ /dev/null @@ -1,4 +0,0 @@ -angular.module('portainer.edge').component('edgeStacksView', { - templateUrl: './edgeStacksView.html', - controller: 'EdgeStacksViewController', -}); diff --git a/app/edge/views/edge-stacks/edgeStacksView.html b/app/edge/views/edge-stacks/edgeStacksView/edgeStacksView.html similarity index 100% rename from app/edge/views/edge-stacks/edgeStacksView.html rename to app/edge/views/edge-stacks/edgeStacksView/edgeStacksView.html diff --git a/app/edge/views/edge-stacks/edgeStacksViewController.js b/app/edge/views/edge-stacks/edgeStacksView/edgeStacksViewController.js similarity index 85% rename from app/edge/views/edge-stacks/edgeStacksViewController.js rename to app/edge/views/edge-stacks/edgeStacksView/edgeStacksViewController.js index 9aae3770d..0c68f2af1 100644 --- a/app/edge/views/edge-stacks/edgeStacksViewController.js +++ b/app/edge/views/edge-stacks/edgeStacksView/edgeStacksViewController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EdgeStacksViewController { +export class EdgeStacksViewController { constructor($state, Notifications, EdgeStackService, $scope, $async) { this.$state = $state; this.Notifications = Notifications; @@ -47,6 +46,3 @@ class EdgeStacksViewController { } } } - -angular.module('portainer.edge').controller('EdgeStacksViewController', EdgeStacksViewController); -export default EdgeStacksViewController; diff --git a/app/edge/views/edge-stacks/edgeStacksView/index.js b/app/edge/views/edge-stacks/edgeStacksView/index.js new file mode 100644 index 000000000..663c6ea41 --- /dev/null +++ b/app/edge/views/edge-stacks/edgeStacksView/index.js @@ -0,0 +1,8 @@ +import angular from 'angular'; + +import { EdgeStacksViewController } from './edgeStacksViewController'; + +angular.module('portainer.edge').component('edgeStacksView', { + templateUrl: './edgeStacksView.html', + controller: EdgeStacksViewController, +}); diff --git a/app/edge/views/edge-stacks/edit/editEdgeStackView.js b/app/edge/views/edge-stacks/edit/editEdgeStackView.js deleted file mode 100644 index 9f64573d5..000000000 --- a/app/edge/views/edge-stacks/edit/editEdgeStackView.js +++ /dev/null @@ -1,4 +0,0 @@ -angular.module('portainer.edge').component('editEdgeStackView', { - templateUrl: './editEdgeStackView.html', - controller: 'EditEdgeStackViewController', -}); diff --git a/app/edge/views/edge-stacks/edit/editEdgeStackView.html b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html similarity index 100% rename from app/edge/views/edge-stacks/edit/editEdgeStackView.html rename to app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html diff --git a/app/edge/views/edge-stacks/edit/editEdgeStackViewController.js b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js similarity index 93% rename from app/edge/views/edge-stacks/edit/editEdgeStackViewController.js rename to app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js index 018cc1c51..bc53df983 100644 --- a/app/edge/views/edge-stacks/edit/editEdgeStackViewController.js +++ b/app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js @@ -1,7 +1,6 @@ -import angular from 'angular'; import _ from 'lodash-es'; -class EditEdgeStackViewController { +export class EditEdgeStackViewController { constructor($async, $state, EdgeGroupService, EdgeStackService, EndpointService, Notifications) { this.$async = $async; this.$state = $state; @@ -91,6 +90,3 @@ class EditEdgeStackViewController { } } } - -angular.module('portainer.edge').controller('EditEdgeStackViewController', EditEdgeStackViewController); -export default EditEdgeStackViewController; diff --git a/app/edge/views/edge-stacks/editEdgeStackView/index.js b/app/edge/views/edge-stacks/editEdgeStackView/index.js new file mode 100644 index 000000000..f81791347 --- /dev/null +++ b/app/edge/views/edge-stacks/editEdgeStackView/index.js @@ -0,0 +1,8 @@ +import angular from 'angular'; + +import { EditEdgeStackViewController } from './editEdgeStackViewController'; + +angular.module('portainer.edge').component('editEdgeStackView', { + templateUrl: './editEdgeStackView.html', + controller: EditEdgeStackViewController, +}); diff --git a/app/edge/views/groups/create/createEdgeGroupView.js b/app/edge/views/groups/create/createEdgeGroupView.js deleted file mode 100644 index e6778e728..000000000 --- a/app/edge/views/groups/create/createEdgeGroupView.js +++ /dev/null @@ -1,4 +0,0 @@ -angular.module('portainer.edge').component('createEdgeGroupView', { - templateUrl: './createEdgeGroupView.html', - controller: 'CreateEdgeGroupController', -}); diff --git a/app/edge/views/groups/edit/editEdgeGroupView.js b/app/edge/views/groups/edit/editEdgeGroupView.js deleted file mode 100644 index 7cb21ef3b..000000000 --- a/app/edge/views/groups/edit/editEdgeGroupView.js +++ /dev/null @@ -1,4 +0,0 @@ -angular.module('portainer.edge').component('editEdgeGroupView', { - templateUrl: './editEdgeGroupView.html', - controller: 'EditEdgeGroupController', -});