Yuki Takei 7 месяцев назад
Родитель
Сommit
23bba58b66
24 измененных файлов с 27 добавлено и 29 удалено
  1. 1 1
      apps/app/src/client/components/Admin/G2GDataTransfer.tsx
  2. 2 2
      apps/app/src/client/components/Admin/Security/GitHubSecuritySettingContents.jsx
  3. 1 1
      apps/app/src/client/components/Admin/Security/GoogleSecuritySettingContents.jsx
  4. 1 1
      apps/app/src/client/components/Admin/Security/LocalSecuritySettingContents.jsx
  5. 1 1
      apps/app/src/client/components/Admin/Security/OidcSecuritySettingContents.jsx
  6. 2 2
      apps/app/src/client/components/Admin/Security/SamlSecuritySettingContents.jsx
  7. 1 1
      apps/app/src/client/components/Admin/SlackIntegration/WithProxyAccordions.jsx
  8. 2 2
      apps/app/src/client/components/Admin/Users/UserInviteModal.jsx
  9. 1 1
      apps/app/src/client/components/DataTransferForm.tsx
  10. 1 1
      apps/app/src/client/components/Hotkeys/Subscribers/CreatePage.jsx
  11. 1 1
      apps/app/src/client/components/IdenticalPathPage.tsx
  12. 1 1
      apps/app/src/client/components/ItemsTree/ItemsTree.tsx
  13. 2 2
      apps/app/src/client/components/PageAccessoriesModal/PageHistory.tsx
  14. 1 1
      apps/app/src/client/components/PageEditor/PageEditor.tsx
  15. 1 1
      apps/app/src/client/components/Sidebar/PageCreateButton/PageCreateButton.tsx
  16. 1 1
      apps/app/src/client/components/Sidebar/PageCreateButton/hooks/use-create-new-page.ts
  17. 1 1
      apps/app/src/client/components/SystemVersion.tsx
  18. 1 1
      apps/app/src/client/components/TemplateModal/use-formatter.tsx
  19. 1 1
      apps/app/src/components/PageView/PageAlerts/PageRedirectedAlert.tsx
  20. 1 1
      apps/app/src/features/openai/client/components/AiAssistant/AiAssistantSidebar/AiAssistantSidebar.tsx
  21. 1 1
      apps/app/src/features/openai/client/components/AiIntegration/AiIntegrationDisableMode.tsx
  22. 1 1
      apps/app/src/features/openai/client/services/editor-assistant/use-editor-assistant.tsx
  23. 1 1
      apps/app/src/features/search/client/components/SearchMethodMenuItem.tsx
  24. 0 2
      apps/app/src/pages/_search/index.page.tsx

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

@@ -124,7 +124,7 @@ const G2GDataTransfer = (): JSX.Element => {
     }
     }
   }, [setTransferring, startTransferKey, selectedCollections, optionsMap]);
   }, [setTransferring, startTransferKey, selectedCollections, optionsMap]);
 
 
-  const [documentationUrl] = useGrowiDocumentationUrl();
+  const documentationUrl = useGrowiDocumentationUrl();
 
 
   // File upload
   // File upload
   // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => {
   // const onChangeFileUploadTypeHandler = useCallback((e: ChangeEvent, type: string) => {

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

