Merge pull request learningequality#11730 from rtibbles/rooting_out_p…

…ages Delete coreAPI PageRoot component in favour of a default component in kolibri_app
nick2432 · Feb 27, 2024 · 51a7503 · 51a7503
2 parents dcce356 + 2ce9790
commit 51a7503
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 37 deletions.
diff --git a/kolibri/core/assets/src/core-app/apiSpec.js b/kolibri/core/assets/src/core-app/apiSpec.js
@@ -102,7 +102,6 @@ import LearnOnlyDeviceNotice from '../views/LearnOnlyDeviceNotice';
 import themeConfig from '../styles/themeConfig';
 import sortLanguages from '../utils/sortLanguages';
 import * as sync from '../views/sync/syncComponentSet';
-import PageRoot from '../views/PageRoot';
 import NotificationsRoot from '../views/NotificationsRoot';
 import useMinimumKolibriVersion from '../composables/useMinimumKolibriVersion';
 import useUserSyncStatus from '../composables/useUserSyncStatus';
@@ -211,7 +210,6 @@ export default {
       PrivacyLinkAndModal,
       LearnOnlyDeviceNotice,
       SuggestedTime,
-      PageRoot,
       MasteryModel,
       NotificationsRoot,
       KolibriLoadingSnippet,

diff --git a/kolibri/core/assets/src/kolibri_app.js b/kolibri/core/assets/src/kolibri_app.js
@@ -27,7 +27,12 @@ export default class KolibriApp extends KolibriModule {
    * @return {Object} A component definition for the root component of this single page app.
    */
   get RootVue() {
-    return {};
+    // By default return the component that just renders router-view,
+    // which will render the component for the current route.
+    return {
+      functional: true,
+      render: createElement => createElement('router-view'),
+    };
   }
   /*
    * @return {Store} A convenience getter to return the vuex store.

diff --git a/kolibri/core/assets/src/views/PageRoot.vue b/kolibri/core/assets/src/views/PageRoot.vue
diff --git a/kolibri/plugins/coach/assets/src/app.js b/kolibri/plugins/coach/assets/src/app.js
@@ -3,7 +3,6 @@ import useUser from 'kolibri.coreVue.composables.useUser';
 import redirectBrowser from 'kolibri.utils.redirectBrowser';
 import { setChannelInfo } from 'kolibri.coreVue.vuex.actions';
 import router from 'kolibri.coreVue.router';
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import KolibriApp from 'kolibri_app';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
@@ -15,9 +14,6 @@ class CoachToolsModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }

diff --git a/kolibri/plugins/learn/assets/src/my_downloads/app.js b/kolibri/plugins/learn/assets/src/my_downloads/app.js
@@ -1,4 +1,3 @@
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import KolibriApp from 'kolibri_app';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
@@ -7,9 +6,6 @@ class MyDownloadsModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }

diff --git a/kolibri/plugins/policies/assets/src/app.js b/kolibri/plugins/policies/assets/src/app.js
@@ -1,4 +1,3 @@
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
 import KolibriApp from 'kolibri_app';
@@ -7,9 +6,6 @@ class PoliciesModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }

diff --git a/kolibri/plugins/user_profile/assets/src/app.js b/kolibri/plugins/user_profile/assets/src/app.js
@@ -1,5 +1,4 @@
 import router from 'kolibri.coreVue.router';
-import PageRoot from 'kolibri.coreVue.components.PageRoot';
 import routes from './routes';
 import pluginModule from './modules/pluginModule';
 import KolibriApp from 'kolibri_app';
@@ -8,9 +7,6 @@ class UserProfileModule extends KolibriApp {
   get routes() {
     return routes;
   }
-  get RootVue() {
-    return PageRoot;
-  }
   get pluginModule() {
     return pluginModule;
   }