Skip to content

Commit 64b3645

Browse files
committed
feat: add feature flag check
Signed-off-by: SuZhou-Joe <suzhou@amazon.com>
1 parent b6a1622 commit 64b3645

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

src/core/public/http/http_service.ts

+8-3
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,14 @@ export class HttpService implements CoreService<HttpSetup, HttpStart> {
5353
public setup({ injectedMetadata, fatalErrors }: HttpDeps): HttpSetup {
5454
const opensearchDashboardsVersion = injectedMetadata.getOpenSearchDashboardsVersion();
5555
let workspaceBasePath = '';
56-
const workspaceId = getWorkspaceIdFromUrl(window.location.href);
57-
if (workspaceId) {
58-
workspaceBasePath = `${WORKSPACE_PATH_PREFIX}/${workspaceId}`;
56+
const plugins = injectedMetadata.getPlugins();
57+
const findWorkspaceConfig = plugins.find((plugin) => plugin.id === 'workspace');
58+
// Only try to get workspace id from url when workspace feature is enabled
59+
if (findWorkspaceConfig) {
60+
const workspaceId = getWorkspaceIdFromUrl(window.location.href);
61+
if (workspaceId) {
62+
workspaceBasePath = `${WORKSPACE_PATH_PREFIX}/${workspaceId}`;
63+
}
5964
}
6065
const basePath = new BasePath(
6166
injectedMetadata.getBasePath(),

src/plugins/workspace/opensearch_dashboards.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"id": "workspace",
33
"version": "opensearchDashboards",
44
"server": true,
5-
"ui": false,
5+
"ui": true,
66
"requiredPlugins": [
77
"savedObjects"
88
],

0 commit comments

Comments
 (0)