Skip to content

Commit f7618bc

Browse files
author
Patryk Jatczak
committed
2 parents 99ba3ef + edd7054 commit f7618bc

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

dqops/src/main/frontend/src/components/ColumnList/ColumnListItem.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ export default function SchemaTableItem({
193193
<SvgIcon
194194
name="data_sources"
195195
className="w-5 h-5 cursor-pointer"
196-
onClick={() => goToTable(item, CheckTypes.SOURCES)}
196+
onClick={() => goToColumn(item, CheckTypes.SOURCES)}
197197
/>
198198
</Tooltip>
199199
<Tooltip
@@ -203,7 +203,7 @@ export default function SchemaTableItem({
203203
<SvgIcon
204204
name="profiling"
205205
className="w-5 h-5 cursor-pointer"
206-
onClick={() => goToTable(item, CheckTypes.PROFILING)}
206+
onClick={() => goToColumn(item, CheckTypes.PROFILING)}
207207
/>
208208
</Tooltip>
209209
<Tooltip
@@ -213,7 +213,7 @@ export default function SchemaTableItem({
213213
<SvgIcon
214214
name="monitoring_checks"
215215
className="w-5 h-5 cursor-pointer"
216-
onClick={() => goToTable(item, CheckTypes.MONITORING)}
216+
onClick={() => goToColumn(item, CheckTypes.MONITORING)}
217217
/>
218218
</Tooltip>
219219
<Tooltip
@@ -223,7 +223,7 @@ export default function SchemaTableItem({
223223
<SvgIcon
224224
name="partitioned_checks"
225225
className="w-5 h-5 cursor-pointer"
226-
onClick={() => goToTable(item, CheckTypes.PARTITIONED)}
226+
onClick={() => goToColumn(item, CheckTypes.PARTITIONED)}
227227
/>
228228
</Tooltip>
229229
</div>

dqops/src/main/frontend/src/pages/ColumnListView/ColumnListView.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
import clsx from 'clsx';
12
import React, { useEffect, useState } from 'react';
23
import { LabelModel, TableListModel } from '../../api';
34
import Button from '../../components/Button';
45
import ColumnList from '../../components/ColumnList';
56
import Input from '../../components/Input';
7+
import SvgIcon from '../../components/SvgIcon';
68
import { LabelsApiClient, SearchApiClient } from '../../services/apiClient';
79
import { CheckTypes } from '../../shared/routes';
810
import { useDecodedParams } from '../../utils';
9-
import SvgIcon from '../../components/SvgIcon';
10-
import clsx from 'clsx';
1111

1212
type TSearchFilters = {
1313
connection?: string | undefined;

dqops/src/main/frontend/src/pages/TableListView/TableListView.tsx

+14-6
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,18 @@ export default function TableListView() {
5959
};
6060

6161
const getTables = async (labels: string[] = []) => {
62-
const addPrefix = (str: string) => {
62+
const addPrefix = (str?: string) => {
63+
if (!str) return '';
6364
return str.includes('*') || str.length === 0 ? str : '*' + str + '*';
6465
};
6566
setLoading(true);
67+
console.log(
68+
connection ? addPrefix(connection) : addPrefix(searchFilters.connection),
69+
schema ? addPrefix(schema) : addPrefix(searchFilters.schema)
70+
);
6671
const res = await SearchApiClient.findTables(
67-
connection ?? addPrefix(searchFilters.connection ?? ''),
68-
schema ?? addPrefix(searchFilters.schema ?? ''),
72+
connection ? addPrefix(connection) : addPrefix(searchFilters.connection),
73+
schema ? addPrefix(schema) : addPrefix(searchFilters.schema),
6974
addPrefix(searchFilters.table ?? ''),
7075
labels,
7176
filters.page,
@@ -133,15 +138,16 @@ export default function TableListView() {
133138

134139
return (
135140
<>
136-
<div className="flex items-center justify-between bg-white w-full">
137-
<div className="flex items-center gap-x-4 mb-4 mt-5 px-4">
141+
<div className="flex items-center justify-between bg-white w-full relative">
142+
<div className="flex items-center gap-x-4 mb-4 mt-4 px-4">
138143
{!connection && (
139144
<Input
140145
label="Connection name"
141146
value={searchFilters.connection}
142147
onChange={(e) =>
143148
onChangeSearchFilters({ connection: e.target.value })
144149
}
150+
className="z-[100]"
145151
/>
146152
)}
147153
{!schema && (
@@ -151,12 +157,14 @@ export default function TableListView() {
151157
onChange={(e) =>
152158
onChangeSearchFilters({ schema: e.target.value })
153159
}
160+
className="z-[100]"
154161
/>
155162
)}
156163
<Input
157164
label="Table name"
158165
value={searchFilters.table}
159166
onChange={(e) => onChangeSearchFilters({ table: e.target.value })}
167+
className="z-[100]"
160168
/>
161169
<Button
162170
label="Search"
@@ -169,7 +177,7 @@ export default function TableListView() {
169177
);
170178
}}
171179
color="primary"
172-
className="mt-5"
180+
className="mt-5 z-[100]"
173181
/>
174182
</div>
175183
<Button

0 commit comments

Comments
 (0)