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.

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

fix: reference table dropdown in add and edit query forms #19026

Merged
merged 14 commits into from
Jan 8, 2025
Merged

fix: reference table dropdown in add and edit query forms #19026

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2cf8c75
fix: reference table dropdown in add and edit query forms
pranita09 Dec 12, 2024
724e73d
fix: show full value of fqn
pranita09 Dec 12, 2024
3186673
fix: e2e test for create new query
pranita09 Dec 16, 2024
944ff36
fix: e2e test for edit query
pranita09 Dec 16, 2024
bb9877c
Merge branch 'main' into fix/add-edit-query-table-dropdown
pranita09 Dec 16, 2024
3938fcd
Merge branch 'main' into fix/add-edit-query-table-dropdown
pranita09 Dec 16, 2024
026c0aa
Merge branch 'main' into fix/add-edit-query-table-dropdown
ShaileshParmar11 Dec 17, 2024
b4c5ef8
Merge branch 'main' into fix/add-edit-query-table-dropdown
pranita09 Dec 18, 2024
eab122f
Merge branch 'main' into fix/add-edit-query-table-dropdown
pranita09 Dec 18, 2024
ce57691
Merge branch 'main' into fix/add-edit-query-table-dropdown
ShaileshParmar11 Dec 19, 2024
7492b1e
Merge branch 'main' into fix/add-edit-query-table-dropdown
pranita09 Jan 6, 2025
a55e8ab
Merge branch 'main' into fix/add-edit-query-table-dropdown
ShaileshParmar11 Jan 6, 2025
79d3217
fix: optionLabelProp value
pranita09 Jan 7, 2025
40c2ead
fix: optionLabelProp value to AsyncSelect component
pranita09 Jan 8, 2025
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 openmetadata-ui/src/main/resources/ui/src/components/Database/TableQueries/QueryCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const QueryCard: FC<QueryCardProp> = ({
return (
existingTable ?? {
id: (option.value as string) ?? '',
displayName: option.label as string,
displayName: option.labelValue as string,
type: EntityType.TABLE,
}
);
Expand Down
12 changes: 7 additions & 5 deletions ...omponents/Database/TableQueries/QueryUsedByOtherTable/QueryUsedByOtherTable.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { QUERY_USED_BY_TABLE_VIEW_CAP } from '../../../../constants/Query.consta
import { EntityType } from '../../../../enums/entity.enum';
import { SearchIndex } from '../../../../enums/search.enum';
import { searchData } from '../../../../rest/miscAPI';
import { getEntityName } from '../../../../utils/EntityUtils';
import { getEntityLabel, getEntityName } from '../../../../utils/EntityUtils';
import { AsyncSelect } from '../../../common/AsyncSelect/AsyncSelect';
import Loader from '../../../common/Loader/Loader';
import {
Expand Down Expand Up @@ -135,8 +135,9 @@ const QueryUsedByOtherTable = ({
);

return data.hits.hits.map((value) => ({
label: getEntityName(value._source),
label: getEntityLabel(value._source),
value: value._source.id,
labelValue: getEntityName(value._source),
}));
} catch (error) {
return [];
Expand All @@ -149,11 +150,12 @@ const QueryUsedByOtherTable = ({
const options = await fetchTableEntity();
const { queryUsedIn = [] } = query;
const selectedValue = queryUsedIn.map((table) => ({
label: getEntityName(table),
label: getEntityLabel(table),
value: table.id,
labelValue: getEntityName(table),
}));

setInitialOptions(uniqBy([...selectedValue, ...options], 'value'));
setInitialOptions(uniqBy([...selectedValue, ...options], 'labelValue'));
} catch (error) {
setInitialOptions([]);
} finally {
Expand All @@ -171,7 +173,7 @@ const QueryUsedByOtherTable = ({
) : (
<AsyncSelect
api={fetchTableEntity}
className="w-min-15 w-full"
className="w-min-30 w-full"
data-testid="edit-query-used-in"
defaultValue={defaultValue}
mode="multiple"
Expand Down
1 change: 1 addition & 0 deletions openmetadata-ui/src/main/resources/ui/src/components/common/AsyncSelect/AsyncSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const AsyncSelect = ({
}}
onSelect={handleSelection}
{...restProps}
optionLabelProp="labelValue"
/>
);
};
1 change: 1 addition & 0 deletions openmetadata-ui/src/main/resources/ui/src/pages/AddQueryPage/AddQueryPage.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ const AddQueryPage = () => {
const options = data.hits.hits.map((value) => ({
label: getEntityLabel(value._source),
value: value._source.id,
labelValue: getEntityName(value._source),
}));

return table
Expand Down
3 changes: 3 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/styles/components/size.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,9 @@
.w-min-20 {
min-width: 20rem;
}
.w-min-30 {
min-width: 30rem;
}
.w-min-60 {
min-width: 60rem;
}
Expand Down
10 changes: 6 additions & 4 deletions openmetadata-ui/src/main/resources/ui/src/utils/EntityUtils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,11 +171,13 @@ export const getEntityLabel = (entity: {
name?: string;
fullyQualifiedName?: string;
}): JSX.Element => (
<Space direction="vertical" size={0}>
<Typography.Text>{getEntityName(entity)}</Typography.Text>
<Typography.Text className="text-gray-400 text-xs break-word">
<Space className="w-full whitespace-normal" direction="vertical" size={0}>
<Typography.Paragraph className="m-b-0">
{getEntityName(entity)}
</Typography.Paragraph>
<Typography.Paragraph className="text-grey-muted text-xs">
{entity?.fullyQualifiedName}
</Typography.Text>
</Typography.Paragraph>
</Space>
);

Expand Down
Loading