Explorar o código

pass isAclEnabled to client as props

kaori %!s(int64=3) %!d(string=hai) anos
pai
achega
8b144b6a5d
Modificáronse 1 ficheiros con 6 adicións e 3 borrados
  1. 6 3
      packages/app/src/pages/admin/[[...path]].page.tsx

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

@@ -13,7 +13,7 @@ import { CrowiRequest } from '~/interfaces/crowi-request';
 import PluginUtils from '~/server/plugins/plugin-utils';
 import PluginUtils from '~/server/plugins/plugin-utils';
 import ConfigLoader from '~/server/service/config-loader';
 import ConfigLoader from '~/server/service/config-loader';
 import {
 import {
-  useCurrentUser, /* useSearchServiceConfigured, */ useIsMailerSetup, useIsSearchServiceReachable, useSiteUrl,
+  useCurrentUser, /* useSearchServiceConfigured, */ useIsAclEnabled, useIsMailerSetup, useIsSearchServiceReachable, useSiteUrl,
 } from '~/stores/context';
 } from '~/stores/context';
 
 
 import {
 import {
@@ -51,7 +51,7 @@ type Props = CommonProps & {
   yarnVersion: string,
   yarnVersion: string,
   installedPlugins: any,
   installedPlugins: any,
   envVars: any,
   envVars: any,
-
+  isAclEnabled: boolean,
   isSearchServiceConfigured: boolean,
   isSearchServiceConfigured: boolean,
   isSearchServiceReachable: boolean,
   isSearchServiceReachable: boolean,
   isMailerSetup: boolean,
   isMailerSetup: boolean,
@@ -144,6 +144,8 @@ const AdminMarkdownSettingsPage: NextPage<Props> = (props: Props) => {
   // useSearchServiceConfigured(props.isSearchServiceConfigured);
   // useSearchServiceConfigured(props.isSearchServiceConfigured);
   useIsSearchServiceReachable(props.isSearchServiceReachable);
   useIsSearchServiceReachable(props.isSearchServiceReachable);
 
 
+  console.log('iii', props.isAclEnabled);
+  useIsAclEnabled(props.isAclEnabled);
   useSiteUrl(props.siteUrl);
   useSiteUrl(props.siteUrl);
 
 
   // useEnvVars(props.envVars);
   // useEnvVars(props.envVars);
@@ -195,7 +197,7 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
   const req: CrowiRequest = context.req as CrowiRequest;
   const req: CrowiRequest = context.req as CrowiRequest;
   const { crowi } = req;
   const { crowi } = req;
   const {
   const {
-    appService, searchService,
+    appService, searchService, aclService,
   } = crowi;
   } = crowi;
 
 
   const { user } = req;
   const { user } = req;
@@ -221,6 +223,7 @@ export const getServerSideProps: GetServerSideProps = async(context: GetServerSi
   props.yarnVersion = crowi.runtimeVersions.versions.yarn ? crowi.runtimeVersions.versions.yarn.version.version : null;
   props.yarnVersion = crowi.runtimeVersions.versions.yarn ? crowi.runtimeVersions.versions.yarn.version.version : null;
   props.installedPlugins = pluginUtils.listPlugins();
   props.installedPlugins = pluginUtils.listPlugins();
   props.envVars = await ConfigLoader.getEnvVarsForDisplay(true);
   props.envVars = await ConfigLoader.getEnvVarsForDisplay(true);
+  props.isAclEnabled = aclService.isAclEnabled();
 
 
   props.isSearchServiceConfigured = searchService.isConfigured;
   props.isSearchServiceConfigured = searchService.isConfigured;
   props.isSearchServiceReachable = searchService.isReachable;
   props.isSearchServiceReachable = searchService.isReachable;