Просмотр исходного кода

use useStaticSWR and clean code

kaori 3 лет назад
Родитель
Сommit
045852bfde

+ 0 - 1
packages/app/src/components/Page.jsx

@@ -192,7 +192,6 @@ const PageWrapper = (props) => {
   const { data: isGuestUser } = useIsGuestUser();
   const { data: isMobile } = useIsMobile();
   const { data: slackChannelsData } = useSWRxSlackChannels();
-  // const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0) || false;
   const { data: isSlackEnabled } = useSWRxIsSlackEnabled();
   const { data: grant } = useSelectedGrant();
   const { data: grantGroupId } = useSelectedGrantGroupId();

+ 0 - 3
packages/app/src/components/PageEditor.jsx

@@ -407,11 +407,8 @@ const PageEditorWrapper = (props) => {
   const { data: isEditable } = useIsEditable();
   const { data: editorMode } = useEditorMode();
   const { data: isMobile } = useIsMobile();
-  // const { data: isSlackEnabled } = useIsSlackEnabled();
   const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels(currentPagePath);
-  // const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0) || false;
-  // const { data: isSlackEnabled } = useSWRxIsSlackEnabled(isSlackEnabledByDefault);
   const { data: isSlackEnabled } = useSWRxIsSlackEnabled();
   const { data: grant, mutate: mutateGrant } = useSelectedGrant();
   const { data: grantGroupId } = useSelectedGrantGroupId();

+ 1 - 7
packages/app/src/components/PageEditor/EditorNavbarBottom.tsx

@@ -6,8 +6,7 @@ import { Collapse, Button } from 'reactstrap';
 
 import AppContainer from '~/client/services/AppContainer';
 import EditorContainer from '~/client/services/EditorContainer';
-import { useCurrentPagePath } from '~/stores/context';
-import { useSWRxSlackChannels, useSWRxIsSlackEnabledBydefault, useSWRxIsSlackEnabled } from '~/stores/editor';
+import { useSWRxSlackChannels, useSWRxIsSlackEnabled } from '~/stores/editor';
 import {
   EditorMode, useDrawerOpened, useEditorMode, useIsDeviceSmallerThanMd,
 } from '~/stores/ui';
@@ -33,14 +32,9 @@ const EditorNavbarBottom = (props) => {
   const { data: isDeviceSmallerThanMd } = useIsDeviceSmallerThanMd();
   const additionalClasses = ['grw-editor-navbar-bottom'];
 
-  // const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels();
-  // const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0);
-  // const { data: isSlackEnabledByDefault } = useSWRxIsSlackEnabledBydefault();
   const { data: isSlackEnabled, mutate: mutateIsSlackEnabled } = useSWRxIsSlackEnabled();
 
-  console.log('isSlackEnabled_hoge', isSlackEnabled);
-
   const [slackChannelsStr, setSlackChannelsStr] = useState<string>('');
 
   useEffect(() => {

+ 0 - 3
packages/app/src/components/PageEditorByHackmd.jsx

@@ -9,7 +9,6 @@ import EditorContainer from '~/client/services/EditorContainer';
 import PageContainer from '~/client/services/PageContainer';
 import { apiPost } from '~/client/util/apiv1-client';
 import { getOptionsToSave } from '~/client/util/editor';
-import { useCurrentPagePath } from '~/stores/context';
 import { useSWRxSlackChannels, useSWRxIsSlackEnabled } from '~/stores/editor';
 import {
   useEditorMode, useSelectedGrant, useSelectedGrantGroupId, useSelectedGrantGroupName,
@@ -431,9 +430,7 @@ const PageEditorByHackmdHOCWrapper = withUnstatedContainers(PageEditorByHackmd,
 
 const PageEditorByHackmdWrapper = (props) => {
   const { data: editorMode } = useEditorMode();
-  // const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels();
-  // const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0) || false;
   const { data: isSlackEnabled } = useSWRxIsSlackEnabled();
   const { data: grant } = useSelectedGrant();
   const { data: grantGroupId } = useSelectedGrantGroupId();

+ 0 - 1
packages/app/src/components/SlackNotification.tsx

@@ -22,7 +22,6 @@ export const SlackNotification: FC<SlackNotificationProps> = ({
   const updateCheckboxHandler = (event: { target: { checked: boolean }; }) => {
     const value = event.target.checked;
     if (onEnabledFlagChange != null) {
-      console.log('value', value);
       onEnabledFlagChange(value);
     }
   };

+ 5 - 6
packages/app/src/stores/editor.tsx

@@ -84,7 +84,6 @@ export const useSWRxSlackChannels = (): SWRResponse<Nullable<string[]>, Error> =
 };
 
 export const useSWRxIsSlackEnabledBydefault = (): SWRResponse<boolean, Error> => {
-  // const { data: currentPagePath } = useCurrentPagePath();
   const { data: slackChannelsData } = useSWRxSlackChannels();
   const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0) || false;
   return useSWR(
@@ -93,11 +92,11 @@ export const useSWRxIsSlackEnabledBydefault = (): SWRResponse<boolean, Error> =>
   );
 };
 
-export const useSWRxIsSlackEnabled = (isEnabled?: boolean): SWRResponse<boolean, Error> => {
-  console.log('useSWRxIsSlackEnabled', isEnabled);
+export const useSWRxIsSlackEnabled = (): SWRResponse<boolean, Error> => {
   const { data: isSlackEnabledByDefault } = useSWRxIsSlackEnabledBydefault();
-  return useSWR(
-    ['isSlackEnabled', isEnabled != null ? isEnabled : isSlackEnabledByDefault],
-    (key: string, isEnabled: boolean) => isEnabled,
+  return useStaticSWR(
+    'isSlackEnabled',
+    undefined,
+    { fallbackData: isSlackEnabledByDefault },
   );
 };