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: update mapToModifyIdentityRequests to properly populate ModifyId… #318

Merged
merged 3 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
88 changes: 88 additions & 0 deletions src/settings/accounts-settings.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1328,6 +1328,94 @@ describe('Account setting', () => {
).toBeVisible();
});

test('When modify an identity, should populate a ModifyIdentityRequest', 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 }));

const request = await pendingBatchRequest;

const requestBody = (request?.body as { Body: { BatchRequest: BatchRequest } }).Body;
CataldoMazzilli marked this conversation as resolved.
Show resolved Hide resolved
expect(requestBody.BatchRequest.CreateIdentityRequest).toBeUndefined();
expect(requestBody.BatchRequest.DeleteIdentityRequest).toBeUndefined();
expect(requestBody.BatchRequest.ModifyIdentityRequest).toHaveLength(1);

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

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
4 changes: 2 additions & 2 deletions src/settings/accounts-settings.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ function mapToDeleteIdentityRequests(deleteArray: Array<string>): Array<DeleteId
function mapToModifyIdentityRequests(
modifyRecord: Record<string, Partial<IdentityAttrs>>
): Array<ModifyIdentityRequest> {
return map(
modifyRecord.current,
return map<typeof modifyRecord, ModifyIdentityRequest>(
modifyRecord,
(item, index): ModifyIdentityRequest => ({
_jsns: 'urn:zimbraAccount',
identity: {
Expand Down