publish: Merge pull request #281 from cozy/feat/add-translate-apps

generated from commit 7e07ec9
cozy · Nov 14, 2024 · 9088327 · 9088327
1 parent e580d57
commit 9088327
Show file tree

Hide file tree

Showing 6 changed files with 513 additions and 455 deletions.
diff --git a/en/cozy-home/src/assistant/ResultMenu/ResultMenuContent.jsx b/en/cozy-home/src/assistant/ResultMenu/ResultMenuContent.jsx
@@ -30,8 +30,10 @@ const SearchResult = () => {
     <ResultMenuItem
       key={result.id || idx}
       icon={result.icon}
+      slug={result.slug}
       primaryText={result.primary}
       secondaryText={result.secondary}
+      secondaryUrl={result.secondaryUrl}
       query={searchValue}
       highlightQuery="true"
       selected={

diff --git a/en/cozy-home/src/assistant/ResultMenu/ResultMenuItem.jsx b/en/cozy-home/src/assistant/ResultMenu/ResultMenuItem.jsx
@@ -6,11 +6,14 @@ import ListItem from 'cozy-ui/transpiled/react/ListItem'
 import ListItemIcon from 'cozy-ui/transpiled/react/ListItemIcon'
 import ListItemText from 'cozy-ui/transpiled/react/ListItemText'
 import SuggestionItemTextHighlighted from './SuggestionItemTextHighlighted'
+import SuggestionItemTextSecondary from './SuggestionItemTextSecondary'
 
 const ResultMenuItem = ({
   icon,
   primaryText,
   secondaryText,
+  secondaryUrl,
+  slug,
   selected,
   onClick,
   query,
@@ -32,7 +35,12 @@ const ResultMenuItem = ({
   )
 
   const secondary = highlightQuery ? (
-    <SuggestionItemTextHighlighted text={secondaryText} query={query} />
+    <SuggestionItemTextSecondary
+      text={secondaryText}
+      query={query}
+      slug={slug}
+      url={secondaryUrl}
+    />
   ) : (
     secondaryText
   )

diff --git a/en/cozy-home/src/assistant/ResultMenu/SuggestionItemTextSecondary.jsx b/en/cozy-home/src/assistant/ResultMenu/SuggestionItemTextSecondary.jsx
@@ -0,0 +1,46 @@
+/**
+ * Code copied and adapted from cozy-drive
+ *
+ * See source: https://github.com/cozy/cozy-drive/blob/fbe2df67199683b23a40f476ccdacb00ee027459/src/modules/search/components/SuggestionItemTextSecondary.jsx
+ */
+import React from 'react'
+
+import AppLinker from 'cozy-ui/transpiled/react/AppLinker'
+import SuggestionItemTextHighlighted from './SuggestionItemTextHighlighted'
+import useBreakpoints from 'cozy-ui/transpiled/react/providers/Breakpoints'
+import Link from 'cozy-ui/transpiled/react/Link'
+
+const SuggestionItemTextSecondary = ({ text, query, url, slug }) => {
+  const { isMobile } = useBreakpoints()
+
+  if (isMobile || !url) {
+    return <SuggestionItemTextHighlighted text={text} query={query} />
+  }
+
+  const app = { slug }
+  return (
+    <AppLinker app={app} href={url}>
+      {({ href, onClick }) => (
+        <Link
+          color="textSecondary"
+          underline="hover"
+          href={href}
+          onClick={e => {
+            e.stopPropagation()
+            if (typeof onClick == 'function') {
+              onClick(e)
+            }
+          }}
+        >
+          <SuggestionItemTextHighlighted
+            text={text}
+            query={query}
+            slug={slug}
+          />
+        </Link>
+      )}
+    </AppLinker>
+  )
+}
+
+export default SuggestionItemTextSecondary
diff --git a/en/cozy-home/src/assistant/Search/useFetchResult.jsx b/en/cozy-home/src/assistant/Search/useFetchResult.jsx
@@ -36,6 +36,8 @@ export const useFetchResult = searchValue => {
         return {
           id: r.doc._id,
           icon: icon,
+          slug: r.slug,
+          secondaryUrl: r.secondaryUrl,
           primary: r.title,
           secondary: r.subTitle,
           onClick: () => {