From 7ba65431ba9696a4d36f473ee3c29538de49ddc2 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 24 Oct 2024 15:24:06 -0700
Subject: [PATCH 1/4] move useChannels to kolibri-common

---
 kolibri/plugins/learn/assets/src/composables/useDevices.js   | 2 +-
 kolibri/plugins/learn/assets/src/routes/index.js             | 2 +-
 kolibri/plugins/learn/assets/src/views/CardList.vue          | 2 +-
 .../src/views/ChannelRenderer/CustomContentRenderer.vue      | 2 +-
 .../assets/src/views/HomePage/__tests__/HomePage.spec.js     | 5 +++--
 kolibri/plugins/learn/assets/src/views/HomePage/index.vue    | 2 +-
 .../assets/src/views/HybridLearningContentCard/index.vue     | 2 +-
 kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue | 2 +-
 kolibri/plugins/learn/assets/src/views/SearchResultsGrid.vue | 2 +-
 kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue | 2 +-
 kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue  | 2 +-
 .../assets/src/views/thumbnails/ContentNodeThumbnail.vue     | 2 +-
 .../learn/assets/test/views/explore-libraries-page.spec.js   | 2 +-
 kolibri/plugins/learn/assets/test/views/library-page.spec.js | 4 ++--
 .../plugins/learn/assets/test/views/topic-content.spec.js    | 5 +++--
 kolibri/plugins/learn/assets/test/views/topics-page.spec.js  | 5 +++--
 .../kolibri-common}/composables/__mocks__/useChannels.js     | 0
 .../kolibri-common}/composables/useChannels.js               | 0
 18 files changed, 23 insertions(+), 20 deletions(-)
 rename {kolibri/plugins/learn/assets/src => packages/kolibri-common}/composables/__mocks__/useChannels.js (100%)
 rename {kolibri/plugins/learn/assets/src => packages/kolibri-common}/composables/useChannels.js (100%)

diff --git a/kolibri/plugins/learn/assets/src/composables/useDevices.js b/kolibri/plugins/learn/assets/src/composables/useDevices.js
index f4ac885b17..d50f4a973b 100644
--- a/kolibri/plugins/learn/assets/src/composables/useDevices.js
+++ b/kolibri/plugins/learn/assets/src/composables/useDevices.js
@@ -15,9 +15,9 @@ import useMinimumKolibriVersion from 'kolibri.coreVue.composables.useMinimumKoli
 import useUser from 'kolibri.coreVue.composables.useUser';
 import { localeCompare } from 'kolibri.utils.i18n';
 import plugin_data from 'plugin_data';
+import useChannels from 'kolibri-common/composables/useChannels';
 import { KolibriStudioId } from '../constants';
 import { learnStrings } from '../views/commonLearnStrings';
