Merge pull request #1625 from SenseNet/fix/2122-download_binary_cache

download_and_preview_fix_on_file_overwrite
SenseNet · Jul 25, 2024 · 890ec34 · 890ec34
2 parents c171d27 + c160214
commit 890ec34
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/apps/sensenet/src/components/Icon.tsx b/apps/sensenet/src/components/Icon.tsx
@@ -228,13 +228,13 @@ export const defaultContentResolvers: Array<IconResolver<GenericContent>> = [
           width={options.style?.width || 32}
           height={options.style?.width || 32}
           alt=""
-          src={PathHelper.joinPaths(
+          src={`${PathHelper.joinPaths(
             options.repo.configuration.repositoryUrl,
             item.Path,
             '/Previews',
             item.Version as string,
             'thumbnail1.png',
-          )}
+          )}?t=${Date.now()}`}
           style={options.style}
         />
       ) : null,
@@ -246,7 +246,7 @@ export const defaultContentResolvers: Array<IconResolver<GenericContent>> = [
           width={options.style?.width || 32}
           height={options.style?.width || 32}
           alt=""
-          src={PathHelper.joinPaths(options.repo.configuration.repositoryUrl, item.Path)}
+          src={`${PathHelper.joinPaths(options.repo.configuration.repositoryUrl, item.Path)}?t=${Date.now()}`}
           style={options.style}
         />
       ) : null,

diff --git a/apps/sensenet/src/components/view-controls/image-view.tsx b/apps/sensenet/src/components/view-controls/image-view.tsx
@@ -91,7 +91,11 @@ export const ImageView: React.FC<ImageViewProps> = (props) => {
         </div>
       </div>
       <div className={classes.imageContainer}>
-        <img className={classes.image} src={`${repository.configuration.repositoryUrl}${contentPath}`} alt="" />
+        <img
+          className={classes.image}
+          src={`${repository.configuration.repositoryUrl}${contentPath}?t=${Date.now()}`}
+          alt=""
+        />
       </div>
       <div className={classes.buttonWrapper}>
         <Button

diff --git a/packages/sn-controls-react/src/fieldcontrols/file-upload.tsx b/packages/sn-controls-react/src/fieldcontrols/file-upload.tsx
@@ -160,7 +160,7 @@ export const FileUpload: React.FC<ReactClientFieldSetting<BinaryFieldSetting>> =
         binaryPropertyName: props.settings.Name,
       })
 
-      const newValue = `${getNameFromPath(e.target.value)}`
+      const newValue = `${getNameFromPath(e.target.value)}?t=${Date.now()}`
       setFileName(newValue)
     } catch (error) {
       console.error(error.message)

diff --git a/packages/sn-hooks-react/src/hooks/use-download.ts b/packages/sn-hooks-react/src/hooks/use-download.ts
@@ -9,8 +9,8 @@ export const fakeClick = (obj: EventTarget) => {
 
 export const downloadFile = (name: string, repositoryUrl: string) => {
   const saveLink = document.createElement('a')
-  saveLink.href = `${repositoryUrl}${name}?download`
-  saveLink.target = '_blank';
+  saveLink.href = `${repositoryUrl}${name}?download?t=${Date.now()}`
+  saveLink.target = '_blank'
   fakeClick(saveLink)
 }