Yuki Takei 7 months ago
parent
commit
688bed84e8

+ 1 - 1
apps/app/src/client/components/Admin/Customize/CustomizeLogoSetting.tsx

@@ -19,7 +19,7 @@ const CUSTOMIZED_LOGO = '/attachment/brand-logo';
 const CustomizeLogoSetting = (): JSX.Element => {
 const CustomizeLogoSetting = (): JSX.Element => {
 
 
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [isDefaultLogo] = useIsDefaultLogo();
+  const isDefaultLogo = useIsDefaultLogo();
   const { data: isCustomizedLogoUploaded, mutate: mutateIsCustomizedLogoUploaded } = useIsCustomizedLogoUploaded();
   const { data: isCustomizedLogoUploaded, mutate: mutateIsCustomizedLogoUploaded } = useIsCustomizedLogoUploaded();
 
 
   const [uploadLogoSrc, setUploadLogoSrc] = useState<ArrayBuffer | string | null>(null);
   const [uploadLogoSrc, setUploadLogoSrc] = useState<ArrayBuffer | string | null>(null);

+ 1 - 1
apps/app/src/client/components/Me/AccessTokenScopeSelect.tsx

@@ -23,7 +23,7 @@ type AccessTokenScopeSelectProps = {
  */
  */
 export const AccessTokenScopeSelect: React.FC<AccessTokenScopeSelectProps> = ({ register, selectedScopes }) => {
 export const AccessTokenScopeSelect: React.FC<AccessTokenScopeSelectProps> = ({ register, selectedScopes }) => {
   const [disabledScopes, setDisabledScopes] = useState<Set<Scope>>(new Set());
   const [disabledScopes, setDisabledScopes] = useState<Set<Scope>>(new Set());
-  const [isAdmin] = useIsAdmin();
+  const isAdmin = useIsAdmin();
 
 
   const ScopesMap = useMemo(() => parseScopes({ scopes: SCOPE, isAdmin }), [isAdmin]);
   const ScopesMap = useMemo(() => parseScopes({ scopes: SCOPE, isAdmin }), [isAdmin]);
   const extractedScopes = useMemo(() => extractScopes(ScopesMap), [ScopesMap]);
   const extractedScopes = useMemo(() => extractScopes(ScopesMap), [ScopesMap]);

+ 1 - 1
apps/app/src/client/components/Sidebar/Bookmarks/BookmarkContents.tsx

@@ -14,7 +14,7 @@ export const BookmarkContents = (): JSX.Element => {
   const { t } = useTranslation();
   const { t } = useTranslation();
   const [isCreateAction, setIsCreateAction] = useState<boolean>(false);
   const [isCreateAction, setIsCreateAction] = useState<boolean>(false);
 
 
-  const [currentUser] = useCurrentUser();
+  const currentUser = useCurrentUser();
   const { mutate: mutateBookmarkFolders } = useSWRxBookmarkFolderAndChild(currentUser?._id);
   const { mutate: mutateBookmarkFolders } = useSWRxBookmarkFolderAndChild(currentUser?._id);
 
 
   const onClickNewBookmarkFolder = useCallback(() => {
   const onClickNewBookmarkFolder = useCallback(() => {

+ 1 - 1
apps/app/src/client/components/Sidebar/PageCreateButton/hooks/use-create-todays-memo.tsx

@@ -18,7 +18,7 @@ type UseCreateTodaysMemo = () => {
 export const useCreateTodaysMemo: UseCreateTodaysMemo = () => {
 export const useCreateTodaysMemo: UseCreateTodaysMemo = () => {
   const { t } = useTranslation('commons');
   const { t } = useTranslation('commons');
 
 
-  const [currentUser] = useCurrentUser();
+  const currentUser = useCurrentUser();
   const { isCreating, create } = useCreatePage();
   const { isCreating, create } = useCreatePage();
 
 
   const isCreatable = currentUser != null;
   const isCreatable = currentUser != null;

+ 1 - 1
apps/app/src/client/components/Sidebar/SidebarNav/PersonalDropdown.tsx

@@ -18,7 +18,7 @@ import styles from './PersonalDropdown.module.scss';
 
 
 export const PersonalDropdown = (): JSX.Element => {
 export const PersonalDropdown = (): JSX.Element => {
   const { t } = useTranslation('commons');
   const { t } = useTranslation('commons');
-  const [currentUser] = useCurrentUser();
+  const currentUser = useCurrentUser();
 
 
   if (currentUser == null) {
   if (currentUser == null) {
     return <SkeletonItem />;
     return <SkeletonItem />;

+ 6 - 6
apps/app/src/components/PageView/PageView.tsx

@@ -49,13 +49,13 @@ export const PageView = memo((props: Props): JSX.Element => {
     pagePath, rendererConfig, className,
     pagePath, rendererConfig, className,
   } = props;
   } = props;
 
 
-  const [currentPageId] = useCurrentPageId();
-  const [isIdenticalPathPage] = useIsIdenticalPath();
-  const [isForbidden] = useIsForbidden();
-  const [isNotCreatable] = useIsNotCreatable();
-  const [isNotFoundMeta] = usePageNotFound();
+  const currentPageId = useCurrentPageId();
+  const isIdenticalPathPage = useIsIdenticalPath();
+  const isForbidden = useIsForbidden();
+  const isNotCreatable = useIsNotCreatable();
+  const isNotFoundMeta = usePageNotFound();
 
 
-  const [page] = useCurrentPageData();
+  const page = useCurrentPageData();
   const { data: viewOptions } = useViewOptions();
   const { data: viewOptions } = useViewOptions();
 
 
   // DEBUG: Log PageView render start
   // DEBUG: Log PageView render start

+ 2 - 2
apps/app/src/components/ShareLinkPageView/ShareLinkPageView.tsx

@@ -41,9 +41,9 @@ export const ShareLinkPageView = memo((props: Props): JSX.Element => {
     isExpired, disableLinkSharing,
     isExpired, disableLinkSharing,
   } = props;
   } = props;
 
 
-  const [isNotFoundMeta] = usePageNotFound();
+  const isNotFoundMeta = usePageNotFound();
 
 
-  const [page] = useCurrentPageData();
+  const page = useCurrentPageData();
 
 
   const { data: viewOptions } = useViewOptions();
   const { data: viewOptions } = useViewOptions();
 
 

+ 1 - 1
apps/app/src/stores/personal-settings.tsx

@@ -23,7 +23,7 @@ const logger = loggerFactory('growi:stores:personal-settings');
 
 
 
 
 export const useSWRxPersonalSettings = (config?: SWRConfiguration): SWRResponse<IUser, Error> => {
 export const useSWRxPersonalSettings = (config?: SWRConfiguration): SWRResponse<IUser, Error> => {
-  const [isGuestUser] = useIsGuestUser();
+  const isGuestUser = useIsGuestUser();
 
 
   const key = !isGuestUser ? '/personal-setting' : null;
   const key = !isGuestUser ? '/personal-setting' : null;