WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 097c655

Browse files
committed
Added workspace editor url route in baseRoutes. Using that to generatePath in URLAssembly for generateBasePathForWorkspace.
1 parent 5768e82 commit 097c655

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
VIEWER_CUSTOM_PATH,
99
VIEWER_PATH,
1010
VIEWER_PATH_DEPRECATED,
11+
WORKSPACE_EDITOR_URL,
1112
} from "constants/routes";
1213
import { APP_MODE } from "entities/App";
1314
import { generatePath } from "react-router";
@@ -262,7 +263,11 @@ export class URLBuilder {
262263
}
263264

264265
generateBasePathForWorkspace(workspaceId: string) {
265-
return `/workspace/${workspaceId}`;
266+
const formattedParams = {
267+
workspaceId,
268+
};
269+
270+
return generatePath(WORKSPACE_EDITOR_URL, formattedParams);
266271
}
267272

268273
getCustomSlugPathPreview(basePageId: string, customSlug: string) {

app/client/src/constants/routes/baseRoutes.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ export const WORKSPACE_INVITE_USERS_PAGE_URL = `${WORKSPACE_URL}/invite`;
2828
export const WORKSPACE_SETTINGS_PAGE_URL = `${WORKSPACE_URL}/settings`;
2929
export const WORKSPACE_SETTINGS_GENERAL_PAGE_URL = `${WORKSPACE_URL}/settings/general`;
3030
export const WORKSPACE_SETTINGS_MEMBERS_PAGE_URL = `${WORKSPACE_URL}/settings/members`;
31-
export const WORKSPACE_DATASOURCES_URL = `${WORKSPACE_URL}/:workspaceId/datasources`;
32-
export const WORKSPACE_DATASOURCE_EDITOR_URL = `${WORKSPACE_URL}/:workspaceId/datasource/:datasourceId`;
31+
export const WORKSPACE_EDITOR_URL = "/workspace/:workspaceId";
32+
export const WORKSPACE_DATASOURCES_URL = `${WORKSPACE_EDITOR_URL}/datasources`;
33+
export const WORKSPACE_DATASOURCE_EDITOR_URL = `${WORKSPACE_EDITOR_URL}/datasource/:datasourceId`;
3334
export const WORKSPACE_SETTINGS_LICENSE_PAGE_URL = `/settings/license`;
3435
export const ORG_LOGIN_PATH = "/org";
3536

0 commit comments

Comments
 (0)