Просмотр исходного кода

imprv useIsSearchServiceReachable data

kaori 3 лет назад
Родитель
Сommit
f16036b27f

+ 4 - 4
packages/app/src/components/Admin/ElasticsearchManagement/ElasticsearchManagement.jsx

@@ -226,9 +226,9 @@ const ElasticsearchManagementWrapperFC = (props) => {
   const { data: isSearchServiceReachable } = useIsSearchServiceReachable();
   const { data: socket } = useAdminSocket();
 
-  // if (isSearchServiceReachable == null) {
-  //   return <></>;
-  // }
+  if (isSearchServiceReachable == null) {
+    return <></>;
+  }
 
   return <ElasticsearchManagement t={t} isSearchServiceReachable={isSearchServiceReachable} socket={socket} {...props} />;
 };
@@ -236,7 +236,7 @@ const ElasticsearchManagementWrapperFC = (props) => {
 
 ElasticsearchManagement.propTypes = {
   t: PropTypes.func.isRequired, // i18next
-  isSearchServiceReachable: PropTypes.bool,
+  isSearchServiceReachable: PropTypes.bool.isRequired,
   socket: PropTypes.object,
 };
 

+ 2 - 2
packages/app/src/pages/admin/[[...path]].page.tsx

@@ -23,7 +23,7 @@ import PluginUtils from '~/server/plugins/plugin-utils';
 import ConfigLoader from '~/server/service/config-loader';
 import {
   useCurrentUser,
-  /* useSearchServiceConfigured, useSearchServiceReachable, */ useSiteUrl,
+  /* useSearchServiceConfigured , */ useIsSearchServiceReachable, useSiteUrl,
 } from '~/stores/context';
 // import { useEnvVars } from '~/stores/admin-context';
 
@@ -122,7 +122,7 @@ const AdminMarkdownSettingsPage: NextPage<Props> = (props: Props) => {
   useCurrentUser(props.currentUser != null ? JSON.parse(props.currentUser) : null);
 
   // useSearchServiceConfigured(props.isSearchServiceConfigured);
-  // useSearchServiceReachable(props.isSearchServiceReachable);
+  useIsSearchServiceReachable(props.isSearchServiceReachable);
 
   useSiteUrl(props.siteUrl);