Merge branch 'main' of https://github.com/shesha-io/shesha-framework

shesha-io · Jul 18, 2023 · c1e7308 · c1e7308
2 parents 66e65f0 + 73e2dd5
commit c1e7308
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/shesha-reactjs/src/components/formDesigner/components/text/utils.ts b/shesha-reactjs/src/components/formDesigner/components/text/utils.ts
@@ -39,18 +39,18 @@ export const getContent = (content: string, { dataType = 'string', dateFormat, n
 
 export const formatDateStringAndPrefix = (content: string, dateFormat: string) => {
   const regex = /^\s*([\S\s]+?)\s+(\d{4}-\d{2}-\d{2})/;
-  const match = content.match(regex);
+  const match = content?.match(regex);
 
-  if (match) {
+  if (match && match?.length > 2) {
     const prefix = match[1] || '';
-    const dateString = match[2];
+    const dateString = match[2] || '';
 
-    const formatedDate = moment(dateString).isValid()
-      ? moment(dateString).format(dateFormat || 'DD/MM/YYYY HH:mm')
-      : dateString;
-
-    return `${prefix} ${formatedDate}`;
+    return `${prefix} ${formatDate(dateString, dateFormat)}`;
   } else {
-    return content;
+    return formatDate(content, dateFormat);
   }
 };
+
+const formatDate = (dateText: string, dateFormat: string) => {
+  return moment(dateText).isValid() ? moment(dateText).format(dateFormat || 'DD/MM/YYYY HH:mm') : dateText;
+};