From 3e803debb444978e82ed355bd7d016c300fcaec0 Mon Sep 17 00:00:00 2001 From: Carlos Monastyrski Date: Mon, 4 Aug 2025 18:22:30 -0300 Subject: [PATCH] Allow users to type the same original value on bulk commits and remove them if no changes are left --- .../components/SecretListView/SecretItem.tsx | 2 +- .../SecretListView/SecretListView.tsx | 37 ++++++------------- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx index 1fe86da09..bf37810c0 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretItem.tsx @@ -222,7 +222,7 @@ export const SecretItem = memo( } if (isDirty && !isSubmitting && !isAutoSavingRef.current) { - const debounceTime = 600; + const debounceTime = 200; autoSaveTimeoutRef.current = setTimeout(() => { autoSaveChanges(formValues); diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx index 2602f1794..a0966bc5d 100644 --- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx +++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/SecretListView/SecretListView.tsx @@ -343,31 +343,18 @@ export const SecretListView = ({ id: orgSecret.id, type: PendingAction.Update, secretKey: trueOriginalSecret.key, - ...(key !== trueOriginalSecret.key && { newSecretName: key }), - ...(value !== trueOriginalSecret.value && { - originalValue: trueOriginalSecret.value, - secretValue: value - }), - ...(comment !== trueOriginalSecret.comment && { - originalComment: trueOriginalSecret.comment, - secretComment: comment - }), - ...(modSecret.skipMultilineEncoding !== - trueOriginalSecret.skipMultilineEncoding && { - originalSkipMultilineEncoding: trueOriginalSecret.skipMultilineEncoding, - skipMultilineEncoding: modSecret.skipMultilineEncoding - }), - ...(!isSameTags && { - originalTags: - trueOriginalSecret.tags?.map((tag) => ({ id: tag.id, slug: tag.slug })) || [], - tags: tags?.map((tag) => ({ id: tag.id, slug: tag.name || tag.slug || "" })) || [] - }), - ...(JSON.stringify(secretMetadata) !== - JSON.stringify(trueOriginalSecret.secretMetadata) && { - originalSecretMetadata: trueOriginalSecret.secretMetadata || [], - secretMetadata: secretMetadata || [] - }), - + newSecretName: key, + originalValue: trueOriginalSecret.value, + secretValue: value, + originalComment: trueOriginalSecret.comment, + secretComment: comment, + originalSkipMultilineEncoding: trueOriginalSecret.skipMultilineEncoding, + skipMultilineEncoding: modSecret.skipMultilineEncoding, + originalTags: + trueOriginalSecret.tags?.map((tag) => ({ id: tag.id, slug: tag.slug })) || [], + tags: tags?.map((tag) => ({ id: tag.id, slug: tag.name || tag.slug || "" })) || [], + originalSecretMetadata: trueOriginalSecret.secretMetadata || [], + secretMetadata: secretMetadata || [], timestamp: Date.now(), resourceType: "secret", existingSecret: orgSecret