Yuki Takei 2 лет назад
Родитель
Сommit
8c735081a0

+ 0 - 7
apps/app/src/interfaces/editor-settings.ts

@@ -15,10 +15,3 @@ export interface IEditorSettings {
   styleActiveLine: boolean,
   autoFormatMarkdownTable: boolean,
 }
-
-export type EditorConfig = {
-  upload: {
-    isUploadAllFileAllowed: boolean,
-    isUploadEnabled: boolean,
-  }
-}

+ 1 - 11
apps/app/src/pages/[[...path]].page.tsx

@@ -40,7 +40,7 @@ import {
   useIsAclEnabled, useIsSearchPage, useIsEnabledAttachTitleHeader,
   useCsrfToken, useIsSearchScopeChildrenAsDefault, useIsEnabledMarp, useCurrentPathname,
   useIsSlackConfigured, useRendererConfig, useGrowiCloudUri,
-  useEditorConfig, useIsAllReplyShown, useIsContainerFluid, useIsNotCreatable,
+  useIsAllReplyShown, useIsContainerFluid, useIsNotCreatable,
   useIsUploadAllFileAllowed, useIsUploadEnabled,
 } from '~/stores/context';
 import { useEditingMarkdown } from '~/stores/editor';
@@ -187,7 +187,6 @@ const Page: NextPageWithLayout<Props> = (props: Props) => {
   useCurrentUser(props.currentUser ?? null);
 
   // commons
-  useEditorConfig(props.editorConfig);
   useCsrfToken(props.csrfToken);
   useGrowiCloudUri(props.growiCloudUri);
 
@@ -568,15 +567,6 @@ function injectServerConfigurations(context: GetServerSidePropsContext, props: P
       isUploadAllFileAllowed: crowi.fileUploadService.getFileUploadEnabled(),
       isUploadEnabled: crowi.fileUploadService.getIsUploadable(),
     },
-    // acceptedUploadFileType: (() => {
-    //   if (!crowi.fileUploadService.getIsUploadable()) {
-    //     return AcceptedUploadFileType.NONE;
-    //   }
-    //   if (crowi.fileUploadService.getFileUploadEnabled()) {
-    //     return AcceptedUploadFileType.ALL;
-    //   }
-    //   return AcceptedUploadFileType.IMAGE;
-    // })(),
   };
 
   props.adminPreferredIndentSize = configManager.getConfig('markdown', 'markdown:adminPreferredIndentSize');

+ 0 - 33
apps/app/src/stores/context.tsx

@@ -1,5 +1,4 @@
 import type { ColorScheme, IUserHasId } from '@growi/core';
-import { AcceptedUploadFileType } from '@growi/editor';
 import type { SWRResponse } from 'swr';
 import useSWR from 'swr';
 import useSWRImmutable from 'swr/immutable';
@@ -142,10 +141,6 @@ export const useIsEnabledStaleNotification = (initialData?: boolean): SWRRespons
   return useContextSWR('isEnabledStaleNotification', initialData);
 };
 
-export const useEditorConfig = (initialData?: EditorConfig): SWRResponse<EditorConfig, Error> => {
-  return useContextSWR<EditorConfig, Error>('editorConfig', initialData);
-};
-
 export const useRendererConfig = (initialData?: RendererConfig): SWRResponse<RendererConfig, any> => {
   return useContextSWR('growiRendererConfig', initialData);
 };
@@ -261,31 +256,3 @@ export const useIsEditable = (): SWRResponse<boolean, Error> => {
     },
   );
 };
-
-// export const useAcceptedUploadFileType = (): SWRResponse<AcceptedUploadFileType, Error> => {
-//   const { data: editorConfig } = useEditorConfig();
-
-//   return useSWRImmutable(
-//     ['acceptedUploadFileType', editorConfig],
-//     ([, editorConfig]) => {
-//       if (!editorConfig?.upload.isUploadEnabled) {
-//         return AcceptedUploadFileType.NONE;
-//       }
-//       if (editorConfig?.upload.isUploadAllFileAllowed) {
-//         return AcceptedUploadFileType.ALL;
-//       }
-//       return AcceptedUploadFileType.IMAGE;
-//     },
-//   );
-// };
-
-// export const useAcceptedMimeType = (): SWRResponse<string, Error> => {
-//   const { data: acceptedUploadFileType } = useAcceptedUploadFileType();
-
-//   return useSWRImmutable(
-//     ['acceptedMimeType', acceptedUploadFileType],
-//     ([, acceptedUploadFileType]) => {
-//       return getMimeType(acceptedUploadFileType ?? AcceptedUploadFileType.NONE);
-//     },
-//   );
-// };