diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx index b0f9f7666..1a33bbca1 100644 --- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx +++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretEditRow.tsx @@ -82,6 +82,7 @@ type Props = { isImported: boolean; }[]; }[]; + isSecretPresent?: boolean; }; export const SecretEditRow = ({ @@ -101,7 +102,8 @@ export const SecretEditRow = ({ isRotatedSecret, importedBy, importedSecret, - isEmpty + isEmpty, + isSecretPresent }: Props) => { const { handlePopUpOpen, handlePopUpToggle, handlePopUpClose, popUp } = usePopUp([ "editSecret" @@ -113,20 +115,21 @@ export const SecretEditRow = ({ const [isFieldFocused, setIsFieldFocused] = useToggle(); - const fetchSecretValueParams = importedSecret - ? { - environment: importedSecret.environment, - secretPath: importedSecret.secretPath, - secretKey: importedSecret.secret?.key ?? "", - projectId: currentProject.id - } - : { - environment, - secretPath, - secretKey: secretName, - projectId: currentProject.id, - isOverride - }; + const fetchSecretValueParams = + importedSecret && !isSecretPresent + ? { + environment: importedSecret.environment, + secretPath: importedSecret.secretPath, + secretKey: importedSecret.secret?.key ?? "", + projectId: currentProject.id + } + : { + environment, + secretPath, + secretKey: secretName, + projectId: currentProject.id, + isOverride + }; // scott: only fetch value if secret exists, has non-empty value and user has permission const canFetchValue = Boolean(importedSecret ?? secretId) && !isEmpty && !secretValueHidden; diff --git a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx index 2a2e1a76a..2099d812d 100644 --- a/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx +++ b/frontend/src/pages/secret-manager/OverviewPage/components/SecretOverviewTableRow/SecretOverviewTableRow.tsx @@ -284,6 +284,7 @@ export const SecretOverviewTableRow = ({ environment={slug} isRotatedSecret={secret?.isRotatedSecret} importedBy={importedBy} + isSecretPresent={Boolean(secret)} />