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

Jump to bottom

feat: show error msg from server on paste [FC-0062] #1378

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+44 −5
Open

feat: show error msg from server on paste [FC-0062] #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96f922f
feat: show error msg from server on paste
navinkarkera Oct 11, 2024
926da3c
test: err msg from server on paste
navinkarkera Oct 11, 2024
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
34 changes: 31 additions & 3 deletions src/library-authoring/add-content/AddContentContainer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ describe('<AddContentContainer />', () => {
});

it('should handle failure to paste content', async () => {
const { axiosMock } = initializeMocks();
const { axiosMock, mockShowToast } = initializeMocks();
// Simulate having an HTML block in the clipboard:
mockClipboardHtml.applyMock();

Expand All @@ -89,8 +89,36 @@ describe('<AddContentContainer />', () => {
const pasteButton = await screen.findByRole('button', { name: /paste from clipboard/i });
fireEvent.click(pasteButton);

await waitFor(() => expect(axiosMock.history.post[0].url).toEqual(pasteUrl));
await waitFor(() => {
expect(axiosMock.history.post[0].url).toEqual(pasteUrl);
expect(mockShowToast).toHaveBeenCalledWith('There was an error pasting the content.');
});
});

it('should handle failure to paste content and show server error if available', async () => {
const { axiosMock, mockShowToast } = initializeMocks();
// Simulate having an HTML block in the clipboard:
mockClipboardHtml.applyMock();

const errMsg = 'Libraries do not support this type of content yet.';
const pasteUrl = getLibraryPasteClipboardUrl(libraryId);

// eslint-disable-next-line prefer-promise-reject-errors
axiosMock.onPost(pasteUrl).reply(() => Promise.reject({
customAttributes: {
httpErrorStatus: 400,
httpErrorResponseData: JSON.stringify({ block_type: errMsg }),
},
}));
Comment on lines +107 to +112
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Did you try the createAxiosError function from the testUtils.tsx?


render();

const pasteButton = await screen.findByRole('button', { name: /paste from clipboard/i });
fireEvent.click(pasteButton);

// TODO: check that an actual error message is shown?!
await waitFor(() => {
expect(axiosMock.history.post[0].url).toEqual(pasteUrl);
expect(mockShowToast).toHaveBeenCalledWith(errMsg);
});
});
});
15 changes: 13 additions & 2 deletions src/library-authoring/add-content/AddContentContainer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,17 @@ const AddContentContainer = () => {
openComponentEditor,
} = useLibraryContext();

const parsePasteErrorMsg = (error) => {
let errMsg: string;
try {
const { customAttributes: { httpErrorResponseData } } = error;
errMsg = JSON.parse(httpErrorResponseData).block_type;
} catch (_err) {
errMsg = intl.formatMessage(messages.errorPasteClipboardMessage);
}
return errMsg;
};

const collectionButtonData = {
name: intl.formatMessage(messages.collectionButton),
disabled: false,
Expand Down Expand Up @@ -138,8 +149,8 @@ const AddContentContainer = () => {
blockId: `${uuid4()}`,
}).then(() => {
showToast(intl.formatMessage(messages.successPasteClipboardMessage));
}).catch(() => {
showToast(intl.formatMessage(messages.errorPasteClipboardMessage));
}).catch((error) => {
showToast(parsePasteErrorMsg(error));
});
} else if (blockType === 'collection') {
openCreateCollectionModal();
Expand Down