From bf2b6b99a7b383e08d78ec21c681c9e081677a14 Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Wed, 13 Mar 2024 15:47:12 +0100
Subject: [PATCH] Fixed tests

---
 admin/package.json                            |  2 --
 admin/src/pages/SettingsPage.tsx              | 26 ++++++++-----------
 .../admin-spec/adminsettings.spec.ts          |  1 +
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/admin/package.json b/admin/package.json
index 8e390d820..20ada9564 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -10,13 +10,11 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@monaco-editor/react": "^4.6.0",
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-toast": "^1.1.5",
     "i18next": "^23.10.1",
     "i18next-browser-languagedetector": "^7.2.0",
     "lucide-react": "^0.356.0",
-    "monaco-editor": "0.47.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-i18next": "^14.1.0",
diff --git a/admin/src/pages/SettingsPage.tsx b/admin/src/pages/SettingsPage.tsx
index 7224f950f..2706ffa38 100644
--- a/admin/src/pages/SettingsPage.tsx
+++ b/admin/src/pages/SettingsPage.tsx
@@ -3,7 +3,6 @@ import {isJSONClean} from "../utils/utils.ts";
 import {Trans} from "react-i18next";
 import {IconButton} from "../components/IconButton.tsx";
 import {RotateCw, Save} from "lucide-react";
-import Editor from '@monaco-editor/react';
 
 export const SettingsPage = ()=>{
     const settingsSocket = useStore(state=>state.settingsSocket)
@@ -11,18 +10,12 @@ export const SettingsPage = ()=>{
 
     return <div>
         <h1><Trans i18nKey="admin_settings.current"/></h1>
-        <Editor language="json" theme="vs-dark" options={{
-            comments: {
-                ignoreEmptyLines: true,
-                insertSpace: true
-            },
-            codeLens:false,
-            inDiffEditor: false
-        }} value={settings} onChange={(v)=>{
-            useStore.getState().setSettings(v!)
-        }}   className="settings"/>
+        <textarea value={settings} className="settings" onChange={v => {
+            useStore.getState().setSettings(v.target.value)
+        }}/>
         <div className="settings-button-bar">
-            <IconButton className="settingsButton" icon={<Save/>} title={<Trans i18nKey="admin_settings.current_save.value"/>} onClick={() => {
+            <IconButton className="settingsButton" icon={<Save/>}
+                        title={<Trans i18nKey="admin_settings.current_save.value"/>} onClick={() => {
                 if (isJSONClean(settings!)) {
                     // JSON is clean so emit it to the server
                     settingsSocket!.emit('saveSettings', settings!);
@@ -39,15 +32,18 @@ export const SettingsPage = ()=>{
                     })
                 }
             }}/>
-            <IconButton className="settingsButton" icon={<RotateCw/>} title={<Trans i18nKey="admin_settings.current_restart.value"/>}   onClick={() => {
+            <IconButton className="settingsButton" icon={<RotateCw/>}
+                        title={<Trans i18nKey="admin_settings.current_restart.value"/>} onClick={() => {
                 settingsSocket!.emit('restartServer');
             }}/>
         </div>
         <div className="separator"/>
         <div className="settings-button-bar">
-            <a rel="noopener noreferrer" target="_blank" href="https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON"><Trans
+            <a rel="noopener noreferrer" target="_blank"
+               href="https://github.com/ether/etherpad-lite/wiki/Example-Production-Settings.JSON"><Trans
                 i18nKey="admin_settings.current_example-prod"/></a>
-            <a rel="noopener noreferrer" target="_blank" href="https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON"><Trans
+            <a rel="noopener noreferrer" target="_blank"
+               href="https://github.com/ether/etherpad-lite/wiki/Example-Development-Settings.JSON"><Trans
                 i18nKey="admin_settings.current_example-devel"/></a>
         </div>
     </div>
diff --git a/src/tests/frontend-new/admin-spec/adminsettings.spec.ts b/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
index ad3a0c441..adeb10f47 100644
--- a/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
+++ b/src/tests/frontend-new/admin-spec/adminsettings.spec.ts
@@ -1,5 +1,6 @@
 import {expect, test} from "@playwright/test";
 import {loginToAdmin, restartEtherpad, saveSettings} from "../helper/adminhelper";
+import exp from "node:constants";
 
 test.beforeEach(async ({ page })=>{
     await loginToAdmin(page, 'admin', 'changeme1');