Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ydb em #2042

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"dev": "DISABLE_ESLINT_PLUGIN=true TSC_COMPILE_ON_ERROR=true REACT_APP_BACKEND=http://localhost:8765 REACT_APP_META_BACKEND=undefined npm start",
"build": "rm -rf build && DISABLE_ESLINT_PLUGIN=true CI=true react-app-rewired build",
"//build:embedded": "echo 'PUBLIC_URL is a setting for create-react-app. Embedded version is built and hosted as is on ydb servers, with no way of knowing the final URL pattern. PUBLIC_URL=. keeps paths to all static relative, allowing servers to handle them as needed'",
"build:embedded": "GENERATE_SOURCEMAP=false PUBLIC_URL=. REACT_APP_BACKEND=http://localhost:8765 REACT_APP_META_BACKEND=undefined npm run build",
"build:embedded": "GENERATE_SOURCEMAP=false PUBLIC_URL=. REACT_APP_BACKEND=undefined REACT_APP_META_BACKEND= npm run build",
"build:embedded:archive": "npm run build:embedded && mv build embedded-ui && zip -r embedded-ui.zip embedded-ui && rm -rf embedded-ui",
"lint": "run-p lint:*",
"lint:js": "eslint --ext .js,.jsx,.ts,.tsx .",
Expand Down
11 changes: 7 additions & 4 deletions src/components/TenantNameWrapper/TenantNameWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ export function TenantNameWrapper({tenant, additionalTenantsProps}: TenantNameWr
withLeftTrim={true}
status={tenant.Overall}
hasClipboardButton
path={getTenantPath({
database: tenant.Name,
backend,
})}
path={
'/ui' +
getTenantPath({
database: tenant.Name,
backend,
})
}
/>
</CellWithPopover>
);
Expand Down
2 changes: 1 addition & 1 deletion src/containers/Clusters/columns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const CLUSTERS_COLUMNS: Column<PreparedCluster>[] = [
const clusterPath =
useEmbeddedUi && backend
? createDeveloperUIMonitoringPageHref(backend)
: getClusterPath(undefined, {backend, clusterName});
: '/ui' + getClusterPath(undefined, {backend, clusterName});

const clusterStatus = row.cluster?.Overall;

Expand Down
2 changes: 1 addition & 1 deletion src/store/configureStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function _configureStore<
return store;
}

export const webVersion = window.web_version;
export const webVersion = true;
export const customBackend = window.custom_backend;
export const metaBackend = window.meta_backend;
export const codeAssistBackend = window.code_assist_backend;
Expand Down
2 changes: 1 addition & 1 deletion src/store/getUrlData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const getUrlData = ({
const backend = urlSearchParams.get('backend') ?? undefined;
const clusterName = urlSearchParams.get('clusterName') ?? undefined;
return {
basename: '/',
basename: 'ui',
backend,
clusterName,
};
Expand Down
Loading