cozy-ui 92.0.0 → 92.0.1

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [92.0.1](https://github.com/cozy/cozy-ui/compare/v92.0.0...v92.0.1) (2023-08-31)
+
+
+### Bug Fixes
+
+* **Viewer:** Remove filename on path ending with slash ([ad8b88c](https://github.com/cozy/cozy-ui/commit/ad8b88c))
+
 # [92.0.0](https://github.com/cozy/cozy-ui/compare/v91.2.0...v92.0.0) (2023-08-28)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cozy-ui",
-  "version": "92.0.0",
+  "version": "92.0.1",
   "description": "Cozy apps UI SDK",
   "main": "./index.js",
   "bin": {

package/react/Viewer/components/ToolbarFilePath.jsx

@@ -7,7 +7,11 @@ import AppLinker from '../../AppLinker'
 import FilePath from '../../FilePath'
 import useBreakpoints from '../../hooks/useBreakpoints'
 
-import { makeWebLink, normalizeAndSpreadAttributes } from '../helpers'
+import {
+  makeWebLink,
+  normalizeAndSpreadAttributes,
+  removeFilenameFromPath
+} from '../helpers'
 import { buildFileByIdQuery } from '../queries'
 
 const { ensureFilePath } = models.file
@@ -35,7 +39,7 @@ const ToolbarFilePath = ({ file }) => {
   if (fileWithPath) {
     const appSlug = 'drive'
     const nativePath = `/folder/${fileWithPath.dir_id}`
-    const path = fileWithPath.path.replace(fileWithPath.name, '')
+    const path = removeFilenameFromPath(fileWithPath.path)
     const link = makeWebLink({ client, path: nativePath, slug: appSlug })
 
     if (isDesktop && link) {

package/react/Viewer/helpers.js

@@ -203,3 +203,13 @@ export const makeWebLink = ({ client, slug, path }) => {
     return null
   }
 }
+
+/**
+ * Remove the file name at the end of a path
+ * @param {string} path
+ * @returns {string} new path
+ */
+export const removeFilenameFromPath = path => {
+  const newPath = path.substring(0, path.lastIndexOf('/'))
+  return newPath === '' ? '/' : newPath
+}

package/react/Viewer/helpers.spec.js

@@ -7,7 +7,8 @@ import {
   buildEditAttributePath,
   knownDateMetadataNames,
   knownInformationMetadataNames,
-  isEditableAttribute
+  isEditableAttribute,
+  removeFilenameFromPath
 } from './helpers'
 
 const fakeMetadata = {
@@ -155,4 +156,19 @@ describe('helpers', () => {
       })
     })
   })
+  describe('removeFilenameFromPath', () => {
+    it('should handle all types of path', () => {
+      expect(removeFilenameFromPath('/folder/7IsD.gif', '7IsD.gif')).toBe(
+        '/folder'
+      )
+
+      expect(removeFilenameFromPath('/7IsD.gif', '7IsD.gif')).toBe('/')
+
+      expect(removeFilenameFromPath('//7IsD.gif', '7IsD.gif')).toBe('/')
+
+      expect(removeFilenameFromPath('/7IsD.gif/7IsD.gif', '7IsD.gif')).toBe(
+        '/7IsD.gif'
+      )
+    })
+  })
 })

package/transpiled/react/Viewer/components/ToolbarFilePath.js

@@ -10,7 +10,7 @@ import Link from "cozy-ui/transpiled/react/Link";
 import AppLinker from "cozy-ui/transpiled/react/AppLinker";
 import FilePath from "cozy-ui/transpiled/react/FilePath";
 import useBreakpoints from "cozy-ui/transpiled/react/hooks/useBreakpoints";
-import { makeWebLink, normalizeAndSpreadAttributes } from "cozy-ui/transpiled/react/Viewer/helpers";
+import { makeWebLink, normalizeAndSpreadAttributes, removeFilenameFromPath } from "cozy-ui/transpiled/react/Viewer/helpers";
 import { buildFileByIdQuery } from "cozy-ui/transpiled/react/Viewer/queries";
 var ensureFilePath = models.file.ensureFilePath;
 
@@ -33,7 +33,7 @@ var ToolbarFilePath = function ToolbarFilePath(_ref) {
   if (fileWithPath) {
     var appSlug = 'drive';
     var nativePath = "/folder/".concat(fileWithPath.dir_id);
-    var path = fileWithPath.path.replace(fileWithPath.name, '');
+    var path = removeFilenameFromPath(fileWithPath.path);
     var link = makeWebLink({
       client: client,
       path: nativePath,

package/transpiled/react/Viewer/helpers.js

@@ -193,4 +193,14 @@ export var makeWebLink = function makeWebLink(_ref6) {
   } catch (e) {
     return null;
   }
+};
+/**
+ * Remove the file name at the end of a path
+ * @param {string} path
+ * @returns {string} new path
+ */
+
+export var removeFilenameFromPath = function removeFilenameFromPath(path) {
+  var newPath = path.substring(0, path.lastIndexOf('/'));
+  return newPath === '' ? '/' : newPath;
 };