fix(ux): customPopup

Related to #27 (closed)

Give your MR title the same name that the desired squash commit. In doubt, check the conventional commit doc. examples
feat(profile): add...
fix(annuaire): remove...

What does this MR do and why?

Describe in detail what your merge request does and why.

Screenshots or screen recordings

These are strongly recommended to assist reviewers and reduce the time to merge your change.

How to set up and validate locally (or on alpha)

List all steps to set up and validate the changes on local environment.

MR acceptance checklist

To be completed by the chosen reviewer.

Quality -

• For the code that this change impacts, I believe that the automated tests validate functionality that is highly important to users. If the existing automated tests do not cover this functionality, I have added the necessary additional tests or I have added an issue to describe the automation testing gap and linked it to this MR.
• I have made sure that the sonar quality coverage is up to standards.
• I have considered the impact of this change on the front-end, back-end, and database portions of the system where appropriate and applied.
• I have tested this MR in all supported browsers or determined that this testing is not needed.
• I have confirmed that this change is backwards compatible across updates (migrate up needs a migrate down), or I have decided that this does not apply.

Performance, reliability and availability

• I am confident that this MR does not harm performance, or I have asked a reviewer to help assess the performance impact.
• I have considered the scalability risk based on future predicted growth.

Documentation

• The MR is named after the desired squash commit to feed the changelog linked to the current milestone.
• I have added/updated documentation (also updated if the changes feature a deprecation) or I have decided that documentation changes are not needed for this MR.

Security

• I have confirmed that if this MR does not contains any sensitive informations hidden in the changes.

Deployment

• When featured on a self-data project release, I have made sure my app version in the manifest and package.json is incremented and any relative changes to the permissions are clearly written and transmitted to Cozy.

src/components/Popups/Popups.tsx

@@ -18,6 +18,7 @@ import {
   Option,
   durationEnum,
   durationType,
+  mapDuration,
 } from '../../models/durationOptions.model'
 import { IPartnersInfo } from '../../models/partnersInfo.model'
 import { CustomPopupService } from '../../services/customPopup.service'
@@ -54,15 +55,15 @@ const Popups: React.FC = () => {
     notification_activated: false,
   })
   const [previousEndDate, setPreviousEndDate] = useState<string>()
+  const [popupDuration, setPopupDuration] = useState<PopupDuration>({
+    type: durationEnum.infinite,
+    duration: 5,
+  })
   const [customPopup, setCustomPopup] = useState<ICustomPopup>({
     popupEnabled: false,
     title: '',
     description: '',
-    endDate: DateTime.local().toISO(),
-  })
-  const [popupDuration, setPopupDuration] = useState<PopupDuration>({
-    type: durationEnum.hours,
-    duration: 0,
+    endDate: DateTime.local().plus({ days: 365 }).toISO(),
   })
 
   const isPartnerNotificationOn = () =>
@@ -135,19 +136,25 @@ const Popups: React.FC = () => {
       if (user) {
         const partnersInfoService = new PartnersInfoService()
         const customPopupService = new CustomPopupService()
-        const partnersInfoData = await partnersInfoService.getPartnersInfo()
-        const customPopupData = await customPopupService.getCustomPopupInfo()
+        const previousPartnersInfo = await partnersInfoService.getPartnersInfo()
+        const previousPopup = await customPopupService.getCustomPopupInfo()
 
-        if (partnersInfoData) {
+        if (previousPartnersInfo) {
           setPartnersInfo({
-            ...partnersInfoData,
+            ...previousPartnersInfo,
           })
         }
-        if (customPopupData) {
+        if (previousPopup) {
+          const isOutdated = isPopupOutdated(previousPopup.endDate)
+          /** If outdated, set value to false, otherwise, set it to its value */
+          const isEnabled = isOutdated ? false : previousPopup.popupEnabled
           setCustomPopup({
-            ...customPopupData,
+            title: previousPopup.title,
+            description: previousPopup.description,
+            endDate: customPopup.endDate,
+            popupEnabled: isEnabled,
           })
-          setPreviousEndDate(customPopupData.endDate || undefined)
+          setPreviousEndDate(previousPopup.endDate || undefined)
         }
       }
       setIsLoading(false)
@@ -190,9 +197,7 @@ const Popups: React.FC = () => {
     }))
   }
 
-  /**
-   * Handles duration change
-   */
+  /** Handles duration change */
   useEffect(() => {
     const now = DateTime.local()
     let newDate: DateTime
@@ -200,7 +205,7 @@ const Popups: React.FC = () => {
       newDate = now.plus({
         [popupDuration.type]: popupDuration.duration,
       })
-    } else if (popupDuration.type === 'infinite') {
+    } else {
       newDate = now.plus({
         years: 1,
       })
@@ -323,6 +328,51 @@ const Popups: React.FC = () => {
                   getRemainingDuration(previousEndDate)}
               </FormGroup>
 
+              <div className="popupEndDate">
+                <h4>Durée</h4>
+                <div>
+                  <FormControl style={{ flexDirection: 'row', gap: '1rem' }}>
+                    <NativeSelect
+                      inputProps={{
+                        name: 'age',
+                        id: 'uncontrolled-native',
+                      }}
+                      onChange={event => handleSelectChange(event)}
+                      value={popupDuration.type}
+                    >
+                      {OPTIONS.map(option => (
+                        <option key={option.value} value={option.value}>
+                          {option.label}
+                        </option>
+                      ))}
+                    </NativeSelect>
+
+                    <TextField
+                      style={{ width: '6rem' }}
+                      inputProps={{
+                        inputMode: 'numeric',
+                        pattern: '[0-9]*',
+                      }}
+                      id="outlined-number"
+                      type="number"
+                      label={mapDuration[popupDuration.type]}
+                      InputLabelProps={{
+                        shrink: true,
+                      }}
+                      value={popupDuration.duration}
+                      disabled={popupDuration.type === 'infinite'}
+                      onChange={e =>
+                        setPopupDuration(prev => ({
+                          ...prev,
+                          duration: Number(e.target.value),
+                        }))
+                      }
+                    />
+                  </FormControl>
+                </div>
+              </div>
+
+              <h4>Contenu</h4>
               <div className="popupTitle">
                 <TextField
                   type="text"
@@ -347,48 +397,6 @@ const Popups: React.FC = () => {
                   type="custom_popup"
                 />
               </div>
-
-              <div className="popupEndDate">
-                <label htmlFor="title">Nouvelle Durée</label>
-                <div>
-                  <FormControl style={{ flexDirection: 'row', gap: '1rem' }}>
-                    <NativeSelect
-                      inputProps={{
-                        name: 'age',
-                        id: 'uncontrolled-native',
-                      }}
-                      onChange={event => handleSelectChange(event)}
-                    >
-                      {OPTIONS.map(option => (
-                        <option key={option.value} value={option.value}>
-                          {option.label}
-                        </option>
-                      ))}
-                    </NativeSelect>
-
-                    {popupDuration.type !== 'infinite' && (
-                      <TextField
-                        inputProps={{
-                          inputMode: 'numeric',
-                          pattern: '[0-9]*',
-                        }}
-                        id="outlined-number"
-                        type="number"
-                        InputLabelProps={{
-                          shrink: true,
-                        }}
-                        value={popupDuration.duration}
-                        onChange={e =>
-                          setPopupDuration(prev => ({
-                            ...prev,
-                            duration: Number(e.target.value),
-                          }))
-                        }
-                      />
-                    )}
-                  </FormControl>
-                </div>
-              </div>
             </div>
 
             <div className="buttons">