yusuketk пре 6 година
родитељ
комит
e0f9259372

+ 5 - 5
src/client/js/components/Admin/AdminHome/InstalledPluginTable.jsx

@@ -21,12 +21,12 @@ class InstalledPluginTable extends React.Component {
           </tr>
         </thead>
         <tbody>
-          { Object.keys(adminHomeContainer.state.installedPlugins).map((pluginName) => {
+          { adminHomeContainer.state.installedPlugins.map((plugin) => {
             return (
-              <tr key={pluginName}>
-                <td>{ pluginName }</td>
-                <td className="text-center">{ adminHomeContainer.state.installedPlugins[pluginName] }</td>
-                <td className="text-center"><span className="tbd">(TBD)</span></td>
+              <tr key={plugin.name}>
+                <td>{ plugin.name }</td>
+                <td className="text-center">{ plugin.requiredVersion }</td>
+                <td className="text-center">{ plugin.installeVersion }</td>
               </tr>
             );
           }) }

+ 1 - 1
src/client/js/services/AdminHomeContainer.js

@@ -24,7 +24,7 @@ export default class AdminCustomizeContainer extends Container {
       nodeVersion: '',
       npmVersion: '',
       yarnVersion: '',
-      installedPlugins: {},
+      installedPlugins: [],
     };
 
   }

+ 3 - 3
src/server/plugins/plugin-utils.js

@@ -48,8 +48,8 @@ class PluginUtils {
    *
    * @returns array of objects
    *   [
-   *     { name: 'growi-plugin-...', version: '1.0.0' },
-   *     { name: 'growi-plugin-...', version: '1.0.0' },
+   *     { name: 'growi-plugin-...', requiredVersion: '^1.0.0', installedVersion: '1.0.0' },
+   *     { name: 'growi-plugin-...', requiredVersion: '^1.0.0', installedVersion: '1.0.0' },
    *     ...
    *   ]
    *
@@ -75,7 +75,7 @@ class PluginUtils {
     const plugins = pluginNames.map((name) => {
       return {
         name,
-        version: deps[name],
+        requiredVersion: deps[name],
         installedVersion: 'TBD',
       };
     });