diff --git a/package-lock.json b/package-lock.json index 13d613ea9..9988c8b5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "0.1.0", "license": "AGPL-3.0", "dependencies": { - "@edx/brand": "npm:@edx/brand-openedx@1.1.0", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/frontend-component-footer": "12.1.0", "@edx/frontend-component-header": "4.3.0", "@edx/frontend-platform": "4.6.3", @@ -1857,10 +1857,10 @@ } }, "node_modules/@edx/brand": { - "name": "@edx/brand-openedx", - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@edx/brand-openedx/-/brand-openedx-1.1.0.tgz", - "integrity": "sha512-ne2ZKF1r0akkt0rEzCAQAk4cTDTI2GiWCpc+T7ldQpw9X57OnUB16dKsFNe40C9uEjL5h3Ps/ZsFM5dm4cIkEQ==" + "name": "@openedx/brand-openedx", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@openedx/brand-openedx/-/brand-openedx-1.2.2.tgz", + "integrity": "sha512-mBvxR7aB9290j9+h3d/9G8VkG1b8ecLSmlxc0vskfm7DL/fKUzFmHAj3PI7Z4kkwCQOL4QT5mJHJKC0ZFf7qvQ==" }, "node_modules/@edx/browserslist-config": { "version": "1.2.0", diff --git a/package.json b/package.json index 38fcf54ad..14e0f9a68 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "url": "https://github.com/openedx/frontend-app-discussions/issues" }, "dependencies": { - "@edx/brand": "npm:@edx/brand-openedx@1.1.0", + "@edx/brand": "npm:@openedx/brand-openedx@^1.2.2", "@edx/frontend-component-footer": "12.1.0", "@edx/frontend-component-header": "4.3.0", "@edx/frontend-platform": "4.6.3", diff --git a/src/discussions/common/ActionsDropdown.jsx b/src/discussions/common/ActionsDropdown.jsx index f699473c2..110219d3d 100644 --- a/src/discussions/common/ActionsDropdown.jsx +++ b/src/discussions/common/ActionsDropdown.jsx @@ -68,7 +68,7 @@ const ActionsDropdown = ({ disabled={disabled} size={iconSize} ref={buttonRef} - iconClassNames={dropDownIconSize ? 'dropdown-icon-dimentions' : ''} + iconClassNames={dropDownIconSize ? 'dropdown-icon-dimensions' : ''} />
{ @@ -30,10 +30,10 @@ const Confirmation = ({ - + {intl.formatMessage(messages.confirmationCancel)} - @@ -45,16 +45,16 @@ const Confirmation = ({ Confirmation.propTypes = { isOpen: PropTypes.bool.isRequired, onClose: PropTypes.func.isRequired, - comfirmAction: PropTypes.func.isRequired, + confirmAction: PropTypes.func.isRequired, title: PropTypes.string.isRequired, description: PropTypes.string.isRequired, - closeButtonVaraint: PropTypes.string, + closeButtonVariant: PropTypes.string, confirmButtonVariant: PropTypes.string, confirmButtonText: PropTypes.string, }; Confirmation.defaultProps = { - closeButtonVaraint: 'default', + closeButtonVariant: 'default', confirmButtonVariant: 'primary', confirmButtonText: '', }; diff --git a/src/discussions/common/HoverCard.jsx b/src/discussions/common/HoverCard.jsx index 05c51cbe2..62eab556f 100644 --- a/src/discussions/common/HoverCard.jsx +++ b/src/discussions/common/HoverCard.jsx @@ -31,7 +31,7 @@ const HoverCard = ({ const intl = useIntl(); const { enableInContextSidebar } = useContext(DiscussionContext); const { isClosed } = useContext(PostCommentsContext); - const isUserPrivilagedInPostingRestriction = useUserPostingEnabled(); + const isUserPrivilegedInPostingRestriction = useUserPostingEnabled(); return (
- {isUserPrivilagedInPostingRestriction && ( + {isUserPrivilegedInPostingRestriction && (
@@ -90,7 +90,7 @@ const CommentsView = ({ endorsed }) => { {handleDefinition(messages.responseCount, unEndorsedCommentsIds.length)} {unEndorsedCommentsIds.length === 0 &&
} {handleComments(unEndorsedCommentsIds, false)} - {(isUserPrivilagedInPostingRestriction && !!unEndorsedCommentsIds.length && !isClosed) && ( + {(isUserPrivilegedInPostingRestriction && !!unEndorsedCommentsIds.length && !isClosed) && (
{!addingResponse && (
) : ( - !isClosed && isUserPrivilagedInPostingRestriction && (inlineReplies.length >= 5) && ( + !isClosed && isUserPrivilegedInPostingRestriction && (inlineReplies.length >= 5) && (
diff --git a/src/discussions/posts/post-editor/PostEditor.test.jsx b/src/discussions/posts/post-editor/PostEditor.test.jsx index 6c8851b5e..1c8bda181 100644 --- a/src/discussions/posts/post-editor/PostEditor.test.jsx +++ b/src/discussions/posts/post-editor/PostEditor.test.jsx @@ -118,7 +118,7 @@ describe('PostEditor', () => { expect(screen.queryAllByRole('radio')).toHaveLength(2); // 2 categories with 4 subcategories each expect(screen.queryAllByText(/category-\d-topic \d/)).toHaveLength(8); - // 3 non courseare topics + // 3 non courseware topics expect(screen.queryAllByText(/ncw-topic \d/)).toHaveLength(3); expect(screen.queryByText('cohort', { exact: false })).not.toBeInTheDocument(); expect(screen.queryByText('Post anonymously')).not.toBeInTheDocument(); @@ -199,7 +199,7 @@ describe('PostEditor', () => { await renderComponent(); // Initially the user can't select a cohort expect(screen.queryByRole('combobox', { name: /cohort visibility/i })).not.toBeInTheDocument(); - // All coursweare topics are divided + // All courseware topics are divided [1, 2].forEach(catId => { [1, 2, 3, 4].forEach((topicId) => { act(() => { diff --git a/src/discussions/posts/post/LikeButton.jsx b/src/discussions/posts/post/LikeButton.jsx index 6adee2de8..afc4b1a60 100644 --- a/src/discussions/posts/post/LikeButton.jsx +++ b/src/discussions/posts/post/LikeButton.jsx @@ -31,10 +31,10 @@ const LikeButton = ({ count, onClick, voted }) => {
diff --git a/src/discussions/posts/post/Post.jsx b/src/discussions/posts/post/Post.jsx index 0911dc762..1f7ee1f92 100644 --- a/src/discussions/posts/post/Post.jsx +++ b/src/discussions/posts/post/Post.jsx @@ -138,8 +138,8 @@ const Post = ({ handleAddResponseButton }) => { title={intl.formatMessage(messages.deletePostTitle)} description={intl.formatMessage(messages.deletePostDescription)} onClose={hideDeleteConfirmation} - comfirmAction={handleDeleteConfirmation} - closeButtonVaraint="tertiary" + confirmAction={handleDeleteConfirmation} + closeButtonVariant="tertiary" confirmButtonText={intl.formatMessage(messages.deleteConfirmationDelete)} /> {!abuseFlagged && ( @@ -148,7 +148,7 @@ const Post = ({ handleAddResponseButton }) => { title={intl.formatMessage(messages.reportPostTitle)} description={intl.formatMessage(messages.reportPostDescription)} onClose={hideReportConfirmation} - comfirmAction={handleReportConfirmation} + confirmAction={handleReportConfirmation} confirmButtonVariant="danger" /> )} diff --git a/src/discussions/posts/post/PostFooter.jsx b/src/discussions/posts/post/PostFooter.jsx index e57ac8bc4..131e60bcd 100644 --- a/src/discussions/posts/post/PostFooter.jsx +++ b/src/discussions/posts/post/PostFooter.jsx @@ -56,8 +56,8 @@ const PostFooter = ({ return true; }} iconAs={Icon} - iconClassNames="follow-icon-dimentions" - className="post-footer-icon-dimentions" + iconClassNames="follow-icon-dimensions" + className="post-footer-icon-dimensions" alt="Follow" /> diff --git a/src/discussions/tours/data/api.js b/src/discussions/tours/data/api.js index e01bafe59..938f66584 100644 --- a/src/discussions/tours/data/api.js +++ b/src/discussions/tours/data/api.js @@ -9,7 +9,7 @@ export const getDiscussionTourUrl = () => `${getConfig().LMS_BASE_URL}/api/user_ * This function makes an HTTP GET request to the API to retrieve a list of tours for the authenticated user. * @returns {Promise} - A promise that resolves to the API response data. */ -export async function getDiscssionTours() { +export async function getDiscussionTours() { const { data } = await getAuthenticatedHttpClient() .get(getDiscussionTourUrl()); return data; diff --git a/src/discussions/tours/data/thunks.js b/src/discussions/tours/data/thunks.js index 7cebe0548..aa6fa4e6d 100644 --- a/src/discussions/tours/data/thunks.js +++ b/src/discussions/tours/data/thunks.js @@ -1,7 +1,7 @@ import { camelCaseObject } from '@edx/frontend-platform'; import { logError } from '@edx/frontend-platform/logging'; -import { getDiscssionTours, updateDiscussionTour } from './api'; +import { getDiscussionTours, updateDiscussionTour } from './api'; import { discussionsTourRequest, discussionsToursRequestError, @@ -21,7 +21,7 @@ export function fetchDiscussionTours() { return async (dispatch) => { try { dispatch(discussionsTourRequest()); - const data = await getDiscssionTours(); + const data = await getDiscussionTours(); dispatch(fetchUserDiscussionsToursSuccess(camelCaseObject(normaliseTourData(data)))); } catch (error) { dispatch(discussionsToursRequestError()); diff --git a/src/index.scss b/src/index.scss index 8fdbb139f..613e10cd7 100755 --- a/src/index.scss +++ b/src/index.scss @@ -69,22 +69,22 @@ $fa-font-path: "~font-awesome/fonts"; font-family: "Inter"; } -.post-footer-icon-dimentions { +.post-footer-icon-dimensions { width: 32px !important; height: 32px !important; } -.like-icon-dimentions { +.like-icon-dimensions { width: 21px !important; height: 23px !important; } -.follow-icon-dimentions { +.follow-icon-dimensions { width: 21px !important; height: 24px !important; } -.dropdown-icon-dimentions { +.dropdown-icon-dimensions { width: 20px !important; height: 21px !important; } @@ -469,7 +469,7 @@ header { } } -.spinner-dimentions { +.spinner-dimensions { height: 24px !important; width: 24px !important; }