chore: Fix rebase conflicts and issues

src/course-unit/CourseUnit.jsx

@@ -124,8 +124,8 @@ const CourseUnit = ({ courseId }) => {
             <Layout.Element>
               <Stack gap={3}>
                 <Sidebar blockId={blockId} variant="publish" data-testid="course-unit-sidebar" />
-                <Sidebar variant="location" data-testid="course-unit-location-sidebar" />
                 <Sidebar variant="tags" />
+                <Sidebar variant="location" data-testid="course-unit-location-sidebar" />
               </Stack>
             </Layout.Element>
           </Layout>

src/course-unit/CourseUnit.test.jsx

@@ -44,6 +44,7 @@ import deleteModalMessages from '../generic/delete-modal/messages';
 import courseXBlockMessages from './course-xblock/messages';
 import addComponentMessages from './add-component/messages';
 import { PUBLISH_TYPES, UNIT_VISIBILITY_STATES } from './constants';
+import { getContentTaxonomyTagsApiUrl, getContentTaxonomyTagsCountApiUrl } from '../content-tags-drawer/data/api';
 
 let axiosMock;
 let store;
@@ -59,6 +60,31 @@ jest.mock('react-router-dom', () => ({
   useNavigate: () => mockedUsedNavigate,
 }));
 
+jest.mock('@tanstack/react-query', () => ({
+  useQuery: jest.fn(({ queryKey }) => {
+    if (queryKey[0] === 'contentTaxonomyTags') {
+      return {
+        data: {
+          taxonomies: [],
+        },
+        isSuccess: true,
+      };
+    } if (queryKey[0] === 'contentTaxonomyTagsCount') {
+      return {
+        data: 17,
+        isSuccess: true,
+      };
+    }
+    return {
+      data: {},
+      isSuccess: true,
+    };
+  }),
+  useQueryClient: jest.fn(() => ({
+    setQueryData: jest.fn(),
+  })),
+}));
+
 const RootWrapper = () => (
   <AppProvider store={store}>
     <IntlProvider locale="en">
@@ -92,6 +118,12 @@ describe('<CourseUnit />', () => {
       .onGet(getCourseVerticalChildrenApiUrl(blockId))
       .reply(200, courseVerticalChildrenMock);
     await executeThunk(fetchCourseVerticalChildrenData(blockId), store.dispatch);
+    axiosMock
+      .onGet(getContentTaxonomyTagsApiUrl(blockId))
+      .reply(200, {});
+    axiosMock
+      .onGet(getContentTaxonomyTagsCountApiUrl(blockId))
+      .reply(200, 17);
   });
 
   it('render CourseUnit component correctly', async () => {

src/course-unit/course-sequence/sequence-navigation/SequenceNavigationTabs.jsx

@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
 import PropTypes from 'prop-types';
-import { Link, useNavigate } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { Button } from '@openedx/paragon';
 import { Plus as PlusIcon } from '@openedx/paragon/icons';
 import { useIntl } from '@edx/frontend-platform/i18n';