put hide-content in permission

goodjoblife · Sep 19, 2024 · ad12698 · ad12698
1 parent 42e8ff8
commit ad12698
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 27 deletions.
diff --git a/src/components/ExperienceDetail/index.js b/src/components/ExperienceDetail/index.js
@@ -48,7 +48,6 @@ import { generateBreadCrumbData } from '../CompanyAndJobTitle/utils';
 import styles from './ExperienceDetail.module.css';
 import { experienceBoxSelectorAtId } from 'selectors/experienceSelector';
 import Button from 'common/button/Button';
-import useIsMyPublishId from 'hooks/useIsMyPublishId';
 
 const MODAL_TYPE = {
   REPORT_DETAIL: 'REPORT_TYPE',
@@ -80,27 +79,6 @@ const useExperienceBox = experienceId => {
   return useSelector(selector);
 };
 
-const useHideContent = ({ experienceId }) => {
-  const isMyExperienceId = useIsMyPublishId();
-
-  const isMyPublish = useMemo(() => isMyExperienceId(experienceId), [
-    isMyExperienceId,
-    experienceId,
-  ]);
-
-  const [, fetchPermission, canView] = usePermission();
-
-  useEffect(() => {
-    fetchPermission();
-  }, [experienceId, fetchPermission]);
-
-  const hideContent = useMemo(() => {
-    return !isMyPublish && !canView;
-  }, [isMyPublish, canView]);
-
-  return hideContent;
-};
-
 const ExperienceDetail = ({ ...props }) => {
   const experienceId = useExperienceId();
   const experienceBox = useExperienceBox(experienceId);
@@ -111,7 +89,7 @@ const ExperienceDetail = ({ ...props }) => {
     dispatch(queryExperienceIfUnfetched(experienceId));
   }, [dispatch, experienceId]);
 
-  const hideContent = useHideContent({ experienceId });
+  const [, , canView] = usePermission({ publishId: experienceId });
 
   const [{ isModalOpen, modalType, modalPayload = {} }, setModal] = useState({
     isModalOpen: false,
@@ -259,7 +237,7 @@ const ExperienceDetail = ({ ...props }) => {
                 {reportZone}
                 <Article
                   experience={experienceBox.data}
-                  hideContent={hideContent}
+                  hideContent={!canView}
                   onClickMsgButton={scrollToCommentZone}
                 />
               </Fragment>

diff --git a/src/hooks/usePermission.js b/src/hooks/usePermission.js
@@ -1,7 +1,8 @@
-import { useContext, useCallback } from 'react';
+import { useContext, useCallback, useMemo } from 'react';
 import PermissionContext from 'contexts/PermissionContext';
 import { useToken } from 'hooks/auth';
 import { queryHasSearchPermissionApi } from 'apis/me';
+import useIsMyPublishId from './useIsMyPublishId';
 
 const useGetSearchPermission = ({ token }) => {
   return useCallback(async () => {
@@ -11,7 +12,13 @@ const useGetSearchPermission = ({ token }) => {
   }, [token]);
 };
 
-export default () => {
+const usePermission = ({ publishId } = {}) => {
+  const isMyPublishId = useIsMyPublishId();
+  const isMyPublish = useMemo(() => !!publishId && isMyPublishId(publishId), [
+    isMyPublishId,
+    publishId,
+  ]);
+
   const token = useToken();
   const { canView, permissionFetched, setPermissionState } = useContext(
     PermissionContext,
@@ -36,5 +43,7 @@ export default () => {
       }
     }
   }, [getSearchPermission, setPermissionState]);
-  return [permissionFetched, fetchPermission, canView];
+  return [permissionFetched, fetchPermission, isMyPublish || canView];
 };
+
+export default usePermission;