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

Merge pull request #3172 from Infisical/fix/secretReminderSubmitOnModalClose

Browse Source 
Save Secret Reminder from Modal
This commit is contained in:
Maidul Islam
2025-03-03 15:25:42 -05:00
committed by GitHub
parent 3b9c62c366 23bd048bb9
commit 4091bc19e9
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/hooks/api/secrets/types.ts
View File

@@ -51,6 +51,7 @@ export type SecretV3RawSanitized = {
folderId?: string;
skipMultilineEncoding?: boolean;
secretMetadata?: { key: string; value: string }[];
isReminderEvent?: boolean;
};
export type SecretV3Raw = {

9
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretDetailSidebar.tsx
View File

@@ -192,6 +192,10 @@ export const SecretDetailSidebar = ({
await onSaveSecret(secret, { ...secret, ...data }, () => reset());
};
const handleReminderSubmit = async (reminderRepeatDays: number | null | undefined, reminderNote: string | null | undefined) => {
await onSaveSecret(secret, { ...secret, reminderRepeatDays, reminderNote, isReminderEvent: true }, () => { });
}
const [createReminderFormOpen, setCreateReminderFormOpen] = useToggle(false);
const secretReminderRepeatDays = watch("reminderRepeatDays");
@@ -207,8 +211,9 @@ export const SecretDetailSidebar = ({
setCreateReminderFormOpen.toggle();
if (data) {
setValue("reminderRepeatDays", data.days, { shouldDirty: true });
setValue("reminderNote", data.note, { shouldDirty: true });
setValue("reminderRepeatDays", data.days, { shouldDirty: false });
setValue("reminderNote", data.note, { shouldDirty: false });
handleReminderSubmit(data.days, data.note)
}
}}
/>

17
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx
View File

@@ -158,7 +158,8 @@ export const SecretListView = ({
comment,
reminderRepeatDays,
reminderNote,
secretMetadata
secretMetadata,
isReminderEvent
} = modSecret;
const hasKeyChanged = oldKey !== key && key;
@@ -234,13 +235,23 @@ export const SecretListView = ({
queryClient.invalidateQueries({
queryKey: secretApprovalRequestKeys.count({ workspaceId })
});
handlePopUpClose("secretDetail");
if (!isReminderEvent) {
handlePopUpClose("secretDetail");
}
let successMessage;
if (isReminderEvent) {
successMessage = reminderRepeatDays ? "Successfully saved secret reminder" : "Successfully deleted secret reminder";
} else {
successMessage = "Successfully saved secrets";
}
createNotification({
type: isProtectedBranch && !personalAction ? "info" : "success",
text:
isProtectedBranch && !personalAction
? "Requested changes have been sent for review"
: "Successfully saved secrets"
: successMessage
});
} catch (error) {
console.log(error);