fix(admin): Fixed updating plugins (#6705)

ether · Oct 10, 2024 · 0b26405 · 0b26405
1 parent f61a3b6
commit 0b26405
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 32 deletions.
diff --git a/admin/src/App.tsx b/admin/src/App.tsx
@@ -95,7 +95,9 @@ export const App = () => {
                     <h1>Etherpad</h1>
                 </span>
         <ul onClick={()=>{
-          setSidebarOpen(false)
+          if (window.innerWidth < 768) {
+            setSidebarOpen(false)
+          }
         }}>
           <li><NavLink to="/plugins"><Cable/><Trans i18nKey="admin_plugins"/></NavLink></li>
           <li><NavLink to={"/settings"}><Wrench/><Trans i18nKey="admin_settings"/></NavLink></li>

diff --git a/admin/src/pages/HomePage.tsx b/admin/src/pages/HomePage.tsx
@@ -4,15 +4,16 @@ import {InstalledPlugin, PluginDef, SearchParams} from "./Plugin.ts";
 import {useDebounce} from "../utils/useDebounce.ts";
 import {Trans, useTranslation} from "react-i18next";
 import {SearchField} from "../components/SearchField.tsx";
-import {Download, Trash} from "lucide-react";
+import {ArrowUpFromDot, Download, Trash} from "lucide-react";
 import {IconButton} from "../components/IconButton.tsx";
 import {determineSorting} from "../utils/sorting.ts";
 
 
 export const HomePage = () => {
     const pluginsSocket = useStore(state=>state.pluginsSocket)
     const [plugins,setPlugins] = useState<PluginDef[]>([])
-    const [installedPlugins, setInstalledPlugins] = useState<InstalledPlugin[]>([])
+  const installedPlugins = useStore(state=>state.installedPlugins)
+  const setInstalledPlugins = useStore(state=>state.setInstalledPlugins)
   const [searchParams, setSearchParams] = useState<SearchParams>({
     offset: 0,
     limit: 99999,
@@ -49,7 +50,7 @@ export const HomePage = () => {
   }, [plugins, searchParams])
 
     const sortedInstalledPlugins = useMemo(()=>{
-        return installedPlugins.sort((a, b)=>{
+        return useStore.getState().installedPlugins.sort((a, b)=>{
 
             if(a.name < b.name){
                 return -1
@@ -78,17 +79,16 @@ export const HomePage = () => {
         })
 
         pluginsSocket.on('results:updatable', (data) => {
-            data.updatable.forEach((pluginName: string) => {
-                setInstalledPlugins(installedPlugins.map(plugin => {
-                    if (plugin.name === pluginName) {
-                        return {
-                            ...plugin,
-                            updatable: true
-                        }
-                    }
-                    return plugin
-                }))
-            })
+          const newInstalledPlugins = useStore.getState().installedPlugins.map(plugin => {
+            if (data.updatable.includes(plugin.name)) {
+              return {
+                ...plugin,
+                updatable: true
+              }
+            }
+            return plugin
+          })
+         setInstalledPlugins(newInstalledPlugins)
         })
 
         pluginsSocket.on('finished:install', () => {
@@ -159,6 +159,7 @@ export const HomePage = () => {
         })
     }, 500, [searchTerm])
 
+
     return <div>
         <h1><Trans i18nKey="admin_plugins"/></h1>
 
@@ -180,7 +181,7 @@ export const HomePage = () => {
                     <td>
                     {
                         plugin.updatable ?
-                            <button onClick={() => installPlugin(plugin.name)}>Update</button>
+                            <IconButton onClick={() => installPlugin(plugin.name)} icon={<ArrowUpFromDot/>} title="Update"></IconButton>
                             : <IconButton disabled={plugin.name == "ep_etherpad-lite"} icon={<Trash/>} title={<Trans i18nKey="admin_plugins.installed_uninstall.value"/>} onClick={() => uninstallPlugin(plugin.name)}/>
                     }
                     </td>

diff --git a/admin/src/store/store.ts b/admin/src/store/store.ts
@@ -1,6 +1,7 @@
 import {create} from "zustand";
 import {Socket} from "socket.io-client";
 import {PadSearchResult} from "../utils/PadSearch.ts";
+import {InstalledPlugin} from "../pages/Plugin.ts";
 
 type ToastState = {
     description?:string,
@@ -22,7 +23,9 @@ type StoreState = {
     toastState: ToastState,
     setToastState: (val: ToastState)=>void,
     pads: PadSearchResult|undefined,
-    setPads: (pads: PadSearchResult)=>void
+    setPads: (pads: PadSearchResult)=>void,
+    installedPlugins: InstalledPlugin[],
+    setInstalledPlugins: (plugins: InstalledPlugin[])=>void
 }
 
 
@@ -43,5 +46,7 @@ export const useStore = create<StoreState>()((set) => ({
         success: false
     },
     pads: undefined,
-    setPads: (pads)=>set({pads})
+    setPads: (pads)=>set({pads}),
+    installedPlugins: [],
+    setInstalledPlugins: (plugins)=>set({installedPlugins: plugins})
 }));
diff --git a/src/node/hooks/express/adminplugins.ts b/src/node/hooks/express/adminplugins.ts
@@ -6,10 +6,10 @@ import {QueryType} from "../../types/QueryType";
 
 import {getAvailablePlugins, install, search, uninstall} from "../../../static/js/pluginfw/installer";
 import {PackageData} from "../../types/PackageInfo";
-
-const pluginDefs = require('../../../static/js/pluginfw/plugin_defs');
 import semver from 'semver';
 import log4js from 'log4js';
+
+const pluginDefs = require('../../../static/js/pluginfw/plugin_defs');
 const logger = log4js.getLogger('adminPlugins');
 
 
@@ -20,27 +20,36 @@ exports.socketio = (hookName:string, args:ArgsExpressType, cb:Function) => {
     const {session: {user: {is_admin: isAdmin} = {}} = {}} = socket.conn.request;
     if (!isAdmin) return;
 
-    socket.on('getInstalled', (query:string) => {
+    const checkPluginForUpdates = async () => {
+      const results = await getAvailablePlugins(/* maxCacheAge:*/ 60 * 10);
+      return Object.keys(pluginDefs.plugins).filter((plugin) => {
+        if (!results[plugin]) return false;
+
+        const latestVersion = results[plugin].version;
+        const currentVersion = pluginDefs.plugins[plugin].package.version;
+
+        return semver.gt(latestVersion, currentVersion);
+      })
+    }
+
+    socket.on('getInstalled', async (query: string) => {
       // send currently installed plugins
       const installed =
-          Object.keys(pluginDefs.plugins).map((plugin) => pluginDefs.plugins[plugin].package);
+        Object.keys(pluginDefs.plugins).map((plugin) => pluginDefs.plugins[plugin].package);
+
+      const updatable = await checkPluginForUpdates();
+
+      installed.forEach((plugin) => {
+        plugin.updatable = updatable.includes(plugin.name);
+      })
 
       socket.emit('results:installed', {installed});
     });
 
     socket.on('checkUpdates', async () => {
       // Check plugins for updates
       try {
-        const results = await getAvailablePlugins(/* maxCacheAge:*/ 60 * 10);
-
-        const updatable = Object.keys(pluginDefs.plugins).filter((plugin) => {
-          if (!results[plugin]) return false;
-
-          const latestVersion = results[plugin].version;
-          const currentVersion = pluginDefs.plugins[plugin].package.version;
-
-          return semver.gt(latestVersion, currentVersion);
-        });
+        const updatable = checkPluginForUpdates();
 
         socket.emit('results:updatable', {updatable});
       } catch (err) {