OpeningHoursEditor: skip auxiliary Mo off; (#643)

zbycz · Oct 7, 2024 · 0a03bea · 0a03bea
1 parent c7d74f5
commit 0a03bea
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/...ts/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/__tests__/parser.test.ts b/...ts/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/__tests__/parser.test.ts
@@ -53,11 +53,22 @@ describe('canEditorHandle() === false', () => {
     { input: 'Mo-We 1:00-2:00; Fr 1:00-2:00' }, // we cant merge days yet, TODO update sanitize ?
     { input: 'Mo' },
     { input: 'Mo,PH 08:00-12:00' },
+    { input: 'Mo-Tu off; Tu-Sa 10:00-13:00' },
   ])('$input', ({ input }) => {
     expect(canItHandle(input)).toBe(false);
   });
 });
 
+describe('Mo off', () => {
+  test.each([
+    { input: 'Mo off', output: '' },
+    { input: 'Mo off; Tu-Sa 10:00-13:00; Su off', output: 'Tu-Sa 10:00-13:00' },
+  ])('$input', ({ input, output }) => {
+    expect(buildString(getDaysTable(input))).toEqual(output);
+    expect(canItHandle(input)).toBe(true);
+  });
+});
+
 describe('daysPart conversion', () => {
   test.each([
     { input: 'Mo,Th' },

diff --git a/src/components/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/canItHandle.ts b/src/components/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/canItHandle.ts
@@ -11,6 +11,9 @@ const sanitizeDaysParts = (value: string) => {
   return (value ?? '')
     .split(/ *; */)
     .map((part) => {
+      if (part.match(/^(Mo|Tu|We|Th|Fr|Sa|Su) off$/)) {
+        return false;
+      }
       if (part.match(/^((Mo|Tu|We|Th|Fr|Sa|Su)[-, ]*)+/)) {
         const [daysPart, timePart] = splitByFirstSpace(part);
         const days = parseDaysPart(daysPart);
@@ -21,6 +24,7 @@ const sanitizeDaysParts = (value: string) => {
       }
       return part;
     })
+    .filter(Boolean)
     .join('; ')
     .replace(/ *, */g, ',')
     .trim();

diff --git a/src/components/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/getDaysTable.ts b/src/components/FeaturePanel/EditDialog/EditContent/OpeningHoursEditor/parser/getDaysTable.ts
@@ -23,10 +23,12 @@ export const getEmptyValue = () =>
   );
 
 const getTimeSlots = (timePart: string) =>
-  timePart.split(/ *, */).map((time: string, slot: number) => {
-    const [from, to = ''] = time.split('-');
-    return { slotIdx: slot, from, to } as Slot;
-  });
+  timePart.trim() === 'off'
+    ? []
+    : timePart.split(/ *, */).map((time: string, slot: number) => {
+        const [from, to = ''] = time.split('-');
+        return { slotIdx: slot, from, to } as Slot;
+      });
 
 export const parseDaysPart = (daysPart: string): string[] => {
   const otherDays = [];