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.

Sign up for GitHub

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: improve accountStore update inside account setting onSave #349

Merged
merged 3 commits into from
Oct 23, 2023
Merged

fix: improve accountStore update inside account setting onSave #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82540fc
fix: improve accountStore update inside account setting onSave
CataldoMazzilli Oct 23, 2023
0899e5a
Merge branch 'devel' into SHELL-176-New-persona-from-name-input-field…
CataldoMazzilli Oct 23, 2023
4409490
Update src/settings/accounts-settings.test.tsx
CataldoMazzilli Oct 23, 2023
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
191 changes: 191 additions & 0 deletions src/settings/accounts-settings.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1417,6 +1417,197 @@ describe('Account setting', () => {
expect(successSnackbar).toBeVisible();
});

test('When modify an identity, the new value must be shown after save', async () => {
const defaultFirstName = faker.person.firstName();
const defaultLastName = faker.person.lastName();
const defaultFullName = faker.person.fullName({
firstName: defaultFirstName,
lastName: defaultLastName
});
const defaultEmail = faker.internet.email({
firstName: defaultFirstName,
lastName: defaultLastName
});
const defaultId = faker.string.uuid();

const identitiesArray: Array<Identity> = [
{
id: defaultId,
name: 'DEFAULT',
_attrs: {
zimbraPrefIdentityName: defaultFullName,
zimbraPrefReplyToEnabled: 'FALSE',
zimbraPrefFromDisplay: defaultFirstName,
zimbraPrefFromAddress: defaultEmail,
zimbraPrefIdentityId: defaultId,
zimbraPrefFromAddressType: 'sendAs'
}
}
];

const account: Account = {
name: defaultEmail,
rights: { targets: [] },
signatures: { signature: [] },
id: defaultId,
displayName: '',
identities: {
identity: identitiesArray
}
};
useAccountStore.setState((previousState) => ({
...previousState,
account,
settings: {
...previousState.settings,
attrs: {
...previousState.settings.attrs,
zimbraIdentityMaxNumEntries: 20
}
}
}));

server.use(
rest.post('/service/soap/BatchRequest', (req, res, ctx) =>
res(
ctx.json({
Body: {
BatchResponse: {
ModifyPrefsResponse: [{ _jsns: 'urn:zimbraAccount' }]
}
}
})
)
)
);

const batchRequestUrl = '/service/soap/BatchRequest';
const pendingBatchRequest = waitForRequest('POST', batchRequestUrl);
const { user } = setup(<AccountsSettings />);
await waitForGetRightsRequest();

const accountNameInput = screen.getByRole('textbox', { name: /account name/i });

const newName = 'Updated Name';
await user.clear(accountNameInput);
await user.type(accountNameInput, newName);

await user.click(screen.getByRole('button', { name: /save/i }));

await pendingBatchRequest;

const successSnackbar = await screen.findByText('Edits saved correctly');
expect(successSnackbar).toBeVisible();

expect(accountNameInput).toHaveDisplayValue(newName);
});

test('When delete an identity, it must not be present after save', async () => {
const defaultFirstName = faker.person.firstName();
const defaultLastName = faker.person.lastName();
const defaultFullName = faker.person.fullName({
firstName: defaultFirstName,
lastName: defaultLastName
});
const defaultEmail = faker.internet.email({
firstName: defaultFirstName,
lastName: defaultLastName
});
const defaultId = faker.string.uuid();

const persona1FullName = faker.person.fullName();
const persona1Email = faker.internet.email();
const persona1Id = faker.string.uuid();

const identitiesArray: Array<Identity> = [
{
id: persona1Id,
name: persona1FullName,
_attrs: {
zimbraPrefIdentityName: persona1FullName,
zimbraPrefReplyToEnabled: 'FALSE',
zimbraPrefFromDisplay: '',
zimbraPrefFromAddress: persona1Email,
zimbraPrefIdentityId: persona1Id,
zimbraPrefFromAddressType: 'sendAs'
}
},
{
id: defaultId,
name: 'DEFAULT',
_attrs: {
zimbraPrefIdentityName: defaultFullName,
zimbraPrefReplyToEnabled: 'FALSE',
zimbraPrefFromDisplay: defaultFirstName,
zimbraPrefFromAddress: defaultEmail,
zimbraPrefIdentityId: defaultId,
zimbraPrefFromAddressType: 'sendAs'
}
}
];

const account: Account = {
name: defaultEmail,
rights: { targets: [] },
signatures: { signature: [] },
id: defaultId,
displayName: '',
identities: {
identity: identitiesArray
}
};
useAccountStore.setState((previousState) => ({
...previousState,
account,
settings: {
...previousState.settings,
attrs: {
...previousState.settings.attrs,
zimbraIdentityMaxNumEntries: 20
}
}
}));

server.use(
rest.post('/service/soap/BatchRequest', (req, res, ctx) =>
res(
ctx.json({
Body: {
BatchResponse: {
ModifyPrefsResponse: [{ _jsns: 'urn:zimbraAccount' }]
}
}
})
)
)
);

const batchRequestUrl = '/service/soap/BatchRequest';
const pendingBatchRequest = waitForRequest('POST', batchRequestUrl);

const { user } = setup(<AccountsSettings />);
await waitForGetRightsRequest();
const persona1Row = screen.getByText(persona1FullName);
expect(persona1Row).toBeVisible();
await user.click(persona1Row);
await user.click(screen.getByRole('button', { name: /delete/i }));
const confirmButton = await screen.findByRole('button', { name: /delete permanently/i });
act(() => {
// run modal timers
jest.runOnlyPendingTimers();
});
await user.click(confirmButton);

await user.click(screen.getByRole('button', { name: /save/i }));

await pendingBatchRequest;

const successSnackbar = await screen.findByText('Edits saved correctly');
expect(successSnackbar).toBeVisible();

expect(screen.queryByText(persona1FullName)).not.toBeInTheDocument();
});

test('Should reset the updated identity name on discard changes(default case)', async () => {
const defaultFirstName = faker.person.firstName();
const defaultLastName = faker.person.lastName();
Expand Down
2 changes: 1 addition & 1 deletion src/settings/accounts-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,6 @@ export const AccountsSettings = (): React.JSX.Element => {
autoHideTimeout: 3000,
hideButton: true
});
resetLists();
useAccountStore.setState(
produce((prevState: AccountState) => {
if (prevState.account) {
Expand All @@ -334,6 +333,7 @@ export const AccountsSettings = (): React.JSX.Element => {
delegatedSendSaveTargetRef.current || '';
})
);
resetLists();
})
.catch((error: unknown) => {
createSnackbar({
Expand Down