-import useChannels from './useChannels';
 
 /**
  * The ref is defined in the outer scope so it can be used as a shared store
diff --git a/kolibri/plugins/learn/assets/src/routes/index.js b/kolibri/plugins/learn/assets/src/routes/index.js
index aa832ed02c..808a0bcc3e 100644
--- a/kolibri/plugins/learn/assets/src/routes/index.js
+++ b/kolibri/plugins/learn/assets/src/routes/index.js
@@ -2,7 +2,7 @@ import { get } from '@vueuse/core';
 import store from 'kolibri.coreVue.vuex.store';
 import router from 'kolibri.coreVue.router';
 import useUser from 'kolibri.coreVue.composables.useUser';
-import useChannels from '../composables/useChannels';
+import useChannels from 'kolibri-common/composables/useChannels';
 import { PageNames, ClassesPageNames, KolibriStudioId } from '../constants';
 import LibraryPage from '../views/LibraryPage';
 import HomePage from '../views/HomePage';
diff --git a/kolibri/plugins/learn/assets/src/views/CardList.vue b/kolibri/plugins/learn/assets/src/views/CardList.vue
index 115ac29bc1..36f1e08469 100644
--- a/kolibri/plugins/learn/assets/src/views/CardList.vue
+++ b/kolibri/plugins/learn/assets/src/views/CardList.vue
@@ -125,7 +125,7 @@
   import { ContentLevels, Categories } from 'kolibri.coreVue.vuex.constants';
   import camelCase from 'lodash/camelCase';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
-  import useChannels from '../composables/useChannels';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import LearningActivityLabel from './LearningActivityLabel';
   import LearningActivityDuration from './LearningActivityDuration';
   import commonLearnStrings from './commonLearnStrings';
diff --git a/kolibri/plugins/learn/assets/src/views/ChannelRenderer/CustomContentRenderer.vue b/kolibri/plugins/learn/assets/src/views/ChannelRenderer/CustomContentRenderer.vue
index 4fc893f550..912ede6fe3 100644
--- a/kolibri/plugins/learn/assets/src/views/ChannelRenderer/CustomContentRenderer.vue
+++ b/kolibri/plugins/learn/assets/src/views/ChannelRenderer/CustomContentRenderer.vue
@@ -36,9 +36,9 @@
   import router from 'kolibri.coreVue.router';
   import { ContentNodeKinds } from 'kolibri.coreVue.vuex.constants';
   import { events, MessageStatuses } from 'hashi/src/hashiBase';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import { validateChannelTheme } from '../../utils/validateChannelTheme';
   import useContentLink from '../../composables/useContentLink';
-  import useChannels from '../../composables/useChannels';
   import ContentModal from './ContentModal';
 
   const { channelsMap } = useChannels();
diff --git a/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js b/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js
index 00eab19cb9..4de42d7a59 100644
--- a/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js
+++ b/kolibri/plugins/learn/assets/src/views/HomePage/__tests__/HomePage.spec.js
@@ -9,10 +9,11 @@ import useTotalProgress, {
   useTotalProgressMock,
 } from 'kolibri.coreVue.composables.useTotalProgress';
 import { ref } from 'kolibri.lib.vueCompositionApi';
+// eslint-disable-next-line import/named
+import useChannels, { useChannelsMock } from 'kolibri-common/composables/useChannels';
 import { ClassesPageNames, PageNames } from '../../../constants';
 import HomePage from '../index';
 /* eslint-disable import/named */
