From 9f246156a5a84dfa6fa63f95b6df3d1ab9fbeea7 Mon Sep 17 00:00:00 2001
From: Paul Tran-Van <paul.tranvan@gmail.com>
Date: Mon, 18 Nov 2024 16:59:24 +0100
Subject: [PATCH] feat: Use parent path in secondary url and subtitle

We now have the same behaviour between files and directories, i.e. the
subTitle is the parent directory, and the secondaryUrl is the parent url
---
 .../helpers/normalizeSearchResult.spec.ts     | 29 ++++++-------------
 .../search/helpers/normalizeSearchResult.ts   | 12 ++++----
 2 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.spec.ts b/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.spec.ts
index c7c7c5e92a..9ff25d5bc5 100644
--- a/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.spec.ts
+++ b/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.spec.ts
@@ -2,7 +2,7 @@ import CozyClient from 'cozy-client'
 import { IOCozyContact, IOCozyFile } from 'cozy-client/types/types'
 
 import { cleanFilePath, normalizeSearchResult } from './normalizeSearchResult'
-import { FILES_DOCTYPE, TYPE_FILE } from '../consts'
+import { FILES_DOCTYPE } from '../consts'
 import { RawSearchResult } from '../types'
 
 const fakeFlatDomainClient = {
@@ -20,7 +20,7 @@ describe('Should normalize files results', () => {
       _id: 'SOME_FILE_ID',
       _type: 'io.cozy.files',
       type: 'file',
-      dir_id: 'SOME_DIR_ID',
+      dir_id: 'PARENT_ID',
       name: 'SOME_FILE_NAME',
       path: 'SOME/FILE/PATH'
     }
@@ -40,8 +40,8 @@ describe('Should normalize files results', () => {
       slug: 'drive',
       title: 'SOME_FILE_NAME',
       subTitle: 'SOME/FILE/PATH',
-      url: 'https://claude-drive.mycozy.cloud/#/folder/SOME_DIR_ID/file/SOME_FILE_ID',
-      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/SOME_DIR_ID'
+      url: 'https://claude-drive.mycozy.cloud/#/folder/PARENT_ID/file/SOME_FILE_ID',
+      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/PARENT_ID'
     })
   })
 
@@ -50,7 +50,7 @@ describe('Should normalize files results', () => {
       _id: 'SOME_NOTE_ID',
       _type: 'io.cozy.files',
       type: 'file',
-      dir_id: 'SOME_DIR_ID',
+      dir_id: 'PARENT_ID',
       name: 'SOME_NOTE_NAME.cozy-note',
       path: 'SOME/NOTE/PATH',
       metadata: {
@@ -75,7 +75,7 @@ describe('Should normalize files results', () => {
       title: 'SOME_NOTE_NAME.cozy-note',
       subTitle: 'SOME/NOTE/PATH',
       url: 'https://claude-notes.mycozy.cloud/#/n/SOME_NOTE_ID',
-      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/SOME_DIR_ID'
+      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/PARENT_ID'
     })
   })
 
@@ -85,7 +85,8 @@ describe('Should normalize files results', () => {
       _type: 'io.cozy.files',
       type: 'directory',
       name: 'SOME_FOLDER_NAME',
-      path: 'SOME/FOLDER/PATH'
+      path: 'SOME/FOLDER/PATH',
+      dir_id: 'PARENT_ID'
     }
     const searchResult = {
       doctype: 'io.cozy.files',
@@ -104,7 +105,7 @@ describe('Should normalize files results', () => {
       title: 'SOME_FOLDER_NAME',
       subTitle: 'SOME/FOLDER/PATH',
       url: 'https://claude-drive.mycozy.cloud/#/folder/SOME_FODLER_ID',
-      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/SOME_FODLER_ID'
+      secondaryUrl: 'https://claude-drive.mycozy.cloud/#/folder/PARENT_ID'
     })
   })
 })
@@ -366,31 +367,19 @@ describe('cleanFilePath', () => {
     expect(cleanFilePath(doc)).toEqual(doc)
   })
 
-  it('should return the document unchanged if not a file', () => {
-    const doc = {
-      _type: FILES_DOCTYPE,
-      name: 'name',
-      type: TYPE_FILE
-    } as IOCozyFile
-    expect(cleanFilePath(doc)).toEqual(doc)
-  })
-
   it('should remove name from path if path ends with name', () => {
     const doc = {
       _type: FILES_DOCTYPE,
-      type: TYPE_FILE,
       path: '/the/path/myname',
       name: 'myname'
     } as IOCozyFile
     const expected = { ...doc, path: '/the/path' }
-
     expect(cleanFilePath(doc)).toEqual(expected)
   })
 
   it('should return the document unchanged if path does not end with name', () => {
     const doc = {
       _type: FILES_DOCTYPE,
-      type: TYPE_FILE,
       path: '/the/path/othername',
       name: 'name'
     } as IOCozyFile
diff --git a/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.ts b/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.ts
index 678da1062b..636a46b8fe 100644
--- a/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.ts
+++ b/packages/cozy-dataproxy-lib/src/search/helpers/normalizeSearchResult.ts
@@ -1,7 +1,7 @@
 import CozyClient, { generateWebLink, models } from 'cozy-client'
 import { IOCozyContact } from 'cozy-client/types/types'
 
-import { APPS_DOCTYPE, TYPE_DIRECTORY, TYPE_FILE } from '../consts'
+import { APPS_DOCTYPE, TYPE_DIRECTORY } from '../consts'
 import {
   CozyDoc,
   RawSearchResult,
@@ -35,8 +35,9 @@ export const cleanFilePath = (doc: CozyDoc): CozyDoc => {
   if (!isIOCozyFile(doc)) {
     return doc
   }
-  const { path, name, type } = doc
-  if (!path || type !== TYPE_FILE) {
+  const { path, name } = doc
+  if (!path) {
+    // Paths should be completed for both files and directories, at indexing time
     return doc
   }
   let newPath = path
@@ -212,11 +213,8 @@ const buildSecondaryURL = (
     return null
   }
 
-  if (doc.type === TYPE_DIRECTORY) {
-    return url
-  }
-
   const folderURLHash = `/folder/${doc.dir_id}`
+
   return generateWebLink({
     cozyUrl: client.getStackClient().uri,
     slug: 'drive',