From 27bb48be851d3de168b04473fd153e13019d714a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:03:23 +0000 Subject: [PATCH 01/17] Bump braces from 3.0.2 to 3.0.3 in /mir-wizard Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3. - [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: braces dependency-type: indirect ... Signed-off-by: dependabot[bot] --- mir-wizard/yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/mir-wizard/yarn.lock b/mir-wizard/yarn.lock index b4864eb039..b8afb0d51f 100644 --- a/mir-wizard/yarn.lock +++ b/mir-wizard/yarn.lock @@ -49,10 +49,10 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" chalk@~4.1.0: version "4.1.2" @@ -109,9 +109,9 @@ extend@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" dependencies: to-regex-range "^5.0.1" From f1869e9c49672c5c37e39f84d54db1c05717d256 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Sep 2024 23:36:02 +0000 Subject: [PATCH 02/17] Bump webpack in /mir-webapp/src/main/vue/editor-tools Bumps [webpack](https://github.com/webpack/webpack) from 5.88.1 to 5.94.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.88.1...v5.94.0) --- updated-dependencies: - dependency-name: webpack dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../src/main/vue/editor-tools/yarn.lock | 255 +++++++++++------- 1 file changed, 159 insertions(+), 96 deletions(-) diff --git a/mir-webapp/src/main/vue/editor-tools/yarn.lock b/mir-webapp/src/main/vue/editor-tools/yarn.lock index 9184458b68..893468cbd4 100644 --- a/mir-webapp/src/main/vue/editor-tools/yarn.lock +++ b/mir-webapp/src/main/vue/editor-tools/yarn.lock @@ -1441,7 +1441,7 @@ "@jridgewell/resolve-uri" "3.1.0" "@jridgewell/sourcemap-codec" "1.4.14" -"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": +"@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": version "0.3.25" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== @@ -1650,26 +1650,10 @@ dependencies: "@types/node" "*" -"@types/eslint-scope@^3.7.3": - version "3.7.4" - resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16" - integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA== - dependencies: - "@types/eslint" "*" - "@types/estree" "*" - -"@types/eslint@*": - version "8.44.0" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.0.tgz#55818eabb376e2272f77fbf5c96c43137c3c1e53" - integrity sha512-gsF+c/0XOguWgaOgvFs+xnnRqt9GwgTvIks36WpE6ueeI4KCEHHd8K/CKHqhOqrJKsYH8m27kRzQEvWXAwXUTw== - dependencies: - "@types/estree" "*" - "@types/json-schema" "*" - -"@types/estree@*", "@types/estree@^1.0.0": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" - integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== +"@types/estree@^1.0.5": + version "1.0.5" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" + integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== "@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33": version "4.17.35" @@ -1742,7 +1726,7 @@ jest-matcher-utils "^27.0.0" pretty-format "^27.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.12" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb" integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA== @@ -2405,10 +2389,10 @@ dependencies: vue-demi ">=0.14.5" -"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" - integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== +"@webassemblyjs/ast@1.12.1", "@webassemblyjs/ast@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.12.1.tgz#bb16a0e8b1914f979f45864c23819cc3e3f0d4bb" + integrity sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg== dependencies: "@webassemblyjs/helper-numbers" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" @@ -2423,10 +2407,10 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== -"@webassemblyjs/helper-buffer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" - integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== +"@webassemblyjs/helper-buffer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz#6df20d272ea5439bf20ab3492b7fb70e9bfcb3f6" + integrity sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw== "@webassemblyjs/helper-numbers@1.11.6": version "1.11.6" @@ -2442,15 +2426,15 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/helper-wasm-section@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" - integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== +"@webassemblyjs/helper-wasm-section@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz#3da623233ae1a60409b509a52ade9bc22a37f7bf" + integrity sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-gen" "1.12.1" "@webassemblyjs/ieee754@1.11.6": version "1.11.6" @@ -2471,59 +2455,59 @@ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== -"@webassemblyjs/wasm-edit@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" - integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== +"@webassemblyjs/wasm-edit@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz#9f9f3ff52a14c980939be0ef9d5df9ebc678ae3b" + integrity sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" - "@webassemblyjs/helper-wasm-section" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-opt" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" - "@webassemblyjs/wast-printer" "1.11.6" - -"@webassemblyjs/wasm-gen@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" - integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== - dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-opt" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" + "@webassemblyjs/wast-printer" "1.12.1" + +"@webassemblyjs/wasm-gen@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz#a6520601da1b5700448273666a71ad0a45d78547" + integrity sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w== + dependencies: + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wasm-opt@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" - integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== +"@webassemblyjs/wasm-opt@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz#9e6e81475dfcfb62dab574ac2dda38226c232bc5" + integrity sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg== dependencies: - "@webassemblyjs/ast" "1.11.6" - "@webassemblyjs/helper-buffer" "1.11.6" - "@webassemblyjs/wasm-gen" "1.11.6" - "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/ast" "1.12.1" + "@webassemblyjs/helper-buffer" "1.12.1" + "@webassemblyjs/wasm-gen" "1.12.1" + "@webassemblyjs/wasm-parser" "1.12.1" -"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" - integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== +"@webassemblyjs/wasm-parser@1.12.1", "@webassemblyjs/wasm-parser@^1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz#c47acb90e6f083391e3fa61d113650eea1e95937" + integrity sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@webassemblyjs/helper-api-error" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/ieee754" "1.11.6" "@webassemblyjs/leb128" "1.11.6" "@webassemblyjs/utf8" "1.11.6" -"@webassemblyjs/wast-printer@1.11.6": - version "1.11.6" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" - integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== +"@webassemblyjs/wast-printer@1.12.1": + version "1.12.1" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz#bcecf661d7d1abdaf989d8341a4833e33e2b31ac" + integrity sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA== dependencies: - "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/ast" "1.12.1" "@xtuc/long" "4.2.2" "@xtuc/ieee754@^1.2.0": @@ -2562,10 +2546,10 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" -acorn-import-assertions@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" - integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== +acorn-import-attributes@^1.9.5: + version "1.9.5" + resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef" + integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ== acorn-jsx@^5.3.1, acorn-jsx@^5.3.2: version "5.3.2" @@ -2991,7 +2975,7 @@ browser-process-hrtime@^1.0.0: resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626" integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow== -browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9: +browserslist@^4.0.0, browserslist@^4.16.3, browserslist@^4.21.4, browserslist@^4.21.5, browserslist@^4.21.9: version "4.21.9" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.9.tgz#e11bdd3c313d7e2a9e87e8b4b0c7872b13897635" integrity sha512-M0MFoZzbUrRU4KNfCrDLnvyE7gub+peetoTid3TBIqtunaDJyXlwhakT+/VkvSXcfIzFfK/nkCs4nmyTmxdNSg== @@ -3001,6 +2985,16 @@ browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4 node-releases "^2.0.12" update-browserslist-db "^1.0.11" +browserslist@^4.21.10: + version "4.23.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" + integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== + dependencies: + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" + bs-logger@0.x: version "0.2.6" resolved "https://registry.yarnpkg.com/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" @@ -3089,6 +3083,11 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001503: resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001515.tgz#418aefeed9d024cd3129bfae0ccc782d4cb8f12b" integrity sha512-eEFDwUOZbE24sb+Ecsx3+OvNETqjWIdabMy52oOkIgcUtAsQifjUG9q4U9dgTHJM2mfk4uEPxc0+xuFdJ629QA== +caniuse-lite@^1.0.30001646: + version "1.0.30001655" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001655.tgz#0ce881f5a19a2dcfda2ecd927df4d5c1684b982f" + integrity sha512-jRGVy3iSGO5Uutn2owlb5gR6qsGngTw9ZTb4ali9f3glshcNmJ2noam4Mo9zia5P9Dk3jNNydy7vQjuE5dQmfg== + canvg@^3.0.6: version "3.0.10" resolved "https://registry.yarnpkg.com/canvg/-/canvg-3.0.10.tgz#8e52a2d088b6ffa23ac78970b2a9eebfae0ef4b3" @@ -3876,6 +3875,11 @@ electron-to-chromium@^1.4.431: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.460.tgz#f360a5059c039c4a5fb4dfa99680ad8129dd9f84" integrity sha512-kKiHnbrHME7z8E6AYaw0ehyxY5+hdaRmeUbjBO22LZMdqTYCO29EvF0T1cQ3pJ1RN5fyMcHl1Lmcsdt9WWJpJQ== +electron-to-chromium@^1.5.4: + version "1.5.13" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.13.tgz#1abf0410c5344b2b829b7247e031f02810d442e6" + integrity sha512-lbBcvtIJ4J6sS4tb5TLp1b4LyfCdMkwStzXPyAgVgTRAsep4bvrAGaBOP7ZJtQMNJpSQ9SqG4brWOroNaQtm7Q== + emittery@^0.10.2: version "0.10.2" resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.10.2.tgz#902eec8aedb8c41938c46e9385e9db7e03182933" @@ -3908,7 +3912,7 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0: +enhanced-resolve@^5.0.0: version "5.15.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== @@ -3916,6 +3920,14 @@ enhanced-resolve@^5.0.0, enhanced-resolve@^5.15.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.17.1: + version "5.17.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15" + integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -3952,6 +3964,11 @@ escalade@^3.1.1: resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.1.2: + version "3.2.0" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5" + integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -4577,7 +4594,7 @@ globby@^11.0.2, globby@^11.0.3, globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" -graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: +graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== @@ -6167,6 +6184,11 @@ node-releases@^2.0.12: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d" integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + nopt@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-6.0.0.tgz#245801d8ebf409c6df22ab9d95b65e1309cdb16d" @@ -6516,6 +6538,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.0.tgz#5358b76a78cde483ba5cef6a9dc9671440b27d59" + integrity sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -7796,7 +7823,7 @@ terminal-link@^2.0.0: ansi-escapes "^4.2.1" supports-hyperlinks "^2.0.0" -terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.3.7: +terser-webpack-plugin@^5.1.1: version "5.3.9" resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== @@ -7807,6 +7834,17 @@ terser-webpack-plugin@^5.1.1, terser-webpack-plugin@^5.3.7: serialize-javascript "^6.0.1" terser "^5.16.8" +terser-webpack-plugin@^5.3.10: + version "5.3.10" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz#904f4c9193c6fd2a03f693a2150c62a92f40d199" + integrity sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w== + dependencies: + "@jridgewell/trace-mapping" "^0.3.20" + jest-worker "^27.4.5" + schema-utils "^3.1.1" + serialize-javascript "^6.0.1" + terser "^5.26.0" + terser@^5.10.0, terser@^5.16.8: version "5.19.0" resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.0.tgz#7b3137b01226bdd179978207b9c8148754a6da9c" @@ -7817,6 +7855,16 @@ terser@^5.10.0, terser@^5.16.8: commander "^2.20.0" source-map-support "~0.5.20" +terser@^5.26.0: + version "5.31.6" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.31.6.tgz#c63858a0f0703988d0266a82fcbf2d7ba76422b1" + integrity sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg== + dependencies: + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" + commander "^2.20.0" + source-map-support "~0.5.20" + test-exclude@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" @@ -8076,6 +8124,14 @@ update-browserslist-db@^1.0.11: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" + integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== + dependencies: + escalade "^3.1.2" + picocolors "^1.0.1" + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" @@ -8244,6 +8300,14 @@ watchpack@^2.4.0: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" +watchpack@^2.4.1: + version "2.4.2" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.2.tgz#2feeaed67412e7c33184e5a79ca738fbd38564da" + integrity sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw== + dependencies: + glob-to-regexp "^0.4.1" + graceful-fs "^4.1.2" + wbuf@^1.1.0, wbuf@^1.7.3: version "1.7.3" resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df" @@ -8368,33 +8432,32 @@ webpack-virtual-modules@^0.4.2: integrity sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA== webpack@^5.54.0: - version "5.88.1" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.1.tgz#21eba01e81bd5edff1968aea726e2fbfd557d3f8" - integrity sha512-FROX3TxQnC/ox4N+3xQoWZzvGXSuscxR32rbzjpXgEzWudJFEJBpdlkkob2ylrv5yzzufD1zph1OoFsLtm6stQ== - dependencies: - "@types/eslint-scope" "^3.7.3" - "@types/estree" "^1.0.0" - "@webassemblyjs/ast" "^1.11.5" - "@webassemblyjs/wasm-edit" "^1.11.5" - "@webassemblyjs/wasm-parser" "^1.11.5" + version "5.94.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" + integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== + dependencies: + "@types/estree" "^1.0.5" + "@webassemblyjs/ast" "^1.12.1" + "@webassemblyjs/wasm-edit" "^1.12.1" + "@webassemblyjs/wasm-parser" "^1.12.1" acorn "^8.7.1" - acorn-import-assertions "^1.9.0" - browserslist "^4.14.5" + acorn-import-attributes "^1.9.5" + browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.15.0" + enhanced-resolve "^5.17.1" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" - graceful-fs "^4.2.9" + graceful-fs "^4.2.11" json-parse-even-better-errors "^2.3.1" loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.3.7" - watchpack "^2.4.0" + terser-webpack-plugin "^5.3.10" + watchpack "^2.4.1" webpack-sources "^3.2.3" websocket-driver@>=0.5.1, websocket-driver@^0.7.4: From cf1d4ed0a7e01ec3ddcaa17c2b8679c2f42ee699 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 18:12:10 +0000 Subject: [PATCH 03/17] Bump dompurify in /mir-webapp/src/main/vue/editor-tools Bumps [dompurify](https://github.com/cure53/DOMPurify) from 2.4.7 to 2.5.7. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/2.4.7...2.5.7) --- updated-dependencies: - dependency-name: dompurify dependency-type: indirect ... Signed-off-by: dependabot[bot] --- mir-webapp/src/main/vue/editor-tools/yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mir-webapp/src/main/vue/editor-tools/yarn.lock b/mir-webapp/src/main/vue/editor-tools/yarn.lock index 893468cbd4..b34fcd2998 100644 --- a/mir-webapp/src/main/vue/editor-tools/yarn.lock +++ b/mir-webapp/src/main/vue/editor-tools/yarn.lock @@ -3809,9 +3809,9 @@ domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: domelementtype "^2.2.0" dompurify@^2.2.0: - version "2.4.7" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.4.7.tgz#277adeb40a2c84be2d42a8bcd45f582bfa4d0cfc" - integrity sha512-kxxKlPEDa6Nc5WJi+qRgPbOAbgTpSULL+vI3NUXsZMlkJxTqYI9wg5ZTay2sFrdZRWHPWNi+EdAhcJf81WtoMQ== + version "2.5.7" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.5.7.tgz#6e0d36b9177db5a99f18ade1f28579db5ab839d7" + integrity sha512-2q4bEI+coQM8f5ez7kt2xclg1XsecaV9ASJk/54vwlfRRNQfDqJz2pzQ8t0Ix/ToBpXlVjrRIx7pFC/o8itG2Q== domutils@^2.5.2, domutils@^2.8.0: version "2.8.0" From ed74361cd58aa66bf97abd0abc274144bb949357 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 12:36:23 +0000 Subject: [PATCH 04/17] Bump express in /mir-webapp/src/main/vue/name-search Bumps [express](https://github.com/expressjs/express) from 4.19.2 to 4.20.0. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.19.2...4.20.0) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] --- mir-webapp/src/main/vue/name-search/yarn.lock | 179 +++++++++++++++--- 1 file changed, 153 insertions(+), 26 deletions(-) diff --git a/mir-webapp/src/main/vue/name-search/yarn.lock b/mir-webapp/src/main/vue/name-search/yarn.lock index 2b134ab675..f42e5b0d8b 100644 --- a/mir-webapp/src/main/vue/name-search/yarn.lock +++ b/mir-webapp/src/main/vue/name-search/yarn.lock @@ -2181,10 +2181,10 @@ bluebird@^3.1.1: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== -body-parser@1.20.2: - version "1.20.2" - resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd" - integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA== +body-parser@1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.3.tgz#1953431221c6fb5cd63c4b36d53fab0928e548c6" + integrity sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g== dependencies: bytes "3.1.2" content-type "~1.0.5" @@ -2194,7 +2194,7 @@ body-parser@1.20.2: http-errors "2.0.0" iconv-lite "0.4.24" on-finished "2.4.1" - qs "6.11.0" + qs "6.13.0" raw-body "2.5.2" type-is "~1.6.18" unpipe "1.0.0" @@ -2280,6 +2280,17 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" +call-bind@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" + integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + set-function-length "^1.2.1" + callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -2805,6 +2816,15 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" +define-data-property@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e" + integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A== + dependencies: + es-define-property "^1.0.0" + es-errors "^1.3.0" + gopd "^1.0.1" + define-lazy-prop@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" @@ -2952,6 +2972,11 @@ encodeurl@~1.0.2: resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== +encodeurl@~2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-2.0.0.tgz#7b8ea898077d7e409d3ac45474ea38eaf0857a58" + integrity sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg== + end-of-stream@^1.1.0: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -2994,6 +3019,18 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.3.4" +es-define-property@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" + integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ== + dependencies: + get-intrinsic "^1.2.4" + +es-errors@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" + integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== + es-module-lexer@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" @@ -3103,36 +3140,36 @@ execa@^5.0.0: strip-final-newline "^2.0.0" express@^4.17.3: - version "4.19.2" - resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465" - integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q== + version "4.20.0" + resolved "https://registry.yarnpkg.com/express/-/express-4.20.0.tgz#f1d08e591fcec770c07be4767af8eb9bcfd67c48" + integrity sha512-pLdae7I6QqShF5PnNTCVn4hI91Dx0Grkn2+IAsMTgMIKuQVte2dN9PeGSSAME2FR8anOhVA62QDIUaWVfEXVLw== dependencies: accepts "~1.3.8" array-flatten "1.1.1" - body-parser "1.20.2" + body-parser "1.20.3" content-disposition "0.5.4" content-type "~1.0.4" cookie "0.6.0" cookie-signature "1.0.6" debug "2.6.9" depd "2.0.0" - encodeurl "~1.0.2" + encodeurl "~2.0.0" escape-html "~1.0.3" etag "~1.8.1" finalhandler "1.2.0" fresh "0.5.2" http-errors "2.0.0" - merge-descriptors "1.0.1" + merge-descriptors "1.0.3" methods "~1.1.2" on-finished "2.4.1" parseurl "~1.3.3" - path-to-regexp "0.1.7" + path-to-regexp "0.1.10" proxy-addr "~2.0.7" qs "6.11.0" range-parser "~1.2.1" safe-buffer "5.2.1" - send "0.18.0" - serve-static "1.15.0" + send "0.19.0" + serve-static "1.16.0" setprototypeof "1.2.0" statuses "2.0.1" type-is "~1.6.18" @@ -3287,6 +3324,11 @@ function-bind@^1.1.1: resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A== +function-bind@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c" + integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA== + gensync@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0" @@ -3307,6 +3349,17 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: has-proto "^1.0.1" has-symbols "^1.0.3" +get-intrinsic@^1.1.3, get-intrinsic@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" + integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== + dependencies: + es-errors "^1.3.0" + function-bind "^1.1.2" + has-proto "^1.0.1" + has-symbols "^1.0.3" + hasown "^2.0.0" + get-stream@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" @@ -3367,6 +3420,13 @@ globby@^11.0.2, globby@^11.0.3: merge2 "^1.4.1" slash "^3.0.0" +gopd@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" + integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA== + dependencies: + get-intrinsic "^1.1.3" + graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.6: version "4.2.11" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" @@ -3401,6 +3461,13 @@ has-property-descriptors@^1.0.0: dependencies: get-intrinsic "^1.1.1" +has-property-descriptors@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854" + integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg== + dependencies: + es-define-property "^1.0.0" + has-proto@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" @@ -3428,6 +3495,13 @@ hash-sum@^2.0.0: resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-2.0.0.tgz#81d01bb5de8ea4a214ad5d6ead1b523460b0b45a" integrity sha512-WdZTbAByD+pHfl/g9QSsBIIwy8IT+EsPiKDs0KNX+zSHhdDLFKdZu0BQHljvO+0QI/BasbMSUa8wYNCZTvhslg== +hasown@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + he@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" @@ -3991,10 +4065,10 @@ memfs@^3.1.2, memfs@^3.4.3: dependencies: fs-monkey "^1.0.4" -merge-descriptors@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== +merge-descriptors@1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.3.tgz#d80319a65f3c7935351e5cfdac8f9318504dbed5" + integrity sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ== merge-source-map@^1.1.0: version "1.1.0" @@ -4234,6 +4308,11 @@ object-assign@^4.0.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== +object-inspect@^1.13.1: + version "1.13.2" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff" + integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g== + object-inspect@^1.9.0: version "1.12.3" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.3.tgz#ba62dffd67ee256c8c086dfae69e016cd1f198b9" @@ -4433,10 +4512,10 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== -path-to-regexp@0.1.7: - version "0.1.7" - resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== +path-to-regexp@0.1.10: + version "0.1.10" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.10.tgz#67e9108c5c0551b9e5326064387de4763c4d5f8b" + integrity sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w== path-type@^4.0.0: version "4.0.0" @@ -4803,6 +4882,13 @@ qs@6.11.0: dependencies: side-channel "^1.0.4" +qs@6.13.0: + version "6.13.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906" + integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg== + dependencies: + side-channel "^1.0.6" + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -5106,6 +5192,25 @@ send@0.18.0: range-parser "~1.2.1" statuses "2.0.1" +send@0.19.0: + version "0.19.0" + resolved "https://registry.yarnpkg.com/send/-/send-0.19.0.tgz#bbc5a388c8ea6c048967049dbeac0e4a3f09d7f8" + integrity sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw== + dependencies: + debug "2.6.9" + depd "2.0.0" + destroy "1.2.0" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "2.0.0" + mime "1.6.0" + ms "2.1.3" + on-finished "2.4.1" + range-parser "~1.2.1" + statuses "2.0.1" + serialize-javascript@^6.0.0, serialize-javascript@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" @@ -5126,16 +5231,28 @@ serve-index@^1.9.1: mime-types "~2.1.17" parseurl "~1.3.2" -serve-static@1.15.0: - version "1.15.0" - resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540" - integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g== +serve-static@1.16.0: + version "1.16.0" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.16.0.tgz#2bf4ed49f8af311b519c46f272bf6ac3baf38a92" + integrity sha512-pDLK8zwl2eKaYrs8mrPZBJua4hMplRWJ1tIFksVC3FtBEBnl8dxgeHtsaMS8DhS9i4fLObaon6ABoc4/hQGdPA== dependencies: encodeurl "~1.0.2" escape-html "~1.0.3" parseurl "~1.3.3" send "0.18.0" +set-function-length@^1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449" + integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + setprototypeof@1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656" @@ -5191,6 +5308,16 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" +side-channel@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2" + integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + object-inspect "^1.13.1" + signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.7" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" From 7be0c75fb0a4144ebbe66ee2aecdebc88d1b4d32 Mon Sep 17 00:00:00 2001 From: Antonia Friedrich <95207430+Antoniafriedrich@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:55:30 +0200 Subject: [PATCH 05/17] MIR-1359 fix choose publication button in related item (#1071) --- .../resources/js/mir/relatedItem-modal.js | 636 +++++++++--------- 1 file changed, 315 insertions(+), 321 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js b/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js index 2aeb42a291..c1fd43cd59 100644 --- a/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js +++ b/mir-module/src/main/resources/META-INF/resources/js/mir/relatedItem-modal.js @@ -1,354 +1,348 @@ -$(document).ready(function() { - var GenreXML; - - $(".mir-related-item-search").each(function() { - const id = $(this).find("input[name$='@xlink:href']").val(); - if (id.length > 0) { - const titleInput = $(this).find("input[name*='mods:title']"); - const urlInput = $(this).find("input[name*='mods:url']"); - const genreInput = $(this).find("select[name*='mods:genre']"); - if ($(titleInput).val().length === 0) { - if (typeof id === "string" && id.split("_").length === 3) { - getInformation(id, function(data) { - titleInput.val($(data).find("str[name='mods.title.main']").text()); - genreInput.val($(data).find("str[name='mods.type']").text()); - }); +$(document).ready(function () { + var GenreXML; + + $(".mir-related-item-search").each(function () { + const input = $(this).find("input[name$='@xlink:href']"); + if (input.length > 0) { + let id = input.val(); + if (id.length > 0) { + const titleInput = $(this).find("input[name*='mods:title']"); + const urlInput = $(this).find("input[name*='mods:url']"); + const genreInput = $(this).find("select[name*='mods:genre']"); + if ($(titleInput).val().length === 0) { + if (typeof id === "string" && id.split("_").length === 3) { + getInformation(id, function (data) { + titleInput.val($(data).find("str[name='mods.title.main']").text()); + genreInput.val($(data).find("str[name='mods.type']").text()); + }); + } + } + $(titleInput).attr("disabled", "true"); + $(genreInput).attr("disabled", "true"); + $(urlInput).attr("disabled", "true"); + } } - } - $(titleInput).attr("disabled", "true"); - $(genreInput).attr("disabled", "true"); - $(urlInput).attr("disabled", "true"); - } - }); + }); - checkHost(); + checkHost(); - $(".mir-relatedItem-select").each(function() { - var button = $(this); - var id = button.next().next("input").val(); - if (parseInt(id.substr(id.lastIndexOf("_") + 1)) < 1){ - button.next("span").text("Wird angelegt"); - } - else { - button.next("span").text(id); - } - }); + $(".mir-relatedItem-select").each(function () { + var button = $(this); + var id = button.next().next("input").val(); + if (parseInt(id.substr(id.lastIndexOf("_") + 1)) < 1) { + button.next("span").text("Wird angelegt"); + } else { + button.next("span").text(id); + } + }); - $("body").on("change", "select[name*='/@type']", function() { - checkHost(); - }); - - $("body").on("click", ".mir-relatedItem-select", function() { - workRelatedItem($(this)); - }); - - function checkHost() { - var hostSelect = $("select[name*='/@type'] option[value='host']:selected").closest(".mir-related-item-search"); - $(".mir-related-item-search").each(function( index ) { - if (hostSelect.length > 0 && $(this)[0] === hostSelect[0]) { - $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', false); - } - else { - $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', true); - $(this).find("select[name*='/@type'] option[value='host']:selected").next().attr('selected', 'selected'); - } - if (hostSelect.length == 0) { - $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', false); - } + $("body").on("change", "select[name*='/@type']", function () { + checkHost(); }); - } - - function getInformation(id, callback) { - $.ajax({ - url: webApplicationBaseURL + "servlets/solr/select?q=id:" + id + "&XSL.Style=xml", - type: "GET", - success: callback, - error: function(error) { - console.error("Failed to load title for " + id ); - console.error(error); - }, + + $("body").on("click", ".mir-relatedItem-select", function () { + workRelatedItem($(this)); }); - } - function workRelatedItem(button){ - initBody(); + function checkHost() { + var hostSelect = $("select[name*='/@type'] option[value='host']:selected").closest(".mir-related-item-search"); + $(".mir-related-item-search").each(function (index) { + if (hostSelect.length > 0 && $(this)[0] === hostSelect[0]) { + $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', false); + } else { + $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', true); + $(this).find("select[name*='/@type'] option[value='host']:selected").next().attr('selected', 'selected'); + } + if (hostSelect.length == 0) { + $(this).find("select[name*='/@type'] option[value='host']").prop('disabled', false); + } + }); + } - var input = button.next().next("input"); - var sortType = ""; + function getInformation(id, callback) { + $.ajax({ + url: webApplicationBaseURL + "servlets/solr/select?q=id:" + id + "&XSL.Style=xml", + type: "GET", + success: callback, + error: function (error) { + console.error("Failed to load title for " + id); + console.error(error); + }, + }); + } - //load genre classification - loadGenres(initContent); + function workRelatedItem(button) { + initBody(); - function initContent() { - if(input.val().length > 0 && parseInt(input.val().substr(input.val().lastIndexOf("_") + 1)) > 1) { - loadPublikation(leftContent, "select", "id:" + input.val(), "0"); - setTimeout(function() { - $("#modalFrame").find(".list-group-item").addClass("active"); - }, 300); - loadPublikation(rightContent, "receive", input.val(), ""); - activateSendButton(input.val()); - } + var input = button.next().next("input"); + var sortType = ""; + //load genre classification + loadGenres(initContent); - if(!input.val() || parseInt(input.val().substr(input.val().lastIndexOf("_") + 1)) < 1) { - loadPublikation(leftContent, "find", "", "0"); - } - } + function initContent() { + if (input.val().length > 0 && parseInt(input.val().substr(input.val().lastIndexOf("_") + 1)) > 1) { + loadPublikation(leftContent, "select", "id:" + input.val(), "0"); + setTimeout(function () { + $("#modalFrame").find(".list-group-item").addClass("active"); + }, 300); + loadPublikation(rightContent, "receive", input.val(), ""); + activateSendButton(input.val()); + } - function initBody() { - $("#modalFrame-title").text(button.val()); - $("#modalFrame-cancel").text($("button[name='_xed_submit_cancel']").text()); - $("#modalFrame-send").text("Auswählen").attr("disabled", "").removeAttr("style"); - // TODO: check if you can remove HTML from js code (e.g. by a js template) - $("#modalFrame-body").append("
"); - $("#modalFrame-body").append("
"); - // TODO: remove styles from js code (by moving it to our css files) - $("#main_left_content, #main_right_content").css({"max-height": "560px", "overflow": "auto"}); - $("#main_right_content").css("padding-left", "10px"); - //create pagination - $("#modalFrame-body").append("
"); - $(".already-linked").after("
"); - $("li a").css("cursor", "pointer"); - $("#modal-searchInput").removeAttr("hidden"); - $("#modal-searchInput > input").attr("autocomplete", "off"); - $("#modalFrame").modal("show"); - } - function leftContent(data) { - $("#main_left_content").empty(); - var mainBody = $(data).find("result[name='doclist']"); - if (mainBody.length < 1) { - mainBody = $(data).find("result[name='response']"); - } - mainBody.each(function() { - $(this).children().each(function() { - var autorContainer = ""; - var autor = ""; - $(this).find("arr[name='mods.author'] > str").each(function() { - autor = autor + "; " + $(this).text(); - }); - autor = $.trim(autor.substring(1, autor.length)); - if(autor != "") { - autorContainer = "
Autor: " + autor + "" - } - var type = "
Type: " + getGenre($(this).find("str[name='mods.type']").text()) + ""; - var elm = $("" + $(this).find("str[name='mods.title.main']").text() + autorContainer + type + ""); - $("#main_left_content").append(elm); - $(elm).css("cursor", "pointer"); - $(elm).attr("data-type", $(this).find("str[name='mods.type']").text()); - $(elm).attr("data-title", $(this).find("str[name='mods.title.main']").text()); - }); - }); - updatePagination(data); - updateType(data); - } + if (!input.val() || parseInt(input.val().substr(input.val().lastIndexOf("_") + 1)) < 1) { + loadPublikation(leftContent, "find", "", "0"); + } + } - function rightContent(data) { - $("#main_right_content").empty().append($(data).find("h1[itemprop='name']").css("margin-top", "0")); - $("h1[itemprop='name']").after($(data).find(".mods_genre").removeAttr("href")); - $("#main_right_content").append($(data).find("#main_col > .detail_block:first-child")).append($(data).find(".mir_metadata")); - $("a[itemprop='creator']").removeAttr("href"); - } + function initBody() { + $("#modalFrame-title").text(button.val()); + $("#modalFrame-cancel").text($("button[name='_xed_submit_cancel']").text()); + $("#modalFrame-send").text("Auswählen").attr("disabled", "").removeAttr("style"); + // TODO: check if you can remove HTML from js code (e.g. by a js template) + $("#modalFrame-body").append("
"); + $("#modalFrame-body").append("
"); + // TODO: remove styles from js code (by moving it to our css files) + $("#main_left_content, #main_right_content").css({"max-height": "560px", "overflow": "auto"}); + $("#main_right_content").css("padding-left", "10px"); + //create pagination + $("#modalFrame-body").append("
"); + $(".already-linked").after("
"); + $("li a").css("cursor", "pointer"); + $("#modal-searchInput").removeAttr("hidden"); + $("#modal-searchInput > input").attr("autocomplete", "off"); + $("#modalFrame").modal("show"); + } - function updateType(data) { - $(".modal-footer select > option[value != '']").remove(); - $(data).find("lst[name='facet_counts'] lst[name='mods.genre'] > int").each(function() { - var type_val = encodeURIComponent('+mods.type:"' + $(this).attr('name') + '"'); - var text = getGenre($(this).attr('name')); - $(".modal-footer select").append(""); - }); - $(".modal-footer select").val(encodeURIComponent(sortType)); - } + function leftContent(data) { + $("#main_left_content").empty(); + var mainBody = $(data).find("result[name='doclist']"); + if (mainBody.length < 1) { + mainBody = $(data).find("result[name='response']"); + } + mainBody.each(function () { + $(this).children().each(function () { + var autorContainer = ""; + var autor = ""; + $(this).find("arr[name='mods.author'] > str").each(function () { + autor = autor + "; " + $(this).text(); + }); + autor = $.trim(autor.substring(1, autor.length)); + if (autor != "") { + autorContainer = "
Autor: " + autor + "" + } + var type = "
Type: " + getGenre($(this).find("str[name='mods.type']").text()) + ""; + var elm = $("" + $(this).find("str[name='mods.title.main']").text() + autorContainer + type + ""); + $("#main_left_content").append(elm); + $(elm).css("cursor", "pointer"); + $(elm).attr("data-type", $(this).find("str[name='mods.type']").text()); + $(elm).attr("data-title", $(this).find("str[name='mods.title.main']").text()); + }); + }); + updatePagination(data); + updateType(data); + } - function updatePagination(data) { - var start = $(data).find("str[name='start']").text(); - var rows = $(data).find("str[name='rows']").text(); - var matches = $(data).find("int[name='matches']").text(); - if (matches == undefined || matches == "") { - matches = $(data).find("result[name='response']").attr("numFound"); - } - - $("#previous, li.next, #first").show(); - $("ul.modal-frame-pagination li").removeClass("disabled"); - - if(parseInt(start) - parseInt(rows) < 0) { - $("#previous").addClass("disabled"); - } - $("#previous a").attr("data", parseInt(start) - parseInt(rows)); - - if((parseInt(start) + parseInt(rows)) > parseInt(matches)) { - $("li.next").addClass("disabled"); - } - $("li.next a").attr("data", parseInt(start) + parseInt(rows)); - - if(parseInt(start) == 0) { - $("#first").addClass("disabled"); - } - - if($("#previous").hasClass("disabled") && $("li.next").hasClass("disabled") && $("#first").hasClass("disabled")) { - $("#previous, li.next, #first").hide(); - } - } + function rightContent(data) { + $("#main_right_content").empty().append($(data).find("h1[itemprop='name']").css("margin-top", "0")); + $("h1[itemprop='name']").after($(data).find(".mods_genre").removeAttr("href")); + $("#main_right_content").append($(data).find("#main_col > .detail_block:first-child")).append($(data).find(".mir_metadata")); + $("a[itemprop='creator']").removeAttr("href"); + } - $("#modalFrame").on("click", "#main_left_content > .list-group-item", function() { - if(!$(this).is($(".list-group-item.active"))) { - $(".list-group-item").removeClass("active"); - loadPublikation(rightContent, "receive", $(this).attr("value"), ""); - $(this).addClass("active"); - activateSendButton($(this).attr("value")); - } - }); + function updateType(data) { + $(".modal-footer select > option[value != '']").remove(); + $(data).find("lst[name='facet_counts'] lst[name='mods.genre'] > int").each(function () { + var type_val = encodeURIComponent('+mods.type:"' + $(this).attr('name') + '"'); + var text = getGenre($(this).attr('name')); + $(".modal-footer select").append(""); + }); + $(".modal-footer select").val(encodeURIComponent(sortType)); + } - $("#modalFrame-send").unbind().click(function() { - input.val($(".list-group-item.active").attr("value")); - $(button).next("span").text($(".list-group-item.active").attr("value")); - const titleInput = $(button).parents(".mir-related-item-search").find("input[name*='mods:title']"); - const genreInput = $(button).parents(".mir-related-item-search").find("select[name*='mods:genre']"); - const urlInput = $(button).parents(".mir-related-item-search").find("input[name*='mods:url']"); - $(titleInput).val($(".list-group-item.active").attr("data-title")); - $(titleInput).attr("disabled", "true"); - $(genreInput).attr("disabled", "true"); - $(genreInput).val($(".list-group-item.active").attr("data-type")).change(); - $(urlInput).attr("disabled", "true"); - $(urlInput).val(''); - $("#modalFrame").modal("hide"); - }); + function updatePagination(data) { + var start = $(data).find("str[name='start']").text(); + var rows = $(data).find("str[name='rows']").text(); + var matches = $(data).find("int[name='matches']").text(); + if (matches == undefined || matches == "") { + matches = $(data).find("result[name='response']").attr("numFound"); + } + + $("#previous, li.next, #first").show(); + $("ul.modal-frame-pagination li").removeClass("disabled"); + + if (parseInt(start) - parseInt(rows) < 0) { + $("#previous").addClass("disabled"); + } + $("#previous a").attr("data", parseInt(start) - parseInt(rows)); + + if ((parseInt(start) + parseInt(rows)) > parseInt(matches)) { + $("li.next").addClass("disabled"); + } + $("li.next a").attr("data", parseInt(start) + parseInt(rows)); + + if (parseInt(start) == 0) { + $("#first").addClass("disabled"); + } + + if ($("#previous").hasClass("disabled") && $("li.next").hasClass("disabled") && $("#first").hasClass("disabled")) { + $("#previous, li.next, #first").hide(); + } + } - $("#modalFrame").on('hidden.bs.modal', function() { - $("#modalFrame-body").empty(); - $("#modal-searchInput > input").val(""); - $(".modal-footer div.type-select").remove(); - }); + $("#modalFrame").on("click", "#main_left_content > .list-group-item", function () { + if (!$(this).is($(".list-group-item.active"))) { + $(".list-group-item").removeClass("active"); + loadPublikation(rightContent, "receive", $(this).attr("value"), ""); + $(this).addClass("active"); + activateSendButton($(this).attr("value")); + } + }); - $("#modal-searchInput > input").typeahead({ - source: function(query, process) { - return loadPublikation(function(data){ - var list = []; - $(data).find("result[name='response']").children().each(function () { - list.push({name: $(this).find("arr[name='mods.title']").find("str:first-child").text(), id: $(this).find("str[name='id']").text()}); - }); - return process(list); - }, "select", "mods.title:*" + query + "*", "0"); - }, - updater: function(item) { - $("#main_right_content").empty(); - sortType = ""; - loadPublikation(leftContent, "select", "id:" + item.id, "0"); - setTimeout(function() { - $("#modalFrame").find(".list-group-item").addClass("active"); - }, 300); - loadPublikation(rightContent, "receive", item.id, ""); - activateSendButton(item.id); - return item; - }, - items: 10, - autoSelect: false - }); + $("#modalFrame-send").unbind().click(function () { + input.val($(".list-group-item.active").attr("value")); + $(button).next("span").text($(".list-group-item.active").attr("value")); + const titleInput = $(button).parents(".mir-related-item-search").find("input[name*='mods:title']"); + const genreInput = $(button).parents(".mir-related-item-search").find("select[name*='mods:genre']"); + const urlInput = $(button).parents(".mir-related-item-search").find("input[name*='mods:url']"); + $(titleInput).val($(".list-group-item.active").attr("data-title")); + $(titleInput).attr("disabled", "true"); + $(genreInput).attr("disabled", "true"); + $(genreInput).val($(".list-group-item.active").attr("data-type")).change(); + $(urlInput).attr("disabled", "true"); + $(urlInput).val(''); + $("#modalFrame").modal("hide"); + }); - $("#modal-searchInput button").unbind().click(function(event) { - event.preventDefault(); - searchPublikation(); - }); + $("#modalFrame").on('hidden.bs.modal', function () { + $("#modalFrame-body").empty(); + $("#modal-searchInput > input").val(""); + $(".modal-footer div.type-select").remove(); + }); - $("#modal-searchInput > input").keydown(function(event) { - if (event.which == 13) { - event.preventDefault(); - searchPublikation(); - } - }); + $("#modal-searchInput > input").typeahead({ + source: function (query, process) { + return loadPublikation(function (data) { + var list = []; + $(data).find("result[name='response']").children().each(function () { + list.push({ + name: $(this).find("arr[name='mods.title']").find("str:first-child").text(), + id: $(this).find("str[name='id']").text() + }); + }); + return process(list); + }, "select", "mods.title:*" + query + "*", "0"); + }, updater: function (item) { + $("#main_right_content").empty(); + sortType = ""; + loadPublikation(leftContent, "select", "id:" + item.id, "0"); + setTimeout(function () { + $("#modalFrame").find(".list-group-item").addClass("active"); + }, 300); + loadPublikation(rightContent, "receive", item.id, ""); + activateSendButton(item.id); + return item; + }, items: 10, autoSelect: false + }); - $("#modalFrame li.next a, #modalFrame #previous a, #modalFrame #first a").click(function() { - if(!$(this).parent().hasClass("disabled")) { - loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), $(this).attr("data"), "xml"); - $("#main_right_content").empty(); - $("#modalFrame-send").attr("disabled", ""); - } - }); + $("#modal-searchInput button").unbind().click(function (event) { + event.preventDefault(); + searchPublikation(); + }); - $(".modal-footer select").change(function() { - sortType = decodeURIComponent($(this).val()); - loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), "0", "xml"); - $("#main_right_content").empty(); - $("#modalFrame-send").attr("disabled", ""); - }); + $("#modal-searchInput > input").keydown(function (event) { + if (event.which == 13) { + event.preventDefault(); + searchPublikation(); + } + }); - function searchPublikation() { - $("#main_right_content").empty(); - $("#modalFrame-send").attr("disabled", ""); - sortType = ""; - loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), "0", "xml"); - } + $("#modalFrame li.next a, #modalFrame #previous a, #modalFrame #first a").click(function () { + if (!$(this).parent().hasClass("disabled")) { + loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), $(this).attr("data"), "xml"); + $("#main_right_content").empty(); + $("#modalFrame-send").attr("disabled", ""); + } + }); + + $(".modal-footer select").change(function () { + sortType = decodeURIComponent($(this).val()); + loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), "0", "xml"); + $("#main_right_content").empty(); + $("#modalFrame-send").attr("disabled", ""); + }); - function loadPublikation(callback, type, qry, start){ - var url = ""; - var dataType = ""; - switch (type) { - case "find": - url = "servlets/solr/find?condQuery=*" + qry + "*&fq=" + sortType + "&start=" + start + "&rows=10&owner=createdby:*&XSL.Style=xml"; - dataType = "xml"; - break; - case "select": - url = "servlets/solr/select?q=" + qry + "&fq=objectType%3A\"mods\"&start=0&rows=10&XSL.Style=xml"; - dataType = "xml"; - break; - case "receive": - url = "receive/" + qry; - dataType = "html"; - break; - default: - break; - } - $.ajax({ - url: webApplicationBaseURL + url, - type: "GET", - dataType: dataType, - success: function(data) { - callback(data); - }, - error: function(error) { - console.log("Failed to load " + webApplicationBaseURL + url); - console.log(error); + function searchPublikation() { + $("#main_right_content").empty(); + $("#modalFrame-send").attr("disabled", ""); + sortType = ""; + loadPublikation(leftContent, "find", $("#modal-searchInput > input").val(), "0", "xml"); } - }); - } - function loadGenres(callback) { - if (!webApplicationBaseURL) console.log("Error: webApplicationBaseURL not set"); - $.ajax({ - method: "GET", - url: webApplicationBaseURL + "api/v1/classifications/mir_genres", - dataType: "xml" - }).done(function( xml ) { - GenreXML=xml; - callback(); - }).fail(function () { - console.log("Warning: could not load genres, genres will be displayed as undefined"); - callback(); - }); - } + function loadPublikation(callback, type, qry, start) { + var url = ""; + var dataType = ""; + switch (type) { + case "find": + url = "servlets/solr/find?condQuery=*" + qry + "*&fq=" + sortType + "&start=" + start + "&rows=10&owner=createdby:*&XSL.Style=xml"; + dataType = "xml"; + break; + case "select": + url = "servlets/solr/select?q=" + qry + "&fq=objectType%3A\"mods\"&start=0&rows=10&XSL.Style=xml"; + dataType = "xml"; + break; + case "receive": + url = "receive/" + qry; + dataType = "html"; + break; + default: + break; + } + $.ajax({ + url: webApplicationBaseURL + url, type: "GET", dataType: dataType, success: function (data) { + callback(data); + }, error: function (error) { + console.log("Failed to load " + webApplicationBaseURL + url); + console.log(error); + } + }); + } - function getGenre(genreID) { - var cat = $(GenreXML).find('category[ID="' + genreID + '"]'); - var lang = $(cat).find("label").filter(function() { - return $(this).attr('xml:lang') == $("html").attr("lang"); - }); - if ($(lang).length === 0) { - lang = $(cat).find("label").filter(function() { - return $(this).attr('xml:lang') == "de"; - }); - } - return $(lang).attr("text"); - } + function loadGenres(callback) { + if (!webApplicationBaseURL) console.log("Error: webApplicationBaseURL not set"); + $.ajax({ + method: "GET", url: webApplicationBaseURL + "api/v1/classifications/mir_genres", dataType: "xml" + }).done(function (xml) { + GenreXML = xml; + callback(); + }).fail(function () { + console.log("Warning: could not load genres, genres will be displayed as undefined"); + callback(); + }); + } - function activateSendButton(id) { - if(input.val() == id && $("input[name*='/@xlink:href'][value='" + id + "']").length > 0) { - $("#modalFrame-send").attr("disabled", "disabled"); - $(".already-linked").removeClass("d-none"); - } - else { - $("#modalFrame-send").removeAttr("disabled"); - $(".already-linked").addClass("d-none"); - } + function getGenre(genreID) { + var cat = $(GenreXML).find('category[ID="' + genreID + '"]'); + var lang = $(cat).find("label").filter(function () { + return $(this).attr('xml:lang') == $("html").attr("lang"); + }); + if ($(lang).length === 0) { + lang = $(cat).find("label").filter(function () { + return $(this).attr('xml:lang') == "de"; + }); + } + return $(lang).attr("text"); + } + + function activateSendButton(id) { + if (input.val() == id && $("input[name*='/@xlink:href'][value='" + id + "']").length > 0) { + $("#modalFrame-send").attr("disabled", "disabled"); + $(".already-linked").removeClass("d-none"); + } else { + $("#modalFrame-send").removeAttr("disabled"); + $(".already-linked").addClass("d-none"); + } + } } - } }); From 7490930d8f1ebe3952598da519b6cec25b26560b Mon Sep 17 00:00:00 2001 From: Silvio Hermann Date: Mon, 4 Nov 2024 10:59:26 +0100 Subject: [PATCH 06/17] MIR-1365 Allow to configure max value for xed template subject.simple and subject.simple.required --- .../resources/META-INF/resources/editor/editor-includes.xed | 4 ++-- mir-module/src/main/resources/config/mir/mycore.properties | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed index 4b6609ef4e..e23f338280 100644 --- a/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed +++ b/mir-module/src/main/resources/META-INF/resources/editor/editor-includes.xed @@ -1812,7 +1812,7 @@ - +