Protect on null dateFormats

Signed-off-by: Joshua Li <[email protected]>
opensearch-project · Oct 21, 2021 · 104c031 · 104c031
1 parent 83a9ce3
commit 104c031
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dashboards-reports/public/components/utils/settings_service.ts b/dashboards-reports/public/components/utils/settings_service.ts
@@ -18,6 +18,6 @@ export const uiSettingsService = {
     uiSettings = client;
   },
   get: (key: string, defaultOverride?: any) => {
-    return uiSettings?.get(key, defaultOverride);
+    return uiSettings?.get(key, defaultOverride) || '';
   },
 };
diff --git a/dashboards-reports/server/routes/report.ts b/dashboards-reports/server/routes/report.ts
@@ -122,7 +122,7 @@ export default function (router: IRouter, accessInfo: AccessInfoType) {
         }),
         query: schema.object({
           timezone: schema.string(),
-          dateFormat: schema.string(),
+          dateFormat: schema.maybe(schema.string()),
         }),
       },
     },
@@ -188,7 +188,7 @@ export default function (router: IRouter, accessInfo: AccessInfoType) {
         }),
         query: schema.object({
           timezone: schema.string(),
-          dateFormat: schema.string(),
+          dateFormat: schema.maybe(schema.string()),
         }),
       },
     },