Skip to content

fix: ensure tag list updates immediately after editing #10577

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

Merged
yuki-takei merged 4 commits into from
Dec 12, 2025
+6 −4
Merged

fix: ensure tag list updates immediately after editing #10577

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8405d83
Fix TagEditModal: ensure tag list updates immediately after editing
riona-k Dec 8, 2025
5839a11
Merge remote-tracking branch 'origin/dev/7.4.x' into fix/tag-edit-mod…
riona-k Dec 10, 2025
02fa567
load only tag info
riona-k Dec 10, 2025
6251748
refactor: remove unnecessary await and null check for mutateTags
riona-k Dec 10, 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
12 changes: 8 additions & 4 deletions apps/app/src/client/components/PageTags/TagEditModal/TagEditModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { useUpdateStateAfterSave } from '~/client/services/page-operation';
import { apiPost } from '~/client/util/apiv1-client';
import { toastError, toastSuccess } from '~/client/util/toastr';
import { useTagEditModalStatus, useTagEditModalActions, type TagEditModalStatus } from '~/states/ui/modal/tag-edit';
import { useSWRxTagsInfo } from '~/stores/page';

import { TagsInput } from './TagsInput';

Expand All @@ -28,8 +29,8 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
const pageId = tagEditModalData.pageId;
const revisionId = tagEditModalData.revisionId;
const updateStateAfterSave = useUpdateStateAfterSave(pageId);

const [tags, setTags] = useState<string[]>([]);
const { mutate: mutateTags } = useSWRxTagsInfo(pageId);
const [tags, setTags] = useState<string[]>(initTags ?? []);

// use to take initTags when redirect to other page
useEffect(() => {
Expand All @@ -46,6 +47,9 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
const handleSubmit = useCallback(async() => {
try {
await apiPost('/tags.update', updateTagsData);
if (mutateTags != null) {
await mutateTags();
}
Copy link
Member

@miya miya Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • これだと何が mutate されているか分かりにくいです
  • String.prototype.includes() だと意図しないキーがマッチして無駄な再検証が走る可能性があります (本来やりたいことは tag の再検証のみ)
  • useSWRxTagsInfo から提供される mutate を使って実装してみてほしいです
    • updateStateAfterSave の中に mutate に実装しても良さそうです

Copy link
Member

@miya miya Dec 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mutateTags って nullable じゃなさそうなので null check は不要そう

Copy link
Member

@miya miya Dec 10, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

あと、これは非同期でも良さそうなので await もいらないかも (更新が成功したら即時トースターをだしたいので)

updateStateAfterSave?.();

toastSuccess('updated tags successfully');
Expand All @@ -54,7 +58,7 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
catch (err) {
toastError(err);
}
}, [closeTagEditModal, updateTagsData, updateStateAfterSave]);
}, [updateTagsData, mutateTags, updateStateAfterSave, closeTagEditModal]);

// Memoized tags update handler
const handleTagsUpdate = useCallback((newTags: string[]) => {
Expand All @@ -67,7 +71,7 @@ const TagEditModalSubstance: React.FC<TagEditModalSubstanceProps> = (props: TagE
{t('tag_edit_modal.edit_tags')}
</ModalHeader>
<ModalBody>
<TagsInput tags={initTags} onTagsUpdated={handleTagsUpdate} autoFocus />
<TagsInput tags={tags} onTagsUpdated={handleTagsUpdate} autoFocus />
</ModalBody>
<ModalFooter>
<button type="button" data-testid="tag-edit-done-btn" className="btn btn-primary" onClick={handleSubmit}>
Expand Down
Loading