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

fix(docker): apply private uac to edge admin [EE-6788] (#11284)

pull/11368/head
Chaim Lev-Ari 2024-03-12 09:59:39 +02:00 committed by GitHub
parent 0144a98b3b
commit b13dac0f6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/react/portainer/templates/custom-templates/CreateView/useInitialValues.ts
View File

@ -1,7 +1,7 @@
import { useCurrentStateAndParams } from '@uirouter/react'; import { useCurrentStateAndParams } from '@uirouter/react';
import { parseAccessControlFormData } from '@/react/portainer/access-control/utils'; import { parseAccessControlFormData } from '@/react/portainer/access-control/utils';
import { useCurrentUser, useIsEdgeAdmin } from '@/react/hooks/useUser'; import { useCurrentUser } from '@/react/hooks/useUser';
import { StackType } from '@/react/common/stacks/types'; import { StackType } from '@/react/common/stacks/types';
import { Platform } from '../../types'; import { Platform } from '../../types';
@ -19,13 +19,12 @@ export function useInitialValues({
isEdge?: boolean; isEdge?: boolean;
buildMethods: Array<Method>; buildMethods: Array<Method>;
}): FormValues | undefined { }): FormValues | undefined {
const { user } = useCurrentUser(); const { user, isPureAdmin } = useCurrentUser();
const isAdminQuery = useIsEdgeAdmin();
const { appTemplateId, type = defaultType } = useAppTemplateParams(); const { appTemplateId, type = defaultType } = useAppTemplateParams();
const fileContentQuery = useFetchTemplateFile(appTemplateId); const fileContentQuery = useFetchTemplateFile(appTemplateId);
if (fileContentQuery.isLoading || isAdminQuery.isLoading) { if (fileContentQuery.isLoading) {
return undefined; return undefined;
} }
@ -53,7 +52,7 @@ export function useInitialValues({
}, },
AccessControl: isEdge AccessControl: isEdge
? undefined ? undefined
: parseAccessControlFormData(isAdminQuery.isAdmin, user.Id), : parseAccessControlFormData(isPureAdmin, user.Id),
EdgeSettings: isEdge ? getDefaultEdgeTemplateSettings() : undefined, EdgeSettings: isEdge ? getDefaultEdgeTemplateSettings() : undefined,
}; };
} }