[Bug] Fix url redirection, add default render path

public/components/Main/main.tsx

@@ -62,8 +62,8 @@
 
 interface ResponseData {
   ok: boolean;
   resp: any;
   body: any;
 }
 
 export interface ResponseDetail<T> {
@@ -73,11 +73,11 @@
 }
 
 export interface TranslateResult {
   [key: string]: any;
 }
 
 export interface QueryMessage {
   text: any;
   className: string;
 }
 
@@ -97,13 +97,13 @@
   [key: string]: {
     nodes: Tree;
     expandedRow?: {};
     selectedNodes?: { [key: string]: any };
   };
 }
 
 export interface DataRow {
   rowId: number;
   data: { [key: string]: any };
 }
 
 interface MainProps {
@@ -153,7 +153,7 @@
 }
 
 const SUCCESS_MESSAGE = 'Success';
 const errorQueryResponse = (queryResultResponseDetail: any) => {
   const errorMessage =
     queryResultResponseDetail.errorMessage +
     ', this query is not runnable. \n \n' +
@@ -181,7 +181,7 @@
         const dataRows: DataRow[] = [];
 
         const schema: object[] = _.get(responseObj, 'schema');
         const datarows: any[][] = _.get(responseObj, 'datarows');
         let queryType = 'default';
 
         for (const column of schema.values()) {
@@ -206,7 +206,7 @@
             }
 
             for (const [id, field] of datarows.entries()) {
               const row: { [key: string]: any } = {};
               row.TABLE_NAME = field[index];
               const dataRow: DataRow = {
                 rowId: id,
@@ -219,7 +219,7 @@
           case 'describe':
           case 'default':
             for (const [id, field] of schema.entries()) {
               let alias: any = null;
               try {
                 alias = _.get(field, 'alias');
               } catch (e) {
@@ -291,7 +291,7 @@
       refreshTree: false,
       isAccelerationFlyoutOpened: false,
       isCallOutVisible: false,
-      cluster: 'Indexes',
+      cluster: props.urlDataSource ? 'Data source Connections' : 'Indexes',
       dataSourceOptions: [],
       selectedMDSDataConnectionId: this.props.dataSourceMDSId,
       mdsClusterName: '',

public/components/app.tsx

@@ -30,10 +30,10 @@
 }
 
 export const WorkbenchApp = ({
   basename,
   notifications,
   http,
   navigation,
   chrome,
   savedObjects,
   dataSourceEnabled,
@@ -42,7 +42,7 @@
   setActionMenu,
 }: WorkbenchAppDeps) => {
   const isNavGroupEnabled = coreRefs?.chrome?.navGroup.getNavGroupEnabled();
-  const basePath = isNavGroupEnabled ? 'opensearch-query-workbench' : '';
+  const basePath = isNavGroupEnabled ? '/opensearch-query-workbench' : '';
 
   return (
     <HashRouter>
@@ -53,7 +53,7 @@
               <Switch>
                 <Route
                   exact
-                  path={`/${basePath}`}
+                  path={isNavGroupEnabled ? [`${basePath}`, `/`] : `/${basePath}`}
                   render={(props) => (
                     <Main
                       httpClient={http}
@@ -72,7 +72,7 @@
                 />
                 <Route
                   exact
-                  path={`/${basePath}/:dataSource`}
+                  path={`${basePath}/:dataSource`}
                   render={(props) => (
                     <Main
                       httpClient={http}
@@ -91,7 +91,7 @@
                 />
                 <Route
                   exact
-                  path={`/${basePath}/accelerate/:dataSource`}
+                  path={`${basePath}/accelerate/:dataSource`}
                   render={(props) => (
                     <Main
                       httpClient={http}