Feat(mespapiers): Use queries instead of sessionStorage to manage contactList when creating a new paper

packages/cozy-mespapiers-lib/src/components/ModelSteps/ContactDialog.jsx

@@ -67,19 +67,17 @@ const ContactDialog = ({ currentStep, onClose, onBack, onSubmit }) => {
             iconSize="small"
             title={t(text)}
             text={
-              currentUser && (
-                <Paper elevation={2} className="u-mt-1 u-mh-half">
-                  <ContactList
-                    className="u-pv-0"
-                    multiple={multiple}
-                    selected={contactsSelected}
-                    currentUser={currentUser}
-                    onSelection={handleContactSelection}
-                    contactModalOpened={contactModalOpened}
-                    setContactModalOpened={setContactModalOpened}
-                  />
-                </Paper>
-              )
+              <Paper elevation={2} className="u-mt-1 u-mh-half">
+                <ContactList
+                  className="u-pv-0"
+                  multiple={multiple}
+                  selected={contactsSelected}
+                  currentUser={currentUser}
+                  onSelection={handleContactSelection}
+                  contactModalOpened={contactModalOpened}
+                  setContactModalOpened={setContactModalOpened}
+                />
+              </Paper>
             }
           />
         }

packages/cozy-mespapiers-lib/src/components/ModelSteps/ContactDialog.spec.jsx

@@ -29,6 +29,7 @@ jest.mock('./widgets/ConfirmReplaceFile', () => () => (
 jest.mock('./widgets/SubmitButton', () => () => (
   <div data-testid="SubmitButton" />
 ))
+jest.mock('./ContactList', () => () => <div data-testid="ContactList" />)
 /* eslint-enable react/display-name */
 
 const setup = ({

packages/cozy-mespapiers-lib/src/components/ModelSteps/ContactList.jsx

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types'
-import React, { useState, useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 
+import { isQueryLoading, useClient, useQuery, useQueryAll } from 'cozy-client'
 import Avatar from 'cozy-ui/transpiled/react/Avatar'
 import ContactsListModal from 'cozy-ui/transpiled/react/ContactsListModal'
 import Divider from 'cozy-ui/transpiled/react/Divider'
@@ -9,16 +10,20 @@ import List from 'cozy-ui/transpiled/react/List'
 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 ListItemSkeleton from 'cozy-ui/transpiled/react/Skeletons/ListItemSkeleton'
 import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 
 import Contact from './Contact'
-import { useSessionstorage } from '../Hooks/useSessionstorage'
+import { SETTINGS_DOCTYPE } from '../../doctypes'
+import { buildContactsQueryByIds, getAppSettings } from '../../helpers/queries'
 
 const styleAvatar = {
   color: 'var(--primaryColor)',
   backgroundColor: 'var(--primaryColorLightest)'
 }
 
+let contactList = []
+
 const ContactList = ({
   multiple,
   currentUser,
@@ -30,23 +35,40 @@ const ContactList = ({
   onSelection
 }) => {
   const { t } = useI18n()
+  const client = useClient()
 
-  const [contactsLocalSession, setContactLocalSession] = useSessionstorage(
-    'contactList',
-    []
+  const { data: settingsData, ...settingsQuery } = useQuery(
+    getAppSettings.definition,
+    getAppSettings.options
   )
-  const [contactsList, setContactsList] = useState([
-    currentUser,
-    ...contactsLocalSession
-  ])
+  const isLoadingSettings = isQueryLoading(settingsQuery)
+
+  const suggestedContactIds = settingsData[0]?.suggestedContactIds || []
+  const contactsQueryByIds = buildContactsQueryByIds(
+    suggestedContactIds,
+    !isLoadingSettings
+  )
+  const { data: contacts, ...contactQueryResult } = useQueryAll(
+    contactsQueryByIds.definition,
+    contactsQueryByIds.options
+  )
+  const isLoadingContacts =
+    isQueryLoading(contactQueryResult) || contactQueryResult.hasMore
+
+  if (!isLoadingSettings && !isLoadingContacts && currentUser) {
+    contactList = [currentUser, ...contacts]
+  }
 
   const idsSelected = useMemo(() => selected.map(v => v._id), [selected])
 
-  const onClickContactsListModal = contact => {
-    const contactAlreadyListed = contactsList.some(cl => cl._id === contact._id)
+  const onClickContactsListModal = async contact => {
+    const contactAlreadyListed = contactList.some(cl => cl._id === contact._id)
     if (!contactAlreadyListed) {
-      setContactsList(prev => [...prev, contact])
-      setContactLocalSession(prev => [...prev, contact])
+      await client.save({
+        ...settingsData[0],
+        suggestedContactIds: [...suggestedContactIds, contact._id],
+        _type: SETTINGS_DOCTYPE
+      })
     }
     onSelection(multiple ? [...selected, contact] : [contact])
     setContactModalOpened(false)
@@ -63,29 +85,44 @@ const ContactList = ({
       else newContactIdSelected.push(newValue)
 
       onSelection(
-        contactsList.filter(contact =>
+        contactList.filter(contact =>
           newContactIdSelected.includes(contact._id)
         )
       )
     } else {
-      onSelection(contactsList.filter(contact => contact.id === newValue))
+      onSelection(contactList.filter(contact => contact.id === newValue))
     }
   }
 
+  // Returns a number of Skeletons based on the number of contactIds in the app settings + the current user
+  const Skeleton = useCallback(
+    () =>
+      Array.from(Array(suggestedContactIds.length + 1), (_, idx) => (
+        <ListItemSkeleton key={idx} />
+      )),
+    [suggestedContactIds.length]
+  )
+
   return (
     <>
       <List className={className}>
-        <div className="u-mah-5 u-ov-auto">
-          {contactsList.map(contact => (
-            <Contact
-              key={contact._id}
-              contact={contact}
-              multiple={multiple}
-              selected={idsSelected.includes(contact._id)}
-              onSelection={onClickContactLine}
-            />
-          ))}
-        </div>
+        {contactList.length === 0 &&
+        (isLoadingSettings || isLoadingContacts) ? (
+          <Skeleton />
+        ) : (
+          <div className="u-mah-5 u-ov-auto">
+            {contactList.map(contact => (
+              <Contact
+                key={contact._id}
+                contact={contact}
+                multiple={multiple}
+                selected={idsSelected.includes(contact._id)}
+                onSelection={onClickContactLine}
+              />
+            ))}
+          </div>
+        )}
+
         {!withoutDivider && <Divider variant="inset" component="li" />}
         <ListItem button onClick={() => setContactModalOpened(true)}>
           <ListItemIcon>
@@ -116,7 +153,7 @@ ContactList.propTypes = {
   /** Determine whether the user can select several contacts */
   multiple: PropTypes.bool.isRequired,
   /** Contact object representing the current user */
-  currentUser: PropTypes.object.isRequired,
+  currentUser: PropTypes.object,
   className: PropTypes.string,
   contactModalOpened: PropTypes.bool.isRequired,
   setContactModalOpened: PropTypes.func.isRequired,