Skip to content

Commit 4c27603

Browse files
committed
feat: improve sealed secret component
1 parent 899e747 commit 4c27603

1 file changed

Lines changed: 5 additions & 13 deletions

File tree

src/pages/secrets/create-edit/SecretCreateEditPage.tsx

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import ControlledCheckbox from 'components/forms/ControlledCheckbox'
1818
import AdvancedSettings from 'components/AdvancedSettings'
1919
import { yupResolver } from '@hookform/resolvers/yup'
2020
import { useEffect } from 'react'
21-
import { cloneDeep, isEmpty } from 'lodash'
21+
import { cloneDeep, isEmpty, isEqual } from 'lodash'
2222
import { LoadingButton } from '@mui/lab'
2323
import DeleteButton from 'components/DeleteButton'
2424
import { encryptSecretItem } from 'utils/sealedSecretsUtils'
@@ -134,15 +134,7 @@ export default function SecretCreateEditPage({
134134

135135
useEffect(() => {
136136
// If we have data, we reset the form with the converted data
137-
if (data) {
138-
const formData = cloneDeep(data) as SealedSecretFormData
139-
formData.encryptedData = mapObjectToKeyValueArray(formData?.encryptedData as Record<string, string>)
140-
formData.metadata.annotations = mapObjectToKeyValueArray(
141-
formData?.metadata?.annotations as Record<string, string>,
142-
)
143-
formData.metadata.labels = mapObjectToKeyValueArray(formData?.metadata?.labels as Record<string, string>)
144-
reset(formData as CreateSealedSecretApiResponse)
145-
}
137+
if (data) reset(formData as CreateSealedSecretApiResponse)
146138
}, [data])
147139

148140
useEffect(() => {
@@ -341,8 +333,8 @@ secret'
341333
<DeleteButton
342334
onDelete={() => del({ teamId, sealedSecretName })}
343335
resourceName={watch('name')}
344-
resourceType='sealed-secret'
345-
data-cy='button-delete-sealed-secret'
336+
resourceType='secret'
337+
data-cy='button-delete-secret'
346338
sx={{ float: 'right', textTransform: 'capitalize', ml: 2 }}
347339
loading={isLoadingDelete}
348340
disabled={isLoadingDelete || isLoadingCreate || isLoadingUpdate}
@@ -354,7 +346,7 @@ secret'
354346
color='primary'
355347
sx={{ float: 'right', textTransform: 'none' }}
356348
loading={isLoadingCreate || isLoadingUpdate}
357-
disabled={isLoadingCreate || isLoadingUpdate || isLoadingDelete}
349+
disabled={isLoadingCreate || isLoadingUpdate || isLoadingDelete || isEqual(formData, watch())}
358350
>
359351
{sealedSecretName ? 'Save Changes' : 'Create Secret'}
360352
</LoadingButton>

0 commit comments

Comments
 (0)