awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-07 13:27:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3042 from Infisical/daniel/fix-approvals-for-personal-secrets

Browse Source 
fix: approvals triggering for personal secrets
This commit is contained in:
Daniel Hougaard
2025-01-25 04:50:19 +01:00
committed by GitHub
parent d7503573b1 08a0550cd7
commit a93bfa69c9
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx
+16 -6
View File
@@ -180,10 +180,12 @@ export const SecretListView = ({
try { try {
// personal secret change // personal secret change
let personalAction = false;
if (overrideAction === "deleted") { if (overrideAction === "deleted") {
await handleSecretOperation("delete", SecretType.Personal, oldKey, { await handleSecretOperation("delete", SecretType.Personal, oldKey, {
secretId: orgSecret.idOverride secretId: orgSecret.idOverride
}); });
personalAction = true;
} else if (overrideAction && idOverride) { } else if (overrideAction && idOverride) {
await handleSecretOperation("update", SecretType.Personal, oldKey, { await handleSecretOperation("update", SecretType.Personal, oldKey, {
value: valueOverride, value: valueOverride,
@@ -191,14 +193,16 @@ export const SecretListView = ({
secretId: orgSecret.idOverride, secretId: orgSecret.idOverride,
skipMultilineEncoding: modSecret.skipMultilineEncoding skipMultilineEncoding: modSecret.skipMultilineEncoding
}); });
personalAction = true;
} else if (overrideAction) { } else if (overrideAction) {
await handleSecretOperation("create", SecretType.Personal, oldKey, { await handleSecretOperation("create", SecretType.Personal, oldKey, {
value: valueOverride value: valueOverride
}); });
personalAction = true;
} }
// shared secret change // shared secret change
if (!isSharedSecUnchanged) { if (!isSharedSecUnchanged && !personalAction) {
await handleSecretOperation("update", SecretType.Shared, oldKey, { await handleSecretOperation("update", SecretType.Shared, oldKey, {
value, value,
tags: tagIds, tags: tagIds,
@@ -232,10 +236,11 @@ export const SecretListView = ({
}); });
handlePopUpClose("secretDetail"); handlePopUpClose("secretDetail");
createNotification({ createNotification({
type: isProtectedBranch ? "info" : "success", type: isProtectedBranch && !personalAction ? "info" : "success",
text: isProtectedBranch text:
? "Requested changes have been sent for review" isProtectedBranch && !personalAction
: "Successfully saved secrets" ? "Requested changes have been sent for review"
: "Successfully saved secrets"
}); });
} catch (error) { } catch (error) {
console.log(error); console.log(error);
@@ -283,7 +288,12 @@ export const SecretListView = ({
text: "Failed to delete secret" text: "Failed to delete secret"
}); });
} }
}, [(popUp.deleteSecret?.data as SecretV3RawSanitized)?.key, environment, secretPath]); }, [
(popUp.deleteSecret?.data as SecretV3RawSanitized)?.key,
environment,
secretPath,
isProtectedBranch
]);
// for optimization on minimise re-rendering of secret items // for optimization on minimise re-rendering of secret items
const onCreateTag = useCallback(() => handlePopUpOpen("createTag"), []); const onCreateTag = useCallback(() => handlePopUpOpen("createTag"), []);