show full json

startreedata · Nov 8, 2024 · 4044ca4 · 4044ca4
1 parent 7d70f13
commit 4044ca4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 33 deletions.
diff --git a/thirdeye-ui/src/app/pages/namespace-configuration/api/index.tsx b/thirdeye-ui/src/app/pages/namespace-configuration/api/index.tsx
@@ -25,18 +25,13 @@ import { useNotificationProviderV1 } from "../../../platform/components";
 import { useTranslation } from "react-i18next";
 import { WorkspaceConfiguration } from "../../../rest/dto/workspace.interfaces";
 
-type namespaceConfig = {
-    timezone: string | undefined;
-    dateTimePattern: string | undefined;
-};
-
 type WorkspaceApiReques = {
     isError: boolean;
     isLoading: boolean;
     isUpdateDisabled: boolean;
-    namespaceConfig: namespaceConfig;
+    namespaceConfig: WorkspaceConfiguration | null;
     workspaceConfiguration: WorkspaceConfiguration | null;
-    setNamespaceConfig: (config: namespaceConfig) => void;
+    setNamespaceConfig: (config: WorkspaceConfiguration) => void;
     getWorkspaceConfiguration: () => Promise<
         WorkspaceConfiguration | undefined
     >;
@@ -49,10 +44,8 @@ type WorkspaceApiReques = {
 };
 
 export const useWorkspaceApiRequests = (): WorkspaceApiReques => {
-    const [namespaceConfig, setNamespaceConfig] = useState<namespaceConfig>({
-        timezone: "",
-        dateTimePattern: "",
-    });
+    const [namespaceConfig, setNamespaceConfig] =
+        useState<WorkspaceConfiguration | null>(null);
 
     const { notify } = useNotificationProviderV1();
     const { t } = useTranslation();
@@ -82,11 +75,7 @@ export const useWorkspaceApiRequests = (): WorkspaceApiReques => {
 
     useEffect(() => {
         if (!isEmpty(workspaceConfiguration)) {
-            setNamespaceConfig({
-                timezone: workspaceConfiguration?.timeConfiguration.timezone,
-                dateTimePattern:
-                    workspaceConfiguration?.timeConfiguration.dateTimePattern,
-            });
+            setNamespaceConfig(workspaceConfiguration);
         }
     }, [workspaceConfiguration]);
 
@@ -136,11 +125,7 @@ export const useWorkspaceApiRequests = (): WorkspaceApiReques => {
         updateStatus === ActionStatus.Working ||
         resetStaus === ActionStatus.Working;
 
-    const isUpdateDisabled = isEqual(namespaceConfig, {
-        dateTimePattern:
-            workspaceConfiguration?.timeConfiguration.dateTimePattern,
-        timezone: workspaceConfiguration?.timeConfiguration.timezone,
-    });
+    const isUpdateDisabled = isEqual(namespaceConfig, workspaceConfiguration);
 
     return {
         isError,

diff --git a/thirdeye-ui/src/app/pages/namespace-configuration/index.tsx b/thirdeye-ui/src/app/pages/namespace-configuration/index.tsx
@@ -32,7 +32,6 @@ export const NamespaceConfiguration = (): JSX.Element => {
         isUpdateDisabled,
         namespaceConfig,
         setNamespaceConfig,
-        workspaceConfiguration,
         resetWorkspaceConfiguration,
         updateWorkspaceConfiguration,
     } = useWorkspaceApiRequests();
@@ -44,17 +43,7 @@ export const NamespaceConfiguration = (): JSX.Element => {
         resetWorkspaceConfiguration();
     };
     const handleUpdate = async (): Promise<void> => {
-        const updatedNamespaceConfig = {
-            ...workspaceConfiguration,
-            timeConfiguration: {
-                ...workspaceConfiguration?.templateConfiguration,
-                timezone: namespaceConfig.timezone,
-                dateTimePattern: namespaceConfig.dateTimePattern,
-            },
-        };
-        updateWorkspaceConfiguration(
-            updatedNamespaceConfig as WorkspaceConfiguration
-        );
+        updateWorkspaceConfiguration(namespaceConfig as WorkspaceConfiguration);
     };
 
     return (