Yuki Takei 7 ماه پیش
والد
کامیت
3fd189edfe

+ 3 - 2
apps/app/src/client/components/Admin/Security/LocalSecuritySettingContents.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { useAtomValue } from 'jotai';
 import { useTranslation } from 'next-i18next';
 import Link from 'next/link';
 import PropTypes from 'prop-types';
@@ -7,7 +8,7 @@ import PropTypes from 'prop-types';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminLocalSecurityContainer from '~/client/services/AdminLocalSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
-import { useIsMailerSetup } from '~/states/server-configurations';
+import { isMailerSetupAtom } from '~/states/server-configurations';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
@@ -248,7 +249,7 @@ LocalSecuritySettingContents.propTypes = {
 
 const LocalSecuritySettingContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
-  const isMailerSetup = useIsMailerSetup();
+  const isMailerSetup = useAtomValue(isMailerSetupAtom);
   return <LocalSecuritySettingContents t={t} {...props} isMailerSetup={isMailerSetup ?? false} />;
 };
 

+ 3 - 2
apps/app/src/client/components/Admin/Users/PasswordResetModal.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 
 import { LoadingSpinner } from '@growi/ui/dist/components';
+import { useAtomValue } from 'jotai';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
@@ -11,7 +12,7 @@ import {
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import { apiv3Put } from '~/client/util/apiv3-client';
 import { toastError } from '~/client/util/toastr';
-import { useIsMailerSetup } from '~/stores-universal/context';
+import { isMailerSetupAtom } from '~/states/server-configurations';
 
 class PasswordResetModal extends React.Component {
 
@@ -204,7 +205,7 @@ class PasswordResetModal extends React.Component {
 
 const PasswordResetModalWrapperFC = (props) => {
   const { t } = useTranslation('admin');
-  const { data: isMailerSetup } = useIsMailerSetup();
+  const isMailerSetup = useAtomValue(isMailerSetupAtom);
   return <PasswordResetModal t={t} isMailerSetup={isMailerSetup ?? false} {...props} />;
 };
 

+ 3 - 3
apps/app/src/client/components/Admin/Users/UserInviteModal.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 
+import { useAtomValue } from 'jotai';
 import { useTranslation } from 'next-i18next';
 import PropTypes from 'prop-types';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
@@ -8,10 +9,9 @@ import {
   Modal, ModalHeader, ModalBody, ModalFooter,
 } from 'reactstrap';
 
-
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import { toastSuccess, toastError, toastWarning } from '~/client/util/toastr';
-import { useIsMailerSetup } from '~/states/server-configurations';
+import { isMailerSetupAtom } from '~/states/server-configurations';
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 
@@ -280,7 +280,7 @@ class UserInviteModal extends React.Component {
 
 const UserInviteModalWrapperFC = (props) => {
   const { t } = useTranslation();
-  const isMailerSetup = useIsMailerSetup();
+  const isMailerSetup = useAtomValue(isMailerSetupAtom);
   return <UserInviteModal t={t} isMailerSetup={isMailerSetup ?? false} {...props} />;
 };
 

+ 1 - 1
apps/app/src/client/components/Hotkeys/Subscribers/CreatePage.jsx

@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
 
 import { useCurrentPagePath } from '~/states/page';
-import { usePageCreateModal } from '~/stores/modal';
+import { usePageCreateModal } from '~/states/ui/modal/page-create';
 
 const CreatePage = React.memo((props) => {
 

+ 2 - 2
apps/app/src/client/components/Hotkeys/Subscribers/EditPage.jsx

@@ -2,11 +2,11 @@ import { useEffect } from 'react';
 
 import PropTypes from 'prop-types';
 
-import { useIsEditable } from '~/stores-universal/context';
+import { useIsEditable } from '~/states/context';
 import { EditorMode, useEditorMode } from '~/states/ui/editor';
 
 const EditPage = (props) => {
-  const { data: isEditable } = useIsEditable();
+  const isEditable = useIsEditable();
   const { mutate: mutateEditorMode } = useEditorMode();
 
   // setup effect

+ 2 - 2
apps/app/src/client/components/Hotkeys/Subscribers/FocusToGlobalSearch.jsx

@@ -1,11 +1,11 @@
 import { useEffect } from 'react';
 
 import { useSearchModal } from '~/features/search/client/stores/search';
-import { useIsEditable } from '~/stores-universal/context';
+import { useIsEditable } from '~/states/context';
 
 
 const FocusToGlobalSearch = (props) => {
-  const { data: isEditable } = useIsEditable();
+  const isEditable = useIsEditable();
   const { data: searchModalData, open: openSearchModal } = useSearchModal();
 
   // setup effect