value), ...this.selectedResourcePools.map((pool) => pool.name)]);
+ return this.updateNamespaces([...this.savedResourcePools.map(({ value }) => value), ...this.selectedResourcePools]);
}
handleRemove(namespaces) {
@@ -52,6 +54,12 @@ export default class KubernetesRegistryAccessController {
});
}
+ onChangeResourcePools(resourcePools) {
+ return this.$scope.$evalAsync(() => {
+ this.selectedResourcePools = resourcePools;
+ });
+ }
+
$onInit() {
return this.$async(async () => {
try {
diff --git a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
index 56eaf8797..96831478a 100644
--- a/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
+++ b/app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html
@@ -12,19 +12,14 @@
Select namespaces
No namespaces available.
-
-
+ value="$ctrl.selectedResourcePools"
+ namespaces="$ctrl.resourcePools"
+ placeholder="'Select one or more namespaces'"
+ on-change="($ctrl.onChangeResourcePools)"
+ >
diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html
index b45c1ab46..7d3abf977 100644
--- a/app/kubernetes/views/configure/configure.html
+++ b/app/kubernetes/views/configure/configure.html
@@ -299,19 +299,12 @@
-
-
+
diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js
index 6f644a6bf..3058ecb4b 100644
--- a/app/kubernetes/views/configure/configureController.js
+++ b/app/kubernetes/views/configure/configureController.js
@@ -45,6 +45,7 @@ class KubernetesConfigureController {
this.limitedFeatureAutoWindow = FeatureId.HIDE_AUTO_UPDATE_WINDOW;
this.onToggleAutoUpdate = this.onToggleAutoUpdate.bind(this);
this.onChangeEnableResourceOverCommit = this.onChangeEnableResourceOverCommit.bind(this);
+ this.onChangeStorageClassAccessMode = this.onChangeStorageClassAccessMode.bind(this);
}
/* #endregion */
@@ -263,6 +264,18 @@ class KubernetesConfigureController {
});
}
+ onChangeStorageClassAccessMode(storageClassName, accessModes) {
+ return this.$scope.$evalAsync(() => {
+ const storageClass = this.StorageClasses.find((item) => item.Name === storageClassName);
+
+ if (!storageClass) {
+ throw new Error('Storage class not found');
+ }
+
+ storageClass.AccessModes = accessModes;
+ });
+ }
+
/* #region ON INIT */
async onInit() {
this.state = {
@@ -288,18 +301,14 @@ class KubernetesConfigureController {
};
try {
+ this.availableAccessModes = new KubernetesStorageClassAccessPolicies();
+
[this.StorageClasses, this.endpoint] = await Promise.all([this.KubernetesStorageService.get(this.state.endpointId), this.EndpointService.endpoint(this.state.endpointId)]);
_.forEach(this.StorageClasses, (item) => {
- item.availableAccessModes = new KubernetesStorageClassAccessPolicies();
const storage = _.find(this.endpoint.Kubernetes.Configuration.StorageClasses, (sc) => sc.Name === item.Name);
if (storage) {
item.selected = true;
- _.forEach(storage.AccessModes, (access) => {
- const mode = _.find(item.availableAccessModes, { Name: access });
- if (mode) {
- mode.selected = true;
- }
- });
+ item.AccessModes = storage.AccessModes.map((name) => this.availableAccessModes.find((accessMode) => accessMode.Name === name));
}
});
diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
index e0e008e54..295d881f7 100644
--- a/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
+++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccess.html
@@ -52,25 +52,19 @@
@@ -80,7 +74,7 @@
diff --git a/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js b/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
index 8c95ef139..c57e2ade7 100644
--- a/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
+++ b/app/kubernetes/views/resource-pools/access/resourcePoolAccessController.js
@@ -6,9 +6,10 @@ import KubernetesConfigMapHelper from 'Kubernetes/helpers/configMapHelper';
class KubernetesResourcePoolAccessController {
/* @ngInject */
- constructor($async, $state, Notifications, KubernetesResourcePoolService, KubernetesConfigMapService, GroupService, AccessService) {
+ constructor($async, $state, $scope, Notifications, KubernetesResourcePoolService, KubernetesConfigMapService, GroupService, AccessService) {
this.$async = $async;
this.$state = $state;
+ this.$scope = $scope;
this.Notifications = Notifications;
this.KubernetesResourcePoolService = KubernetesResourcePoolService;
this.KubernetesConfigMapService = KubernetesConfigMapService;
@@ -19,7 +20,7 @@ class KubernetesResourcePoolAccessController {
this.onInit = this.onInit.bind(this);
this.authorizeAccessAsync = this.authorizeAccessAsync.bind(this);
this.unauthorizeAccessAsync = this.unauthorizeAccessAsync.bind(this);
-
+ this.onUsersAndTeamsChange = this.onUsersAndTeamsChange.bind(this);
this.unauthorizeAccess = this.unauthorizeAccess.bind(this);
}
@@ -72,6 +73,7 @@ class KubernetesResourcePoolAccessController {
return false;
});
}
+
this.availableUsersAndTeams = _.without(endpointAccesses.authorizedUsersAndTeams, ...this.authorizedUsersAndTeams);
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to retrieve namespace information');
@@ -100,6 +102,12 @@ class KubernetesResourcePoolAccessController {
}
}
+ onUsersAndTeamsChange(value) {
+ this.$scope.$evalAsync(() => {
+ this.formValues.multiselectOutput = value;
+ });
+ }
+
authorizeAccess() {
return this.$async(this.authorizeAccessAsync);
}
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePool.html b/app/kubernetes/views/resource-pools/create/createResourcePool.html
index 699cdbba5..69b6c304d 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePool.html
+++ b/app/kubernetes/views/resource-pools/create/createResourcePool.html
@@ -403,7 +403,7 @@
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
index 8c8987ad3..02d125f5a 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
@@ -39,6 +39,7 @@ class KubernetesCreateResourcePoolController {
this.onToggleStorageQuota = this.onToggleStorageQuota.bind(this);
this.onToggleLoadBalancerQuota = this.onToggleLoadBalancerQuota.bind(this);
this.onToggleResourceQuota = this.onToggleResourceQuota.bind(this);
+ this.onRegistriesChange = this.onRegistriesChange.bind(this);
}
/* #endregion */
@@ -92,6 +93,12 @@ class KubernetesCreateResourcePoolController {
});
}
+ onRegistriesChange(registries) {
+ return this.$scope.$evalAsync(() => {
+ this.formValues.Registries = registries;
+ });
+ }
+
addHostname(ingressClass) {
ingressClass.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue());
}
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html
index cd612187c..f7b3704e5 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePool.html
+++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html
@@ -364,27 +364,21 @@
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
index 56eb3f020..1aa1480cf 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
@@ -73,6 +73,7 @@ class KubernetesResourcePoolController {
this.getEvents = this.getEvents.bind(this);
this.onToggleLoadBalancersQuota = this.onToggleLoadBalancersQuota.bind(this);
this.onToggleStorageQuota = this.onToggleStorageQuota.bind(this);
+ this.onRegistriesChange = this.onRegistriesChange.bind(this);
}
/* #endregion */
@@ -101,6 +102,12 @@ class KubernetesResourcePoolController {
}
/* #endregion */
+ onRegistriesChange(registries) {
+ return this.$scope.$evalAsync(() => {
+ this.formValues.Registries = registries;
+ });
+ }
+
onToggleLoadBalancersQuota(checked) {
return this.$scope.$evalAsync(() => {
this.formValues.UseLoadBalancersQuota = checked;
diff --git a/app/portainer/components/accessControlForm/porAccessControlForm.html b/app/portainer/components/accessControlForm/porAccessControlForm.html
index 645c9cfaa..2558c0452 100644
--- a/app/portainer/components/accessControlForm/porAccessControlForm.html
+++ b/app/portainer/components/accessControlForm/porAccessControlForm.html
@@ -72,8 +72,8 @@
class="form-group mt-4"
ng-if="$ctrl.formData.AccessControlEnabled && $ctrl.formData.Ownership === $ctrl.RCO.RESTRICTED && ($ctrl.isAdmin || (!$ctrl.isAdmin && $ctrl.availableTeams.length > 1))"
>
-
-
+
+
Authorized teams
-
- You have not yet created any teams. Head over to the Teams view to manage teams.
-
-
+
+
+ You have not yet created any teams. Head over to the Teams view to manage teams.
+
+
+
-
-
+
+
Authorized users
-
- You have not yet created any users. Head over to the Users view to manage users.
-
-
+
+
+ You have not yet created any users. Head over to the Users view to manage users.
+
+
+
-
+
Role
@@ -38,7 +42,7 @@
{
+ this.formValues.multiselectOutput = value;
+ });
}
updateAction() {
diff --git a/app/portainer/components/endpoint-selector/endpoint-selector.js b/app/portainer/components/endpoint-selector/endpoint-selector.js
deleted file mode 100644
index a45f810ae..000000000
--- a/app/portainer/components/endpoint-selector/endpoint-selector.js
+++ /dev/null
@@ -1,9 +0,0 @@
-angular.module('portainer.app').component('endpointSelector', {
- templateUrl: './endpointSelector.html',
- controller: 'EndpointSelectorController',
- bindings: {
- model: '=',
- endpoints: '<',
- groups: '<',
- },
-});
diff --git a/app/portainer/components/endpoint-selector/endpointSelector.html b/app/portainer/components/endpoint-selector/endpointSelector.html
deleted file mode 100644
index 10b057c56..000000000
--- a/app/portainer/components/endpoint-selector/endpointSelector.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- {{ $select.selected.Name }}
-
-
- {{ endpoint.Name }}
-
-
diff --git a/app/portainer/components/endpoint-selector/endpointSelectorController.js b/app/portainer/components/endpoint-selector/endpointSelectorController.js
deleted file mode 100644
index 805b62137..000000000
--- a/app/portainer/components/endpoint-selector/endpointSelectorController.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import _ from 'lodash-es';
-
-angular.module('portainer.app').controller('EndpointSelectorController', function () {
- var ctrl = this;
-
- this.sortGroups = function (groups) {
- return _.sortBy(groups, ['name']);
- };
-
- this.groupEndpoints = function (endpoint) {
- for (var i = 0; i < ctrl.availableGroups.length; i++) {
- var group = ctrl.availableGroups[i];
-
- if (endpoint.GroupId === group.Id) {
- return group.Name;
- }
- }
- };
-
- this.$onInit = function () {
- this.availableGroups = filterEmptyGroups(this.groups, this.endpoints);
- };
-
- function filterEmptyGroups(groups, endpoints) {
- return groups.filter(function f(group) {
- for (var i = 0; i < endpoints.length; i++) {
- var endpoint = endpoints[i];
- if (endpoint.GroupId === group.Id) {
- return true;
- }
- }
- return false;
- });
- }
-});
diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js b/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js
index db1bb366c..e14a2330e 100644
--- a/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js
+++ b/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js
@@ -2,16 +2,19 @@ import { STACK_NAME_VALIDATION_REGEX } from '@/constants';
angular.module('portainer.app').controller('StackDuplicationFormController', [
'Notifications',
- function StackDuplicationFormController(Notifications) {
+ '$scope',
+ function StackDuplicationFormController(Notifications, $scope) {
var ctrl = this;
+ ctrl.environmentSelectorOptions = null;
+
ctrl.state = {
duplicationInProgress: false,
migrationInProgress: false,
};
ctrl.formValues = {
- endpoint: null,
+ endpointId: null,
newName: '',
};
@@ -23,15 +26,24 @@ angular.module('portainer.app').controller('StackDuplicationFormController', [
ctrl.migrateStack = migrateStack;
ctrl.isMigrationButtonDisabled = isMigrationButtonDisabled;
ctrl.isEndpointSelected = isEndpointSelected;
+ ctrl.onChangeEnvironment = onChangeEnvironment;
+ ctrl.$onChanges = $onChanges;
function isFormValidForMigration() {
- return ctrl.formValues.endpoint && ctrl.formValues.endpoint.Id;
+ return ctrl.formValues.endpointId;
}
function isFormValidForDuplication() {
return isFormValidForMigration() && ctrl.formValues.newName && !ctrl.yamlError;
}
+ function onChangeEnvironment(endpointId) {
+ console.log({ endpointId });
+ return $scope.$evalAsync(() => {
+ ctrl.formValues.endpointId = endpointId;
+ });
+ }
+
function duplicateStack() {
if (!ctrl.formValues.newName) {
Notifications.error('Failure', null, 'Stack name is required for duplication');
@@ -40,7 +52,7 @@ angular.module('portainer.app').controller('StackDuplicationFormController', [
ctrl.state.duplicationInProgress = true;
ctrl
.onDuplicate({
- endpointId: ctrl.formValues.endpoint.Id,
+ endpointId: ctrl.formValues.endpointId,
name: ctrl.formValues.newName ? ctrl.formValues.newName : undefined,
})
.finally(function () {
@@ -52,7 +64,7 @@ angular.module('portainer.app').controller('StackDuplicationFormController', [
ctrl.state.migrationInProgress = true;
ctrl
.onMigrate({
- endpointId: ctrl.formValues.endpoint.Id,
+ endpointId: ctrl.formValues.endpointId,
name: ctrl.formValues.newName ? ctrl.formValues.newName : undefined,
})
.finally(function () {
@@ -65,11 +77,42 @@ angular.module('portainer.app').controller('StackDuplicationFormController', [
}
function isTargetEndpointAndCurrentEquals() {
- return ctrl.formValues.endpoint && ctrl.formValues.endpoint.Id === ctrl.currentEndpointId;
+ return ctrl.formValues.endpointId === ctrl.currentEndpointId;
}
function isEndpointSelected() {
- return ctrl.formValues.endpoint && ctrl.formValues.endpoint.Id;
+ return ctrl.formValues.endpointId;
+ }
+
+ function $onChanges() {
+ ctrl.environmentSelectorOptions = getOptions(ctrl.groups, ctrl.endpoints);
}
},
]);
+
+function getOptions(groups, environments) {
+ if (!groups || !environments) {
+ return [];
+ }
+
+ const groupSet = environments.reduce((groupSet, environment) => {
+ const groupEnvironments = groupSet[environment.GroupId] || [];
+
+ return {
+ ...groupSet,
+ [environment.GroupId]: [...groupEnvironments, { label: environment.Name, value: environment.Id }],
+ };
+ }, {});
+
+ return Object.entries(groupSet).map(([groupId, environments]) => {
+ const group = groups.find((group) => group.Id === parseInt(groupId, 10));
+ if (!group) {
+ throw new Error('missing group');
+ }
+
+ return {
+ label: group.Name,
+ options: environments,
+ };
+ });
+}
diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form.html b/app/portainer/components/stack-duplication-form/stack-duplication-form.html
index bcce3d68a..e0e335962 100644
--- a/app/portainer/components/stack-duplication-form/stack-duplication-form.html
+++ b/app/portainer/components/stack-duplication-form/stack-duplication-form.html
@@ -30,8 +30,8 @@