feat(sharing): Change ShareRestrictionModal validity

Changed validation conditions when creating a share link.
cozy · Jan 21, 2025 · f68c3a4 · f68c3a4
1 parent fe25984
commit f68c3a4
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/packages/cozy-sharing/src/components/ShareRestrictionModal/ShareRestrictionContentModal.jsx b/packages/cozy-sharing/src/components/ShareRestrictionModal/ShareRestrictionContentModal.jsx
@@ -9,6 +9,8 @@ import { useI18n } from 'cozy-ui/transpiled/react/providers/I18n'
 import { BoxDate } from './BoxDate'
 import { BoxEditingRights } from './BoxEditingRights'
 import { BoxPassword } from './BoxPassword'
+import { checkIsPermissionHasPassword } from '../../helpers/permissions'
+import { useSharingContext } from '../../hooks/useSharingContext'
 
 const PASSWORD_MIN_LENGTH = 4
 
@@ -32,26 +34,40 @@ export const ShareRestrictionContentModal = ({
   setEditingRights
 }) => {
   const { t } = useI18n()
+  const { getDocumentPermissions } = useSharingContext()
+  const permissions = getDocumentPermissions(file._id)
+  const hasPassword = checkIsPermissionHasPassword(permissions)
 
   const handlePassword = value => {
     setPassword(value)
-    setIsValidPassword(
-      value.trim().length === 0 || value.trim().length >= PASSWORD_MIN_LENGTH
-    )
+    setIsValidPassword(value.trim().length >= PASSWORD_MIN_LENGTH)
   }
 
   const handlePasswordToggle = val => {
     setPasswordToggle(val)
     handlePassword('')
+    if (val && !password) {
+      setIsValidPassword(hasPassword)
+    } else {
+      setIsValidPassword(true)
+    }
+  }
+
+  const handleDate = date => {
+    setSelectedDate(date)
+    setIsValidDate(Boolean(date))
   }
 
   const handleDateToggle = val => {
+    setDateToggle(val)
     if (!val) {
+      setSelectedDate(null)
+      setIsValidDate(true)
+    } else {
+      const defaultValue = val ? addDays(new Date(), 30) : null
+      setSelectedDate(defaultValue)
       setIsValidDate(true)
     }
-    const defaultValue = val ? addDays(new Date(), 30) : null
-    setSelectedDate(defaultValue, true)
-    setDateToggle(val)
   }
 
   return (
@@ -66,7 +82,7 @@ export const ShareRestrictionContentModal = ({
         setEditingRights={setEditingRights}
       />
       <BoxDate
-        onChange={setSelectedDate}
+        onChange={handleDate}
         date={selectedDate}
         onToggle={handleDateToggle}
         toggle={dateToggle}

diff --git a/packages/cozy-sharing/src/components/ShareRestrictionModal/ShareRestrictionModal.jsx b/packages/cozy-sharing/src/components/ShareRestrictionModal/ShareRestrictionModal.jsx
@@ -70,11 +70,6 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
       })
     : null
 
-  const handleDateChange = (date, isValid) => {
-    setSelectedDate(date)
-    setIsValidDate(isValid)
-  }
-
   const handleClick = async () => {
     setLoading(true)
     // If the file is not shared, we create a new sharing link
@@ -146,7 +141,7 @@ export const ShareRestrictionModal = ({ file, onClose }) => {
           // Date
           dateToggle={dateToggle}
           setDateToggle={setDateToggle}
-          setSelectedDate={handleDateChange}
+          setSelectedDate={setSelectedDate}
           selectedDate={selectedDate}
           setIsValidDate={setIsValidDate}
           // Password