From 5a62e7865ebb497f4b8fa74067ca36d67947ab89 Mon Sep 17 00:00:00 2001
From: Prabhat Sharma <ptsharma@amazon.com>
Date: Mon, 29 Apr 2024 08:53:31 +0530
Subject: [PATCH] Fixed bug: Readonly DataSourceMEnu in create rollup and
 create transform workflow

Signed-off-by: Prabhat Sharma <ptsharma@amazon.com>
---
 .../CreateRollupForm/CreateRollupForm.tsx     |  1 +
 public/pages/Main/Main.tsx                    | 54 +++++++++----------
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx b/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx
index c7cc2ea8b..8c5632049 100644
--- a/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx
+++ b/public/pages/CreateRollup/containers/CreateRollupForm/CreateRollupForm.tsx
@@ -196,6 +196,7 @@ export class CreateRollupForm extends Component<CreateRollupFormProps, CreateRol
     const setDataSourceReadOnly = this.props.setDataSourceReadOnly;
 
     if (this.props.multiDataSourceEnabled && !dataSourceReadOnly) {
+      console.log("setting data source read only");
       setDataSourceReadOnly(true);
     }
 
diff --git a/public/pages/Main/Main.tsx b/public/pages/Main/Main.tsx
index 6f48fb144..e462fe10d 100644
--- a/public/pages/Main/Main.tsx
+++ b/public/pages/Main/Main.tsx
@@ -390,6 +390,33 @@ export default class Main extends Component<MainProps, MainState> {
                       >
                         {this.props.multiDataSourceEnabled && DataSourceMenu && DataSourceViewer && (
                           <Switch>
+                            <Route
+                              path={[ROUTES.CREATE_ROLLUP, ROUTES.CREATE_TRANSFORM]}
+                              render={() =>
+                                this.state.dataSourceReadOnly ? (
+                                  <DataSourceViewer
+                                    setMenuMountPoint={this.props.setActionMenu}
+                                    componentType={"DataSourceView"}
+                                    componentConfig={{
+                                      activeOption,
+                                      fullWidth: false,
+                                    }}
+                                  />
+                                ) : (
+                                  <DataSourceMenu
+                                    setMenuMountPoint={this.props.setActionMenu}
+                                    componentType={"DataSourceSelectable"}
+                                    componentConfig={{
+                                      savedObjects: core?.savedObjects.client,
+                                      notifications: core?.notifications,
+                                      fullWidth: false,
+                                      activeOption,
+                                      onSelectedDataSources: this.onSelectedDataSources,
+                                    }}
+                                  />
+                                )
+                              }
+                            />
                             <Route
                               path={[
                                 `${ROUTES.CREATE_DATA_STREAM}/:dataStream`,
@@ -451,33 +478,6 @@ export default class Main extends Component<MainProps, MainState> {
                                 />
                               )}
                             />
-                            <Route
-                              path={[ROUTES.CREATE_ROLLUP, ROUTES.CREATE_TRANSFORM]}
-                              render={() =>
-                                this.state.dataSourceReadOnly ? (
-                                  <DataSourceViewer
-                                    setMenuMountPoint={this.props.setActionMenu}
-                                    componentType={"DataSourceView"}
-                                    componentConfig={{
-                                      activeOption,
-                                      fullWidth: false,
-                                    }}
-                                  />
-                                ) : (
-                                  <DataSourceMenu
-                                    setMenuMountPoint={this.props.setActionMenu}
-                                    componentType={"DataSourceSelectable"}
-                                    componentConfig={{
-                                      savedObjects: core?.savedObjects.client,
-                                      notifications: core?.notifications,
-                                      fullWidth: false,
-                                      activeOption,
-                                      onSelectedDataSources: this.onSelectedDataSources,
-                                    }}
-                                  />
-                                )
-                              }
-                            />
                           </Switch>
                         )}
                         {!this.state.dataSourceLoading && (