From 8136d0d149e32d34c58efb52285a4d76e90cc06d Mon Sep 17 00:00:00 2001 From: hgaol Date: Wed, 29 Nov 2023 00:51:50 +0800 Subject: [PATCH 1/3] fix: can't show tag description in tag edit page --- ui/src/pages/Tags/Edit/index.tsx | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx index c1f514870..db12f009f 100644 --- a/ui/src/pages/Tags/Edit/index.tsx +++ b/ui/src/pages/Tags/Edit/index.tsx @@ -70,9 +70,6 @@ const Index = () => { const { data } = useTagInfo({ id: tagId }); const { data: revisions = [] } = useQueryRevisions(data?.tag_id); - initFormData.displayName.value = data?.display_name || ''; - initFormData.slugName.value = data?.slug_name || ''; - initFormData.description.value = data?.original_text || ''; const [formData, setFormData] = useState(initFormData); const [immData, setImmData] = useState(initFormData); const [contentChanged, setContentChanged] = useState(false); @@ -85,6 +82,18 @@ const Index = () => { when: contentChanged, }); + useEffect(() => { + setFormData({ + ...formData, + displayName: { ...formData.displayName, value: data?.display_name || '' }, + slugName: { ...formData.slugName, value: data?.slug_name || '' }, + description: { + ...formData.description, + value: data?.original_text || '', + }, + }); + }, [data]); + useEffect(() => { const { displayName, slugName, description, editSummary } = formData; const { From 005a7de9333eb35a5f328a3dbff6e237ff0e0e12 Mon Sep 17 00:00:00 2001 From: hgaol Date: Wed, 29 Nov 2023 21:03:18 +0800 Subject: [PATCH 2/3] update state of immData --- ui/src/pages/Tags/Edit/index.tsx | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx index db12f009f..93e831f5b 100644 --- a/ui/src/pages/Tags/Edit/index.tsx +++ b/ui/src/pages/Tags/Edit/index.tsx @@ -92,6 +92,16 @@ const Index = () => { value: data?.original_text || '', }, }); + + setImmData({ + ...immData, + displayName: { ...immData.displayName, value: data?.display_name || '' }, + slugName: { ...immData.slugName, value: data?.slug_name || '' }, + description: { + ...immData.description, + value: data?.original_text || '', + }, + }); }, [data]); useEffect(() => { From f80a7cc6850495da0ff09f17d9f6823926b78f1e Mon Sep 17 00:00:00 2001 From: hgaol Date: Thu, 30 Nov 2023 14:14:18 +0800 Subject: [PATCH 3/3] simplify assignment code and delete useless condition --- ui/src/pages/Tags/Edit/index.tsx | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/ui/src/pages/Tags/Edit/index.tsx b/ui/src/pages/Tags/Edit/index.tsx index 93e831f5b..c737353c2 100644 --- a/ui/src/pages/Tags/Edit/index.tsx +++ b/ui/src/pages/Tags/Edit/index.tsx @@ -83,25 +83,11 @@ const Index = () => { }); useEffect(() => { - setFormData({ - ...formData, - displayName: { ...formData.displayName, value: data?.display_name || '' }, - slugName: { ...formData.slugName, value: data?.slug_name || '' }, - description: { - ...formData.description, - value: data?.original_text || '', - }, - }); - - setImmData({ - ...immData, - displayName: { ...immData.displayName, value: data?.display_name || '' }, - slugName: { ...immData.slugName, value: data?.slug_name || '' }, - description: { - ...immData.description, - value: data?.original_text || '', - }, - }); + initFormData.displayName.value = data?.display_name || ''; + initFormData.slugName.value = data?.slug_name || ''; + initFormData.description.value = data?.original_text || ''; + setFormData(initFormData); + setImmData(initFormData); }, [data]); useEffect(() => { @@ -111,9 +97,6 @@ const Index = () => { slugName: slug_name, description: original_text, } = immData; - if (!display_name || !slug_name || !original_text) { - return; - } if ( display_name.value !== displayName.value ||