From 9f01a48998997c855c2b2a7f3e10a240a0e4b786 Mon Sep 17 00:00:00 2001
From: Matthias Eichner <matthias.eichner@uni-jena.de>
Date: Tue, 20 Feb 2024 16:05:09 +0100
Subject: [PATCH] MCR-3043 request changes

* add TODO for allow header
* rm npm-run-all2 as yarn dep
* better documentation
* use nextTick instead of setTimeout
---
 .../src/main/vue/texteditor/README.md         |  2 +-
 .../src/main/vue/texteditor/package.json      |  1 -
 .../texteditor/src/apis/BaseContentHandler.ts |  2 +-
 .../src/apis/ClassificationsContentHandler.ts |  4 +
 .../texteditor/src/views/TextEditorView.vue   | 28 +++---
 .../src/main/vue/texteditor/yarn.lock         | 91 +------------------
 6 files changed, 20 insertions(+), 108 deletions(-)

diff --git a/mycore-webtools/src/main/vue/texteditor/README.md b/mycore-webtools/src/main/vue/texteditor/README.md
index 8991f2c87e..a4748af169 100644
--- a/mycore-webtools/src/main/vue/texteditor/README.md
+++ b/mycore-webtools/src/main/vue/texteditor/README.md
@@ -9,5 +9,5 @@ yarn
 ### Compile and Hot-Reload for Development
 
 ```sh
-npm dev
+yarn dev
 ```
diff --git a/mycore-webtools/src/main/vue/texteditor/package.json b/mycore-webtools/src/main/vue/texteditor/package.json
index ab52ebb2ad..45f0cb0562 100644
--- a/mycore-webtools/src/main/vue/texteditor/package.json
+++ b/mycore-webtools/src/main/vue/texteditor/package.json
@@ -22,7 +22,6 @@
     "@types/node": "^20.11.10",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/tsconfig": "^0.5.1",
-    "npm-run-all2": "^6.1.1",
     "typescript": "~5.3.0",
     "vite": "^5.0.11",
     "vue-tsc": "^1.8.27"
