Merge pull request #539 from flocon-trpg/main

flocon-trpg · Feb 21, 2023 · f9db5c3 · f9db5c3
2 parents d5724d7 + ae521ef
commit f9db5c3
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 34 deletions.
diff --git a/apps/web-server/package.json b/apps/web-server/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@flocon-trpg/web-server",
-    "version": "0.8.8",
+    "version": "0.8.9",
     "description": "Flocon Web server",
     "license": "MIT",
     "scripts": {

diff --git a/apps/web-server/src/components/models/file/FileBrowser/FileBrowser.tsx b/apps/web-server/src/components/models/file/FileBrowser/FileBrowser.tsx
@@ -36,12 +36,11 @@ import { ItemType } from 'antd/lib/menu/hooks/useItems';
 import classNames from 'classnames';
 import { produce } from 'immer';
 import {
-    Provider,
     useAtom as useAtomCore,
     useAtomValue as useAtomValueCore,
     useSetAtom as useSetAtomCore,
 } from 'jotai/react';
-import { Atom, PrimitiveAtom, atom, createStore } from 'jotai/vanilla';
+import { Atom, PrimitiveAtom, atom, createStore, getDefaultStore } from 'jotai/vanilla';
 import React from 'react';
 import { useDeepCompareEffect, useLatest } from 'react-use';
 import { VirtuosoGrid } from 'react-virtuoso';
@@ -232,10 +231,8 @@ export type Props = {
     }[];
 };
 
-const defaultJotaiStore = createStore();
-
 const defaultProps: Props = {
-    jotaiStore: defaultJotaiStore,
+    jotaiStore: getDefaultStore(),
     files: [],
     height: null,
     isProtected: () => false,
@@ -2533,12 +2530,9 @@ const FileBrowserWithoutJotaiProvider: React.FC<Props> = props => {
 
 /** 汎用的なファイルブラウザー（ファイルマネージャ）です。 */
 export const FileBrowser: React.FC<Props> = props => {
-    // もしProvider.scopeがない場合、jotaiは最も近いProviderにアクセスするため、useWebConfigなどが常にnullishとなってしまう。それを防ぐため、scopeを用いている。
     return (
         <JotaiStoreContext.Provider value={props.jotaiStore}>
-            <Provider store={props.jotaiStore}>
-                <FileBrowserWithoutJotaiProvider {...props} />
-            </Provider>
+            <FileBrowserWithoutJotaiProvider {...props} />
         </JotaiStoreContext.Provider>
     );
 };
diff --git a/apps/web-server/src/components/models/file/UploaderFileBrowser/UploaderFileBrowser.tsx b/apps/web-server/src/components/models/file/UploaderFileBrowser/UploaderFileBrowser.tsx
@@ -394,9 +394,13 @@ export const UploaderFileBrowser: React.FC<Props> = ({
     height,
 }: Props) => {
     const [{ data: serverInfo }] = useQuery({ query: GetServerInfoDocument });
-    const isEmbeddedUploaderDisabled = serverInfo?.result.uploaderEnabled !== true;
+    /** `true` ならば enabled、`false` ならば disabled、nullish ならば判定中だということを示します。 */
+    const isEmbeddedUploaderEnabled = serverInfo?.result.uploaderEnabled;
     const firebaseStorageFiles = useFirebaseStorageFiles(onSelect);
-    const floconUploaderFiles = useFloconUploaderFiles(onSelect, isEmbeddedUploaderDisabled);
+    const floconUploaderFiles = useFloconUploaderFiles(
+        onSelect,
+        isEmbeddedUploaderEnabled !== true
+    );
     const [firebaseStorageUploaderModalState, setFirebaseStorageUploaderModalState] =
         React.useState<{ storageType: StorageType; folderPath: readonly string[] }>();
     const [floconUploaderModalState, setFloconUploaderModalState] = React.useState<{
@@ -477,28 +481,56 @@ export const UploaderFileBrowser: React.FC<Props> = ({
         push(firebaseStorageFiles.public, [uploaderTypeFolderName.publicFirebaseStorage]);
         push(firebaseStorageFiles.unlisted, [uploaderTypeFolderName.unlistedFirebaseStorage]);
 
-        if (isEmbeddedUploaderDisabled) {
-            result.push(
-                {
-                    path: [uploaderTypeFolderName.publicApiServer],
-                    element: <div style={style}>設定によって無効化されています。</div>,
-                },
-                {
-                    path: [uploaderTypeFolderName.unlistedApiServer],
-                    element: <div style={style}>設定によって無効化されています。</div>,
-                }
-            );
-        } else if (floconUploaderFiles == null) {
-            result.push(
-                {
-                    path: [uploaderTypeFolderName.publicApiServer],
-                    element: <div style={style}>読み込み中です…</div>,
-                },
-                {
-                    path: [uploaderTypeFolderName.unlistedApiServer],
-                    element: <div style={style}>読み込み中です…</div>,
+        switch (isEmbeddedUploaderEnabled) {
+            case null:
+            case undefined: {
+                result.push(
+                    {
+                        path: [uploaderTypeFolderName.publicApiServer],
+                        element: (
+                            <div style={style}>
+                                内蔵アップローダーが有効かどうかを確認しています…
+                            </div>
+                        ),
+                    },
+                    {
+                        path: [uploaderTypeFolderName.unlistedApiServer],
+                        element: (
+                            <div style={style}>
+                                内蔵アップローダーが有効かどうかを確認しています…
+                            </div>
+                        ),
+                    }
+                );
+                break;
+            }
+            case false: {
+                result.push(
+                    {
+                        path: [uploaderTypeFolderName.publicApiServer],
+                        element: <div style={style}>設定によって無効化されています。</div>,
+                    },
+                    {
+                        path: [uploaderTypeFolderName.unlistedApiServer],
+                        element: <div style={style}>設定によって無効化されています。</div>,
+                    }
+                );
+                break;
+            }
+            case true: {
+                if (floconUploaderFiles == null) {
+                    result.push(
+                        {
+                            path: [uploaderTypeFolderName.publicApiServer],
+                            element: <div style={style}>読み込み中です…</div>,
+                        },
+                        {
+                            path: [uploaderTypeFolderName.unlistedApiServer],
+                            element: <div style={style}>読み込み中です…</div>,
+                        }
+                    );
                 }
-            );
+            }
         }
 
         return result;
@@ -507,7 +539,7 @@ export const UploaderFileBrowser: React.FC<Props> = ({
         firebaseStorageFiles.unlisted,
         firebaseUser,
         floconUploaderFiles,
-        isEmbeddedUploaderDisabled,
+        isEmbeddedUploaderEnabled,
     ]);
 
     const jotaiStore = useConstant(() => createStore());