wip

Author: manuq

kolibri_explore_plugin/assets/src/modules/topicsTree/handlers.js

@@ -5,7 +5,7 @@ import urls from 'kolibri.urls';
 import { ContentNodeResource } from 'kolibri.resources';
 import { PageNames } from '../../constants';
 import { getAppNameByID, getChannelIcon } from '../../customApps';
-import { normalizeContentNode, contentState } from '../coreExplore/utils';
+import { normalizeContentNode } from '../coreExplore/utils';
 
 function _getAppMetadata(appName) {
   const url = urls['kolibri:kolibri_explore_plugin:app_metadata']({ app: appName });
@@ -127,38 +127,14 @@ export function showTopicsChannel(store, id) {
   });
 }
 
-export function showTopicsContentInLightbox(store, id) {
-  const promises = [ContentNodeResource.fetchModel({ id }), store.dispatch('setChannelInfo')];
-  const shouldResolve = samePageCheckGenerator(store);
-  Promise.all(promises).then(
-    ([content]) => {
-      if (shouldResolve()) {
-        const currentChannel = store.getters.getChannelObject(content.channel_id);
-        if (!currentChannel) {
-          router.replace({ name: PageNames.CONTENT_UNAVAILABLE });
-          return;
-        }
-        store.commit('topicsTree/SET_STATE', {
-          content: contentState(content),
-          channel: currentChannel,
-        });
-
-        const appName = getAppNameByID(content.channel_id);
-        if (appName) {
-          _getAppMetadata(appName)
-            .then(({ data }) => {
-              store.commit('topicsTree/SET_APP_METADATA', _parseAppMetadata(data, appName));
-            })
-            .catch(() => {
-              console.log(`no metadata ${appName}`);
-            });
-        }
-      }
-    },
-    error => {
-      shouldResolve() ? store.dispatch('handleApiError', error) : null;
-    }
-  );
+export function showTopicsContentInLightbox(_store, id) {
+  const learnUrl = urls['kolibri:kolibri.plugins.learn:learn'];
+  if (learnUrl) {
+    const prevName = encodeURIComponent(window.location.href);
+    const contentViewerUrl = `${learnUrl()}#/topics/c/${id}?prevName=${prevName}`;
+    window.location.replace(contentViewerUrl);
+    return;
+  }
 }
 
 export function hideTopicsContentFromLightbox(store) {

kolibri_explore_plugin/assets/src/routes/index.js

@@ -97,14 +97,6 @@ export default [
       showTopicsChannel(store, toRoute.params.channel_id);
     },
   },
-  {
-    name: PageNames.CONTENT,
-    path: '/content/:content_id',
-    handler: toRoute => {
-      store.commit('SET_CONTENT_ID', toRoute.params.content_id);
-      store.commit('SET_PAGE_NAME', PageNames.CONTENT);
-    },
-  },
   {
     path: '*',
     redirect: '/',