jam411 3 years ago
parent
commit
8db74bffe7

+ 1 - 1
packages/app/src/components/Admin/PluginsExtension/PluginInstallerForm.tsx

@@ -45,7 +45,7 @@ export const PluginInstallerForm = (): JSX.Element => {
             className="form-control"
             className="form-control"
             type="text"
             type="text"
             name="pluginInstallerForm[url]"
             name="pluginInstallerForm[url]"
-            placeholder="https://github.com/weseek/growi-plugin-lsx"
+            placeholder="https://github.com/growi/plugins"
             required
             required
           />
           />
           <p className="form-text text-muted">You can install plugins by inputting the GitHub URL.</p>
           <p className="form-text text-muted">You can install plugins by inputting the GitHub URL.</p>

+ 24 - 43
packages/app/src/components/Admin/PluginsExtension/PluginsExtensionPageContents.tsx

@@ -5,34 +5,11 @@ import { useSWRxPlugins } from '~/stores/plugin';
 import { Loading } from './Loading';
 import { Loading } from './Loading';
 import { PluginCard } from './PluginCard';
 import { PluginCard } from './PluginCard';
 import { PluginInstallerForm } from './PluginInstallerForm';
 import { PluginInstallerForm } from './PluginInstallerForm';
-// TODO: i18n
 
 
 export const PluginsExtensionPageContents = (): JSX.Element => {
 export const PluginsExtensionPageContents = (): JSX.Element => {
   const { data, mutate } = useSWRxPlugins();
   const { data, mutate } = useSWRxPlugins();
 
 
-  if (data?.data?.plugins == null) {
-    return (
-      <>
-        <div className="row mb-5">
-          <div className="col-lg-12">
-            <h2 className="admin-setting-header">Plugin Installer</h2>
-            <PluginInstallerForm />
-          </div>
-        </div>
-        <div className="row mb-5">
-          <div className="col-lg-12">
-            <h2 className="admin-setting-header">Plugins
-              <button type="button" className="btn btn-sm ml-auto grw-btn-reload" onClick={() => mutate()}>
-                <i className="icon icon-reload"></i>
-              </button>
-            </h2>
-            <Loading />
-          </div>
-        </div>
-      </>
-
-    );
-  }
+  console.log(data);
 
 
   return (
   return (
     <div>
     <div>
@@ -51,26 +28,30 @@ export const PluginsExtensionPageContents = (): JSX.Element => {
               <i className="icon icon-reload"></i>
               <i className="icon icon-reload"></i>
             </button>
             </button>
           </h2>
           </h2>
-          <div className="d-grid gap-5">
-            { data?.data?.plugins.length === 0 && (
-              <div>Plugin is not installed</div>
+          {data?.data == null
+            ? <Loading />
+            : (
+              <div className="d-grid gap-5">
+                { data?.data?.plugins.length === 0 && (
+                  <div>Plugin is not installed</div>
+                )}
+                { data?.data?.plugins.map((item) => {
+                  const pluginId = item[0]._id;
+                  const pluginName = item[0].meta.name;
+                  const pluginUrl = item[0].origin.url;
+                  const pluginDiscription = item[0].meta.desc;
+                  return (
+                    <PluginCard
+                      key={pluginId}
+                      id={pluginId}
+                      name={pluginName}
+                      url={pluginUrl}
+                      description={pluginDiscription}
+                    />
+                  );
+                })}
+              </div>
             )}
             )}
-            { data?.data?.plugins.map((item) => {
-              const pluginId = item[0]._id;
-              const pluginName = item[0].meta.name;
-              const pluginUrl = item[0].origin.url;
-              const pluginDiscription = item[0].meta.desc;
-              return (
-                <PluginCard
-                  key={pluginId}
-                  id={pluginId}
-                  name={pluginName}
-                  url={pluginUrl}
-                  description={pluginDiscription}
-                />
-              );
-            })}
-          </div>
         </div>
         </div>
       </div>
       </div>