Oct 27, 2025 · Oct 27, 2025 · Oct 27, 2025 · Oct 28, 2025 · Oct 29, 2025 · Oct 29, 2025
diff --git a/app/client/src/ce/RouteBuilder.ts b/app/client/src/ce/RouteBuilder.ts
 export const workspaceDatasourceEditorURL = (
  workspaceId: string,
  datasourceId: string,
 ): string => `/workspace/${workspaceId}/datasources/${datasourceId}`;
 ): string => `/workspace/${workspaceId}/datasource/${datasourceId}`;

 export const appLibrariesURL = (): string =>
  urlBuilder.build({
diff --git a/app/client/src/ce/entities/URLRedirect/URLAssembly.ts b/app/client/src/ce/entities/URLRedirect/URLAssembly.ts

    const entityId = this.resolveEntityId(builderParams);

    // Handle workspace-specific suffix modification
    let modifiedSuffix = suffix;
    // Handle workspace-specific URL generation
    let basePath = this.generateBasePath(entityId, mode);
    let suffixPath = suffix ? `/${suffix}` : "";

    if (this.isWorkspaceContext() && suffix?.startsWith("datasource/")) {
      // For workspace context, remove the 'datasource/' prefix from suffix
      modifiedSuffix = suffix.replace("datasource/", "");
      // For workspace datasource URLs, use singular /datasource path
      basePath = `/workspace/${entityId}/datasource`;
      suffixPath = `/${suffix.replace("datasource/", "")}`;
    }

    const basePath = this.generateBasePath(entityId, mode);

    const queryParamsToPersist = fetchQueryParamsToPersist(
      persistExistingParams,
    );

    const queryString = getQueryStringfromObject(modifiedQueryParams);

    const suffixPath = modifiedSuffix ? `/${modifiedSuffix}` : "";

    const hashPath = hash ? `#${hash}` : "";

    // hash fragment should be at the end of the href
diff --git a/app/client/src/pages/workspace/WorkspaceDatasourcesPage.tsx b/app/client/src/pages/workspace/WorkspaceDatasourcesPage.tsx
            {/* Create new datasource - use the exact same component */}
            <SentryRoute
              exact
              path="/workspace/:workspaceId/datasources/new"
              path="/workspace/:workspaceId/datasources/NEW"
              render={() => <WorkspaceCreateNewDatasourceTab />}
            />
            {/* Edit existing datasource - use workspace-specific editor */}
            <SentryRoute
              exact
              path="/workspace/:workspaceId/datasources/:datasourceId"
              path="/workspace/:workspaceId/datasource/:datasourceId"
              render={() => <WorkspaceDatasourceEditor />}
            />
            {/* Default list view - show "Connect a datasource" page by default */}
            <SentryRoute
              path="/workspace/:workspaceId/datasources"
              render={() => (
                <WorkspaceCreateNewDatasourceTab workspaceId={workspaceId} />
              )}
              render={() => <WorkspaceCreateNewDatasourceTab />}
            />
          </Switch>
        </MainPane>
diff --git a/app/client/src/pages/workspace/index.tsx b/app/client/src/pages/workspace/index.tsx
          )}
          path={`${path}/:workspaceId/datasources`}
        />
        <SentryRoute
          component={({
            match,
          }: {
            match: { params: { workspaceId: string } };
          }) => (
            <WorkspaceDatasourcesPage workspaceId={match.params.workspaceId} />
          )}
          path={`${path}/:workspaceId/datasource`}
        />
        <SentryRoute component={DefaultWorkspacePage} />
      </Switch>
    </PageWrapper>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -203,7 +203,7 @@ export const workspaceDatasourcesURL = (workspaceId: string): string =>
		export const workspaceDatasourceEditorURL = (
		workspaceId: string,
		datasourceId: string,
		): string => `/workspace/${workspaceId}/datasources/${datasourceId}`;
		): string => `/workspace/${workspaceId}/datasource/${datasourceId}`;

		export const appLibrariesURL = (): string =>
		urlBuilder.build({
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -338,16 +338,16 @@ export class URLBuilder {

		const entityId = this.resolveEntityId(builderParams);

		// Handle workspace-specific suffix modification
		let modifiedSuffix = suffix;
		// Handle workspace-specific URL generation
		let basePath = this.generateBasePath(entityId, mode);
		let suffixPath = suffix ? `/${suffix}` : "";

		if (this.isWorkspaceContext() && suffix?.startsWith("datasource/")) {
		// For workspace context, remove the 'datasource/' prefix from suffix
		modifiedSuffix = suffix.replace("datasource/", "");
		// For workspace datasource URLs, use singular /datasource path
		basePath = `/workspace/${entityId}/datasource`;
		suffixPath = `/${suffix.replace("datasource/", "")}`;
		}

		const basePath = this.generateBasePath(entityId, mode);

		const queryParamsToPersist = fetchQueryParamsToPersist(
		persistExistingParams,
		);
Expand All		@@ -362,8 +362,6 @@ export class URLBuilder {

		const queryString = getQueryStringfromObject(modifiedQueryParams);

		const suffixPath = modifiedSuffix ? `/${modifiedSuffix}` : "";

		const hashPath = hash ? `#${hash}` : "";

		// hash fragment should be at the end of the href
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -119,21 +119,19 @@ export const WorkspaceDatasourcesPage = (
		{/* Create new datasource - use the exact same component */}
		<SentryRoute
		exact
		path="/workspace/:workspaceId/datasources/new"
		path="/workspace/:workspaceId/datasources/NEW"
		render={() => <WorkspaceCreateNewDatasourceTab />}
		/>
		{/* Edit existing datasource - use workspace-specific editor */}
		<SentryRoute
		exact
		path="/workspace/:workspaceId/datasources/:datasourceId"
		path="/workspace/:workspaceId/datasource/:datasourceId"
		render={() => <WorkspaceDatasourceEditor />}
		/>
		{/* Default list view - show "Connect a datasource" page by default */}
		<SentryRoute
		path="/workspace/:workspaceId/datasources"
		render={() => (
		<WorkspaceCreateNewDatasourceTab workspaceId={workspaceId} />
		)}
		render={() => <WorkspaceCreateNewDatasourceTab />}
		/>
		</Switch>
		</MainPane>
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -27,6 +27,16 @@ export function Workspace() {
		)}
		path={`${path}/:workspaceId/datasources`}
		/>
		<SentryRoute
		component={({
		match,
		}: {
		match: { params: { workspaceId: string } };
		}) => (
		<WorkspaceDatasourcesPage workspaceId={match.params.workspaceId} />
		)}
		path={`${path}/:workspaceId/datasource`}
		/>
		<SentryRoute component={DefaultWorkspacePage} />
		</Switch>
		</PageWrapper>
Expand Down