Removing unused diffs and fix librarypage tests

learningequality · Aug 23, 2024 · 4953fe7 · 4953fe7
1 parent 981bac5
commit 4953fe7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
@@ -174,7 +174,6 @@
   import appCapabilities, { checkCapability } from 'kolibri.utils.appCapabilities';
   import LearningActivityChip from 'kolibri-common/components/ResourceDisplayAndSearch/LearningActivityChip.vue';
   import { searchKeys } from 'kolibri-common/composables/useBaseSearch';
-  import useSearch from '../../composables/useSearch';
   import SidePanelModal from '../SidePanelModal';
   import SearchFiltersPanel from '../SearchFiltersPanel';
   import { KolibriStudioId, PageNames } from '../../constants';
@@ -187,6 +186,7 @@
     setCurrentDevice,
     StudioNotAllowedError,
   } from '../../composables/useDevices';
+  import useSearch from '../../composables/useSearch';
   import useLearnerResources from '../../composables/useLearnerResources';
   import BrowseResourceMetadata from '../BrowseResourceMetadata';
   import commonLearnStrings from '../commonLearnStrings';
@@ -235,8 +235,6 @@
         isLearnerOnlyImport,
       } = useUser();
       const { allowDownloadOnMeteredConnection } = useDeviceSettings();
-      const { baseurl, deviceName } = currentDeviceData();
-
       const {
         searchTerms,
         displayingSearchResults,
@@ -263,6 +261,7 @@
       const { canAddDownloads, canDownloadExternally } = useCoreLearn();
       const { currentCardViewStyle } = useCardViewStyle();
       const { back } = useContentLink();
+      const { baseurl, deviceName } = currentDeviceData();
       const { fetchChannels } = useChannels();
 
       onMounted(() => {

diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
@@ -363,8 +363,6 @@
       const store = currentInstance.$store;
       const router = currentInstance.$router;
       const topic = ref(null);
-      const { fetchContentNodeProgress, fetchContentNodeTreeProgress } = useContentNodeProgress();
-
       const {
         searchTerms,
         displayingSearchResults,
@@ -381,6 +379,7 @@
       const { back, genContentLinkKeepCurrentBackLink } = useContentLink();
       const { windowBreakpoint, windowIsLarge, windowIsSmall } = useKResponsiveWindow();
       const { channelsMap, fetchChannels } = useChannels();
+      const { fetchContentNodeProgress, fetchContentNodeTreeProgress } = useContentNodeProgress();
       const { isUserLoggedIn, isCoach, isAdmin, isSuperuser } = useUser();
       const { fetchUserDownloadRequests } = useDownloadRequests(store);
 

diff --git a/kolibri/plugins/learn/assets/test/views/library-page.spec.js b/kolibri/plugins/learn/assets/test/views/library-page.spec.js
@@ -39,11 +39,11 @@ const CHANNEL = {
 jest.mock('../../src/composables/useChannels');
 jest.mock('../../src/composables/useCardLayoutSpan');
 jest.mock('../../src/composables/useDevices');
-jest.mock('kolibri-common/composables/useBaseSearch');
 jest.mock('../../src/composables/useLearnerResources');
 jest.mock('../../src/composables/useLearningActivities');
 jest.mock('../../src/composables/useContentLink');
 jest.mock('../../src/composables/usePinnedDevices');
+jest.mock('kolibri-common/composables/useBaseSearch');
 jest.mock('kolibri.coreVue.composables.useUser');
 jest.mock('kolibri-design-system/lib/composables/useKResponsiveWindow');
 jest.mock('kolibri.resources');
@@ -118,7 +118,7 @@ describe('LibraryPage', () => {
       const wrapper = await makeWrapper();
       expect(wrapper.find('[data-test="filter-button"').element).toBeFalsy();
     });
-    it('is hidden when the page is large and channels are available', async () => {
+    it.only('is hidden when the page is large and channels are available', async () => {
       useKResponsiveWindow.mockImplementation(() => ({
         windowIsLarge: true,
       }));

diff --git a/kolibri/plugins/learn/assets/test/views/topics-page.spec.js b/kolibri/plugins/learn/assets/test/views/topics-page.spec.js
@@ -87,8 +87,8 @@ jest.mock('kolibri.client');
 jest.mock('kolibri.resources');
 jest.mock('kolibri.urls');
 jest.mock('kolibri.coreVue.composables.useUser');
-jest.mock('../../src/composables/useContentLink');
 jest.mock('kolibri-common/composables/useBaseSearch');
+jest.mock('../../src/composables/useContentLink');
 jest.mock('../../src/composables/useChannels');
 // Needed to test anything using mount() where children use this composable
 jest.mock('../../src/composables/useLearningActivities');

diff --git a/packages/kolibri-common/composables/__mocks__/useBaseSearch.js b/packages/kolibri-common/composables/__mocks__/useBaseSearch.js
@@ -71,7 +71,7 @@ export function useBaseSearchMock(overrides = {}) {
   };
 }
 
-export default jest.fn(() => useBaseSearch());
+export default jest.fn(() => useBaseSearchMock());
 
 export const injectBaseSearch = jest.fn(() => ({
   availableLearningActivities: [],

diff --git a/packages/kolibri-common/composables/useBaseSearch.js b/packages/kolibri-common/composables/useBaseSearch.js
@@ -238,7 +238,7 @@ export default function useBaseSearch({
   }
 
   function search() {
-    const currentBaseUrl = baseurl && get(baseurl);
+    const currentBaseUrl = get(baseurl);
     const getParams = {
       include_coach_content:
         store.getters.isAdmin || store.getters.isCoach || store.getters.isSuperuser,
@@ -367,7 +367,7 @@ export default function useBaseSearch({
 
   function ensureGlobalLabels() {
     set(globalLabelsLoading, true);
-    const currentBaseUrl = baseurl && get(baseurl);
+    const currentBaseUrl = get(baseurl);
     ContentNodeResource.fetchCollection({
       getParams: { max_results: 1, baseurl: currentBaseUrl },
     })