Skip to content

fix: support name param for database #2426

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 19, 2025
Merged

fix: support name param for database #2426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 11 additions & 1 deletion src/containers/Tenant/Tenant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,24 @@ interface TenantProps {
additionalNodesProps?: AdditionalNodesProps;
}

// eslint-disable-next-line complexity
export function Tenant(props: TenantProps) {
const [summaryVisibilityState, dispatchSummaryVisibilityAction] = React.useReducer(
paneVisibilityToggleReducerCreator(DEFAULT_IS_TENANT_SUMMARY_COLLAPSED),
undefined,
getTenantSummaryState,
);

const {database, schema} = useTenantQueryParams();
// TODO: name is used together with database to keep old links valid, do not remove
const {database: queryDatabase, schema, name, handleDatabaseChange} = useTenantQueryParams();

React.useEffect(() => {
if (name && !queryDatabase) {
handleDatabaseChange(name);
}
}, [queryDatabase, name, handleDatabaseChange]);

const database = queryDatabase ?? name;

if (!database) {
throw new Error('Tenant name is not defined');
Expand Down
4 changes: 3 additions & 1 deletion src/containers/Tenant/useTenantQueryParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import {BooleanParam, StringParam, useQueryParams} from 'use-query-params';

export function useTenantQueryParams() {
const [
{showHealthcheck, database, schema, view, issuesFilter, showGrantAccess, aclSubject},
{showHealthcheck, database, schema, view, issuesFilter, showGrantAccess, aclSubject, name},
setQueryParams,
] = useQueryParams({
name: StringParam,
showHealthcheck: BooleanParam,
database: StringParam,
schema: StringParam,
Expand Down Expand Up @@ -75,5 +76,6 @@ export function useTenantQueryParams() {
handleIssuesFilterChange,
aclSubject,
handleAclSubjectChange,
name,
};
}
Loading