[File] removes force download when embedded

claroline · Apr 11, 2023 · d2e3916 · d2e3916
1 parent 88bd4f2
commit d2e3916
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/main/core/Resources/modules/resources/file/player/components/main.jsx b/src/main/core/Resources/modules/resources/file/player/components/main.jsx
@@ -16,8 +16,7 @@ import {ContentComments} from '#/main/app/content/components/comments'
 import {PlayerOverview} from '#/main/core/resources/file/player/components/overview'
 
 const PlayerMain = (props) => {
-  // FIXME : ugly
-  if (constants.OPENING_DOWNLOAD === props.file.opening) {
+  if (!props.embedded && constants.OPENING_DOWNLOAD === props.file.opening) {
     props.download(props.resourceNode)
   } else if (constants.OPENING_BROWSER === props.file.opening) {
     window.location.replace(url(['claro_resource_file_raw', {file: props.file.id}]))
@@ -59,9 +58,9 @@ const PlayerMain = (props) => {
           )
         }
 
-        props.download(props.resourceNode)
-
-        console.log(props.mimeType)
+        if (!props.embedded) {
+          props.download(props.resourceNode)
+        }
 
         return (
           <PlayerOverview
@@ -82,6 +81,7 @@ PlayerMain.propTypes = {
   mimeType: T.string.isRequired,
   download: T.func.isRequired,
   resourceNode: T.shape(ResourceNodeType.propTypes).isRequired,
+  embedded: T.bool.isRequired,
   canEdit: T.bool.isRequired,
   file: T.shape(
     FileTypes.propTypes

diff --git a/src/main/core/Resources/modules/resources/file/player/containers/main.jsx b/src/main/core/Resources/modules/resources/file/player/containers/main.jsx
@@ -19,6 +19,7 @@ const PlayerMain = connect(
     mimeType: selectors.mimeType(state),
     file: selectors.file(state),
     resourceNode: resourceSelectors.resourceNode(state),
+    embedded: resourceSelectors.embedded(state),
     workspace: resourceSelectors.workspace(state),
     canEdit: hasPermission('edit', resourceSelectors.resourceNode(state))
   }),