awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: group listing using project id

Browse Source
This commit is contained in:
Meet
2024-09-24 02:24:37 +05:30
parent dafb89d1dd
commit 2469c8d0c6
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/ApprovalPolicyList.tsx
View File

@@ -103,7 +103,7 @@ export const ApprovalPolicyList = ({ workspaceId }: IProps) => {
const { currentWorkspace } = useWorkspace(); const { currentWorkspace } = useWorkspace();
const { data: members } = useGetWorkspaceUsers(workspaceId, true); const { data: members } = useGetWorkspaceUsers(workspaceId, true);
const { data: groups } = useListWorkspaceGroups(currentWorkspace?.slug || ""); const { data: groups } = useListWorkspaceGroups(currentWorkspace?.id || "");
const { policies, isLoading: isPoliciesLoading } = useApprovalPolicies( const { policies, isLoading: isPoliciesLoading } = useApprovalPolicies(
permission, permission,
@@ -270,6 +270,7 @@ export const ApprovalPolicyList = ({ workspaceId }: IProps) => {
</Table> </Table>
</TableContainer> </TableContainer>
<AccessPolicyForm <AccessPolicyForm
projectId={currentWorkspace?.id!}
projectSlug={currentWorkspace?.slug!} projectSlug={currentWorkspace?.slug!}
isOpen={popUp.policyForm.isOpen} isOpen={popUp.policyForm.isOpen}
onToggle={(isOpen) => handlePopUpToggle("policyForm", isOpen)} onToggle={(isOpen) => handlePopUpToggle("policyForm", isOpen)}

8
frontend/src/views/SecretApprovalPage/components/ApprovalPolicyList/components/AccessPolicyModal.tsx
View File

@@ -35,6 +35,7 @@ type Props = {
isOpen?: boolean; isOpen?: boolean;
onToggle: (isOpen: boolean) => void; onToggle: (isOpen: boolean) => void;
members?: TWorkspaceUser[]; members?: TWorkspaceUser[];
projectId: string;
projectSlug: string; projectSlug: string;
editValues?: TAccessApprovalPolicy; editValues?: TAccessApprovalPolicy;
}; };
@@ -60,6 +61,7 @@ export const AccessPolicyForm = ({
isOpen, isOpen,
onToggle, onToggle,
members = [], members = [],
projectId,
projectSlug, projectSlug,
editValues editValues
}: Props) => { }: Props) => {
@@ -81,7 +83,7 @@ export const AccessPolicyForm = ({
: undefined : undefined
}); });
const { currentWorkspace } = useWorkspace(); const { currentWorkspace } = useWorkspace();
const { data: groups } = useListWorkspaceGroups(projectSlug); const { data: groups } = useListWorkspaceGroups(projectId);
const environments = currentWorkspace?.environments || []; const environments = currentWorkspace?.environments || [];
const isEditMode = Boolean(editValues); const isEditMode = Boolean(editValues);
@@ -99,7 +101,7 @@ export const AccessPolicyForm = ({
const policyName = policyDetails[watch("policyType")]?.name || "Policy"; const policyName = policyDetails[watch("policyType")]?.name || "Policy";
const handleCreatePolicy = async (data: TFormSchema) => { const handleCreatePolicy = async (data: TFormSchema) => {
if (!projectSlug) return; if (!projectId) return;
try { try {
if (data.policyType === PolicyType.ChangePolicy) { if (data.policyType === PolicyType.ChangePolicy) {
@@ -128,7 +130,7 @@ export const AccessPolicyForm = ({
}; };
const handleUpdatePolicy = async (data: TFormSchema) => { const handleUpdatePolicy = async (data: TFormSchema) => {
if (!projectSlug) return; if (!projectId || !projectSlug) return;
if (!editValues?.id) return; if (!editValues?.id) return;
try { try {