Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Credentials save button is hidden unless you make changes to the #11492

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ const isDeleting = ref(false);
const isSaving = ref(false);
const isTesting = ref(false);
const hasUnsavedChanges = ref(false);
const isSaved = ref(false);
const loading = ref(false);
const showValidationWarning = ref(false);
const testedSuccessfully = ref(false);
Expand Down Expand Up @@ -318,8 +319,8 @@ const defaultCredentialTypeName = computed(() => {

const showSaveButton = computed(() => {
return (
(hasUnsavedChanges.value || !!credentialId.value) &&
(credentialPermissions.value.create || credentialPermissions.value.update)
(props.mode === 'new' || hasUnsavedChanges.value || isSaved.value) &&
(credentialPermissions.value.create ?? credentialPermissions.value.update)
);
});

Expand Down Expand Up @@ -828,6 +829,7 @@ async function updateCredential(
isSharedWithChanged.value = false;
}
hasUnsavedChanges.value = false;
isSaved.value = true;

if (credential) {
await externalHooks.run('credential.saved', {
Expand Down Expand Up @@ -879,6 +881,7 @@ async function deleteCredential() {
isDeleting.value = true;
await credentialsStore.deleteCredential({ id: credentialId.value });
hasUnsavedChanges.value = false;
isSaved.value = true;
} catch (error) {
toast.showError(
error,
Expand Down Expand Up @@ -1064,7 +1067,7 @@ function resetCredentialData(): void {
/>
<SaveButton
v-if="showSaveButton"
:saved="!hasUnsavedChanges && !isTesting"
:saved="!hasUnsavedChanges && !isTesting && !!credentialId"
:is-saving="isSaving || isTesting"
:saving-label="
isTesting
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
import { createComponentRenderer } from '@/__tests__/render';
import CredentialEdit from '@/components/CredentialEdit/CredentialEdit.vue';
import { createTestingPinia } from '@pinia/testing';
import { CREDENTIAL_EDIT_MODAL_KEY, STORES } from '@/constants';
import { cleanupAppModals, createAppModals, retry } from '@/__tests__/utils';

vi.mock('@/permissions', () => ({
getResourcePermissions: vi.fn(() => ({
credential: {
create: true,
update: true,
},
})),
}));

const renderComponent = createComponentRenderer(CredentialEdit, {
pinia: createTestingPinia({
initialState: {
[STORES.UI]: {
modalsById: {
[CREDENTIAL_EDIT_MODAL_KEY]: { open: true },
},
},
[STORES.SETTINGS]: {
settings: {
templates: {
host: '',
},
},
},
},
}),
});
describe('CredentialEdit', () => {
beforeEach(() => {
createAppModals();
});

afterEach(() => {
cleanupAppModals();
vi.clearAllMocks();
});

test('shows the save button when credentialId is null', async () => {
const { queryByTestId } = renderComponent({
props: {
isTesting: false,
isSaving: false,
hasUnsavedChanges: false,
modalName: CREDENTIAL_EDIT_MODAL_KEY,
mode: 'new',
},
});
await retry(() => expect(queryByTestId('credential-save-button')).toBeInTheDocument());
});

test('hides the save button when credentialId exists and there are no unsaved changes', async () => {
const { queryByTestId } = renderComponent({
props: {
activeId: '123', // credentialId will be set to this value in edit mode
isTesting: false,
isSaving: false,
hasUnsavedChanges: false,
modalName: CREDENTIAL_EDIT_MODAL_KEY,
mode: 'edit',
},
});
await retry(() => expect(queryByTestId('credential-save-button')).not.toBeInTheDocument());
});
});
Loading