clean code

packages/app/src/components/Navbar/GrowiContextualSubNavigation.tsx

@@ -193,7 +193,7 @@ const GrowiContextualSubNavigation = (props) => {
 
       // revalidate SWRTagsInfo
       mutateSWRTagsInfo();
-      mutateTagsOnEditMode(newTags, false);
+      syncPageTagsForEditors(newTags);
 
       toastSuccess('updated tags successfully');
     }
@@ -201,13 +201,13 @@ const GrowiContextualSubNavigation = (props) => {
       toastError(err, 'fail to update tags');
     }
 
-  }, [mutateTagsOnEditMode, pageId, revisionId, mutateSWRTagsInfo]);
+  }, [pageId, revisionId, mutateSWRTagsInfo, syncPageTagsForEditors]);
 
   const tagsUpdatedHandlerForEditMode = useCallback(async(newTags: string[]) => {
     // It will not be reflected in the DB until the page is refreshed
-    mutateTagsOnEditMode(newTags, false);
+    syncPageTagsForEditors(newTags);
     return;
-  }, [mutateTagsOnEditMode]);
+  }, [syncPageTagsForEditors]);
 
   const duplicateItemClickedHandler = useCallback(async(page: IPageForPageDuplicateModal) => {
     const duplicatedHandler: OnDuplicatedFunction = (fromPath, toPath) => {

packages/app/src/components/Page.jsx

@@ -191,9 +191,7 @@ const PageWrapper = (props) => {
   const { data: isMobile } = useIsMobile();
   const { data: slackChannelsData } = useSWRxSlackChannels(currentPagePath);
   const { data: isSlackEnabled } = useIsSlackEnabled();
-  const { data: pageId } = useCurrentPageId();
-  const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
-  const { data: pageTags } = usePageTagsForEditors(tagsInfoData?.tags);
+  const { data: pageTags, sync: syncPageTagsForEditors } = usePageTagsForEditors();
   const { data: grant } = useSelectedGrant();
   const { data: grantGroupId } = useSelectedGrantGroupId();
   const { data: grantGroupName } = useSelectedGrantGroupName();

packages/app/src/components/PageEditor.tsx

@@ -87,9 +87,7 @@ const PageEditor = (props: Props): JSX.Element => {
   const { data: editorMode } = useEditorMode();
   const { data: isMobile } = useIsMobile();
   const { data: isSlackEnabled } = useIsSlackEnabled();
-  const { data: pageId } = useCurrentPageId();
-  const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
-  const { data: pageTags } = usePageTagsForEditors(tagsInfoData?.tags);
+  const { data: pageTags } = usePageTagsForEditors();
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels(currentPagePath);
   const { data: grant, mutate: mutateGrant } = useSelectedGrant();

packages/app/src/components/PageEditorByHackmd.jsx

@@ -453,9 +453,7 @@ const PageEditorByHackmdWrapper = (props) => {
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels(currentPagePath);
   const { data: isSlackEnabled } = useIsSlackEnabled();
-  const { data: pageId } = useCurrentPageId();
-  const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
-  const { data: pageTags } = usePageTagsForEditors(tagsInfoData?.tags);
+  const { data: pageTags } = usePageTagsForEditors();
   const { data: grant } = useSelectedGrant();
   const { data: grantGroupId } = useSelectedGrantGroupId();
   const { data: grantGroupName } = useSelectedGrantGroupName();

packages/app/src/components/SavePageControls.jsx

@@ -145,9 +145,7 @@ const SavePageControlsWrapper = (props) => {
   const { data: grant, mutate: mutateGrant } = useSelectedGrant();
   const { data: grantGroupId, mutate: mutateGrantGroupId } = useSelectedGrantGroupId();
   const { data: grantGroupName, mutate: mutateGrantGroupName } = useSelectedGrantGroupName();
-  const { data: pageId } = useCurrentPageId();
-  const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
-  const { data: pageTags } = usePageTagsForEditors(tagsInfoData?.tags);
+  const { data: pageTags } = usePageTagsForEditors();
 
 
   if (isEditable == null || editorMode == null) {

packages/app/src/stores/editor.tsx

@@ -97,19 +97,13 @@ export type IPageTagsForEditorsOption = {
 }
 
 export const usePageTagsForEditors = (): SWRResponse<string[], Error> & IPageTagsForEditorsOption => {
-  // const { data: pageId } = useCurrentPageId();
-  // const { data: tagsInfoData } = useSWRxTagsInfo(pageId);
-
   const swrResult = useStaticSWR<string[], Error>('pageTags', undefined);
+
   return {
     ...swrResult,
-    // sync: (): void => {
-    //   const { mutate } = swrResult;
-    //   mutate(tagsInfoData?.tags || []);
-    // },
     sync: (tags): void => {
       const { mutate } = swrResult;
-      mutate(tags || []);
+      mutate(tags || [], false);
     },
   };
 };