Skip to content

Commit 736c5f0

Browse files
authored
fix: do not expose obsolet name param (#2458)
1 parent 5b1e397 commit 736c5f0

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

src/containers/Tenant/Tenant.tsx

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,7 @@ export function Tenant(props: TenantProps) {
5252
getTenantSummaryState,
5353
);
5454

55-
// TODO: name is used together with database to keep old links valid, do not remove
56-
const {database: queryDatabase, schema, name, handleDatabaseChange} = useTenantQueryParams();
57-
58-
React.useEffect(() => {
59-
if (name && !queryDatabase) {
60-
handleDatabaseChange(name);
61-
}
62-
}, [queryDatabase, name, handleDatabaseChange]);
63-
64-
const database = queryDatabase ?? name;
55+
const {database, schema} = useTenantQueryParams();
6556

6657
if (!database) {
6758
throw new Error('Tenant name is not defined');

src/containers/Tenant/useTenantQueryParams.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,16 @@ export function useTenantQueryParams() {
6161
[setQueryParams],
6262
);
6363

64+
React.useEffect(() => {
65+
if (name && !database) {
66+
setQueryParams({database: name, name: undefined}, 'replaceIn');
67+
}
68+
}, [database, name, setQueryParams]);
69+
6470
return {
6571
showHealthcheck,
6672
handleShowHealthcheckChange,
67-
database,
73+
database: database || name,
6874
handleDatabaseChange,
6975
showGrantAccess,
7076
handleShowGrantAccessChange,
@@ -76,6 +82,5 @@ export function useTenantQueryParams() {
7682
handleIssuesFilterChange,
7783
aclSubject,
7884
handleAclSubjectChange,
79-
name,
8085
};
8186
}

0 commit comments

Comments
 (0)