Skip to content

Commit

Permalink
Merge branch 'master' into dnuon/courseware-search-component
Browse files Browse the repository at this point in the history
  • Loading branch information
davidnuon committed Oct 20, 2023
2 parents 692813f + 00e7680 commit e074643
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 14 deletions.
24 changes: 15 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,10 @@
"url": "https://github.com/openedx/frontend-app-learning/issues"
},
"dependencies": {
"@edx/brand": "npm:@edx/[email protected].0",
"@edx/brand": "npm:@openedx/brand-openedx@^1.2.2",
"@edx/frontend-component-footer": "12.2.1",
"@edx/frontend-component-header": "4.6.0",
"@edx/frontend-lib-learning-assistant": "^1.14.0",
"@edx/frontend-lib-learning-assistant": "^1.16.0",
"@edx/frontend-lib-special-exams": "2.23.3",
"@edx/frontend-platform": "5.5.2",
"@edx/paragon": "20.46.0",
Expand Down
2 changes: 0 additions & 2 deletions src/course-home/courseware-search/CoursewareSearch.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import { setShowSearch } from '../data/slice';
import { useElementBoundingBox, useLockScroll } from './hooks';
import messages from './messages';

import CoursewareSearchBar from './CoursewareSearchBar';

const CoursewareSearch = ({ intl, ...sectionProps }) => {
const dispatch = useDispatch();

Expand Down
3 changes: 3 additions & 0 deletions src/course-home/courseware-search/CoursewareSearch.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ describe('CoursewareSearch', () => {
describe('when rendering normally', () => {
beforeAll(() => {
useElementBoundingBox.mockImplementation(() => ({ top: tabsTopPosition }));
});

beforeEach(() => {
renderComponent();
});

Expand Down
1 change: 0 additions & 1 deletion src/course-home/courseware-search/messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ const messages = defineMessages({
defaultMessage: 'Search this course',
description: 'Title for the Courseware Search module.',
},

searchBarPlaceholderText: {
id: 'learn.coursewareSerch.searchBarPlaceholderText',
defaultMessage: 'Search',
Expand Down

0 comments on commit e074643

Please sign in to comment.