Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 2.3.2
+
+### Notable enhancements and fixes
+
+- Fixed admin ui displaying incorrect text
+
 # 2.3.1
 
 ### Notable enhancements and fixes

admin/package.json

@@ -1,7 +1,7 @@
 {
   "name": "admin",
   "private": true,
-  "version": "2.3.1",
+  "version": "2.3.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

bin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bin",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "",
   "main": "checkAllPads.js",
   "directories": {

package.json

@@ -50,6 +50,6 @@
     "type": "git",
     "url": "https://github.com/ether/etherpad-lite.git"
   },
-  "version": "2.3.1",
+  "version": "2.3.2",
   "license": "Apache-2.0"
 }

src/node/hooks/express/admin.ts

@@ -23,11 +23,9 @@ exports.expressCreateServer = (hookName: string, args: ArgsExpressType, cb: Func
     return cb();
   }
   args.app.get('/admin/*', (req: any, res: any) => {
-    // parse URL
-    const parsedUrl = url.parse(req.url);
     // extract URL path
-    let pathname = ADMIN_PATH + `${parsedUrl.pathname}`;
+    let pathname = path.join(ADMIN_PATH, req.url);
-    pathname = path.normalize(path.join(ADMIN_PATH), parsedUrl.pathname)
+    pathname = path.normalize(pathname)
 
     if (!pathname.startsWith(ADMIN_PATH)) {
       res.statusCode = 403;

src/package.json

@@ -142,6 +142,6 @@
     "debug:socketio": "cross-env DEBUG=socket.io* node --require tsx/cjs node/server.ts",
     "test:vitest": "vitest"
   },
-  "version": "2.3.1",
+  "version": "2.3.2",
   "license": "Apache-2.0"
 }

src/tests/frontend-new/admin-spec/adminupdateplugins.spec.ts

@@ -13,18 +13,17 @@ test.describe('Plugins page',  ()=> {
         await page.waitForSelector('.search-field');
         const pluginTable =  page.locator('table tbody').nth(1);
         await expect(pluginTable).not.toBeEmpty()
-        const plugins = await pluginTable.locator('tr').count()
+        await expect(pluginTable.locator('tr')).toHaveCount(190)
-        expect(plugins).toBeGreaterThan(10)
     })
 
     test('Searches for a plugin', async ({page}) => {
         await page.waitForSelector('.search-field');
         await page.click('.search-field')
-        await page.keyboard.type('ep_font_color3')
+        await page.keyboard.type('ep_font_color')
         await page.keyboard.press('Enter')
         const pluginTable =  page.locator('table tbody').nth(1);
         await expect(pluginTable.locator('tr')).toHaveCount(1)
-        await expect(pluginTable.locator('tr').first()).toContainText('ep_font_color3')
+        await expect(pluginTable.locator('tr').first()).toContainText('ep_font_color')
     })
 
 
@@ -35,17 +34,17 @@ test.describe('Plugins page',  ()=> {
             timeout: 15000
         })
         const plugins = await pluginTable.locator('tr').count()
-        expect(plugins).toBeGreaterThan(10)
+      await expect(pluginTable.locator('tr')).toHaveCount(190)
 
         // Now everything is loaded, lets install a plugin
 
         await page.click('.search-field')
-        await page.keyboard.type('ep_font_color3')
+        await page.keyboard.type('ep_font_color')
         await page.keyboard.press('Enter')
 
         await expect(pluginTable.locator('tr')).toHaveCount(1)
         const pluginRow = pluginTable.locator('tr').first()
-        await expect(pluginRow).toContainText('ep_font_color3')
+        await expect(pluginRow).toContainText('ep_font_color')
 
         // Select Installation button
         await pluginRow.locator('td').nth(4).locator('button').first().click()
@@ -59,7 +58,7 @@ test.describe('Plugins page',  ()=> {
 
         const installedPluginRow = installedPluginsRows.nth(1)
 
-        await expect(installedPluginRow).toContainText('ep_font_color3')
+        await expect(installedPluginRow).toContainText('ep_font_color')
         await installedPluginRow.locator('td').nth(2).locator('button').first().click()
 
         // Wait for the uninstallation to complete