fix(Viewer): Editing a contact use now the correct intent path

cozy · Jan 16, 2025 · 44881c3 · 44881c3
1 parent 24a4927
commit 44881c3
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 73 deletions.
diff --git a/packages/cozy-viewer/src/Panel/ActionMenuWrapper.jsx b/packages/cozy-viewer/src/Panel/ActionMenuWrapper.jsx
@@ -17,7 +17,10 @@ const ActionMenuWrapper = forwardRef(
     const { showAlert } = useAlert()
 
     const isEditable = isEditableAttribute(name, file) && !isReadOnly
-    const editPath = `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
+    const editPath =
+      name === 'contact'
+        ? `${file.metadata.qualification.label}/${file._id}/edit/contact`
+        : `${file.metadata.qualification.label}/${file._id}/edit/information?metadata=${optionFile.name}`
 
     const handleCopy = async () => {
       try {

diff --git a/packages/cozy-viewer/src/Panel/Qualification.jsx b/packages/cozy-viewer/src/Panel/Qualification.jsx
@@ -120,11 +120,11 @@ const Qualification = ({ file, isPublic, isReadOnly }) => {
           })}
           {optionFile.name && (
             <ActionMenuWrapper
-              onClose={hideActionsMenu}
+              ref={actionBtnRef.current[optionFile.id]}
               file={file}
               optionFile={optionFile}
-              ref={actionBtnRef.current[optionFile.id]}
               isReadOnly={isPublic ? true : isReadOnly}
+              onClose={hideActionsMenu}
             />
           )}
         </List>

diff --git a/packages/cozy-viewer/src/Panel/QualificationListItemContact.jsx b/packages/cozy-viewer/src/Panel/QualificationListItemContact.jsx
@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types'
-import React, { useRef, useState } from 'react'
+import React, { forwardRef } from 'react'
 
 import {
   getTranslatedNameForContact,
@@ -15,85 +15,66 @@ import ListItemSecondaryAction from 'cozy-ui/transpiled/react/ListItemSecondaryA
 import Spinner from 'cozy-ui/transpiled/react/Spinner'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
-import ActionMenuWrapper from './ActionMenuWrapper'
 import QualificationListItemText from './QualificationListItemText'
 import IntentOpener from '../components/IntentOpener'
 import useReferencedContactName from '../hooks/useReferencedContactName'
 
-const QualificationListItemContact = ({ file, isReadOnly }) => {
-  const { lang } = useI18n()
-  const actionBtnRef = useRef()
-  const [optionFile, setOptionFile] = useState({
-    name: '',
-    value: ''
-  })
-  const { contacts, isLoadingContacts } = useReferencedContactName(file)
+const QualificationListItemContact = forwardRef(
+  ({ file, isReadOnly, toggleActionsMenu }, ref) => {
+    const { lang } = useI18n()
+    const { contacts, isLoadingContacts } = useReferencedContactName(file)
 
-  if (isLoadingContacts) {
-    return (
-      <ListItem>
-        <Spinner color="var(--secondaryTextColor)" />
-      </ListItem>
-    )
-  }
-
-  const formattedValue = formatContactValue(contacts)
+    if (isLoadingContacts) {
+      return (
+        <ListItem>
+          <Spinner color="var(--secondaryTextColor)" />
+        </ListItem>
+      )
+    }
 
-  if (!formattedValue) {
-    return null
-  }
+    const formattedValue = formatContactValue(contacts)
 
-  const formattedTitle = getTranslatedNameForContact({ lang })
-  const qualificationLabel = file.metadata.qualification.label
+    if (!formattedValue) {
+      return null
+    }
 
-  const hideActionsMenu = () => setOptionFile({ name: '', value: '' })
-  const toggleActionsMenu = (name, value) =>
-    setOptionFile(prev => {
-      if (prev.value) return { name: '', value: '' }
-      return { name, value }
-    })
+    const formattedTitle = getTranslatedNameForContact({ lang })
+    const qualificationLabel = file.metadata.qualification.label
 
-  return (
-    <>
-      <IntentOpener
-        action="OPEN"
-        doctype="io.cozy.files.paper"
-        options={{
-          path: `${qualificationLabel}/${file._id}/edit/contact`
-        }}
-        disabled={!!formattedValue || isReadOnly}
-      >
-        <ListItem button={!formattedValue && !isReadOnly}>
-          <ListItemIcon>
-            <Icon icon={PeopleIcon} />
-          </ListItemIcon>
-          <QualificationListItemText
-            primary={formattedTitle}
-            secondary={formattedValue}
-          />
-          <ListItemSecondaryAction>
-            <IconButton
-              ref={actionBtnRef}
-              onClick={() => toggleActionsMenu('contact', formattedValue)}
-            >
-              <Icon icon={Dots} />
-            </IconButton>
-          </ListItemSecondaryAction>
-        </ListItem>
-      </IntentOpener>
+    return (
+      <>
+        <IntentOpener
+          action="OPEN"
+          doctype="io.cozy.files.paper"
+          options={{
+            path: `${qualificationLabel}/${file._id}/edit/contact`
+          }}
+          disabled={!!formattedValue || isReadOnly}
+        >
+          <ListItem button={!formattedValue && !isReadOnly}>
+            <ListItemIcon>
+              <Icon icon={PeopleIcon} />
+            </ListItemIcon>
+            <QualificationListItemText
+              primary={formattedTitle}
+              secondary={formattedValue}
+            />
+            <ListItemSecondaryAction>
+              <IconButton
+                ref={ref}
+                onClick={() => toggleActionsMenu('contact', formattedValue)}
+              >
+                <Icon icon={Dots} />
+              </IconButton>
+            </ListItemSecondaryAction>
+          </ListItem>
+        </IntentOpener>
+      </>
+    )
+  }
+)
 
-      {optionFile.value && (
-        <ActionMenuWrapper
-          onClose={hideActionsMenu}
-          file={file}
-          optionFile={optionFile}
-          ref={actionBtnRef}
-          isReadOnly={isReadOnly}
-        />
-      )}
-    </>
-  )
-}
+QualificationListItemContact.displayName = 'QualificationListItemContact'
 
 QualificationListItemContact.propTypes = {
   file: PropTypes.object.isRequired,