Refactor usePageStatusAlert

apps/app/src/components/PageEditor/PageEditor.tsx

@@ -123,7 +123,7 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
   const { data: defaultIndentSize } = useDefaultIndentSize();
   const { data: acceptedUploadFileType } = useAcceptedUploadFileType();
   const { open: openConflictDiffModal, close: closeConflictDiffModal } = useConflictDiffModal();
-  const { storeMethods: storeConflictHandler, clearMethods: clearConflictHandler } = usePageStatusAlert();
+  const { storeMethods: storeMethodsForPageStatusAlert, clearMethods: clearMethodsForPageStatusAlert } = usePageStatusAlert();
   const { data: editorSettings } = useEditorSettings();
   const { setRemoteLatestPageData } = useSetRemoteLatestPageData();
   const { data: user } = useCurrentUser();
@@ -258,12 +258,12 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
       // Reflect conflict resolution results in CodeMirrorEditor
       codeMirrorEditor?.initDoc(newMarkdown);
 
-      clearConflictHandler();
+      clearMethodsForPageStatusAlert();
       closeConflictDiffModal();
       toastSuccess(t('toaster.save_succeeded'));
       updateStateAfterSave?.();
     };
-  }, [clearConflictHandler, closeConflictDiffModal, codeMirrorEditor, save, t, updateStateAfterSave]);
+  }, [save, codeMirrorEditor, clearMethodsForPageStatusAlert, closeConflictDiffModal, t, updateStateAfterSave]);
 
   const onConflictHandler: ConflictHandler = useCallback((remoteRevidsionData, newMarkdown, saveOptions) => {
     setRemoteLatestPageData(remoteRevidsionData);
@@ -274,8 +274,8 @@ export const PageEditor = React.memo((props: Props): JSX.Element => {
       openConflictDiffModal(newMarkdown, resolveConflictHandler);
     };
 
-    storeConflictHandler(conflictHandler);
-  }, [generateResolveConflictHandler, openConflictDiffModal, setRemoteLatestPageData, storeConflictHandler]);
+    storeMethodsForPageStatusAlert({ onResolveConflict: conflictHandler });
+  }, [setRemoteLatestPageData, generateResolveConflictHandler, storeMethodsForPageStatusAlert, openConflictDiffModal]);
 
   const saveAndReturnToViewHandler = useCallback(async(opts: {slackChannels: string, overwriteScopesOfDescendants?: boolean}) => {
     const markdown = codeMirrorEditor?.getDoc();

apps/app/src/components/PageStatusAlert.tsx

@@ -36,7 +36,7 @@ export const PageStatusAlert = (): JSX.Element => {
   }, [mutateEditingMarkdown, mutatePageData]);
 
   const onClickResolveConflict = useCallback(() => {
-    pageStatusAlertData?.onConflict?.();
+    pageStatusAlertData?.onResolveConflict?.();
   }, [pageStatusAlertData]);
 
   const alertContentsForView = useMemo(() => {
@@ -86,7 +86,7 @@ export const PageStatusAlert = (): JSX.Element => {
     return <></>;
   }
 
-  const hasConflictHandler = pageStatusAlertData?.onConflict != null;
+  const hasConflictHandler = pageStatusAlertData?.onResolveConflict != null;
   if (!hasConflictHandler && editorMode === EditorMode.Editor) {
     return <></>;
   }

apps/app/src/stores/alert.tsx

@@ -4,21 +4,21 @@ import type { SWRResponse } from 'swr';
 /*
 * PageStatusAlert
 */
-type PageStatusAlertStatus = {
-  onConflict?: () => void,
+type PageStatusAlertMethods = {
+  onResolveConflict?: () => void,
 }
 
 type PageStatusAlertUtils = {
-  storeMethods: (conflictHandler: () => void) => void,
+  storeMethods: (methods: PageStatusAlertMethods) => void,
   clearMethods: () => void,
 }
-export const usePageStatusAlert = (): SWRResponse<PageStatusAlertStatus, Error> & PageStatusAlertUtils => {
-  const swrResponse = useSWRStatic<PageStatusAlertStatus, Error>('pageStatusAlert', undefined);
+export const usePageStatusAlert = (): SWRResponse<PageStatusAlertMethods, Error> & PageStatusAlertUtils => {
+  const swrResponse = useSWRStatic<PageStatusAlertMethods, Error>('pageStatusAlert', undefined);
 
   return {
     ...swrResponse,
-    storeMethods(onConflict) {
-      swrResponse.mutate({ onConflict });
+    storeMethods(methods) {
+      swrResponse.mutate(methods);
     },
     clearMethods() {
       swrResponse.mutate({});