Moved fetching of all workspaces if not already to WorkspaceEditorEngine. Fixed route to handle for /workspace/:worksapceId/datasource/:datasourceId. Added NoFocusStrategy for Workspace.

Author: tomjose92

app/client/src/ce/entities/URLRedirect/URLAssembly.ts

@@ -398,6 +398,7 @@ export class URLBuilder {
       persistExistingParams = false,
       suffix,
     } = builderParams;
+
     const entityId = this.resolveEntityId(builderParams);
 
     const basePath = this.generateBasePath(entityId, mode);

app/client/src/ce/navigation/FocusStrategy/index.ts

@@ -8,6 +8,8 @@ export const getIDEFocusStrategy = (type: IDEType) => {
       return NoIDEFocusStrategy;
     case IDE_TYPE.App:
       return AppIDEFocusStrategy;
+    case IDE_TYPE.Workspace:
+      return NoIDEFocusStrategy;
     // Add EE cases below
     default:
       throw Error("Ide focus strategy not defined");

app/client/src/entities/Engine/WorkspaceEditorEngine.ts

@@ -1,4 +1,4 @@
-import { call, put } from "redux-saga/effects";
+import { call, put, select, take } from "redux-saga/effects";
 import CodemirrorTernService from "utils/autocomplete/CodemirrorTernService";
 import {
   ReduxActionErrorTypes,
@@ -18,6 +18,8 @@ import {
 import type { ReduxAction } from "actions/ReduxActionTypes";
 import { waitForFetchEnvironments } from "ee/sagas/EnvironmentSagas";
 import { fetchingEnvironmentConfigs } from "ee/actions/environmentAction";
+import { getWorkspaceFromId } from "ee/selectors/workspaceSelectors";
+import { fetchAllWorkspaces } from "ee/actions/workspaceActions";
 
 export default class WorkspaceEditorEngine {
   constructor() {
@@ -27,7 +29,8 @@ export default class WorkspaceEditorEngine {
     this.completeChore = this.completeChore.bind(this);
   }
 
-  *loadWorkspace(workspaceId: string) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  *loadWorkspace(workspaceId: string): any {
     // Set the current workspace context
     yield put({
       type: ReduxActionTypes.SET_CURRENT_WORKSPACE_ID,
@@ -37,6 +40,18 @@ export default class WorkspaceEditorEngine {
       },
     });
 
+    // Check if workspace exists, if not fetch it
+    const workspace = yield select(getWorkspaceFromId, workspaceId);
+
+    if (!workspace) {
+      yield put(fetchAllWorkspaces({ workspaceId, fetchEntities: true }));
+      // Wait for workspaces to be fetched
+      yield take([
+        ReduxActionTypes.FETCH_ALL_WORKSPACES_SUCCESS,
+        ReduxActionErrorTypes.FETCH_WORKSPACES_ERROR,
+      ]);
+    }
+
     // Fetch environment configs for the workspace
     yield put(
       fetchingEnvironmentConfigs({

app/client/src/pages/workspace/index.tsx

@@ -27,7 +27,7 @@ export function Workspace() {
         )}
       />
       <SentryRoute
-        path={`${path}/:workspaceId/datasource`}
+        path={`${path}/:workspaceId/datasource/:datasourceId`}
         render={({ match }: { match: { params: { workspaceId: string } } }) => (
           <WorkspaceDatasourcesPage workspaceId={match.params.workspaceId} />
         )}