Re-implement share file functionality.

Remove unneeded appCapabilities from kolibri/utils.
learningequality · Dec 19, 2024 · c1ec045 · c1ec045
1 parent 3a3a72b
commit c1ec045
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 42 deletions.
diff --git a/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue b/kolibri/plugins/learn/assets/src/views/CurrentlyViewedResourceMetadata.vue
@@ -136,16 +136,25 @@
       class="download-button"
       data-test="download-button"
     />
+    <KButton
+      v-if="canShareFile"
+      :text="learnString('shareFile')"
+      class="share-button"
+      @click="shareFile()"
+    />
   </section>
 
 </template>
 
 
 <script>
 
-  import { ContentLevels } from 'kolibri/constants';
+  import { ContentNodeKinds, ContentLevels } from 'kolibri/constants';
   import camelCase from 'lodash/camelCase';
-
+  import client from 'kolibri/client';
+  import useUser from 'kolibri/composables/useUser';
+  import urls from 'kolibri/urls';
+  import pluginData from 'kolibri-plugin-data';
   import LearnerNeeds from 'kolibri-constants/labels/Needs';
   import DownloadButton from 'kolibri/components/DownloadButton';
   import TimeDuration from 'kolibri-common/components/TimeDuration';
@@ -167,6 +176,10 @@
       TimeDuration,
     },
     mixins: [commonCoreStrings, commonLearnStrings],
+    setup() {
+      const { isAppContext } = useUser();
+      return { isAppContext };
+    },
     props: {
       canDownloadExternally: {
         type: Boolean,
@@ -187,6 +200,13 @@
       };
     },
     computed: {
+      canShareFile() {
+        return (
+          this.isAppContext &&
+          this.content.kind !== ContentNodeKinds.EXERCISE &&
+          pluginData.canShareFile
+        );
+      },
       forBeginners() {
         return get(this.content, 'learner_needs', []).includes(LearnerNeeds.FOR_BEGINNERS);
       },
@@ -260,6 +280,21 @@
           return '-';
         }
       },
+      shareFile() {
+        const urlFunction = urls['kolibri:core:sharefile'];
+        return client({
+          url: urlFunction(),
+          method: 'POST',
+          data: {
+            content_node: this.content.id,
+            message: this.learnString('shareFileMessage', {
+              title: this.content.title,
+              topic: this.content.ancestors.slice(-1)[0].title,
+              copyrightHolder: this.content.license_owner,
+            }),
+          },
+        });
+      },
     },
   };
 
@@ -309,7 +344,8 @@
     padding-top: 8px;
   }
 
-  .download-button {
+  .download-button,
+  .share-button {
     margin-top: 16px;
   }
 

diff --git a/kolibri/plugins/learn/assets/src/views/commonLearnStrings.js b/kolibri/plugins/learn/assets/src/views/commonLearnStrings.js
@@ -106,6 +106,10 @@ export const learnStrings = createTranslator('CommonLearnStrings', {
     message: 'Share',
     context: 'Option to share a specific file from a learning resource.',
   },
+  shareFileMessage: {
+    message: '"{title}" (in "{topic}"), from {copyrightHolder}',
+    context: 'Message shared with the default file from a learning resource.',
+  },
   locationsInChannel: {
     message: 'Location in {channelname}',
     context:

diff --git a/kolibri/plugins/learn/kolibri_plugin.py b/kolibri/plugins/learn/kolibri_plugin.py
@@ -3,6 +3,7 @@
 from kolibri.core.auth.constants.user_kinds import ANONYMOUS
 from kolibri.core.auth.constants.user_kinds import LEARNER
 from kolibri.core.content.hooks import ContentNodeDisplayHook
+from kolibri.core.content.hooks import ShareFileHook
 from kolibri.core.device.hooks import CheckIsMeteredHook
 from kolibri.core.device.utils import allow_learner_unassigned_resource_access
 from kolibri.core.device.utils import get_device_setting
@@ -65,6 +66,7 @@ def plugin_data(self):
                 "allow_download_on_metered_connection"
             ),
             "canCheckMeteredConnection": CheckIsMeteredHook.is_registered,
+            "canShareFile": ShareFileHook.is_registered,
             "allowGuestAccess": get_device_setting("allow_guest_access"),
             "allowLearnerDownloads": get_device_setting(
                 "allow_learner_download_resources"

diff --git a/packages/kolibri-tools/lib/moduleMapping.js b/packages/kolibri-tools/lib/moduleMapping.js
@@ -149,7 +149,7 @@ module.exports = {
   },
   'kolibri.themeConfig': 'kolibri/styles/themeConfig',
   'kolibri.urls': 'kolibri/urls',
-  'kolibri.utils.appCapabilities': 'kolibri/utils/appCapabilities',
+  'kolibri.utils.appCapabilities': null, // Redistributed into more specific code where used.
   'kolibri.utils.browserInfo': 'kolibri/utils/browserInfo',
   'kolibri.utils.bytesForHumans': 'kolibri/uiText/bytesForHumans',
   'kolibri.utils.CatchErrors': 'kolibri/utils/CatchErrors',

diff --git a/packages/kolibri/internal/apiSpec.js b/packages/kolibri/internal/apiSpec.js
@@ -48,7 +48,6 @@ export default {
   'kolibri/uiText/notificationStrings': require('kolibri/uiText/notificationStrings'),
   'kolibri/urls': require('kolibri/urls'),
   'kolibri/utils/CatchErrors': require('kolibri/utils/CatchErrors'),
-  'kolibri/utils/appCapabilities': require('kolibri/utils/appCapabilities'),
   'kolibri/utils/baseClient': require('kolibri/utils/baseClient'),
   'kolibri/utils/browserInfo': require('kolibri/utils/browserInfo'),
   'kolibri/utils/i18n': require('kolibri/utils/i18n'),

diff --git a/packages/kolibri/package.json b/packages/kolibri/package.json
@@ -55,7 +55,6 @@
     "./uiText/notificationStrings": "./uiText/notificationStrings",
     "./urls": "./urls",
     "./utils/CatchErrors": "./utils/CatchErrors",
-    "./utils/appCapabilities": "./utils/appCapabilities",
     "./utils/baseClient": "./utils/baseClient",
     "./utils/browserInfo": "./utils/browserInfo",
     "./utils/i18n": "./utils/i18n",

diff --git a/packages/kolibri/utils/appCapabilities.js b/packages/kolibri/utils/appCapabilities.js