github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(applications): update ns options for non admin users [r8s-99]

pull/12274/head
testA113 2024-10-01 15:47:00 +13:00
parent c0db48b29d
commit bb7c59c1f3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/kubernetes/views/applications/create/createApplicationController.js
View File

@ -29,6 +29,7 @@ import { confirm, confirmUpdate, confirmWebEditorDiscard } from '@@/modals/confi
import { buildConfirmButton } from '@@/modals/utils';
import { ModalType } from '@@/modals';
import { KUBE_STACK_NAME_VALIDATION_REGEX } from '@/react/kubernetes/DeployView/StackName/constants';
import { getNamespaces } from '@/react/kubernetes/namespaces/queries/useNamespacesQuery';
class KubernetesCreateApplicationController {
/* #region CONSTRUCTOR */
@ -1022,16 +1023,14 @@ class KubernetesCreateApplicationController {
this.deploymentOptions = await getGlobalDeploymentOptions();
const [resourcePools, nodes, nodesLimits] = await Promise.all([
this.KubernetesResourcePoolService.get(),
this.KubernetesNodeService.get(),
this.KubernetesNodesLimitsService.get(),
]);
const [namespaces, nodes, nodesLimits] = await Promise.all([getNamespaces(this.endpoint.Id), this.KubernetesNodeService.get(), this.KubernetesNodesLimitsService.get()]);
this.nodesLimits = nodesLimits;
// transform the namespaces to resource pools to conform to legacy code ( this.KubernetesResourcePoolService.get() )
const resourcePools = namespaces.map((namespace) => ({ Namespace: namespace }));
const nonSystemNamespaces = _.filter(
resourcePools,
(resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Namespace.Name) && resourcePool.Namespace.Status === 'Active'
(resourcePool) => !KubernetesNamespaceHelper.isSystemNamespace(resourcePool.Name) && resourcePool.Namespace.Status.phase === 'Active'
);
this.allNamespaces = resourcePools.map(({ Namespace }) => Namespace.Name);