Editor: Rework update frequency dropdown

apps/metadata-editor-e2e/src/e2e/edit.cy.ts

@@ -308,9 +308,6 @@ describe('editor form', () => {
         describe('when the regularity switch is on', () => {
           it('should allow to select a frequency', () => {
             cy.editor_wrapPreviousDraft()
-            cy.get('gn-ui-form-field-update-frequency')
-              .find('gn-ui-check-toggle label')
-              .click()
             cy.get('gn-ui-form-field-update-frequency')
               .find('gn-ui-dropdown-selector')
               .openDropdown()
@@ -324,7 +321,7 @@ describe('editor form', () => {
               .getActiveDropdownOption()
               .find('span')
               .invoke('text')
-              .should('eq', ' 2 times per week ')
+              .should('eq', ' Data is updated each day ')
           })
         })
         describe('when the regularity switch is off', () => {
@@ -340,7 +337,7 @@ describe('editor form', () => {
               .find('button')
               .find('div')
               .invoke('text')
-              .should('eq', ' Once per day ')
+              .should('eq', ' Data is repeatedly and frequently updated ')
           })
         })
       })

libs/api/metadata-converter/src/lib/gn4/gn4.converter.spec.ts

@@ -1657,10 +1657,7 @@ describe('Gn4Converter', () => {
             topics: ['Installations de suivi environnemental', 'Océans'],
             title: 'Surval - Données par paramètre',
             uniqueIdentifier: 'cf5048f6-5bbf-4e44-ba74-e6f429af51ea',
-            updateFrequency: {
-              per: 'day',
-              updatedTimes: 1,
-            },
+            updateFrequency: 'daily',
             spatialExtents: [
               {
                 description: 'Hauts-de-France (Région)',

libs/api/metadata-converter/src/lib/iso19139/utils/update-frequency.mapper.ts

@@ -1,67 +1,14 @@
-import { UpdateFrequency } from '@geonetwork-ui/common/domain/model/record'
+import {
+  UpdateFrequency,
+  UpdateFrequencyCode,
+  updateFrequencyCodeValues,
+} from '@geonetwork-ui/common/domain/model/record'
 
 export function getUpdateFrequencyFromFrequencyCode(
   frequencyCode: string
 ): UpdateFrequency {
-  switch (frequencyCode) {
-    case 'asNeeded':
-      return 'asNeeded'
-    case 'unknown':
-      return 'unknown'
-    case 'irregular':
-      return 'irregular'
-    case 'notPlanned':
-      return 'notPlanned'
-    case 'continual':
-      return 'continual'
-    case 'periodic':
-      return 'periodic'
-    case 'daily':
-      return {
-        updatedTimes: 1,
-        per: 'day',
-      }
-    case 'weekly':
-      return {
-        updatedTimes: 1,
-        per: 'week',
-      }
-    case 'fortnightly':
-      return {
-        updatedTimes: 0.5,
-        per: 'week',
-      }
-    case 'semimonthly':
-      return {
-        updatedTimes: 2,
-        per: 'month',
-      }
-    case 'monthly':
-      return {
-        updatedTimes: 1,
-        per: 'month',
-      }
-    case 'quarterly':
-      return {
-        updatedTimes: 4,
-        per: 'year',
-      }
-    case 'biannually':
-      return {
-        updatedTimes: 2,
-        per: 'year',
-      }
-    case 'annually':
-      return {
-        updatedTimes: 1,
-        per: 'year',
-      }
-    case 'biennially':
-      return {
-        updatedTimes: 0.5,
-        per: 'year',
-      }
-    default:
-      return null
-  }
+  return frequencyCode &&
+    updateFrequencyCodeValues.includes(frequencyCode as UpdateFrequencyCode)
+    ? (frequencyCode as UpdateFrequencyCode)
+    : null
 }

libs/api/metadata-converter/src/lib/iso19139/write-parts.ts

@@ -269,6 +269,24 @@ export function getMaintenanceFrequencyCode(
       return 'continual'
     case 'periodic':
       return 'periodic'
+    case 'daily':
+      return 'daily'
+    case 'weekly':
+      return 'weekly'
+    case 'fortnightly':
+      return 'fortnightly'
+    case 'monthly':
+      return 'monthly'
+    case 'quarterly':
+      return 'quarterly'
+    case 'biannually':
+      return 'biannually'
+    case 'annually':
+      return 'annually'
+    case 'semimonthly':
+      return 'semimonthly'
+    case 'biennially':
+      return 'biennially'
   }
 }
 

libs/common/domain/src/lib/model/record/metadata.model.ts

@@ -21,19 +21,41 @@ marker('domain.record.updateFrequency.irregular')
 marker('domain.record.updateFrequency.continual')
 marker('domain.record.updateFrequency.periodic')
 
-export type UpdateFrequencyCode =
-  | 'unknown'
-  | 'notPlanned'
-  | 'asNeeded'
-  | 'irregular'
-  | 'continual'
-  | 'periodic'
+export const updateFrequencyCodeValues = [
+  'unknown',
+  'notPlanned',
+  'asNeeded',
+  'irregular',
+  'continual',
+  'periodic',
+  'daily',
+  'weekly',
+  'fortnightly',
+  'semimonthly',
+  'monthly',
+  'quarterly',
+  'biannually',
+  'annually',
+  'biennially',
+] as const
+
+export type UpdateFrequencyCode = (typeof updateFrequencyCodeValues)[number]
 
 marker('domain.record.updateFrequency.day')
 marker('domain.record.updateFrequency.week')
 marker('domain.record.updateFrequency.month')
 marker('domain.record.updateFrequency.year')
 
+marker('domain.record.updateFrequency.daily')
+marker('domain.record.updateFrequency.weekly')
+marker('domain.record.updateFrequency.fortnightly')
+marker('domain.record.updateFrequency.monthly')
+marker('domain.record.updateFrequency.quarterly')
+marker('domain.record.updateFrequency.biannually')
+marker('domain.record.updateFrequency.annually')
+marker('domain.record.updateFrequency.semimonthly')
+marker('domain.record.updateFrequency.biennially')
+
 export type UpdateFrequencyCustom = {
   updatedTimes: number // this should be an integer
   per: 'day' | 'week' | 'month' | 'year'

libs/feature/editor/src/lib/components/record-form/form-field/form-field-update-frequency/form-field-update-frequency.component.spec.ts

@@ -30,7 +30,7 @@ describe('FormFieldUpdateFrequencyComponent', () => {
     })
 
     it('should offer a set of initial choices', () => {
-      expect(component['choices']).toHaveLength(10)
+      expect(component['choices']).toHaveLength(13)
       expect(component['choices']).toContainEqual({
         label: 'domain.record.updateFrequency.week',
         value: 'week.3',
@@ -77,10 +77,7 @@ describe('FormFieldUpdateFrequencyComponent', () => {
     it('should emit once per day on toggle', () => {
       const spy = jest.spyOn(component.valueChange, 'emit')
       component.onPlannedToggled()
-      expect(spy).toHaveBeenCalledWith({
-        updatedTimes: 1,
-        per: 'day',
-      })
+      expect(spy).toHaveBeenCalledWith('continual')
     })
   })
 })