@@ -10,9 +10,9 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
 import AdminGitHubSecurityContainer from '~/client/services/AdminGitHubSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { toastSuccess, toastError } from '~/client/util/toastr';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 
 class GitHubSecurityManagementContents extends React.Component {
 class GitHubSecurityManagementContents extends React.Component {
 
 
@@ -194,7 +194,7 @@ class GitHubSecurityManagementContents extends React.Component {
 
 
 const GitHubSecurityManagementContentsFC = (props) => {
 const GitHubSecurityManagementContentsFC = (props) => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
+  const siteUrl = useSiteUrlWithEmptyValueWarn();
   return <GitHubSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
   return <GitHubSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 };
 
 

+ 1 - 1
apps/app/src/client/components/Admin/Security/GoogleSecuritySettingContents.jsx

@@ -200,7 +200,7 @@ class GoogleSecurityManagementContents extends React.Component {
 
 
 const GoogleSecurityManagementContentsFc = (props) => {
 const GoogleSecurityManagementContentsFc = (props) => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
+  const siteUrl = useSiteUrlWithEmptyValueWarn();
   return <GoogleSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
   return <GoogleSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 };
 
 

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

@@ -248,7 +248,7 @@ LocalSecuritySettingContents.propTypes = {
 
 
 const LocalSecuritySettingContentsWrapperFC = (props) => {
 const LocalSecuritySettingContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [isMailerSetup] = useIsMailerSetup();
+  const isMailerSetup = useIsMailerSetup();
   return <LocalSecuritySettingContents t={t} {...props} isMailerSetup={isMailerSetup ?? false} />;
   return <LocalSecuritySettingContents t={t} {...props} isMailerSetup={isMailerSetup ?? false} />;
 };
 };
 
 

+ 1 - 1
apps/app/src/client/components/Admin/Security/OidcSecuritySettingContents.jsx

@@ -476,7 +476,7 @@ OidcSecurityManagementContents.propTypes = {
 
 
 const OidcSecurityManagementContentsWrapperFC = (props) => {
 const OidcSecurityManagementContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
+  const siteUrl = useSiteUrlWithEmptyValueWarn();
   return <OidcSecurityManagementContents t={t} {...props} siteUrl={siteUrl} />;
   return <OidcSecurityManagementContents t={t} {...props} siteUrl={siteUrl} />;
 };
 };
 
 

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

@@ -11,9 +11,9 @@ import urljoin from 'url-join';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminGeneralSecurityContainer from '~/client/services/AdminGeneralSecurityContainer';
 import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
 import AdminSamlSecurityContainer from '~/client/services/AdminSamlSecurityContainer';
 import { toastSuccess, toastError } from '~/client/util/toastr';
 import { toastSuccess, toastError } from '~/client/util/toastr';
+import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { useSiteUrlWithEmptyValueWarn } from '~/states/global';
 
 
 
 
 class SamlSecurityManagementContents extends React.Component {
 class SamlSecurityManagementContents extends React.Component {
@@ -551,7 +551,7 @@ SamlSecurityManagementContents.propTypes = {
 
 
 const SamlSecurityManagementContentsWrapperFC = (props) => {
 const SamlSecurityManagementContentsWrapperFC = (props) => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
+  const siteUrl = useSiteUrlWithEmptyValueWarn();
   return <SamlSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
   return <SamlSecurityManagementContents t={t} siteUrl={siteUrl} {...props} />;
 };
 };
 
 

+ 1 - 1
apps/app/src/client/components/Admin/SlackIntegration/WithProxyAccordions.jsx

@@ -286,7 +286,7 @@ const TestProcess = ({
 
 
 const WithProxyAccordions = (props) => {
 const WithProxyAccordions = (props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [siteUrl] = useSiteUrlWithEmptyValueWarn();
+  const siteUrl = useSiteUrlWithEmptyValueWarn();
   const [isLatestConnectionSuccess, setIsLatestConnectionSuccess] = useState(false);
   const [isLatestConnectionSuccess, setIsLatestConnectionSuccess] = useState(false);
 
 
   const submitForm = () => {
   const submitForm = () => {

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

@@ -11,9 +11,9 @@ import {
 
 
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import AdminUsersContainer from '~/client/services/AdminUsersContainer';
 import { toastSuccess, toastError, toastWarning } from '~/client/util/toastr';
 import { toastSuccess, toastError, toastWarning } from '~/client/util/toastr';
+import { useIsMailerSetup } from '~/states/server-configurations';
 
 
 import { withUnstatedContainers } from '../../UnstatedUtils';
 import { withUnstatedContainers } from '../../UnstatedUtils';
-import { useIsMailerSetup } from '~/states/server-configurations';
 
 
 class UserInviteModal extends React.Component {
 class UserInviteModal extends React.Component {
 
 
@@ -280,7 +280,7 @@ class UserInviteModal extends React.Component {
 
 
 const UserInviteModalWrapperFC = (props) => {
 const UserInviteModalWrapperFC = (props) => {
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [isMailerSetup] = useIsMailerSetup();
+  const isMailerSetup = useIsMailerSetup();
   return <UserInviteModal t={t} isMailerSetup={isMailerSetup ?? false} {...props} />;
   return <UserInviteModal t={t} isMailerSetup={isMailerSetup ?? false} {...props} />;
 };
 };
 
 

+ 1 - 1
apps/app/src/client/components/DataTransferForm.tsx

@@ -10,7 +10,7 @@ import CustomCopyToClipBoard from './Common/CustomCopyToClipBoard';
 const DataTransferForm = (): JSX.Element => {
 const DataTransferForm = (): JSX.Element => {
   const { t } = useTranslation('commons');
   const { t } = useTranslation('commons');
   const { transferKey, generateTransferKey } = useGenerateTransferKey();
   const { transferKey, generateTransferKey } = useGenerateTransferKey();
-  const [documentationUrl] = useGrowiDocumentationUrl();
+  const documentationUrl = useGrowiDocumentationUrl();
 
 
   return (
   return (
     <div data-testid="installerForm" className="py-3 px-4">
     <div data-testid="installerForm" className="py-3 px-4">

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

@@ -8,7 +8,7 @@ import { usePageCreateModal } from '~/stores/modal';
 const CreatePage = React.memo((props) => {
 const CreatePage = React.memo((props) => {
 
 
   const { open: openCreateModal } = usePageCreateModal();
   const { open: openCreateModal } = usePageCreateModal();
-  const [currentPath] = useCurrentPagePath();
+  const currentPath = useCurrentPagePath();
 
 
   // setup effect
   // setup effect
   useEffect(() => {
   useEffect(() => {

+ 1 - 1
apps/app/src/client/components/IdenticalPathPage.tsx

@@ -50,7 +50,7 @@ const IdenticalPathAlert : FC<IdenticalPathAlertProps> = (props: IdenticalPathAl
 
 
 export const IdenticalPathPage = (): JSX.Element => {
 export const IdenticalPathPage = (): JSX.Element => {
 
 
-  const [currentPath] = useCurrentPathname();
+  const currentPath = useCurrentPathname();
 
 
   const { data: pages } = useSWRxPagesByPath(currentPath);
   const { data: pages } = useSWRxPagesByPath(currentPath);
   const { injectTo } = useSWRxPageInfoForList(null, currentPath, true, true);
   const { injectTo } = useSWRxPageInfoForList(null, currentPath, true, true);

+ 1 - 1
apps/app/src/client/components/ItemsTree/ItemsTree.tsx

@@ -55,7 +55,7 @@ export const ItemsTree = (props: ItemsTreeProps): JSX.Element => {
   const router = useRouter();
   const router = useRouter();
 
 
   const { data: rootPageResult, error } = useSWRxRootPage({ suspense: true });
   const { data: rootPageResult, error } = useSWRxRootPage({ suspense: true });
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
   const { open: openDuplicateModal } = usePageDuplicateModal();
   const { open: openDuplicateModal } = usePageDuplicateModal();
   const { open: openDeleteModal } = usePageDeleteModal();
   const { open: openDeleteModal } = usePageDeleteModal();
 
 

+ 2 - 2
apps/app/src/client/components/PageAccessoriesModal/PageHistory.tsx

@@ -16,8 +16,8 @@ type PageHistoryProps = {
 export const PageHistory: React.FC<PageHistoryProps> = (props: PageHistoryProps) => {
 export const PageHistory: React.FC<PageHistoryProps> = (props: PageHistoryProps) => {
   const { onClose } = props;
   const { onClose } = props;
 
 
-  const [currentPageId] = useCurrentPageId();
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPageId = useCurrentPageId();
+  const currentPagePath = useCurrentPagePath();
 
 
   const comparingRevisions = useAutoComparingRevisionsByQueryParam();
   const comparingRevisions = useAutoComparingRevisionsByQueryParam();
 
 

+ 1 - 1
apps/app/src/client/components/PageEditor/PageEditor.tsx

@@ -106,7 +106,7 @@ export const PageEditorSubstance = (props: Props): JSX.Element => {
   const { data: selectedGrant } = useSelectedGrant();
   const { data: selectedGrant } = useSelectedGrant();
   const [editingMarkdown] = useEditingMarkdown();
   const [editingMarkdown] = useEditingMarkdown();
   const isEnabledAttachTitleHeader = useAtomValue(isEnabledAttachTitleHeaderAtom);
   const isEnabledAttachTitleHeader = useAtomValue(isEnabledAttachTitleHeaderAtom);
-  const [templateBody] = useTemplateBody();
+  const templateBody = useTemplateBody();
   const isEditable = useIsEditable();
   const isEditable = useIsEditable();
   const { mutate: mutateWaitingSaveProcessing } = useWaitingSaveProcessing();
   const { mutate: mutateWaitingSaveProcessing } = useWaitingSaveProcessing();
   const { editorMode, setEditorMode } = useEditorMode();
   const { editorMode, setEditorMode } = useEditorMode();

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

@@ -19,7 +19,7 @@ export const PageCreateButton = React.memo((): JSX.Element => {
   const [dropdownOpen, setDropdownOpen] = useState(false);
   const [dropdownOpen, setDropdownOpen] = useState(false);
 
 
   const { open: openPageCreateModal } = usePageCreateModal();
   const { open: openPageCreateModal } = usePageCreateModal();
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
 
 
   const { createNewPage, isCreating: isNewPageCreating } = useCreateNewPage();
   const { createNewPage, isCreating: isNewPageCreating } = useCreateNewPage();
   // TODO: https://redmine.weseek.co.jp/issues/138806
   // TODO: https://redmine.weseek.co.jp/issues/138806

+ 1 - 1
apps/app/src/client/components/Sidebar/PageCreateButton/hooks/use-create-new-page.ts

@@ -12,7 +12,7 @@ type UseCreateNewPage = () => {
 }
 }
 
 
 export const useCreateNewPage: UseCreateNewPage = () => {
 export const useCreateNewPage: UseCreateNewPage = () => {
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
 
 
   const { isCreating, create } = useCreatePage();
   const { isCreating, create } = useCreatePage();
 
 

+ 1 - 1
apps/app/src/client/components/SystemVersion.tsx

@@ -15,7 +15,7 @@ const SystemVersion = (props: Props): JSX.Element => {
 
 
   const { open: openShortcutsModal } = useShortcutsModal();
   const { open: openShortcutsModal } = useShortcutsModal();
 
 
-  const [growiVersion] = useGrowiVersion();
+  const growiVersion = useGrowiVersion();
   // add classes to cmd-key by OS
   // add classes to cmd-key by OS
   const platform = window.navigator.platform.toLowerCase();
   const platform = window.navigator.platform.toLowerCase();
   const isMac = (platform.indexOf('mac') > -1);
   const isMac = (platform.indexOf('mac') > -1);

+ 1 - 1
apps/app/src/client/components/TemplateModal/use-formatter.tsx

@@ -15,7 +15,7 @@ type FormatterData = {
 }
 }
 
 
 export const useFormatter = (): FormatterData => {
 export const useFormatter = (): FormatterData => {
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
 
 
   const format: FormatMethod = (markdown) => {
   const format: FormatMethod = (markdown) => {
     if (markdown == null) {
     if (markdown == null) {

+ 1 - 1
apps/app/src/components/PageView/PageAlerts/PageRedirectedAlert.tsx

@@ -7,7 +7,7 @@ import { useRedirectFrom } from '~/stores/page-redirect';
 
 
 export const PageRedirectedAlert = React.memo((): JSX.Element => {
 export const PageRedirectedAlert = React.memo((): JSX.Element => {
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
   const { data: redirectFrom } = useRedirectFrom();
   const { data: redirectFrom } = useRedirectFrom();
 
 
   const [isUnlinked, setIsUnlinked] = useState(false);
   const [isUnlinked, setIsUnlinked] = useState(false);

+ 1 - 1
apps/app/src/features/openai/client/components/AiAssistant/AiAssistantSidebar/AiAssistantSidebar.tsx

@@ -68,7 +68,7 @@ const AiAssistantSidebarSubstance: React.FC<AiAssistantSidebarSubstanceProps> =
 
 
   // Hooks
   // Hooks
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [growiCloudUri] = useGrowiCloudUri();
+  const growiCloudUri = useGrowiCloudUri();
 
 
   const {
   const {
     createThread: createThreadForKnowledgeAssistant,
     createThread: createThreadForKnowledgeAssistant,

+ 1 - 1
apps/app/src/features/openai/client/components/AiIntegration/AiIntegrationDisableMode.tsx

@@ -7,7 +7,7 @@ import { useGrowiDocumentationUrl } from '~/states/context';
 
 
 export const AiIntegrationDisableMode: FC = () => {
 export const AiIntegrationDisableMode: FC = () => {
   const { t } = useTranslation('admin');
   const { t } = useTranslation('admin');
-  const [documentationUrl] = useGrowiDocumentationUrl();
+  const documentationUrl = useGrowiDocumentationUrl();
 
 
   return (
   return (
     <div className="ccontainer-lg">
     <div className="ccontainer-lg">

+ 1 - 1
apps/app/src/features/openai/client/services/editor-assistant/use-editor-assistant.tsx

@@ -139,7 +139,7 @@ export const useEditorAssistant: UseEditorAssistant = () => {
 
 
   // Hooks
   // Hooks
   const { t } = useTranslation();
   const { t } = useTranslation();
-  const [currentPageId] = useCurrentPageId();
+  const currentPageId = useCurrentPageId();
   const { data: isEnableUnifiedMergeView, mutate: mutateIsEnableUnifiedMergeView } = useIsEnableUnifiedMergeView();
   const { data: isEnableUnifiedMergeView, mutate: mutateIsEnableUnifiedMergeView } = useIsEnableUnifiedMergeView();
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN);
   const { data: codeMirrorEditor } = useCodeMirrorEditorIsolated(GlobalCodeMirrorEditorKey.MAIN);
   const yDocs = useSecondaryYdocs(isEnableUnifiedMergeView ?? false, { pageId: currentPageId ?? undefined, useSecondary: isEnableUnifiedMergeView ?? false });
   const yDocs = useSecondaryYdocs(isEnableUnifiedMergeView ?? false, { pageId: currentPageId ?? undefined, useSecondary: isEnableUnifiedMergeView ?? false });

+ 1 - 1
apps/app/src/features/search/client/components/SearchMethodMenuItem.tsx

@@ -19,7 +19,7 @@ export const SearchMethodMenuItem = (props: Props): JSX.Element => {
 
 
   const { t } = useTranslation('commons');
   const { t } = useTranslation('commons');
 
 
-  const [currentPagePath] = useCurrentPagePath();
+  const currentPagePath = useCurrentPagePath();
 
 
   const dPagePath = new DevidedPagePath(currentPagePath ?? '', true, true);
   const dPagePath = new DevidedPagePath(currentPagePath ?? '', true, true);
   const currentPageName = `
   const currentPageName = `

+ 0 - 2
apps/app/src/pages/_search/index.page.tsx

@@ -34,8 +34,6 @@ const SearchResultPage: NextPageWithLayout<Props> = (props: Props) => {
   // useHydratePageAtoms(undefined);
   // useHydratePageAtoms(undefined);
   // useCurrentPathname('/_search');
   // useCurrentPathname('/_search');
 
 
-  // const [, setSearchPage] = useIsSearchPage();
-
   // Hydrate server-side data
   // Hydrate server-side data
   useHydrateBasicLayoutConfigurationAtoms(props.searchConfig, props.sidebarConfig, props.userUISettings);
   useHydrateBasicLayoutConfigurationAtoms(props.searchConfig, props.sidebarConfig, props.userUISettings);
   useHydrateServerConfigurationAtoms(props.serverConfig, props.rendererConfig);
   useHydrateServerConfigurationAtoms(props.serverConfig, props.rendererConfig);