Bugfix KNOWAGE-8571

KnowageLabs · Aug 6, 2024 · b1ed0f0 · b1ed0f0
1 parent 37bb48c
commit b1ed0f0
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/modules/documentExecution/main/DocumentExecutionHelpers.ts b/src/modules/documentExecution/main/DocumentExecutionHelpers.ts
@@ -126,11 +126,11 @@ const removeEmptyToolbarItems = (toolbarMenuItems: any[]) => {
 export const getValidDate = (value: string, serverDateFormat: string) => {
     const extractedDateValue = extractDatePart(value)
     let momentDate = moment(deepcopy(extractedDateValue))
-    const tempServerDateFormat = serverDateFormat.replaceAll('y', 'Y')
+    const tempServerDateFormat = convertToMomentFormat(serverDateFormat)
     const validFormats = [tempServerDateFormat, 'DD/MM/YYYY', 'DD/MM/YYYY HH:mm:ss.SSS']
     let tempDateFormatFromTheDateValue = extractDateFormatPart(value)
     if (tempDateFormatFromTheDateValue) {
-        tempDateFormatFromTheDateValue = tempDateFormatFromTheDateValue.replaceAll('y', 'Y')
+        tempDateFormatFromTheDateValue = convertToMomentFormat(tempDateFormatFromTheDateValue)
         validFormats.unshift(tempDateFormatFromTheDateValue)
     }
     for (let i = 0; i < validFormats.length; i++) {
@@ -140,6 +140,10 @@ export const getValidDate = (value: string, serverDateFormat: string) => {
     return ''
 }
 
+const convertToMomentFormat = (format: string) => {
+    return format.replace(/yyyy/g, 'YYYY').replace(/dd/g, 'DD').replace(/mm/g, 'MM')
+}
+
 const extractDatePart = (dateString: string) => {
     if (dateString.includes('#')) {
         return dateString.split('#')[0]