refactor

apps/app/src/client/components/Bookmarks/BookmarkFolderTree.tsx

@@ -42,8 +42,8 @@ export const BookmarkFolderTree: React.FC<Props> = (props: Props) => {
   const { t } = useTranslation();
   const router = useRouter();
 
-  const [isReadOnlyUser] = useIsReadOnlyUser();
-  const [currentPage] = useCurrentPageData();
+  const isReadOnlyUser = useIsReadOnlyUser();
+  const currentPage = useCurrentPageData();
   const { data: bookmarkFolders, mutate: mutateBookmarkFolders } = useSWRxBookmarkFolderAndChild(userId);
   const { data: userBookmarks, mutate: mutateUserBookmarks } = useSWRxUserBookmarks(userId ?? null);
   const { trigger: mutatePageInfo } = useSWRMUTxPageInfo(currentPage?._id ?? null);

apps/app/src/client/components/InvitedForm.tsx

@@ -17,7 +17,7 @@ export const InvitedForm = (props: InvitedFormProps): JSX.Element => {
 
   const { t } = useTranslation();
   const router = useRouter();
-  const [user] = useCurrentUser();
+  const user = useCurrentUser();
   const [loginErrors, setLoginErrors] = useState<Error[]>([]);
   const [isLoading, setIsLoading] = useState(false);
 

apps/app/src/client/components/ReactMarkdownComponents/DrawioViewerWithEditButton.tsx

@@ -29,11 +29,11 @@ export const DrawioViewerWithEditButton = React.memo((props: DrawioViewerProps):
 
   const { bol, eol } = props;
 
-  const [isGuestUser] = useIsGuestUser();
-  const [isReadOnlyUser] = useIsReadOnlyUser();
-  const [isSharedUser] = useIsSharedUser();
-  const [shareLinkId] = useShareLinkId();
-  const [isRevisionOutdated] = useIsRevisionOutdated();
+  const isGuestUser = useIsGuestUser();
+  const isReadOnlyUser = useIsReadOnlyUser();
+  const isSharedUser = useIsSharedUser();
+  const shareLinkId = useShareLinkId();
+  const isRevisionOutdated = useIsRevisionOutdated();
   const { data: currentPageYjsData } = useCurrentPageYjsData();
 
   const [isRendered, setRendered] = useState(false);

apps/app/src/client/components/Sidebar/Sidebar.tsx

@@ -232,7 +232,7 @@ export const Sidebar = (): JSX.Element => {
     isDrawerMode, isCollapsedMode, isDockMode,
   } = useSidebarMode();
 
-  const [isSearchPage] = useIsSearchPage();
+  const isSearchPage = useIsSearchPage();
   const { editorMode } = useEditorMode();
   const { data: isMdSize } = useIsDeviceLargerThanMd();
   const [isXlSize] = useDeviceLargerThanXl();

apps/app/src/client/components/Sidebar/SidebarContents.tsx

@@ -1,11 +1,12 @@
 import React, { memo, useMemo } from 'react';
 
+import { useAtomValue } from 'jotai';
+
 import { AiAssistant } from '~/features/openai/client/components/AiAssistant/Sidebar/AiAssistant';
 import { SidebarContentsType } from '~/interfaces/ui';
 import { useIsGuestUser } from '~/states/context';
-import { useSidebarMode, useCollapsedContentsOpened, useCurrentSidebarContents } from '~/states/ui/sidebar';
-import { useAtomValue } from 'jotai';
 import { aiEnabledAtom } from '~/states/server-configurations';
+import { useSidebarMode, useCollapsedContentsOpened, useCurrentSidebarContents } from '~/states/ui/sidebar';
 
 import { Bookmarks } from './Bookmarks';
 import { CustomSidebar } from './Custom';

apps/app/src/features/external-user-group/client/components/ExternalUserGroup/ExternalUserGroupManagement.tsx

@@ -1,10 +1,10 @@
 import type { IGrantedGroup } from '@growi/core';
 import { GroupType, getIdForRef } from '@growi/core';
+import { useAtomValue } from 'jotai';
 import type { FC } from 'react';
 import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { TabContent, TabPane } from 'reactstrap';
-
 import { UserGroupDeleteModal } from '~/client/components/Admin/UserGroup/UserGroupDeleteModal';
 import { UserGroupModal } from '~/client/components/Admin/UserGroup/UserGroupModal';
 import { UserGroupTable } from '~/client/components/Admin/UserGroup/UserGroupTable';
@@ -13,7 +13,7 @@ import { apiv3Delete, apiv3Put } from '~/client/util/apiv3-client';
 import { toastError, toastSuccess } from '~/client/util/toastr';
 import type { IExternalUserGroupHasId } from '~/features/external-user-group/interfaces/external-user-group';
 import type { PageActionOnGroupDelete } from '~/interfaces/user-group';
-import { useIsAclEnabled } from '~/states/server-configurations';
+import { isAclEnabledAtom } from '~/states/server-configurations/server-configurations';
 import { useSWRxUserGroupList } from '~/stores/user-group';
 
 import {
@@ -55,7 +55,7 @@ export const ExternalGroupManagement: FC = () => {
       ? childExternalUserGroupsList.childUserGroups
       : [];
 
-  const [isAclEnabled] = useIsAclEnabled();
+  const isAclEnabled = useAtomValue(isAclEnabledAtom);
 
   const [activeTab, setActiveTab] = useState('ldap');
   const [activeComponents, setActiveComponents] = useState(new Set(['ldap']));