diff --git a/mycore-webtools/src/main/vue/texteditor/src/apis/BaseContentHandler.ts b/mycore-webtools/src/main/vue/texteditor/src/apis/BaseContentHandler.ts
index f5465a9c74..a39bb7c9b0 100644
--- a/mycore-webtools/src/main/vue/texteditor/src/apis/BaseContentHandler.ts
+++ b/mycore-webtools/src/main/vue/texteditor/src/apis/BaseContentHandler.ts
@@ -33,7 +33,7 @@ export abstract class BaseContentHandler implements ContentHandler {
         if (!response.ok) {
             throw this.buildError(`Unable get OPTIONS of ${id}.`, response);
         }
-        //let allow = response.headers.get("Allow");
+        //TODO const allow = response.headers.get("Allow");
         const allow = "HEAD,DELETE,GET,OPTIONS,PUT";
         if (!allow) {
             throw new Error(`Unable get OPTIONS of ${id}. Request failed because 'Allow' header is empty.`);
diff --git a/mycore-webtools/src/main/vue/texteditor/src/apis/ClassificationsContentHandler.ts b/mycore-webtools/src/main/vue/texteditor/src/apis/ClassificationsContentHandler.ts
index ae9f8c3978..4dd02edf18 100644
--- a/mycore-webtools/src/main/vue/texteditor/src/apis/ClassificationsContentHandler.ts
+++ b/mycore-webtools/src/main/vue/texteditor/src/apis/ClassificationsContentHandler.ts
@@ -42,6 +42,10 @@ export class ClassificationsContentHandler extends BaseContentHandler {
     }
 
     /**
+     * Prettifies classification xml. This is a workaround as long as the server does not returns a prettified xml by
+     * itself.
+     * TODO: remove if not necessary anymore
+     *
      * https://stackoverflow.com/questions/376373/pretty-printing-xml-with-javascript
      *
      * @param xml xml to prettify
diff --git a/mycore-webtools/src/main/vue/texteditor/src/views/TextEditorView.vue b/mycore-webtools/src/main/vue/texteditor/src/views/TextEditorView.vue
index aa2e36623b..84638db097 100644
--- a/mycore-webtools/src/main/vue/texteditor/src/views/TextEditorView.vue
+++ b/mycore-webtools/src/main/vue/texteditor/src/views/TextEditorView.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {type Ref, ref, watch} from "vue";
+import {nextTick, type Ref, ref, watch} from "vue";
 import {ContentHandlerSelector} from "@/apis/ContentHandlerSelector";
 import TextEditor from "@/components/TextEditor.vue";
 
@@ -21,14 +21,13 @@ let originalModel: string = "";
 
 watch(() => model.value.data, async (newModel) => {
   // prevent ctrl+z clearing the textarea
-  setTimeout(() => {
-    if (undoKeyPressed && newModel === "") {
-      model.value.data = originalModel;
-      updateEnabled.value = false;
-      return;
-    }
-  }, 0);
-  updateEnabled.value = originalModel !== newModel;
+  await nextTick();
+  if (undoKeyPressed && newModel === "") {
+    model.value.data = originalModel;
+    updateEnabled.value = false;
+  } else {
+    updateEnabled.value = originalModel !== newModel;
+  }
 });
 
 const hasWriteAccess = async () => {
@@ -86,14 +85,13 @@ const save = async () => {
   loading.value = false;
 }
 
-function onKeyDown(evt: any) {
+const onKeyDown = async (evt: any) => {
   undoKeyPressed = evt.ctrlKey && (evt.key === "z" || evt.key === "Z");
   // fix undo is not triggered on empty textarea
-  setTimeout(() => {
-    if (undoKeyPressed && model.value.data === "") {
-      model.value.data = originalModel;
-    }
-  }, 0);
+  await nextTick();
+  if (undoKeyPressed && model.value.data === "") {
+    model.value.data = originalModel;
+  }
 }
 
 load();
diff --git a/mycore-webtools/src/main/vue/texteditor/yarn.lock b/mycore-webtools/src/main/vue/texteditor/yarn.lock
index 7e4eecb5f6..e0218f6999 100644
--- a/mycore-webtools/src/main/vue/texteditor/yarn.lock
+++ b/mycore-webtools/src/main/vue/texteditor/yarn.lock
@@ -345,11 +345,6 @@
   resolved "https://registry.yarnpkg.com/@vue/tsconfig/-/tsconfig-0.5.1.tgz#3124ec16cc0c7e04165b88dc091e6b97782fffa9"
   integrity sha512-VcZK7MvpjuTPx2w6blwnwZAu5/LgBUtejFOi3pPGQFXQN5Ela03FUtd2Qtg4yWGGissVL0dr6Ro1LfOFh+PCuQ==
 
-ansi-styles@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-6.2.1.tgz#0e62320cf99c21afff3b3012192546aacbfb05c5"
-  integrity sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -367,15 +362,6 @@ computeds@^0.0.1:
   resolved "https://registry.yarnpkg.com/computeds/-/computeds-0.0.1.tgz#215b08a4ba3e08a11ff6eee5d6d8d7166a97ce2e"
   integrity sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==
 
-cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
-  dependencies:
-    path-key "^3.1.0"
-    shebang-command "^2.0.0"
-    which "^2.0.1"
-
 csstype@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
@@ -435,16 +421,6 @@ he@^1.2.0:
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
-
-json-parse-even-better-errors@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.1.tgz#02bb29fb5da90b5444581749c22cedd3597c6cb0"
-  integrity sha512-aatBvbL26wVUCLmbWdCpeu9iF5wOyWpagiKkInA+kfws3sWdBrTnsvN2CKcyCYyUrc7rebNBlK6+kteg7ksecg==
-
 lru-cache@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
@@ -459,12 +435,7 @@ magic-string@^0.30.5:
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.4.15"
 
-memorystream@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2"
-  integrity sha512-S3UwM3yj5mtUSEfP41UZmt/0SCoVYUcU1rkXv+BQ5Ig8ndL4sPoJNBUJERafdPb5jjHJGuMgytgKvKIf58XNBw==
-
-minimatch@^9.0.0, minimatch@^9.0.3:
+minimatch@^9.0.3:
   version "9.0.3"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
   integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
@@ -481,44 +452,16 @@ nanoid@^3.3.7:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
   integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
 
-npm-normalize-package-bin@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz#25447e32a9a7de1f51362c61a559233b89947832"
-  integrity sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==
-
-npm-run-all2@^6.1.1:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/npm-run-all2/-/npm-run-all2-6.1.2.tgz#637b2b804f32dd8cee9e5edf7d47a9fc4ca8bf9d"
-  integrity sha512-WwwnS8Ft+RpXve6T2EIEVpFLSqN+ORHRvgNk3H9N62SZXjmzKoRhMFg3I17TK3oMaAEr+XFbRirWS2Fn3BCPSg==
-  dependencies:
-    ansi-styles "^6.2.1"
-    cross-spawn "^7.0.3"
-    memorystream "^0.3.1"
-    minimatch "^9.0.0"
-    pidtree "^0.6.0"
-    read-package-json-fast "^3.0.2"
-    shell-quote "^1.7.3"
-
 path-browserify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
   integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
 
-path-key@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
-  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
-
 picocolors@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
   integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
 
-pidtree@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.6.0.tgz#90ad7b6d42d5841e69e0a2419ef38f8883aa057c"
-  integrity sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==
-
 postcss@^8.4.32, postcss@^8.4.33:
   version "8.4.34"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.34.tgz#563276e86b4ff20dfa5eed0d394d4c53853b2051"
@@ -533,14 +476,6 @@ prismjs@^1.29.0:
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.29.0.tgz#f113555a8fa9b57c35e637bba27509dcf802dd12"
   integrity sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==
 
-read-package-json-fast@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz#394908a9725dc7a5f14e70c8e7556dff1d2b1049"
-  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
-  dependencies:
-    json-parse-even-better-errors "^3.0.0"
-    npm-normalize-package-bin "^3.0.0"
-
 rollup@^4.2.0:
   version "4.9.6"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.9.6.tgz#4515facb0318ecca254a2ee1315e22e09efc50a0"
@@ -570,23 +505,6 @@ semver@^7.5.4:
   dependencies:
     lru-cache "^6.0.0"
 
-shebang-command@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
-  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
-  dependencies:
-    shebang-regex "^3.0.0"
-
-shebang-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
-  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
-
-shell-quote@^1.7.3:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
-  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
-
 source-map-js@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
@@ -653,13 +571,6 @@ vue@^3.4.15:
     "@vue/server-renderer" "3.4.15"
     "@vue/shared" "3.4.15"
 
-which@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
-  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
-  dependencies:
-    isexe "^2.0.0"
-
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"