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 #4676 from Infisical/fix/overviewEditRowFetchSecret

Browse Source 
Fix secret value fetching to prioritize folder secrets over imported ones
This commit is contained in:
carlosmonastyrski
2025-10-14 21:09:08 -03:00
committed by GitHub
parent bbdde04fd9 fad4b13758
commit 4092325a02
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx
View File

@@ -82,6 +82,7 @@ type Props = {
isImported: boolean; isImported: boolean;
}[]; }[];
}[]; }[];
isSecretPresent?: boolean;
}; };
export const SecretEditRow = ({ export const SecretEditRow = ({
@@ -101,7 +102,8 @@ export const SecretEditRow = ({
isRotatedSecret, isRotatedSecret,
importedBy, importedBy,
importedSecret, importedSecret,
isEmpty isEmpty,
isSecretPresent
}: Props) => { }: Props) => {
const { handlePopUpOpen, handlePopUpToggle, handlePopUpClose, popUp } = usePopUp([ const { handlePopUpOpen, handlePopUpToggle, handlePopUpClose, popUp } = usePopUp([
"editSecret" "editSecret"
@@ -113,20 +115,21 @@ export const SecretEditRow = ({
const [isFieldFocused, setIsFieldFocused] = useToggle(); const [isFieldFocused, setIsFieldFocused] = useToggle();
const fetchSecretValueParams = importedSecret const fetchSecretValueParams =
? { importedSecret && !isSecretPresent
environment: importedSecret.environment, ? {
secretPath: importedSecret.secretPath, environment: importedSecret.environment,
secretKey: importedSecret.secret?.key ?? "", secretPath: importedSecret.secretPath,
projectId: currentProject.id secretKey: importedSecret.secret?.key ?? "",
} projectId: currentProject.id
: { }
environment, : {
secretPath, environment,
secretKey: secretName, secretPath,
projectId: currentProject.id, secretKey: secretName,
isOverride projectId: currentProject.id,
}; isOverride
};
// scott: only fetch value if secret exists, has non-empty value and user has permission // scott: only fetch value if secret exists, has non-empty value and user has permission
const canFetchValue = Boolean(importedSecret ?? secretId) && !isEmpty && !secretValueHidden; const canFetchValue = Boolean(importedSecret ?? secretId) && !isEmpty && !secretValueHidden;

1
frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx
View File

@@ -284,6 +284,7 @@ export const SecretOverviewTableRow = ({
environment={slug} environment={slug}
isRotatedSecret={secret?.isRotatedSecret} isRotatedSecret={secret?.isRotatedSecret}
importedBy={importedBy} importedBy={importedBy}
isSecretPresent={Boolean(secret)}
/> />
</td> </td>
</tr> </tr>