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(ui): expand invalid state upon glossary term add #18968

Merged
merged 7 commits into from
Dec 16, 2024
Merged

fix(ui): expand invalid state upon glossary term add #18968

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
226d959
fix(ui): expand invalid state upon glossary term add
chirag-madlani Dec 9, 2024
1157d75
fix tests
chirag-madlani Dec 9, 2024
9b383f9
Merge branch 'main' into fix-glossary-term-listing
chirag-madlani Dec 13, 2024
de1b249
update glossary store upon changes in tree
chirag-madlani Dec 14, 2024
0374a9d
Merge branch 'main' into fix-glossary-term-listing
chirag-madlani Dec 14, 2024
9eda39e
fix tests
chirag-madlani Dec 16, 2024
182f1c7
Merge branch 'main' into fix-glossary-term-listing
chirag-madlani Dec 16, 2024
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
8 changes: 7 additions & 1 deletion ...c/main/resources/ui/src/components/Glossary/GlossaryTermTab/GlossaryTermTab.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,10 @@ const GlossaryTermTab = ({
useGlossaryStore();
const { t } = useTranslation();

const glossaryTerms = (glossaryChildTerms as ModifiedGlossaryTerm[]) ?? [];
const glossaryTerms = useMemo(
() => (glossaryChildTerms as ModifiedGlossaryTerm[]) ?? [],
[glossaryChildTerms]
);

const [movedGlossaryTerm, setMovedGlossaryTerm] =
useState<MoveGlossaryTermType>();
Expand Down Expand Up @@ -141,6 +144,9 @@ const GlossaryTermTab = ({
}, [isGlossary, activeGlossary]);

const expandableKeys = useMemo(() => {
// clean expandedRowKey upon glossaryTerm change
setExpandedRowKeys([]);

return findExpandableKeysForArray(glossaryTerms);
}, [glossaryTerms]);

Expand Down
14 changes: 8 additions & 6 deletions openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryV1.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,9 @@ const GlossaryV1 = ({
const { data } = await getFirstLevelGlossaryTerms(
params?.glossary ?? params?.parent ?? ''
);
const children = data.map((data) =>
data.childrenCount ?? 0 > 0 ? { ...data, children: [] } : data
);

setGlossaryChildTerms(children as ModifiedGlossary[]);
// We are considering childrenCount fot expand collapse state
// Hence don't need any intervention to list response here
setGlossaryChildTerms(data as ModifiedGlossary[]);
} catch (error) {
showErrorToast(error as AxiosError);
} finally {
Expand Down Expand Up @@ -232,7 +230,11 @@ const GlossaryV1 = ({
entity: t('label.glossary-term'),
});
} else {
updateGlossaryTermInStore(response);
updateGlossaryTermInStore({
...response,
// Since patch didn't respond with childrenCount preserve it from currentData
childrenCount: currentData.childrenCount,
});
setIsEditModalOpen(false);
}
} catch (error) {
Expand Down
Loading