Procházet zdrojové kódy

imprv useIsSlackEnabled

kaori před 3 roky
rodič
revize
cd8d1b0c56

+ 21 - 14
packages/app/src/components/PageEditor/EditorNavbarBottom.tsx

@@ -83,13 +83,17 @@ const EditorNavbarBottom = (props) => {
       {isSlackConfigured && (
         <Collapse isOpen={isSlackExpanded && isDeviceSmallerThanMd === true}>
           <nav className={`navbar navbar-expand-lg border-top ${additionalClasses.join(' ')}`}>
-            <SlackNotification
-              isSlackEnabled={isSlackEnabled ?? false}
-              slackChannels={slackChannelsStr}
-              onEnabledFlagChange={isSlackEnabledToggleHandler}
-              onChannelChange={slackChannelsChangedHandler}
-              id="idForEditorNavbarBottomForMobile"
-            />
+            {isSlackEnabled != null
+            && (
+              <SlackNotification
+                isSlackEnabled={isSlackEnabled}
+                slackChannels={slackChannelsStr}
+                onEnabledFlagChange={isSlackEnabledToggleHandler}
+                onChannelChange={slackChannelsChangedHandler}
+                id="idForEditorNavbarBottomForMobile"
+              />
+            )
+            }
           </nav>
         </Collapse>
       )
@@ -114,13 +118,16 @@ const EditorNavbarBottom = (props) => {
             </Button>
           ) : (
             <div className="mr-2">
-              <SlackNotification
-                isSlackEnabled={isSlackEnabled || false}
-                slackChannels={slackChannelsStr}
-                onEnabledFlagChange={isSlackEnabledToggleHandler}
-                onChannelChange={slackChannelsChangedHandler}
-                id="idForEditorNavbarBottom"
-              />
+              {isSlackEnabled != null
+              && (
+                <SlackNotification
+                  isSlackEnabled={isSlackEnabled}
+                  slackChannels={slackChannelsStr}
+                  onEnabledFlagChange={isSlackEnabledToggleHandler}
+                  onChannelChange={slackChannelsChangedHandler}
+                  id="idForEditorNavbarBottom"
+                />
+              )}
             </div>
           ))}
           <SavePageControls slackChannels={slackChannelsStr} isSlackEnabled={isSlackEnabled || false} />

+ 1 - 12
packages/app/src/stores/editor.tsx

@@ -84,21 +84,10 @@ export const useSWRxSlackChannels = (): SWRResponse<string[], Error> => {
   );
 };
 
-export const useIsSlackEnabledBydefault = (): SWRResponse<boolean, Error> => {
-  const { data: slackChannelsData } = useSWRxSlackChannels();
-  const isSlackEnabledByDefault = (slackChannelsData != null && slackChannelsData.length > 0) || false;
-  return useSWR(
-    ['isSlackEnabledByDefault', isSlackEnabledByDefault],
-    (key: string, isSlackEnabledByDefault: boolean) => isSlackEnabledByDefault,
-    { fallbackData: false },
-  );
-};
-
 export const useIsSlackEnabled = (): SWRResponse<boolean, Error> => {
-  const { data: isSlackEnabledByDefault } = useIsSlackEnabledBydefault();
   return useStaticSWR(
     'isSlackEnabled',
     undefined,
-    { fallbackData: isSlackEnabledByDefault },
+    { fallbackData: false },
   );
 };