-import useChannels, { useChannelsMock } from '../../../composables/useChannels';
 import useDeviceSettings, { useDeviceSettingsMock } from '../../../composables/useDeviceSettings';
 import useLearnerResources, {
   useLearnerResourcesMock,
@@ -21,7 +22,7 @@ import useLearnerResources, {
 jest.mock('kolibri.client');
 jest.mock('kolibri.urls');
 jest.mock('kolibri.coreVue.componentSets.sync');
-jest.mock('../../../composables/useChannels');
+jest.mock('kolibri-common/composables/useChannels');
 jest.mock('kolibri.coreVue.composables.useUser');
 jest.mock('../../../composables/useDeviceSettings');
 jest.mock('../../../composables/useLearnerResources');
diff --git a/kolibri/plugins/learn/assets/src/views/HomePage/index.vue b/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
index 2eb4cfdec2..a272c4a2fd 100644
--- a/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/HomePage/index.vue
@@ -67,8 +67,8 @@
   import client from 'kolibri.client';
   import urls from 'kolibri.urls';
   import useUser from 'kolibri.coreVue.composables.useUser';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import ResourceSyncingUiAlert from '../ResourceSyncingUiAlert';
-  import useChannels from '../../composables/useChannels';
   import useDeviceSettings from '../../composables/useDeviceSettings';
   import useLearnerResources, {
     setClasses,
diff --git a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue
index 141184e08d..1170692e87 100644
--- a/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/HybridLearningContentCard/index.vue
@@ -72,7 +72,7 @@
 
   import { validateLinkObject } from 'kolibri.utils.validators';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
-  import useChannels from '../../composables/useChannels';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import LearningActivityLabel from '../LearningActivityLabel';
   import commonLearnStrings from '../commonLearnStrings';
   import CardThumbnail from './CardThumbnail.vue';
diff --git a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
index d6603aac6c..aa2f81a92f 100644
--- a/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/LibraryPage/index.vue
@@ -176,6 +176,7 @@
   import { searchKeys } from 'kolibri-common/composables/useBaseSearch';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import SearchFiltersPanel from 'kolibri-common/components/SearchFiltersPanel';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import { KolibriStudioId, PageNames } from '../../constants';
   import useCardViewStyle from '../../composables/useCardViewStyle';
   import useContentLink from '../../composables/useContentLink';
@@ -194,7 +195,6 @@
   import SearchResultsGrid from '../SearchResultsGrid';
   import LearnAppBarPage from '../LearnAppBarPage';
   import PostSetupModalGroup from '../../../../../device/assets/src/views/PostSetupModalGroup.vue';
-  import useChannels from './../../composables/useChannels';
   import ResumableContentGrid from './ResumableContentGrid';
   import OtherLibraries from './OtherLibraries';
 
diff --git a/kolibri/plugins/learn/assets/src/views/SearchResultsGrid.vue b/kolibri/plugins/learn/assets/src/views/SearchResultsGrid.vue
index 17323b41f0..f70bfbf2f4 100644
--- a/kolibri/plugins/learn/assets/src/views/SearchResultsGrid.vue
+++ b/kolibri/plugins/learn/assets/src/views/SearchResultsGrid.vue
@@ -76,8 +76,8 @@
   import { ref } from 'kolibri.lib.vueCompositionApi';
   import useKResponsiveWindow from 'kolibri-design-system/lib/composables/useKResponsiveWindow';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
+  import SearchChips from 'kolibri-common/components/SearchChips';
   import CopiesModal from './CopiesModal';
-  import SearchChips from './SearchChips';
   import LibraryAndChannelBrowserMainContent from './LibraryAndChannelBrowserMainContent';
 
   export default {
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
index 58226678d2..ca02c803a4 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsContentPage.vue
@@ -173,9 +173,9 @@
   import GlobalSnackbar from 'kolibri-common/components/GlobalSnackbar';
   import LearningActivityChip from 'kolibri-common/components/ResourceDisplayAndSearch/LearningActivityChip.vue';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import { PageNames, ClassesPageNames } from '../constants';
   import SkipNavigationLink from '../../../../../../kolibri/core/assets/src/views/SkipNavigationLink';
-  import useChannels from '../composables/useChannels';
   import useContentLink from '../composables/useContentLink';
   import useCoreLearn from '../composables/useCoreLearn';
   import useContentNodeProgress from '../composables/useContentNodeProgress';
diff --git a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
index 8d85d3de2a..0ba3a3c6f3 100644
--- a/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
+++ b/kolibri/plugins/learn/assets/src/views/TopicsPage/index.vue
@@ -274,8 +274,8 @@
   import LearningActivityChip from 'kolibri-common/components/ResourceDisplayAndSearch/LearningActivityChip.vue';
   import SidePanelModal from 'kolibri-common/components/SidePanelModal';
   import SearchFiltersPanel from 'kolibri-common/components/SearchFiltersPanel';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import { PageNames } from '../../constants';
-  import useChannels from '../../composables/useChannels';
   import useSearch from '../../composables/useSearch';
   import useContentLink from '../../composables/useContentLink';
   import useContentNodeProgress from '../../composables/useContentNodeProgress';
diff --git a/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue b/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue
index 6aaa8f3958..fd6007e3d9 100644
--- a/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue
+++ b/kolibri/plugins/learn/assets/src/views/thumbnails/ContentNodeThumbnail.vue
@@ -27,7 +27,7 @@
 <script>
 
   import LearningActivityIcon from 'kolibri-common/components/ResourceDisplayAndSearch/LearningActivityIcon.vue';
-  import useChannels from '../../composables/useChannels';
+  import useChannels from 'kolibri-common/composables/useChannels';
   import Thumbnail from './Thumbnail';
 
   /**
diff --git a/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js b/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
index 099f1b03a6..a36d0b26e6 100644
--- a/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/explore-libraries-page.spec.js
@@ -8,7 +8,7 @@ localVue.use(Vuex);
 localVue.use(VueRouter);
 
 jest.mock('../../src/composables/useCardLayoutSpan');
-jest.mock('../../src/composables/useChannels');
+jest.mock('kolibri-common/composables/useChannels');
 jest.mock('../../src/composables/useDevices');
 jest.mock('../../src/composables/useContentLink');
 jest.mock('../../src/composables/usePinnedDevices');
diff --git a/kolibri/plugins/learn/assets/test/views/library-page.spec.js b/kolibri/plugins/learn/assets/test/views/library-page.spec.js
index 42145b2321..b16aabc082 100644
--- a/kolibri/plugins/learn/assets/test/views/library-page.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/library-page.spec.js
@@ -8,12 +8,12 @@ import { ContentNodeResource } from 'kolibri.resources';
 import useUser from 'kolibri.coreVue.composables.useUser';
 /* eslint-disable import/named */
 import useBaseSearch, { useBaseSearchMock } from 'kolibri-common/composables/useBaseSearch';
+import useChannels, { useChannelsMock } from 'kolibri-common/composables/useChannels';
 /* eslint-enable import/named */
 import { PageNames } from '../../src/constants';
 import LibraryPage from '../../src/views/LibraryPage';
 import OtherLibraries from '../../src/views/LibraryPage/OtherLibraries';
 /* eslint-disable import/named */
-import useChannels, { useChannelsMock } from '../../src/composables/useChannels';
 import usePinnedDevices, { usePinnedDevicesMock } from '../../src/composables/usePinnedDevices';
 import useDevices, { useDevicesMock } from '../../src/composables/useDevices';
 /* eslint-enable import/named */
@@ -38,7 +38,7 @@ const CHANNEL = {
   thumbnail: 'test thumbnail',
 };
 
-jest.mock('../../src/composables/useChannels');
+jest.mock('kolibri-common/composables/useChannels');
 jest.mock('../../src/composables/useCardLayoutSpan');
 jest.mock('../../src/composables/useDevices');
 jest.mock('../../src/composables/useLearnerResources');
diff --git a/kolibri/plugins/learn/assets/test/views/topic-content.spec.js b/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
index d26559d101..2f8923b505 100644
--- a/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/topic-content.spec.js
@@ -1,13 +1,14 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import flushPromises from 'flush-promises';
 import { ContentNodeResource } from 'kolibri.resources';
+// eslint-disable-next-line import/named
+import useChannels, { useChannelsMock } from 'kolibri-common/composables/useChannels';
 import makeStore from '../makeStore';
 import TopicsContentPage from '../../src/views/TopicsContentPage';
 /* eslint-disable import/named */
 import useDownloadRequests, {
   useDownloadRequestsMock,
 } from '../../src/composables/useDownloadRequests';
-import useChannels, { useChannelsMock } from '../../src/composables/useChannels';
 import useCoreLearn, { useCoreLearnMock } from '../../src/composables/useCoreLearn';
 /* eslint-enable import/named */
 
@@ -15,7 +16,7 @@ jest.mock('kolibri.urls');
 jest.mock('kolibri.client');
 jest.mock('kolibri.resources');
 jest.mock('../../src/composables/useDownloadRequests');
-jest.mock('../../src/composables/useChannels');
+jest.mock('kolibri-common/composables/useChannels');
 jest.mock('../../src/composables/useCoreLearn');
 jest.mock('../../src/composables/useDevices');
 
diff --git a/kolibri/plugins/learn/assets/test/views/topics-page.spec.js b/kolibri/plugins/learn/assets/test/views/topics-page.spec.js
index ad353d66b9..dfb64d3767 100644
--- a/kolibri/plugins/learn/assets/test/views/topics-page.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/topics-page.spec.js
@@ -9,12 +9,13 @@ import { ContentNodeResource } from 'kolibri.resources';
 import plugin_data from 'plugin_data';
 // eslint-disable-next-line import/named
 import useBaseSearch, { useBaseSearchMock } from 'kolibri-common/composables/useBaseSearch';
+// eslint-disable-next-line import/named
+import useChannels, { useChannelsMock } from 'kolibri-common/composables/useChannels';
 import makeStore from '../makeStore';
 import CustomContentRenderer from '../../src/views/ChannelRenderer/CustomContentRenderer';
 import { PageNames } from '../../src/constants';
 import TopicsPage from '../../src/views/TopicsPage';
 // eslint-disable-next-line import/named
-import useChannels, { useChannelsMock } from '../../src/composables/useChannels';
 
 jest.mock('kolibri.coreVue.componentSets.sync');
 jest.mock('plugin_data', () => {
@@ -89,7 +90,7 @@ jest.mock('kolibri.urls');
 jest.mock('kolibri.coreVue.composables.useUser');
 jest.mock('kolibri-common/composables/useBaseSearch');
 jest.mock('../../src/composables/useContentLink');
-jest.mock('../../src/composables/useChannels');
+jest.mock('kolibri-common/composables/useChannels');
 // Needed to test anything using mount() where children use this composable
 jest.mock('../../src/composables/useLearningActivities');
 
diff --git a/kolibri/plugins/learn/assets/src/composables/__mocks__/useChannels.js b/packages/kolibri-common/composables/__mocks__/useChannels.js
similarity index 100%
rename from kolibri/plugins/learn/assets/src/composables/__mocks__/useChannels.js
rename to packages/kolibri-common/composables/__mocks__/useChannels.js
diff --git a/kolibri/plugins/learn/assets/src/composables/useChannels.js b/packages/kolibri-common/composables/useChannels.js
similarity index 100%
rename from kolibri/plugins/learn/assets/src/composables/useChannels.js
rename to packages/kolibri-common/composables/useChannels.js

From 5a9ea16f995ac9753ee16a1bcc8840cde1963e1d Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 24 Oct 2024 15:25:44 -0700
Subject: [PATCH 2/4] move SearchChips to kolibri-common & get languages from
 injectBaseSearch

removes useLanguageses altogether as they are going unused
---
 .../assets/src/composables/useLanguages.js    | 30 -------------------
 .../components}/SearchChips.vue               | 15 +++++++---
 .../composables/useBaseSearch.js              |  2 --
 .../composables/useLanguages.js               | 30 -------------------
 4 files changed, 11 insertions(+), 66 deletions(-)
 delete mode 100644 kolibri/plugins/learn/assets/src/composables/useLanguages.js
 rename {kolibri/plugins/learn/assets/src/views => packages/kolibri-common/components}/SearchChips.vue (86%)
 delete mode 100644 packages/kolibri-common/composables/useLanguages.js

diff --git a/kolibri/plugins/learn/assets/src/composables/useLanguages.js b/kolibri/plugins/learn/assets/src/composables/useLanguages.js
deleted file mode 100644
index 2f05fff81c..0000000000
--- a/kolibri/plugins/learn/assets/src/composables/useLanguages.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * A composable function containing logic related to languages
- */
-
-import sortBy from 'lodash/sortBy';
-import { computed, ref } from 'kolibri.lib.vueCompositionApi';
-import { get } from '@vueuse/core';
-import plugin_data from 'plugin_data';
-
-const langArray = plugin_data.languages ? plugin_data.languages : [];
-const langMap = {};
-
-export function setLanguages(langs) {
-  for (const lang of langs) {
-    langMap[lang.id] = lang;
-  }
-}
-
-setLanguages(langArray);
-
-// The refs are defined in the outer scope so they can be used as a shared store
-const languagesMap = ref(langMap);
-
-export default function useLanguages() {
-  const languages = computed(() => sortBy(Object.values(get(languagesMap)), 'id'));
-  return {
-    languages,
-    languagesMap,
-  };
-}
diff --git a/kolibri/plugins/learn/assets/src/views/SearchChips.vue b/packages/kolibri-common/components/SearchChips.vue
similarity index 86%
rename from kolibri/plugins/learn/assets/src/views/SearchChips.vue
rename to packages/kolibri-common/components/SearchChips.vue
index 07ce478b91..7d352b4577 100644
--- a/kolibri/plugins/learn/assets/src/views/SearchChips.vue
+++ b/packages/kolibri-common/components/SearchChips.vue
@@ -33,16 +33,23 @@
   import flatMap from 'lodash/flatMap';
   import commonCoreStrings from 'kolibri.coreVue.mixins.commonCoreStrings';
   import { NoCategories } from 'kolibri.coreVue.vuex.constants';
-  import useChannels from '../composables/useChannels';
-  import useLanguages from '../composables/useLanguages';
+  import useChannels from 'kolibri-common/composables/useChannels';
+  import { injectBaseSearch } from 'kolibri-common/composables/useBaseSearch';
 
   export default {
     name: 'SearchChips',
     mixins: [commonCoreStrings],
     setup() {
-      const { languagesMap } = useLanguages();
+      const { availableLanguages } = injectBaseSearch();
+      const languagesMap = availableLanguages.value.reduce((map, lang) => {
+        map[lang.id] = map;
+        return map;
+      }, {});
       const { channelsMap } = useChannels();
-      return { channelsMap, languagesMap };
+      return {
+        channelsMap,
+        languagesMap,
+      };
     },
     props: {
       searchTerms: {
diff --git a/packages/kolibri-common/composables/useBaseSearch.js b/packages/kolibri-common/composables/useBaseSearch.js
index 5b7e17f1ad..76e75ddd19 100644
--- a/packages/kolibri-common/composables/useBaseSearch.js
+++ b/packages/kolibri-common/composables/useBaseSearch.js
@@ -23,7 +23,6 @@ import {
 import useUser from 'kolibri.coreVue.composables.useUser';
 
 import { deduplicateResources } from '../utils/contentNode';
-import { setLanguages } from './useLanguages';
 
 export const logging = logger.getLogger(__filename);
 
@@ -384,7 +383,6 @@ export default function useBaseSearch({
           languagesList: labels.languages || [],
           channelsList: labels.channels || [],
         });
-        setLanguages(labels.languages || []);
       })
       .catch(err => logging.error('Failed to fetch search labels from remote', err))
       .then(() => {
diff --git a/packages/kolibri-common/composables/useLanguages.js b/packages/kolibri-common/composables/useLanguages.js
deleted file mode 100644
index 2f05fff81c..0000000000
--- a/packages/kolibri-common/composables/useLanguages.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * A composable function containing logic related to languages
- */
-
-import sortBy from 'lodash/sortBy';
-import { computed, ref } from 'kolibri.lib.vueCompositionApi';
-import { get } from '@vueuse/core';
-import plugin_data from 'plugin_data';
-
-const langArray = plugin_data.languages ? plugin_data.languages : [];
-const langMap = {};
-
-export function setLanguages(langs) {
-  for (const lang of langs) {
-    langMap[lang.id] = lang;
-  }
-}
-
-setLanguages(langArray);
-
-// The refs are defined in the outer scope so they can be used as a shared store
-const languagesMap = ref(langMap);
-
-export default function useLanguages() {
-  const languages = computed(() => sortBy(Object.values(get(languagesMap)), 'id'));
-  return {
-    languages,
-    languagesMap,
-  };
-}

From d08e0ffc056ba9fae193cfe00f471a3a5bbf5635 Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 31 Oct 2024 12:23:14 -0700
Subject: [PATCH 3/4] fix recursive eternal map reduction in SearchChips

---
 packages/kolibri-common/components/SearchChips.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/kolibri-common/components/SearchChips.vue b/packages/kolibri-common/components/SearchChips.vue
index 7d352b4577..fc4bf219d6 100644
--- a/packages/kolibri-common/components/SearchChips.vue
+++ b/packages/kolibri-common/components/SearchChips.vue
@@ -42,7 +42,7 @@
     setup() {
       const { availableLanguages } = injectBaseSearch();
       const languagesMap = availableLanguages.value.reduce((map, lang) => {
-        map[lang.id] = map;
+        map[lang.id] = lang;
         return map;
       }, {});
       const { channelsMap } = useChannels();

From 599d7e31f1c1ba7931977dcf196d79457496611b Mon Sep 17 00:00:00 2001
From: Jacob Pierce <w.jacobpierce@gmail.com>
Date: Thu, 31 Oct 2024 12:31:48 -0700
Subject: [PATCH 4/4] stub SearchChips in SearchResultsGrid test

---
 .../plugins/learn/assets/test/views/search-results-grid.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kolibri/plugins/learn/assets/test/views/search-results-grid.spec.js b/kolibri/plugins/learn/assets/test/views/search-results-grid.spec.js
index 6cb5d2e987..e628e8d75a 100644
--- a/kolibri/plugins/learn/assets/test/views/search-results-grid.spec.js
+++ b/kolibri/plugins/learn/assets/test/views/search-results-grid.spec.js
@@ -79,7 +79,7 @@ describe('when search results are loaded', () => {
           displayingSearchResults: true,
           searchLoading: false,
         },
-        stubs: ['LibraryAndChannelBrowserMainContent'],
+        stubs: ['LibraryAndChannelBrowserMainContent', 'SearchChips'],
       });
 
       const moreButton = wrapper.find('[data-test="more-results-button"]');