From 1db31ea5edf08a7582ba4825bccf3c631a9ff355 Mon Sep 17 00:00:00 2001 From: Jacob Pihl Date: Tue, 12 Nov 2024 13:57:58 +0100 Subject: [PATCH 1/5] Upgrade orval --- package.json | 2 +- yarn.lock | 266 +++++++++++++-------------------------------------- 2 files changed, 67 insertions(+), 201 deletions(-) diff --git a/package.json b/package.json index ea5b36bbf6..b7c492fc11 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,7 @@ "markdownlint-cli2": "^0.4.0", "mutationobserver-shim": "^0.3.7", "nyc": "^17.1.0", - "orval": "^6.26.0", + "orval": "^7.2.0", "postcss": "^8.4.49", "postcss-cli": "^11.0.0", "postcss-loader": "^8.1.1", diff --git a/yarn.lock b/yarn.lock index 25ccd9f83d..6e3ad2e158 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1305,11 +1305,6 @@ ts-node "^9" tslib "^2" -"@esbuild/aix-ppc64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz#d1bc06aedb6936b3b6d313bf809a5a40387d2b7f" - integrity sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA== - "@esbuild/aix-ppc64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz#b57697945b50e99007b4c2521507dc613d4a648c" @@ -1320,11 +1315,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.16.17.tgz#cf91e86df127aa3d141744edafcba0abdc577d23" integrity sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg== -"@esbuild/android-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz#7ad65a36cfdb7e0d429c353e00f680d737c2aed4" - integrity sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA== - "@esbuild/android-arm64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz#1add7e0af67acefd556e407f8497e81fddad79c0" @@ -1335,11 +1325,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.16.17.tgz#025b6246d3f68b7bbaa97069144fb5fb70f2fff2" integrity sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw== -"@esbuild/android-arm@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.19.12.tgz#b0c26536f37776162ca8bde25e42040c203f2824" - integrity sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w== - "@esbuild/android-arm@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.24.0.tgz#ab7263045fa8e090833a8e3c393b60d59a789810" @@ -1350,11 +1335,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.16.17.tgz#c820e0fef982f99a85c4b8bfdd582835f04cd96e" integrity sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ== -"@esbuild/android-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.19.12.tgz#cb13e2211282012194d89bf3bfe7721273473b3d" - integrity sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew== - "@esbuild/android-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.24.0.tgz#e8f8b196cfdfdd5aeaebbdb0110983460440e705" @@ -1365,11 +1345,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.16.17.tgz#edef4487af6b21afabba7be5132c26d22379b220" integrity sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w== -"@esbuild/darwin-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz#cbee41e988020d4b516e9d9e44dd29200996275e" - integrity sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g== - "@esbuild/darwin-arm64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz#2d0d9414f2acbffd2d86e98253914fca603a53dd" @@ -1380,11 +1355,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.16.17.tgz#42829168730071c41ef0d028d8319eea0e2904b4" integrity sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg== -"@esbuild/darwin-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz#e37d9633246d52aecf491ee916ece709f9d5f4cd" - integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A== - "@esbuild/darwin-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz#33087aab31a1eb64c89daf3d2cf8ce1775656107" @@ -1395,11 +1365,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.16.17.tgz#1f4af488bfc7e9ced04207034d398e793b570a27" integrity sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw== -"@esbuild/freebsd-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz#1ee4d8b682ed363b08af74d1ea2b2b4dbba76487" - integrity sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA== - "@esbuild/freebsd-arm64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz#bb76e5ea9e97fa3c753472f19421075d3a33e8a7" @@ -1410,11 +1375,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.16.17.tgz#636306f19e9bc981e06aa1d777302dad8fddaf72" integrity sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug== -"@esbuild/freebsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz#37a693553d42ff77cd7126764b535fb6cc28a11c" - integrity sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg== - "@esbuild/freebsd-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz#e0e2ce9249fdf6ee29e5dc3d420c7007fa579b93" @@ -1425,11 +1385,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.16.17.tgz#a003f7ff237c501e095d4f3a09e58fc7b25a4aca" integrity sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g== -"@esbuild/linux-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz#be9b145985ec6c57470e0e051d887b09dddb2d4b" - integrity sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA== - "@esbuild/linux-arm64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz#d1b2aa58085f73ecf45533c07c82d81235388e75" @@ -1440,11 +1395,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.16.17.tgz#b591e6a59d9c4fe0eeadd4874b157ab78cf5f196" integrity sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ== -"@esbuild/linux-arm@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz#207ecd982a8db95f7b5279207d0ff2331acf5eef" - integrity sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w== - "@esbuild/linux-arm@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz#8e4915df8ea3e12b690a057e77a47b1d5935ef6d" @@ -1455,11 +1405,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.16.17.tgz#24333a11027ef46a18f57019450a5188918e2a54" integrity sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg== -"@esbuild/linux-ia32@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz#d0d86b5ca1562523dc284a6723293a52d5860601" - integrity sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA== - "@esbuild/linux-ia32@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz#8200b1110666c39ab316572324b7af63d82013fb" @@ -1470,11 +1415,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.16.17.tgz#d5ad459d41ed42bbd4d005256b31882ec52227d8" integrity sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ== -"@esbuild/linux-loong64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz#9a37f87fec4b8408e682b528391fa22afd952299" - integrity sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA== - "@esbuild/linux-loong64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz#6ff0c99cf647504df321d0640f0d32e557da745c" @@ -1485,11 +1425,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.16.17.tgz#4e5967a665c38360b0a8205594377d4dcf9c3726" integrity sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw== -"@esbuild/linux-mips64el@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz#4ddebd4e6eeba20b509d8e74c8e30d8ace0b89ec" - integrity sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w== - "@esbuild/linux-mips64el@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz#3f720ccd4d59bfeb4c2ce276a46b77ad380fa1f3" @@ -1500,11 +1435,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.16.17.tgz#206443a02eb568f9fdf0b438fbd47d26e735afc8" integrity sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g== -"@esbuild/linux-ppc64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz#adb67dadb73656849f63cd522f5ecb351dd8dee8" - integrity sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg== - "@esbuild/linux-ppc64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz#9d6b188b15c25afd2e213474bf5f31e42e3aa09e" @@ -1515,11 +1445,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.16.17.tgz#c351e433d009bf256e798ad048152c8d76da2fc9" integrity sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw== -"@esbuild/linux-riscv64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz#11bc0698bf0a2abf8727f1c7ace2112612c15adf" - integrity sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg== - "@esbuild/linux-riscv64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz#f989fdc9752dfda286c9cd87c46248e4dfecbc25" @@ -1530,11 +1455,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.16.17.tgz#661f271e5d59615b84b6801d1c2123ad13d9bd87" integrity sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w== -"@esbuild/linux-s390x@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz#e86fb8ffba7c5c92ba91fc3b27ed5a70196c3cc8" - integrity sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg== - "@esbuild/linux-s390x@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz#29ebf87e4132ea659c1489fce63cd8509d1c7319" @@ -1545,11 +1465,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.16.17.tgz#e4ba18e8b149a89c982351443a377c723762b85f" integrity sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw== -"@esbuild/linux-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz#5f37cfdc705aea687dfe5dfbec086a05acfe9c78" - integrity sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg== - "@esbuild/linux-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz#4af48c5c0479569b1f359ffbce22d15f261c0cef" @@ -1560,11 +1475,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.16.17.tgz#7d4f4041e30c5c07dd24ffa295c73f06038ec775" integrity sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA== -"@esbuild/netbsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz#29da566a75324e0d0dd7e47519ba2f7ef168657b" - integrity sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA== - "@esbuild/netbsd-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz#1ae73d23cc044a0ebd4f198334416fb26c31366c" @@ -1580,11 +1490,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.16.17.tgz#970fa7f8470681f3e6b1db0cc421a4af8060ec35" integrity sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg== -"@esbuild/openbsd-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz#306c0acbdb5a99c95be98bdd1d47c916e7dc3ff0" - integrity sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw== - "@esbuild/openbsd-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz#4c8aa88c49187c601bae2971e71c6dc5e0ad1cdf" @@ -1595,11 +1500,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.16.17.tgz#abc60e7c4abf8b89fb7a4fe69a1484132238022c" integrity sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw== -"@esbuild/sunos-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz#0933eaab9af8b9b2c930236f62aae3fc593faf30" - integrity sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA== - "@esbuild/sunos-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz#8ddc35a0ea38575fa44eda30a5ee01ae2fa54dd4" @@ -1610,11 +1510,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.16.17.tgz#7b0ff9e8c3265537a7a7b1fd9a24e7bd39fcd87a" integrity sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw== -"@esbuild/win32-arm64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz#773bdbaa1971b36db2f6560088639ccd1e6773ae" - integrity sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A== - "@esbuild/win32-arm64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz#6e79c8543f282c4539db684a207ae0e174a9007b" @@ -1625,11 +1520,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.16.17.tgz#e90fe5267d71a7b7567afdc403dfd198c292eb09" integrity sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig== -"@esbuild/win32-ia32@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz#000516cad06354cc84a73f0943a4aa690ef6fd67" - integrity sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ== - "@esbuild/win32-ia32@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz#057af345da256b7192d18b676a02e95d0fa39103" @@ -1640,11 +1530,6 @@ resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.16.17.tgz#c5a1a4bfe1b57f0c3e61b29883525c6da3e5c091" integrity sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q== -"@esbuild/win32-x64@0.19.12": - version "0.19.12" - resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz#c57c8afbb4054a3ab8317591a0b7320360b444ae" - integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA== - "@esbuild/win32-x64@0.24.0": version "0.24.0" resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz#168ab1c7e1c318b922637fad8f339d48b01e1244" @@ -2341,24 +2226,24 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@orval/angular@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/angular/-/angular-6.26.0.tgz#1261e45d22d2b80c5a14180e21bd1b2e329d87ad" - integrity sha512-xxskcRUPDz5kKCzAa0q0wyQcyxGE1k5yUOPSg8VYJWGPZ4i7sDnW/6B//RSZU/obBjmA5JEaYbCaTrImT+BxzA== +"@orval/angular@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/angular/-/angular-7.2.0.tgz#2165463f8fa731213450f4767aff93d159ad6173" + integrity sha512-wjizqcEqu90VzYBrasfRdk4Xy7mzFN+K0ioXiC8UwCzFpNJOqNnLK6Jw09qPKP1BkwRsvYp8STquXJ5Z5DCKsg== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" -"@orval/axios@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/axios/-/axios-6.26.0.tgz#6f49d3e8ea4b9926d7bc7e0a735e3dff57feddad" - integrity sha512-Pn6jOZyWYe/tjD1yhDy2hJUx1+sOrqLeLyTg4SjN+2KkKmiIyMDw4+TzeNqwqtctQr10pAshu14O4QlJ+Td69A== +"@orval/axios@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/axios/-/axios-7.2.0.tgz#6b274f787c0545473c0f37c13f316d31709504df" + integrity sha512-RnOMK3xet97h7a2oJ1g0sPv2mTFwM701a3BzNmlQFwC49oOQv2ZhKNiHlKwkTwk5C/PwblkA/WHK9wU9DtUCgw== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" -"@orval/core@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/core/-/core-6.26.0.tgz#5c964de0b8518d7aec694428a8faba473b61adf7" - integrity sha512-k6NpRQIU83jsZDXW+CvmHGDjvvsi29QX87UXLZNiJd2oyHPML7BdYkxrLvWLJh9V7iGp/KGQ9uHtj6OtCjLhHg== +"@orval/core@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/core/-/core-7.2.0.tgz#0691a6c82bb0969c14d21a6ab37780902fe1426f" + integrity sha512-46BZ+1xCydgbZ7shHxdE3QGMYwhOuKAgOPiTRNZpHvCp4iUdkh64kA9PPObSfQmp5BtYZI+ADVgEue2KBUdK/A== dependencies: "@apidevtools/swagger-parser" "^10.1.0" "@ibm-cloud/openapi-ruleset" "^1.14.2" @@ -2367,7 +2252,7 @@ chalk "^4.1.2" compare-versions "^6.1.0" debug "^4.3.4" - esbuild "^0.19.11" + esbuild "^0.24.0" esutils "2.0.3" fs-extra "^11.2.0" globby "11.1.0" @@ -2381,46 +2266,55 @@ openapi3-ts "4.2.2" swagger2openapi "^7.0.8" -"@orval/hono@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/hono/-/hono-6.26.0.tgz#59b779c12d26641c0bdbd6bd023a0ccd47f0f47a" - integrity sha512-RB5yqd62bnTFT27uGbdWxxwKJCineCcRlVlq/IeeWz7X6FTZs2KWkeKEMUi5f8MM4pJP20aXqvrYNXLPYmNKkQ== +"@orval/fetch@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/fetch/-/fetch-7.2.0.tgz#0db110290f3712e33e6b020925354a8007c1fe5c" + integrity sha512-jX82Lrk10hBmRm5gbxALREn97P20IBCbwc0adXmdD1JiuxOESDiTvn3UMM0FJUQAmc7maU3+mWN6+Kr0emD88A== dependencies: - "@orval/core" "6.26.0" - "@orval/zod" "6.26.0" + "@orval/core" "7.2.0" + +"@orval/hono@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/hono/-/hono-7.2.0.tgz#3568ec8cf3dba090051a4b2438f13aa4d6809d54" + integrity sha512-ENLWcpLltPueq4Ygevqne27ph4HR0T48yGbp9XiTCNPa1IfJYfmh66qaNLvAezbnJ8B1JeiYO8wKhQ9hZQTtWg== + dependencies: + "@orval/core" "7.2.0" + "@orval/zod" "7.2.0" lodash.uniq "^4.5.0" -"@orval/mock@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/mock/-/mock-6.26.0.tgz#79cbb324e230125a7c7196c1b920a130b4a2e584" - integrity sha512-Fmrtgukp/ljUdEIlsHEdVce963iJiUT+9Le30fgrbctY+UUupXTCDNI82PSS7KUMQqx694YnGWUlv6ONiBCBpg== +"@orval/mock@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/mock/-/mock-7.2.0.tgz#bd97f5709127e67c59b02eaef7c6d93e440bec22" + integrity sha512-9shlOuMUlz93m8FhYb1gJHtmQR0iixdC+262r2NTQcZ0EWKj7Rg7mnvAHCiTfSLhs9cbOpOO1T4VU5jcBQAWCA== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" lodash.get "^4.4.2" lodash.omit "^4.5.0" openapi3-ts "^4.2.2" -"@orval/query@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/query/-/query-6.26.0.tgz#b8e7c20cfca66e73929c9fd657689a1db69b9c94" - integrity sha512-A4lyv/4Rzs5C748IdXIOHM1ZhDDnHLNtfaAMEvT2m3Z/CSnv9KMz0EwimLuXm3Q5I4AL5R2ULDPnYlj9hah6Qw== +"@orval/query@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/query/-/query-7.2.0.tgz#0c40b3bd16cbcecfad81d8b26031faf28a3d368f" + integrity sha512-XVSI/dQAPdi9RNIzTjdood7u+PRwNtyGanhN65LFhQr1jMYG1mrPZJW7vyTinHEcJRJnNXdMBdfqoOPUGmBrgQ== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" + "@orval/fetch" "7.2.0" lodash.omitby "^4.6.0" -"@orval/swr@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/swr/-/swr-6.26.0.tgz#5a3c715187b42ceccf0bf450b0926fdd271e9b30" - integrity sha512-ZyQJhoUgEa4z+8+otEsZ/XENoGXz6U+SPjC2Y6yXm5Oc0GzaXIQlE6/WkAhsx4kAzYANGVX3pS3EtHRqKnIApQ== +"@orval/swr@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/swr/-/swr-7.2.0.tgz#557ca0b4234bb3ea25c3f89b90e2aa2462b945dd" + integrity sha512-LbMFyUVU2RD7PLBRku8GGnktjv9QasQ8VKh996uLhlKlzgVWd1yjE1z5U9k0KKCgJPyRiH7lV3IcTSEa457gUA== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" + "@orval/fetch" "7.2.0" -"@orval/zod@6.26.0": - version "6.26.0" - resolved "https://registry.yarnpkg.com/@orval/zod/-/zod-6.26.0.tgz#203959abb670ff6114cae8e1b63a2600372b615f" - integrity sha512-+1WHsgGtA0l3xAC2gFhlfLYgwPeXqC7SO93Qu03UvisxSJSNM+osz+7bN2MrZQwbX5JXqlYi2+3B8xCRYdRhDw== +"@orval/zod@7.2.0": + version "7.2.0" + resolved "https://registry.yarnpkg.com/@orval/zod/-/zod-7.2.0.tgz#f6f525ef0c84319b5289cc724f1e9dde88fc1844" + integrity sha512-WjJabVPrICOgj0ReLB4ooKIxVbvYtqskGcmNkXv1xiNDbgpcpYpYk9HYJ43zTN0bw3T4+8RmpvoLRgHi1TtdzQ== dependencies: - "@orval/core" "6.26.0" + "@orval/core" "7.2.0" lodash.uniq "^4.5.0" "@parcel/watcher-android-arm64@2.4.1": @@ -5092,7 +4986,7 @@ chokidar@^3.3.0, chokidar@^3.4.0, chokidar@^3.5.2, chokidar@^3.5.3: optionalDependencies: fsevents "~2.3.2" -chokidar@^4.0.0: +chokidar@^4.0.0, chokidar@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41" integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA== @@ -6605,7 +6499,7 @@ esbuild@^0.16.14: "@esbuild/win32-ia32" "0.16.17" "@esbuild/win32-x64" "0.16.17" -"esbuild@^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0": +"esbuild@^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0", esbuild@^0.24.0: version "0.24.0" resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.24.0.tgz#f2d470596885fcb2e91c21eb3da3b3c89c0b55e7" integrity sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ== @@ -6635,35 +6529,6 @@ esbuild@^0.16.14: "@esbuild/win32-ia32" "0.24.0" "@esbuild/win32-x64" "0.24.0" -esbuild@^0.19.11: - version "0.19.12" - resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.19.12.tgz#dc82ee5dc79e82f5a5c3b4323a2a641827db3e04" - integrity sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg== - optionalDependencies: - "@esbuild/aix-ppc64" "0.19.12" - "@esbuild/android-arm" "0.19.12" - "@esbuild/android-arm64" "0.19.12" - "@esbuild/android-x64" "0.19.12" - "@esbuild/darwin-arm64" "0.19.12" - "@esbuild/darwin-x64" "0.19.12" - "@esbuild/freebsd-arm64" "0.19.12" - "@esbuild/freebsd-x64" "0.19.12" - "@esbuild/linux-arm" "0.19.12" - "@esbuild/linux-arm64" "0.19.12" - "@esbuild/linux-ia32" "0.19.12" - "@esbuild/linux-loong64" "0.19.12" - "@esbuild/linux-mips64el" "0.19.12" - "@esbuild/linux-ppc64" "0.19.12" - "@esbuild/linux-riscv64" "0.19.12" - "@esbuild/linux-s390x" "0.19.12" - "@esbuild/linux-x64" "0.19.12" - "@esbuild/netbsd-x64" "0.19.12" - "@esbuild/openbsd-x64" "0.19.12" - "@esbuild/sunos-x64" "0.19.12" - "@esbuild/win32-arm64" "0.19.12" - "@esbuild/win32-ia32" "0.19.12" - "@esbuild/win32-x64" "0.19.12" - escalade@^3.1.1, escalade@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" @@ -10437,24 +10302,25 @@ ora@^5.4.1: strip-ansi "^6.0.0" wcwidth "^1.0.1" -orval@^6.26.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/orval/-/orval-6.26.0.tgz#8e79690b7cf3eb305eaa40474288c8eea495f02b" - integrity sha512-pgUNgXYSjnLz6uF1LOoeoIlI39mwq//ktx1FDUoRJ+ZspouLTKM4GSNmoMjEdn6T/CvPmkKQffTGo5rIUYPcmA== +orval@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/orval/-/orval-7.2.0.tgz#146e04ec3185ab820aa53b12ff9c56e5d16ca6b2" + integrity sha512-4cXVNXnw5yS9+JRLlgpIkbKgBY8NXaOY6NVbUM8SNAPppUCbfU566tPrVbmcFmz6bHMniQfEzxQW8FcbgwuEiQ== dependencies: "@apidevtools/swagger-parser" "^10.1.0" - "@orval/angular" "6.26.0" - "@orval/axios" "6.26.0" - "@orval/core" "6.26.0" - "@orval/hono" "6.26.0" - "@orval/mock" "6.26.0" - "@orval/query" "6.26.0" - "@orval/swr" "6.26.0" - "@orval/zod" "6.26.0" + "@orval/angular" "7.2.0" + "@orval/axios" "7.2.0" + "@orval/core" "7.2.0" + "@orval/fetch" "7.2.0" + "@orval/hono" "7.2.0" + "@orval/mock" "7.2.0" + "@orval/query" "7.2.0" + "@orval/swr" "7.2.0" + "@orval/zod" "7.2.0" ajv "^8.12.0" cac "^6.7.14" chalk "^4.1.2" - chokidar "^3.5.3" + chokidar "^4.0.1" enquirer "^2.4.1" execa "^5.1.1" find-up "5.0.0" From 44ae892032949b89ff901228dc36ab1e71ab0b3a Mon Sep 17 00:00:00 2001 From: Jacob Pihl Date: Tue, 12 Nov 2024 13:58:39 +0100 Subject: [PATCH 2/5] Generate api files with orval --- src/core/cover-service-api/cover-service.ts | 9 +- src/core/cover-service-api/model/cover.ts | 2 +- .../cover-service-api/model/coverImageUrls.ts | 2 +- src/core/cover-service-api/model/coverType.ts | 2 +- .../model/getCoverCollectionParams.ts | 2 +- .../model/getCoverCollectionSizesItem.ts | 2 +- .../model/getCoverCollectionType.ts | 2 +- src/core/cover-service-api/model/imageUrl.ts | 2 +- .../cover-service-api/model/imageUrlSize.ts | 2 +- src/core/cover-service-api/model/index.ts | 2 +- src/core/dpl-cms/dpl-cms.ts | 111 +++++++- .../dpl-cms/model/campaignMatchPOST200.ts | 2 +- .../dpl-cms/model/campaignMatchPOST200Data.ts | 2 +- .../model/campaignMatchPOST200DataImage.ts | 2 +- .../model/campaignMatchPOSTBodyItem.ts | 2 +- .../campaignMatchPOSTBodyItemValuesItem.ts | 2 +- .../dpl-cms/model/campaignMatchPOSTFormat.ts | 2 +- .../dpl-cms/model/campaignMatchPOSTParams.ts | 2 +- .../model/dplOpeningHoursCreatePOST200Item.ts | 2 +- ...plOpeningHoursCreatePOST200ItemCategory.ts | 2 +- ...OpeningHoursCreatePOST200ItemRepetition.ts | 2 +- ...ingHoursCreatePOST200ItemRepetitionType.ts | 2 +- ...rsCreatePOST200ItemRepetitionWeeklyData.ts | 2 +- .../model/dplOpeningHoursCreatePOSTFormat.ts | 2 +- ...HoursCreatePOSTOpeningHoursInstanceBody.ts | 2 +- ...atePOSTOpeningHoursInstanceBodyCategory.ts | 2 +- ...ePOSTOpeningHoursInstanceBodyRepetition.ts | 2 +- ...TOpeningHoursInstanceBodyRepetitionType.ts | 2 +- ...ngHoursInstanceBodyRepetitionWeeklyData.ts | 2 +- .../model/dplOpeningHoursCreatePOSTParams.ts | 2 +- .../dplOpeningHoursDeleteDELETEFormat.ts | 2 +- .../dplOpeningHoursDeleteDELETEParams.ts | 2 +- .../dplOpeningHoursLegacyListGET200Item.ts | 25 ++ .../dplOpeningHoursLegacyListGETFormat.ts | 15 ++ .../dplOpeningHoursLegacyListGETParams.ts | 27 ++ .../model/dplOpeningHoursListGET200Item.ts | 2 +- .../dplOpeningHoursListGET200ItemCategory.ts | 2 +- ...dplOpeningHoursListGET200ItemRepetition.ts | 2 +- ...peningHoursListGET200ItemRepetitionType.ts | 2 +- ...HoursListGET200ItemRepetitionWeeklyData.ts | 2 +- .../model/dplOpeningHoursListGETFormat.ts | 2 +- .../model/dplOpeningHoursListGETParams.ts | 2 +- .../dplOpeningHoursUpdatePATCH200Item.ts | 2 +- ...lOpeningHoursUpdatePATCH200ItemCategory.ts | 2 +- ...peningHoursUpdatePATCH200ItemRepetition.ts | 2 +- ...ngHoursUpdatePATCH200ItemRepetitionType.ts | 2 +- ...sUpdatePATCH200ItemRepetitionWeeklyData.ts | 2 +- .../model/dplOpeningHoursUpdatePATCHFormat.ts | 2 +- .../model/dplOpeningHoursUpdatePATCHParams.ts | 2 +- src/core/dpl-cms/model/eventPATCHBody.ts | 2 +- .../model/eventPATCHBodyExternalData.ts | 6 +- src/core/dpl-cms/model/eventPATCHBodyState.ts | 2 +- src/core/dpl-cms/model/eventPATCHFormat.ts | 2 +- src/core/dpl-cms/model/eventPATCHParams.ts | 2 +- src/core/dpl-cms/model/eventsGET200Item.ts | 16 +- .../dpl-cms/model/eventsGET200ItemAddress.ts | 2 +- .../dpl-cms/model/eventsGET200ItemDateTime.ts | 2 +- .../model/eventsGET200ItemExternalData.ts | 6 +- .../dpl-cms/model/eventsGET200ItemImage.ts | 4 +- .../dpl-cms/model/eventsGET200ItemSeries.ts | 2 +- .../dpl-cms/model/eventsGET200ItemState.ts | 2 +- .../eventsGET200ItemTicketCategoriesItem.ts | 4 +- ...entsGET200ItemTicketCategoriesItemPrice.ts | 2 +- src/core/dpl-cms/model/eventsGETFormat.ts | 2 +- src/core/dpl-cms/model/eventsGETParams.ts | 6 +- src/core/dpl-cms/model/index.ts | 5 +- src/core/dpl-cms/model/proxyUrlGET200.ts | 2 +- src/core/dpl-cms/model/proxyUrlGET200Data.ts | 2 +- src/core/dpl-cms/model/proxyUrlGETFormat.ts | 2 +- src/core/dpl-cms/model/proxyUrlGETParams.ts | 2 +- src/core/fbs/fbs.ts | 58 ++-- src/core/fbs/model/address.ts | 2 +- src/core/fbs/model/addressV2.ts | 2 +- src/core/fbs/model/agencyBranch.ts | 2 +- src/core/fbs/model/agencyDepartment.ts | 2 +- src/core/fbs/model/agencyLocation.ts | 2 +- src/core/fbs/model/agencySublocation.ts | 2 +- src/core/fbs/model/authenticatedPatronV4.ts | 2 +- src/core/fbs/model/authenticatedPatronV6.ts | 2 +- ...authenticatedPatronV6AuthenticateStatus.ts | 2 +- src/core/fbs/model/availabilityV3.ts | 2 +- src/core/fbs/model/blockStatus.ts | 2 +- src/core/fbs/model/booking.ts | 2 +- src/core/fbs/model/bookingInfo.ts | 2 +- src/core/fbs/model/createBooking.ts | 2 +- src/core/fbs/model/createPatronRequestV3.ts | 2 +- src/core/fbs/model/createReservation.ts | 2 +- src/core/fbs/model/createReservationBatch.ts | 2 +- .../fbs/model/createReservationBatchV2.ts | 2 +- .../fbs/model/deleteReservationsParams.ts | 2 +- src/core/fbs/model/feeMaterial.ts | 2 +- src/core/fbs/model/feeMaterialV2.ts | 2 +- src/core/fbs/model/feeV2.ts | 2 +- src/core/fbs/model/getAvailabilityV3Params.ts | 2 +- src/core/fbs/model/getBranchesParams.ts | 2 +- src/core/fbs/model/getFeesV2Params.ts | 2 +- src/core/fbs/model/getHoldingsV3Params.ts | 2 +- src/core/fbs/model/guardian.ts | 2 +- src/core/fbs/model/holdings.ts | 2 +- .../holdingsForBibliographicalRecordV3.ts | 2 +- src/core/fbs/model/holdingsV3.ts | 2 +- src/core/fbs/model/iLLBibliographicRecord.ts | 2 +- src/core/fbs/model/index.ts | 2 +- src/core/fbs/model/loanDetails.ts | 2 +- src/core/fbs/model/loanDetailsV2.ts | 2 +- src/core/fbs/model/loanV2.ts | 2 +- src/core/fbs/model/material.ts | 2 +- src/core/fbs/model/materialGroup.ts | 2 +- src/core/fbs/model/materialV3.ts | 2 +- src/core/fbs/model/patron.ts | 2 +- src/core/fbs/model/patronGroup.ts | 2 +- src/core/fbs/model/patronSettings.ts | 2 +- src/core/fbs/model/patronSettingsV3.ts | 2 +- src/core/fbs/model/patronSettingsV4.ts | 2 +- src/core/fbs/model/patronV3.ts | 2 +- src/core/fbs/model/patronV4.ts | 2 +- src/core/fbs/model/patronV5.ts | 2 +- .../fbs/model/patronWithGuardianRequest.ts | 2 +- src/core/fbs/model/period.ts | 2 +- src/core/fbs/model/periodical.ts | 2 +- src/core/fbs/model/periodicalReservation.ts | 2 +- src/core/fbs/model/pincodeChange.ts | 2 +- src/core/fbs/model/renewedLoanV2.ts | 2 +- src/core/fbs/model/reservationDetails.ts | 2 +- src/core/fbs/model/reservationDetailsV2.ts | 2 +- src/core/fbs/model/reservationResponseV2.ts | 2 +- src/core/fbs/model/reservationResult.ts | 2 +- src/core/fbs/model/reservationResultV2.ts | 2 +- src/core/fbs/model/updateGuardianRequest.ts | 2 +- src/core/fbs/model/updatePatronRequestV4.ts | 2 +- src/core/fbs/model/updateReservation.ts | 2 +- src/core/fbs/model/updateReservationBatch.ts | 2 +- src/core/material-list-api/material-list.ts | 248 +++++++++++------- .../model/collectionIdsParameter.ts | 2 +- .../material-list-api/model/getListParams.ts | 9 +- src/core/material-list-api/model/index.ts | 13 +- src/core/material-list-api/model/itemId.ts | 3 +- .../material-list-api/model/legacyUserId.ts | 2 +- src/core/material-list-api/model/list.ts | 6 +- src/core/material-list-api/model/listId.ts | 2 +- src/core/publizon/model/apiResponseCode.ts | 2 +- src/core/publizon/model/apiResult.ts | 2 +- src/core/publizon/model/bookTypes.ts | 2 +- src/core/publizon/model/checklistItem.ts | 2 +- src/core/publizon/model/checklistResult.ts | 2 +- .../publizon/model/contentLoanStatusEnum.ts | 2 +- src/core/publizon/model/createLoanResult.ts | 2 +- src/core/publizon/model/fileExtensionType.ts | 2 +- src/core/publizon/model/friendlyCardResult.ts | 2 +- .../publizon/model/getV1UserLoansParams.ts | 2 +- src/core/publizon/model/identifierTypeEnum.ts | 2 +- src/core/publizon/model/index.ts | 2 +- src/core/publizon/model/libraryBook.ts | 2 +- src/core/publizon/model/libraryData.ts | 2 +- .../publizon/model/libraryProductCategory.ts | 2 +- .../model/libraryProductContributor.ts | 2 +- .../model/libraryProductExternalId.ts | 2 +- src/core/publizon/model/libraryProfile.ts | 2 +- src/core/publizon/model/loan.ts | 2 +- src/core/publizon/model/loanListResult.ts | 2 +- src/core/publizon/model/loanResult.ts | 2 +- src/core/publizon/model/loanStatusItem.ts | 2 +- .../publizon/model/loanStatusListResult.ts | 2 +- src/core/publizon/model/loanStatusResult.ts | 2 +- .../model/postV1UserLoansIdentifierParams.ts | 2 +- src/core/publizon/model/product.ts | 2 +- src/core/publizon/model/productListResult.ts | 2 +- src/core/publizon/model/productResult.ts | 2 +- src/core/publizon/model/reservation.ts | 2 +- src/core/publizon/model/reservationInput.ts | 2 +- .../publizon/model/reservationListResult.ts | 2 +- src/core/publizon/model/testCard.ts | 2 +- src/core/publizon/model/userData.ts | 2 +- src/core/publizon/publizon.ts | 64 +++-- 174 files changed, 604 insertions(+), 341 deletions(-) create mode 100644 src/core/dpl-cms/model/dplOpeningHoursLegacyListGET200Item.ts create mode 100644 src/core/dpl-cms/model/dplOpeningHoursLegacyListGETFormat.ts create mode 100644 src/core/dpl-cms/model/dplOpeningHoursLegacyListGETParams.ts diff --git a/src/core/cover-service-api/cover-service.ts b/src/core/cover-service-api/cover-service.ts index 63a637ac3a..5eaed1f675 100644 --- a/src/core/cover-service-api/cover-service.ts +++ b/src/core/cover-service-api/cover-service.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. @@ -78,7 +78,8 @@ export type GetCoverCollectionQueryError = ErrorType; /** * @summary Search multiple covers */ -export const useGetCoverCollection = < + +export function useGetCoverCollection< TData = Awaited>, TError = ErrorType >( @@ -90,7 +91,7 @@ export const useGetCoverCollection = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetCoverCollectionQueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -100,4 +101,4 @@ export const useGetCoverCollection = < query.queryKey = queryOptions.queryKey; return query; -}; +} diff --git a/src/core/cover-service-api/model/cover.ts b/src/core/cover-service-api/model/cover.ts index 4e7f2f3506..cdc03f0cad 100644 --- a/src/core/cover-service-api/model/cover.ts +++ b/src/core/cover-service-api/model/cover.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/coverImageUrls.ts b/src/core/cover-service-api/model/coverImageUrls.ts index a8a3c980d4..c7a600114e 100644 --- a/src/core/cover-service-api/model/coverImageUrls.ts +++ b/src/core/cover-service-api/model/coverImageUrls.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/coverType.ts b/src/core/cover-service-api/model/coverType.ts index ed31984dd9..0dae4d7693 100644 --- a/src/core/cover-service-api/model/coverType.ts +++ b/src/core/cover-service-api/model/coverType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/getCoverCollectionParams.ts b/src/core/cover-service-api/model/getCoverCollectionParams.ts index 95282f4569..da7a357e40 100644 --- a/src/core/cover-service-api/model/getCoverCollectionParams.ts +++ b/src/core/cover-service-api/model/getCoverCollectionParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/getCoverCollectionSizesItem.ts b/src/core/cover-service-api/model/getCoverCollectionSizesItem.ts index 659123cec7..9b9ad91cda 100644 --- a/src/core/cover-service-api/model/getCoverCollectionSizesItem.ts +++ b/src/core/cover-service-api/model/getCoverCollectionSizesItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/getCoverCollectionType.ts b/src/core/cover-service-api/model/getCoverCollectionType.ts index 091c5e1820..be75dcd439 100644 --- a/src/core/cover-service-api/model/getCoverCollectionType.ts +++ b/src/core/cover-service-api/model/getCoverCollectionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/imageUrl.ts b/src/core/cover-service-api/model/imageUrl.ts index 30864ca974..b700490b61 100644 --- a/src/core/cover-service-api/model/imageUrl.ts +++ b/src/core/cover-service-api/model/imageUrl.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/imageUrlSize.ts b/src/core/cover-service-api/model/imageUrlSize.ts index 0e2032b1b2..6dae64a2e8 100644 --- a/src/core/cover-service-api/model/imageUrlSize.ts +++ b/src/core/cover-service-api/model/imageUrlSize.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/cover-service-api/model/index.ts b/src/core/cover-service-api/model/index.ts index 43260a83b0..89a750f3dd 100644 --- a/src/core/cover-service-api/model/index.ts +++ b/src/core/cover-service-api/model/index.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DDF Cover Service * This service provides covers for library materials indexed by isbn, issn, faust, pid. diff --git a/src/core/dpl-cms/dpl-cms.ts b/src/core/dpl-cms/dpl-cms.ts index a9440cfcc9..ec6a70adae 100644 --- a/src/core/dpl-cms/dpl-cms.ts +++ b/src/core/dpl-cms/dpl-cms.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -23,6 +23,8 @@ import type { DplOpeningHoursCreatePOSTOpeningHoursInstanceBody, DplOpeningHoursCreatePOSTParams, DplOpeningHoursDeleteDELETEParams, + DplOpeningHoursLegacyListGET200Item, + DplOpeningHoursLegacyListGETParams, DplOpeningHoursListGET200Item, DplOpeningHoursListGETParams, DplOpeningHoursUpdatePATCH200Item, @@ -276,7 +278,8 @@ export type DplOpeningHoursListGETQueryError = ErrorType; /** * @summary List all opening hours */ -export const useDplOpeningHoursListGET = < + +export function useDplOpeningHoursListGET< TData = Awaited>, TError = ErrorType >( @@ -286,7 +289,7 @@ export const useDplOpeningHoursListGET = < TError, TData > -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const options = getDplOpeningHoursListGETQueryOptions(params, queryOptions); const query = useQuery(options) as UseQueryResult & { @@ -296,7 +299,7 @@ export const useDplOpeningHoursListGET = < query.queryKey = options.queryKey; return query; -}; +} /** * @summary Delete individual opening hours @@ -471,6 +474,92 @@ export const useDplOpeningHoursUpdatePATCH = < return useMutation(mutationOptions); }; +/** + * @summary List all opening hours for legacy API + */ +export const dplOpeningHoursLegacyListGET = ( + params: DplOpeningHoursLegacyListGETParams, + signal?: AbortSignal +) => { + return fetcher({ + url: `/opening_hours/instances`, + method: "GET", + params, + signal + }); +}; + +export const getDplOpeningHoursLegacyListGETQueryKey = ( + params: DplOpeningHoursLegacyListGETParams +) => { + return [`/opening_hours/instances`, ...(params ? [params] : [])] as const; +}; + +export const getDplOpeningHoursLegacyListGETQueryOptions = < + TData = Awaited>, + TError = ErrorType +>( + params: DplOpeningHoursLegacyListGETParams, + options?: { + query?: UseQueryOptions< + Awaited>, + TError, + TData + >; + } +) => { + const { query: queryOptions } = options ?? {}; + + const queryKey = + queryOptions?.queryKey ?? getDplOpeningHoursLegacyListGETQueryKey(params); + + const queryFn: QueryFunction< + Awaited> + > = ({ signal }) => dplOpeningHoursLegacyListGET(params, signal); + + return { queryKey, queryFn, ...queryOptions } as UseQueryOptions< + Awaited>, + TError, + TData + > & { queryKey: QueryKey }; +}; + +export type DplOpeningHoursLegacyListGETQueryResult = NonNullable< + Awaited> +>; +export type DplOpeningHoursLegacyListGETQueryError = ErrorType; + +/** + * @summary List all opening hours for legacy API + */ + +export function useDplOpeningHoursLegacyListGET< + TData = Awaited>, + TError = ErrorType +>( + params: DplOpeningHoursLegacyListGETParams, + options?: { + query?: UseQueryOptions< + Awaited>, + TError, + TData + >; + } +): UseQueryResult & { queryKey: QueryKey } { + const queryOptions = getDplOpeningHoursLegacyListGETQueryOptions( + params, + options + ); + + const query = useQuery(queryOptions) as UseQueryResult & { + queryKey: QueryKey; + }; + + query.queryKey = queryOptions.queryKey; + + return query; +} + /** * @summary Update single events */ @@ -600,7 +689,8 @@ export type EventsGETQueryError = ErrorType; /** * @summary Retrieve all events */ -export const useEventsGET = < + +export function useEventsGET< TData = Awaited>, TError = ErrorType >( @@ -612,7 +702,7 @@ export const useEventsGET = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getEventsGETQueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -622,7 +712,7 @@ export const useEventsGET = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Generate proxy url @@ -675,7 +765,8 @@ export type ProxyUrlGETQueryError = ErrorType; /** * @summary Generate proxy url */ -export const useProxyUrlGET = < + +export function useProxyUrlGET< TData = Awaited>, TError = ErrorType >( @@ -685,7 +776,7 @@ export const useProxyUrlGET = < TError, TData > -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const options = getProxyUrlGETQueryOptions(params, queryOptions); const query = useQuery(options) as UseQueryResult & { @@ -695,4 +786,4 @@ export const useProxyUrlGET = < query.queryKey = options.queryKey; return query; -}; +} diff --git a/src/core/dpl-cms/model/campaignMatchPOST200.ts b/src/core/dpl-cms/model/campaignMatchPOST200.ts index dd9d325d59..59329df578 100644 --- a/src/core/dpl-cms/model/campaignMatchPOST200.ts +++ b/src/core/dpl-cms/model/campaignMatchPOST200.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOST200Data.ts b/src/core/dpl-cms/model/campaignMatchPOST200Data.ts index 2fa9f3054a..15270514b3 100644 --- a/src/core/dpl-cms/model/campaignMatchPOST200Data.ts +++ b/src/core/dpl-cms/model/campaignMatchPOST200Data.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOST200DataImage.ts b/src/core/dpl-cms/model/campaignMatchPOST200DataImage.ts index ea856479a1..074006508f 100644 --- a/src/core/dpl-cms/model/campaignMatchPOST200DataImage.ts +++ b/src/core/dpl-cms/model/campaignMatchPOST200DataImage.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOSTBodyItem.ts b/src/core/dpl-cms/model/campaignMatchPOSTBodyItem.ts index e9ed351d35..2f83b472e4 100644 --- a/src/core/dpl-cms/model/campaignMatchPOSTBodyItem.ts +++ b/src/core/dpl-cms/model/campaignMatchPOSTBodyItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOSTBodyItemValuesItem.ts b/src/core/dpl-cms/model/campaignMatchPOSTBodyItemValuesItem.ts index 7ede3b3ff9..7d9f0667b0 100644 --- a/src/core/dpl-cms/model/campaignMatchPOSTBodyItemValuesItem.ts +++ b/src/core/dpl-cms/model/campaignMatchPOSTBodyItemValuesItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOSTFormat.ts b/src/core/dpl-cms/model/campaignMatchPOSTFormat.ts index 6759ad7d17..e787693f37 100644 --- a/src/core/dpl-cms/model/campaignMatchPOSTFormat.ts +++ b/src/core/dpl-cms/model/campaignMatchPOSTFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/campaignMatchPOSTParams.ts b/src/core/dpl-cms/model/campaignMatchPOSTParams.ts index 91ab240b2f..ab9798df5d 100644 --- a/src/core/dpl-cms/model/campaignMatchPOSTParams.ts +++ b/src/core/dpl-cms/model/campaignMatchPOSTParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200Item.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200Item.ts index 9285c8ce86..bc9033a041 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200Item.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200Item.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemCategory.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemCategory.ts index e87465a6d1..b43db71df0 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemCategory.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemCategory.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetition.ts index 2d4b501a82..92baf21d2b 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetition.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetition.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionType.ts index e81933dbd4..ff52820dda 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionType.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionWeeklyData.ts index 0b508c9253..bec60bb3f5 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionWeeklyData.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOST200ItemRepetitionWeeklyData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTFormat.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTFormat.ts index 7d1a949971..cadeae15b2 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTFormat.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBody.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBody.ts index f0aee90591..9cb098d11f 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBody.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBody.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyCategory.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyCategory.ts index 4dede814fd..b9a20c0626 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyCategory.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyCategory.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetition.ts index d780ddb2d1..530fcfd39b 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetition.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetition.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionType.ts index fd8f0e22f8..73b5383d97 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionType.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionWeeklyData.ts index 09f929b3a4..d23a878db1 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionWeeklyData.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTOpeningHoursInstanceBodyRepetitionWeeklyData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTParams.ts b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTParams.ts index 836093470d..2bd17c353f 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTParams.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursCreatePOSTParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEFormat.ts b/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEFormat.ts index f3810b4444..77d107a239 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEFormat.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEParams.ts b/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEParams.ts index c983db0a7c..2416a5312d 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEParams.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursDeleteDELETEParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursLegacyListGET200Item.ts b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGET200Item.ts new file mode 100644 index 0000000000..f4b1ebb3ab --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGET200Item.ts @@ -0,0 +1,25 @@ +/** + * Generated by orval v7.2.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursLegacyListGET200Item = { + /** The (t)id of the opening hours category. */ + category_tid: number; + /** The date which the opening hours applies to. In ISO 8601 format. */ + date: string; + /** When the opening hours end. In format HH:MM */ + end_time: string; + /** The node Id of the branch the opening hours instance belongs to. */ + nid: number; + /** + * Additional notice regarding the opening hours. + * @nullable + */ + notice: string | null; + /** When the opening hours start. In format HH:MM */ + start_time: string; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETFormat.ts b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETFormat.ts new file mode 100644 index 0000000000..1fdd5f69e0 --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETFormat.ts @@ -0,0 +1,15 @@ +/** + * Generated by orval v7.2.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ + +export type DplOpeningHoursLegacyListGET_Format = + typeof DplOpeningHoursLegacyListGET_Format[keyof typeof DplOpeningHoursLegacyListGET_Format]; + +// eslint-disable-next-line @typescript-eslint/no-redeclare +export const DplOpeningHoursLegacyListGET_Format = { + json: "json" +} as const; diff --git a/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETParams.ts b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETParams.ts new file mode 100644 index 0000000000..f12758389d --- /dev/null +++ b/src/core/dpl-cms/model/dplOpeningHoursLegacyListGETParams.ts @@ -0,0 +1,27 @@ +/** + * Generated by orval v7.2.0 🍺 + * Do not edit manually. + * DPL CMS - REST API + * The REST API provide by the core REST module. + * OpenAPI spec version: Versioning not supported + */ +import type { DplOpeningHoursLegacyListGET_Format } from "./dplOpeningHoursLegacyListGETFormat"; + +export type DplOpeningHoursLegacyListGETParams = { + /** + * Request format + */ + _format?: DplOpeningHoursLegacyListGET_Format; + /** + * Retrieve opening hours which occur after and including the provided date. In ISO 8601 format. + */ + from_date: string; + /** + * Retrieve opening hours which occur before and including the provided date. In ISO 8601 format. + */ + to_date: string; + /** + * The id(s) of the branch(es) for which to retrieve opening hours. Can be a single id or a comma-separated list of ids. + */ + nid: number[]; +}; diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts index 85b6347e54..9836cad883 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200Item.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemCategory.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemCategory.ts index e7c3a95ca5..b61ae682f9 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemCategory.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemCategory.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts index 97a493a47d..2c83d4f7aa 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetition.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts index d9860d1d5c..d2801ff85e 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts index 8dc61957a4..8ba1b01e27 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGET200ItemRepetitionWeeklyData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGETFormat.ts b/src/core/dpl-cms/model/dplOpeningHoursListGETFormat.ts index 734fc70671..cb58624215 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGETFormat.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGETFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursListGETParams.ts b/src/core/dpl-cms/model/dplOpeningHoursListGETParams.ts index d7d9bfd877..84bc2b403b 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursListGETParams.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursListGETParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Item.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Item.ts index a5d3054903..14f2f8b151 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Item.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200Item.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemCategory.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemCategory.ts index e512bb3db0..a0827f06ec 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemCategory.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemCategory.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetition.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetition.ts index 7463c737b5..08b5d6670a 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetition.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetition.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionType.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionType.ts index 676a83d3b9..ff331fff60 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionType.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionWeeklyData.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionWeeklyData.ts index 1b2d0d4a75..e408272a2e 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionWeeklyData.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCH200ItemRepetitionWeeklyData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHFormat.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHFormat.ts index fd0c9142d8..a7515d9779 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHFormat.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHParams.ts b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHParams.ts index f630489f25..3e1c75dfcb 100644 --- a/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHParams.ts +++ b/src/core/dpl-cms/model/dplOpeningHoursUpdatePATCHParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventPATCHBody.ts b/src/core/dpl-cms/model/eventPATCHBody.ts index fe5ea905a0..518c52c454 100644 --- a/src/core/dpl-cms/model/eventPATCHBody.ts +++ b/src/core/dpl-cms/model/eventPATCHBody.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventPATCHBodyExternalData.ts b/src/core/dpl-cms/model/eventPATCHBodyExternalData.ts index ff1a946cee..385e3c7aae 100644 --- a/src/core/dpl-cms/model/eventPATCHBodyExternalData.ts +++ b/src/core/dpl-cms/model/eventPATCHBodyExternalData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -10,8 +10,8 @@ * Data for the event provided by a third party. */ export type EventPATCHBodyExternalData = { - /** An absolute url provided by the third party where editorial users can administer the event. Accessing this url should require authentication. */ + /** An absolute URL provided by the third party where editorial users can administer the event. Accessing this URL should require authentication. */ admin_url?: string; - /** An absolute url provided by the third party where end users can access the event. */ + /** An absolute URL provided by the third party where end users can access the event. */ url?: string; }; diff --git a/src/core/dpl-cms/model/eventPATCHBodyState.ts b/src/core/dpl-cms/model/eventPATCHBodyState.ts index 6311f48d53..e6c27f380c 100644 --- a/src/core/dpl-cms/model/eventPATCHBodyState.ts +++ b/src/core/dpl-cms/model/eventPATCHBodyState.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventPATCHFormat.ts b/src/core/dpl-cms/model/eventPATCHFormat.ts index e9c39b7c91..ab67967731 100644 --- a/src/core/dpl-cms/model/eventPATCHFormat.ts +++ b/src/core/dpl-cms/model/eventPATCHFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventPATCHParams.ts b/src/core/dpl-cms/model/eventPATCHParams.ts index 5c2c92bee5..c449c2390a 100644 --- a/src/core/dpl-cms/model/eventPATCHParams.ts +++ b/src/core/dpl-cms/model/eventPATCHParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGET200Item.ts b/src/core/dpl-cms/model/eventsGET200Item.ts index e1d861fd79..e1a689d572 100644 --- a/src/core/dpl-cms/model/eventsGET200Item.ts +++ b/src/core/dpl-cms/model/eventsGET200Item.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -16,11 +16,15 @@ import type { EventsGET200ItemTicketCategoriesItem } from "./eventsGET200ItemTic export type EventsGET200Item = { /** Where the event occurs. */ address?: EventsGET200ItemAddress; + /** An editorial WYSIWYG/HTML description of the event. */ + body?: string; + /** The associated library branches. */ + branches?: string[]; /** When the event was created. In ISO 8601 format. */ created_at: string; /** When the event occurs. */ date_time: EventsGET200ItemDateTime; - /** An editorial description of the event. */ + /** The short event description. */ description?: string; /** Data for the event provided by a third party. */ external_data?: EventsGET200ItemExternalData; @@ -30,16 +34,20 @@ export type EventsGET200Item = { series?: EventsGET200ItemSeries; /** The state of the event. */ state: EventsGET200ItemState; + /** The tags associated with the event. */ + tags?: string[]; /** Total number of tickets which can be sold for the event. */ ticket_capacity?: number; /** Ticket categories used for the event. Not present for events without ticketing. */ ticket_categories?: EventsGET200ItemTicketCategoriesItem[]; + /** Whether the event is marked as relevant for ticket management systems */ + ticket_manager_relevance?: boolean; /** The event title. */ title: string; /** When the event was last updated. In ISO 8601 format. */ updated_at: string; - /** An absolute url end users should use to view the event at the website. */ + /** An absolute URL end users should use to view the event at the website. */ url: string; - /** A unique identifer for the event. */ + /** A unique identifier for the event. */ uuid: string; }; diff --git a/src/core/dpl-cms/model/eventsGET200ItemAddress.ts b/src/core/dpl-cms/model/eventsGET200ItemAddress.ts index 1bcff5ccfa..bebd3c56ca 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemAddress.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemAddress.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGET200ItemDateTime.ts b/src/core/dpl-cms/model/eventsGET200ItemDateTime.ts index 8ba713902b..38b05b0930 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemDateTime.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemDateTime.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGET200ItemExternalData.ts b/src/core/dpl-cms/model/eventsGET200ItemExternalData.ts index 11049be284..e98331e3c0 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemExternalData.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemExternalData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -10,8 +10,8 @@ * Data for the event provided by a third party. */ export type EventsGET200ItemExternalData = { - /** An absolute url provided by the third party where editorial users can administer the event. Accessing this url should require authentication. */ + /** An absolute URL provided by the third party where editorial users can administer the event. Accessing this URL should require authentication. */ admin_url?: string; - /** An absolute url provided by the third party where end users can access the event. */ + /** An absolute URL provided by the third party where end users can access the event. */ url?: string; }; diff --git a/src/core/dpl-cms/model/eventsGET200ItemImage.ts b/src/core/dpl-cms/model/eventsGET200ItemImage.ts index 3cac388817..4456ea980e 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemImage.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemImage.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -10,6 +10,6 @@ * The main image for the event. */ export type EventsGET200ItemImage = { - /** An absolute url for the image. This is a link to the original, unaltered file, so the size, aspect ratio, and file format will be different from event to event. */ + /** An absolute URL for the image. This is a link to the original, unaltered file, so the size, aspect ratio, and file format will be different from event to event. */ url: string; }; diff --git a/src/core/dpl-cms/model/eventsGET200ItemSeries.ts b/src/core/dpl-cms/model/eventsGET200ItemSeries.ts index 0913390eea..848f4409f4 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemSeries.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemSeries.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGET200ItemState.ts b/src/core/dpl-cms/model/eventsGET200ItemState.ts index dcc7b0573d..a911485b7e 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemState.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemState.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts index 70faee9881..9d3f2f834f 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -12,4 +12,6 @@ export type EventsGET200ItemTicketCategoriesItem = { price: EventsGET200ItemTicketCategoriesItemPrice; /** The name of the ticket category. */ title: string; + /** A unique identifier for the ticket category. */ + uuid?: string; }; diff --git a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemPrice.ts b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemPrice.ts index a145a77107..03370305dd 100644 --- a/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemPrice.ts +++ b/src/core/dpl-cms/model/eventsGET200ItemTicketCategoriesItemPrice.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGETFormat.ts b/src/core/dpl-cms/model/eventsGETFormat.ts index 71a0b96090..0934dc67cc 100644 --- a/src/core/dpl-cms/model/eventsGETFormat.ts +++ b/src/core/dpl-cms/model/eventsGETFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/eventsGETParams.ts b/src/core/dpl-cms/model/eventsGETParams.ts index b15dc6bc22..ea9111a12a 100644 --- a/src/core/dpl-cms/model/eventsGETParams.ts +++ b/src/core/dpl-cms/model/eventsGETParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -12,4 +12,8 @@ export type EventsGETParams = { * Request format */ _format?: EventsGET_Format; + /** + * Retrieve events which occur after and including the provided date. In ISO 8601 format. + */ + from_date?: string; }; diff --git a/src/core/dpl-cms/model/index.ts b/src/core/dpl-cms/model/index.ts index e26cb5d5bb..bb4925119f 100644 --- a/src/core/dpl-cms/model/index.ts +++ b/src/core/dpl-cms/model/index.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. @@ -61,3 +61,6 @@ export * from "./proxyUrlGET200"; export * from "./proxyUrlGET200Data"; export * from "./proxyUrlGETFormat"; export * from "./proxyUrlGETParams"; +export * from "./dplOpeningHoursLegacyListGET200Item"; +export * from "./dplOpeningHoursLegacyListGETFormat"; +export * from "./dplOpeningHoursLegacyListGETParams"; diff --git a/src/core/dpl-cms/model/proxyUrlGET200.ts b/src/core/dpl-cms/model/proxyUrlGET200.ts index 82205680ec..df3688d97c 100644 --- a/src/core/dpl-cms/model/proxyUrlGET200.ts +++ b/src/core/dpl-cms/model/proxyUrlGET200.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/proxyUrlGET200Data.ts b/src/core/dpl-cms/model/proxyUrlGET200Data.ts index 48289a3213..701ca63ada 100644 --- a/src/core/dpl-cms/model/proxyUrlGET200Data.ts +++ b/src/core/dpl-cms/model/proxyUrlGET200Data.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/proxyUrlGETFormat.ts b/src/core/dpl-cms/model/proxyUrlGETFormat.ts index 0ae7a0693f..6359d05679 100644 --- a/src/core/dpl-cms/model/proxyUrlGETFormat.ts +++ b/src/core/dpl-cms/model/proxyUrlGETFormat.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/dpl-cms/model/proxyUrlGETParams.ts b/src/core/dpl-cms/model/proxyUrlGETParams.ts index 05ff783973..01da6a022d 100644 --- a/src/core/dpl-cms/model/proxyUrlGETParams.ts +++ b/src/core/dpl-cms/model/proxyUrlGETParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * DPL CMS - REST API * The REST API provide by the core REST module. diff --git a/src/core/fbs/fbs.ts b/src/core/fbs/fbs.ts index 146bc5f3dd..0ee91ed34c 100644 --- a/src/core/fbs/fbs.ts +++ b/src/core/fbs/fbs.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 @@ -104,7 +104,8 @@ export type GetBranchesQueryError = ErrorType; /** * @summary Get branches for an agency. */ -export const useGetBranches = < + +export function useGetBranches< TData = Awaited>, TError = ErrorType >( @@ -116,7 +117,7 @@ export const useGetBranches = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetBranchesQueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -126,7 +127,7 @@ export const useGetBranches = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Delete existing reservations. @@ -270,7 +271,8 @@ export type GetReservationsQueryError = ErrorType; /** * @summary Get all unfulfilled reservations made by the patron (DEPRECATED). */ -export const useGetReservations = < + +export function useGetReservations< TData = Awaited>, TError = ErrorType >(options?: { @@ -279,7 +281,7 @@ export const useGetReservations = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetReservationsQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -289,7 +291,7 @@ export const useGetReservations = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -556,7 +558,8 @@ export type GetReservationsV2QueryError = ErrorType; /** * @summary Get all unfulfilled reservations made by the patron. */ -export const useGetReservationsV2 = < + +export function useGetReservationsV2< TData = Awaited>, TError = ErrorType >(options?: { @@ -565,7 +568,7 @@ export const useGetReservationsV2 = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetReservationsV2QueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -575,7 +578,7 @@ export const useGetReservationsV2 = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -769,7 +772,8 @@ export type GetAvailabilityV3QueryError = ErrorType; /** * @summary Get availability of bibliographical records. */ -export const useGetAvailabilityV3 = < + +export function useGetAvailabilityV3< TData = Awaited>, TError = ErrorType >( @@ -781,7 +785,7 @@ export const useGetAvailabilityV3 = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetAvailabilityV3QueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -791,7 +795,7 @@ export const useGetAvailabilityV3 = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -854,7 +858,8 @@ export type GetHoldingsV3QueryError = ErrorType; /** * @summary Get placement holdings for bibliographical records. */ -export const useGetHoldingsV3 = < + +export function useGetHoldingsV3< TData = Awaited>, TError = ErrorType >( @@ -866,7 +871,7 @@ export const useGetHoldingsV3 = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetHoldingsV3QueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -876,7 +881,7 @@ export const useGetHoldingsV3 = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -947,7 +952,8 @@ export type GetFeesV2QueryError = ErrorType; /** * @summary List of fees in FBS for the patron with all available information about the fee. */ -export const useGetFeesV2 = < + +export function useGetFeesV2< TData = Awaited>, TError = ErrorType >( @@ -959,7 +965,7 @@ export const useGetFeesV2 = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetFeesV2QueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -969,7 +975,7 @@ export const useGetFeesV2 = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -1409,7 +1415,8 @@ export type GetLoansV2QueryError = ErrorType; /** * @summary Get list of current loans by the patron. */ -export const useGetLoansV2 = < + +export function useGetLoansV2< TData = Awaited>, TError = ErrorType >(options?: { @@ -1418,7 +1425,7 @@ export const useGetLoansV2 = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetLoansV2QueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -1428,7 +1435,7 @@ export const useGetLoansV2 = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @@ -1489,7 +1496,8 @@ export type GetPatronInformationByPatronIdV2QueryError = ErrorType; /** * @summary Returns the patron details */ -export const useGetPatronInformationByPatronIdV2 = < + +export function useGetPatronInformationByPatronIdV2< TData = Awaited>, TError = ErrorType >( @@ -1498,7 +1506,7 @@ export const useGetPatronInformationByPatronIdV2 = < TError, TData > -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const options = getGetPatronInformationByPatronIdV2QueryOptions(queryOptions); const query = useQuery(options) as UseQueryResult & { @@ -1508,7 +1516,7 @@ export const useGetPatronInformationByPatronIdV2 = < query.queryKey = options.queryKey; return query; -}; +} /** * diff --git a/src/core/fbs/model/address.ts b/src/core/fbs/model/address.ts index d49eee4d3c..3c4cbb6f30 100644 --- a/src/core/fbs/model/address.ts +++ b/src/core/fbs/model/address.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/addressV2.ts b/src/core/fbs/model/addressV2.ts index 83c0983e16..a962617938 100644 --- a/src/core/fbs/model/addressV2.ts +++ b/src/core/fbs/model/addressV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/agencyBranch.ts b/src/core/fbs/model/agencyBranch.ts index b128a97776..8b8931a32a 100644 --- a/src/core/fbs/model/agencyBranch.ts +++ b/src/core/fbs/model/agencyBranch.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/agencyDepartment.ts b/src/core/fbs/model/agencyDepartment.ts index 125397ac6b..805d4aa9dc 100644 --- a/src/core/fbs/model/agencyDepartment.ts +++ b/src/core/fbs/model/agencyDepartment.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/agencyLocation.ts b/src/core/fbs/model/agencyLocation.ts index cdbc024790..b8792ff84a 100644 --- a/src/core/fbs/model/agencyLocation.ts +++ b/src/core/fbs/model/agencyLocation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/agencySublocation.ts b/src/core/fbs/model/agencySublocation.ts index b86b4ea72e..af285dc736 100644 --- a/src/core/fbs/model/agencySublocation.ts +++ b/src/core/fbs/model/agencySublocation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/authenticatedPatronV4.ts b/src/core/fbs/model/authenticatedPatronV4.ts index 34b6364295..e68bae4b98 100644 --- a/src/core/fbs/model/authenticatedPatronV4.ts +++ b/src/core/fbs/model/authenticatedPatronV4.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/authenticatedPatronV6.ts b/src/core/fbs/model/authenticatedPatronV6.ts index 979e922174..6f864c3488 100644 --- a/src/core/fbs/model/authenticatedPatronV6.ts +++ b/src/core/fbs/model/authenticatedPatronV6.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/authenticatedPatronV6AuthenticateStatus.ts b/src/core/fbs/model/authenticatedPatronV6AuthenticateStatus.ts index f45f68a1bd..66d222ac7f 100644 --- a/src/core/fbs/model/authenticatedPatronV6AuthenticateStatus.ts +++ b/src/core/fbs/model/authenticatedPatronV6AuthenticateStatus.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/availabilityV3.ts b/src/core/fbs/model/availabilityV3.ts index c106b74a40..8fec34a66a 100644 --- a/src/core/fbs/model/availabilityV3.ts +++ b/src/core/fbs/model/availabilityV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/blockStatus.ts b/src/core/fbs/model/blockStatus.ts index ca17083159..d9bf2f90e8 100644 --- a/src/core/fbs/model/blockStatus.ts +++ b/src/core/fbs/model/blockStatus.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/booking.ts b/src/core/fbs/model/booking.ts index cec6bdfc95..3d7128dc5d 100644 --- a/src/core/fbs/model/booking.ts +++ b/src/core/fbs/model/booking.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/bookingInfo.ts b/src/core/fbs/model/bookingInfo.ts index 26a70edda1..208a62a65a 100644 --- a/src/core/fbs/model/bookingInfo.ts +++ b/src/core/fbs/model/bookingInfo.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/createBooking.ts b/src/core/fbs/model/createBooking.ts index 402aac12eb..1624b894bb 100644 --- a/src/core/fbs/model/createBooking.ts +++ b/src/core/fbs/model/createBooking.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/createPatronRequestV3.ts b/src/core/fbs/model/createPatronRequestV3.ts index fb086c4d92..16c3fdb7b9 100644 --- a/src/core/fbs/model/createPatronRequestV3.ts +++ b/src/core/fbs/model/createPatronRequestV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/createReservation.ts b/src/core/fbs/model/createReservation.ts index 07beb7a46d..564bbf3895 100644 --- a/src/core/fbs/model/createReservation.ts +++ b/src/core/fbs/model/createReservation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/createReservationBatch.ts b/src/core/fbs/model/createReservationBatch.ts index d24926de16..1f2051cbf0 100644 --- a/src/core/fbs/model/createReservationBatch.ts +++ b/src/core/fbs/model/createReservationBatch.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/createReservationBatchV2.ts b/src/core/fbs/model/createReservationBatchV2.ts index 5722600226..70d7570f7b 100644 --- a/src/core/fbs/model/createReservationBatchV2.ts +++ b/src/core/fbs/model/createReservationBatchV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/deleteReservationsParams.ts b/src/core/fbs/model/deleteReservationsParams.ts index 8458e1b08b..71398c1b20 100644 --- a/src/core/fbs/model/deleteReservationsParams.ts +++ b/src/core/fbs/model/deleteReservationsParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/feeMaterial.ts b/src/core/fbs/model/feeMaterial.ts index 8d4450b6c4..d658674a24 100644 --- a/src/core/fbs/model/feeMaterial.ts +++ b/src/core/fbs/model/feeMaterial.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/feeMaterialV2.ts b/src/core/fbs/model/feeMaterialV2.ts index 235533a233..b6adcb7a88 100644 --- a/src/core/fbs/model/feeMaterialV2.ts +++ b/src/core/fbs/model/feeMaterialV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/feeV2.ts b/src/core/fbs/model/feeV2.ts index 19f9e1015d..0b1226c1c9 100644 --- a/src/core/fbs/model/feeV2.ts +++ b/src/core/fbs/model/feeV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/getAvailabilityV3Params.ts b/src/core/fbs/model/getAvailabilityV3Params.ts index 2310c054a8..e1d2236df2 100644 --- a/src/core/fbs/model/getAvailabilityV3Params.ts +++ b/src/core/fbs/model/getAvailabilityV3Params.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/getBranchesParams.ts b/src/core/fbs/model/getBranchesParams.ts index e28881907d..f1b995715d 100644 --- a/src/core/fbs/model/getBranchesParams.ts +++ b/src/core/fbs/model/getBranchesParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/getFeesV2Params.ts b/src/core/fbs/model/getFeesV2Params.ts index 606bcda7df..84302d5270 100644 --- a/src/core/fbs/model/getFeesV2Params.ts +++ b/src/core/fbs/model/getFeesV2Params.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/getHoldingsV3Params.ts b/src/core/fbs/model/getHoldingsV3Params.ts index 9cec7878b0..8a5a50d256 100644 --- a/src/core/fbs/model/getHoldingsV3Params.ts +++ b/src/core/fbs/model/getHoldingsV3Params.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/guardian.ts b/src/core/fbs/model/guardian.ts index 053046a9ba..a805cb402a 100644 --- a/src/core/fbs/model/guardian.ts +++ b/src/core/fbs/model/guardian.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/holdings.ts b/src/core/fbs/model/holdings.ts index 21ab55c429..02a35a930e 100644 --- a/src/core/fbs/model/holdings.ts +++ b/src/core/fbs/model/holdings.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/holdingsForBibliographicalRecordV3.ts b/src/core/fbs/model/holdingsForBibliographicalRecordV3.ts index 4eaf02e099..4602051365 100644 --- a/src/core/fbs/model/holdingsForBibliographicalRecordV3.ts +++ b/src/core/fbs/model/holdingsForBibliographicalRecordV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/holdingsV3.ts b/src/core/fbs/model/holdingsV3.ts index 22981ccc51..b7c1cff08a 100644 --- a/src/core/fbs/model/holdingsV3.ts +++ b/src/core/fbs/model/holdingsV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/iLLBibliographicRecord.ts b/src/core/fbs/model/iLLBibliographicRecord.ts index 451280906a..e16fd18314 100644 --- a/src/core/fbs/model/iLLBibliographicRecord.ts +++ b/src/core/fbs/model/iLLBibliographicRecord.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/index.ts b/src/core/fbs/model/index.ts index e41e120c5f..9657dc4202 100644 --- a/src/core/fbs/model/index.ts +++ b/src/core/fbs/model/index.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/loanDetails.ts b/src/core/fbs/model/loanDetails.ts index 9e6f0429e7..b8ed056ca1 100644 --- a/src/core/fbs/model/loanDetails.ts +++ b/src/core/fbs/model/loanDetails.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/loanDetailsV2.ts b/src/core/fbs/model/loanDetailsV2.ts index 335f9d0586..a9860ae07e 100644 --- a/src/core/fbs/model/loanDetailsV2.ts +++ b/src/core/fbs/model/loanDetailsV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/loanV2.ts b/src/core/fbs/model/loanV2.ts index d449e678b2..57ad70ba62 100644 --- a/src/core/fbs/model/loanV2.ts +++ b/src/core/fbs/model/loanV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/material.ts b/src/core/fbs/model/material.ts index 5cfe05d0ca..991e68cc8f 100644 --- a/src/core/fbs/model/material.ts +++ b/src/core/fbs/model/material.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/materialGroup.ts b/src/core/fbs/model/materialGroup.ts index fce4c3da89..0bac204d2b 100644 --- a/src/core/fbs/model/materialGroup.ts +++ b/src/core/fbs/model/materialGroup.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/materialV3.ts b/src/core/fbs/model/materialV3.ts index 4abff76662..6f35db7a8c 100644 --- a/src/core/fbs/model/materialV3.ts +++ b/src/core/fbs/model/materialV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patron.ts b/src/core/fbs/model/patron.ts index 0a03876858..5e1b465886 100644 --- a/src/core/fbs/model/patron.ts +++ b/src/core/fbs/model/patron.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronGroup.ts b/src/core/fbs/model/patronGroup.ts index 71bc73d8b8..567dc6bc77 100644 --- a/src/core/fbs/model/patronGroup.ts +++ b/src/core/fbs/model/patronGroup.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronSettings.ts b/src/core/fbs/model/patronSettings.ts index d6adcee884..1c3e6ba9e7 100644 --- a/src/core/fbs/model/patronSettings.ts +++ b/src/core/fbs/model/patronSettings.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronSettingsV3.ts b/src/core/fbs/model/patronSettingsV3.ts index 5c547c9b68..28e661de43 100644 --- a/src/core/fbs/model/patronSettingsV3.ts +++ b/src/core/fbs/model/patronSettingsV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronSettingsV4.ts b/src/core/fbs/model/patronSettingsV4.ts index 087a63d39d..98d0e210a3 100644 --- a/src/core/fbs/model/patronSettingsV4.ts +++ b/src/core/fbs/model/patronSettingsV4.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronV3.ts b/src/core/fbs/model/patronV3.ts index a5bdb95e8c..59c601e8f4 100644 --- a/src/core/fbs/model/patronV3.ts +++ b/src/core/fbs/model/patronV3.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronV4.ts b/src/core/fbs/model/patronV4.ts index 182105782a..2b9a5f7f6d 100644 --- a/src/core/fbs/model/patronV4.ts +++ b/src/core/fbs/model/patronV4.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronV5.ts b/src/core/fbs/model/patronV5.ts index afa97f7aaa..cc920aa8b6 100644 --- a/src/core/fbs/model/patronV5.ts +++ b/src/core/fbs/model/patronV5.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/patronWithGuardianRequest.ts b/src/core/fbs/model/patronWithGuardianRequest.ts index 92f76fd891..13c2597d71 100644 --- a/src/core/fbs/model/patronWithGuardianRequest.ts +++ b/src/core/fbs/model/patronWithGuardianRequest.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/period.ts b/src/core/fbs/model/period.ts index c2cb1134a5..dbf0a93209 100644 --- a/src/core/fbs/model/period.ts +++ b/src/core/fbs/model/period.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/periodical.ts b/src/core/fbs/model/periodical.ts index 93d36b53f7..49fa9ad2f5 100644 --- a/src/core/fbs/model/periodical.ts +++ b/src/core/fbs/model/periodical.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/periodicalReservation.ts b/src/core/fbs/model/periodicalReservation.ts index 5f028cd9b7..78eb20d50d 100644 --- a/src/core/fbs/model/periodicalReservation.ts +++ b/src/core/fbs/model/periodicalReservation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/pincodeChange.ts b/src/core/fbs/model/pincodeChange.ts index 5508228811..2d5958a1d8 100644 --- a/src/core/fbs/model/pincodeChange.ts +++ b/src/core/fbs/model/pincodeChange.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/renewedLoanV2.ts b/src/core/fbs/model/renewedLoanV2.ts index 7867cc8e9a..5ec0cc97b6 100644 --- a/src/core/fbs/model/renewedLoanV2.ts +++ b/src/core/fbs/model/renewedLoanV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/reservationDetails.ts b/src/core/fbs/model/reservationDetails.ts index 7efa942efb..25da6d82fe 100644 --- a/src/core/fbs/model/reservationDetails.ts +++ b/src/core/fbs/model/reservationDetails.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/reservationDetailsV2.ts b/src/core/fbs/model/reservationDetailsV2.ts index 0c86aaeee7..4d3a013d15 100644 --- a/src/core/fbs/model/reservationDetailsV2.ts +++ b/src/core/fbs/model/reservationDetailsV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/reservationResponseV2.ts b/src/core/fbs/model/reservationResponseV2.ts index aafe8460b8..8e52d87beb 100644 --- a/src/core/fbs/model/reservationResponseV2.ts +++ b/src/core/fbs/model/reservationResponseV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/reservationResult.ts b/src/core/fbs/model/reservationResult.ts index cc0cf8ecc8..48e61042b1 100644 --- a/src/core/fbs/model/reservationResult.ts +++ b/src/core/fbs/model/reservationResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/reservationResultV2.ts b/src/core/fbs/model/reservationResultV2.ts index 475a1fb5d0..9d2b0ab4e6 100644 --- a/src/core/fbs/model/reservationResultV2.ts +++ b/src/core/fbs/model/reservationResultV2.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/updateGuardianRequest.ts b/src/core/fbs/model/updateGuardianRequest.ts index c4161c7b86..065051c195 100644 --- a/src/core/fbs/model/updateGuardianRequest.ts +++ b/src/core/fbs/model/updateGuardianRequest.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/updatePatronRequestV4.ts b/src/core/fbs/model/updatePatronRequestV4.ts index e61234d3b0..947bf25802 100644 --- a/src/core/fbs/model/updatePatronRequestV4.ts +++ b/src/core/fbs/model/updatePatronRequestV4.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/updateReservation.ts b/src/core/fbs/model/updateReservation.ts index 658603ac95..0223bead72 100644 --- a/src/core/fbs/model/updateReservation.ts +++ b/src/core/fbs/model/updateReservation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/fbs/model/updateReservationBatch.ts b/src/core/fbs/model/updateReservationBatch.ts index 6cfc2e734c..fc9661fc19 100644 --- a/src/core/fbs/model/updateReservationBatch.ts +++ b/src/core/fbs/model/updateReservationBatch.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * FBS Adapter * OpenAPI spec version: 1.0 diff --git a/src/core/material-list-api/material-list.ts b/src/core/material-list-api/material-list.ts index 81a9b35ac0..4164b3a406 100644 --- a/src/core/material-list-api/material-list.ts +++ b/src/core/material-list-api/material-list.ts @@ -1,27 +1,22 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 */ -import { - useQuery, - useMutation, - UseQueryOptions, - UseMutationOptions, - QueryFunction, +import { useMutation, useQuery } from "react-query"; +import type { MutationFunction, - UseQueryResult, + QueryFunction, QueryKey, - useQueryClient, - QueryClient + UseMutationOptions, + UseMutationResult, + UseQueryOptions, + UseQueryResult } from "react-query"; -import type { List, GetListParams } from "./model"; -import { fetcher, ErrorType } from "./mutator/fetcher"; - -type AwaitedInput = PromiseLike | T; - -type Awaited = O extends AwaitedInput ? T : never; +import type { GetListParams, List } from "./model"; +import { fetcher } from "./mutator/fetcher"; +import type { ErrorType } from "./mutator/fetcher"; /** * Get list with collections. @@ -33,23 +28,17 @@ export const getList = ( ) => { return fetcher({ url: `/list/${listId}`, - method: "get", - signal, - params + method: "GET", + params, + signal }); }; -export const getGetListQueryKey = (listId: string, params?: GetListParams) => [ - `/list/${listId}`, - ...(params ? [params] : []) -]; - -export type GetListQueryResult = NonNullable< - Awaited> ->; -export type GetListQueryError = ErrorType; +export const getGetListQueryKey = (listId: string, params?: GetListParams) => { + return [`/list/${listId}`, ...(params ? [params] : [])] as const; +}; -export const useGetList = < +export const getGetListQueryOptions = < TData = Awaited>, TError = ErrorType >( @@ -58,7 +47,7 @@ export const useGetList = < options?: { query?: UseQueryOptions>, TError, TData>; } -): UseQueryResult & { queryKey: QueryKey } => { +) => { const { query: queryOptions } = options ?? {}; const queryKey = queryOptions?.queryKey ?? getGetListQueryKey(listId, params); @@ -67,18 +56,42 @@ export const useGetList = < signal }) => getList(listId, params, signal); - const query = useQuery>, TError, TData>( - queryKey, - queryFn, - { enabled: !!listId, ...queryOptions } - ); - return { queryKey, - ...query + queryFn, + enabled: !!listId, + ...queryOptions + } as UseQueryOptions>, TError, TData> & { + queryKey: QueryKey; }; }; +export type GetListQueryResult = NonNullable< + Awaited> +>; +export type GetListQueryError = ErrorType; + +export function useGetList< + TData = Awaited>, + TError = ErrorType +>( + listId: string, + params?: GetListParams, + options?: { + query?: UseQueryOptions>, TError, TData>; + } +): UseQueryResult & { queryKey: QueryKey } { + const queryOptions = getGetListQueryOptions(listId, params, options); + + const query = useQuery(queryOptions) as UseQueryResult & { + queryKey: QueryKey; + }; + + query.queryKey = queryOptions.queryKey; + + return query; +} + /** * Check existence of a collection on a list. To check multiple collections in one request, see the collection_ids query parameter on /list/{listId}. */ @@ -89,19 +102,13 @@ export const hasItem = ( ) => { return fetcher({ url: `/list/${listId}/${itemId}`, - method: "head", + method: "HEAD", signal }); }; -export type HasItemMutationResult = NonNullable< - Awaited> ->; - -export type HasItemMutationError = ErrorType; - -export const useHasItem = < - TError = ErrorType, +export const getHasItemMutationOptions = < + TError = ErrorType, TContext = unknown >(options?: { mutation?: UseMutationOptions< @@ -110,7 +117,12 @@ export const useHasItem = < { listId: string; itemId: string }, TContext >; -}) => { +}): UseMutationOptions< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { const { mutation: mutationOptions } = options ?? {}; const mutationFn: MutationFunction< @@ -122,36 +134,45 @@ export const useHasItem = < return hasItem(listId, itemId); }; - return useMutation< + return { mutationFn, ...mutationOptions }; +}; + +export type HasItemMutationResult = NonNullable< + Awaited> +>; + +export type HasItemMutationError = ErrorType; + +export const useHasItem = < + TError = ErrorType, + TContext = unknown +>(options?: { + mutation?: UseMutationOptions< Awaited>, TError, { listId: string; itemId: string }, TContext - >(mutationFn, mutationOptions); + >; +}): UseMutationResult< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { + const mutationOptions = getHasItemMutationOptions(options); + + return useMutation(mutationOptions); }; /** * Add collection to the the list. */ -export const addItem = ( - listId: string, - itemId: string, - queryClient: QueryClient -): Promise => { - return fetcher({ - url: `/list/${listId}/${itemId}`, - method: "put" - }).then(() => queryClient.invalidateQueries(getGetListQueryKey(listId))); +export const addItem = (listId: string, itemId: string) => { + return fetcher({ url: `/list/${listId}/${itemId}`, method: "PUT" }); }; -export type AddItemMutationResult = NonNullable< - Awaited> ->; - -export type AddItemMutationError = ErrorType; - -export const useAddItem = < - TError = ErrorType, +export const getAddItemMutationOptions = < + TError = ErrorType, TContext = unknown >(options?: { mutation?: UseMutationOptions< @@ -160,8 +181,12 @@ export const useAddItem = < { listId: string; itemId: string }, TContext >; -}) => { - const queryClient = useQueryClient(); +}): UseMutationOptions< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { const { mutation: mutationOptions } = options ?? {}; const mutationFn: MutationFunction< @@ -170,41 +195,48 @@ export const useAddItem = < > = (props) => { const { listId, itemId } = props ?? {}; - return addItem(listId, itemId, queryClient); + return addItem(listId, itemId); }; - return useMutation< + return { mutationFn, ...mutationOptions }; +}; + +export type AddItemMutationResult = NonNullable< + Awaited> +>; + +export type AddItemMutationError = ErrorType; + +export const useAddItem = < + TError = ErrorType, + TContext = unknown +>(options?: { + mutation?: UseMutationOptions< Awaited>, TError, { listId: string; itemId: string }, TContext - >(mutationFn, mutationOptions); + >; +}): UseMutationResult< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { + const mutationOptions = getAddItemMutationOptions(options); + + return useMutation(mutationOptions); }; /** * Delete collection from list. */ -export const removeItem = ( - listId: string, - itemId: string, - queryClient: QueryClient -): Promise => { - return fetcher({ - url: `/list/${listId}/${itemId}`, - method: "delete" - }).then(() => queryClient.invalidateQueries(getGetListQueryKey(listId))); +export const removeItem = (listId: string, itemId: string) => { + return fetcher({ url: `/list/${listId}/${itemId}`, method: "DELETE" }); }; -export type RemoveItemMutationResult = NonNullable< - Awaited> ->; - -export type RemoveItemMutationError = ErrorType; - -// TODO: I probably had greatness and prosperity in mind when creating this function, -// but I'm not sure how it functions. Find out or delete. -export const useRemoveItem = < - TError = ErrorType, +export const getRemoveItemMutationOptions = < + TError = ErrorType, TContext = unknown >(options?: { mutation?: UseMutationOptions< @@ -213,8 +245,12 @@ export const useRemoveItem = < { listId: string; itemId: string }, TContext >; -}) => { - const queryClient = useQueryClient(); +}): UseMutationOptions< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { const { mutation: mutationOptions } = options ?? {}; const mutationFn: MutationFunction< @@ -223,13 +259,35 @@ export const useRemoveItem = < > = (props) => { const { listId, itemId } = props ?? {}; - return removeItem(listId, itemId, queryClient); + return removeItem(listId, itemId); }; - return useMutation< + return { mutationFn, ...mutationOptions }; +}; + +export type RemoveItemMutationResult = NonNullable< + Awaited> +>; + +export type RemoveItemMutationError = ErrorType; + +export const useRemoveItem = < + TError = ErrorType, + TContext = unknown +>(options?: { + mutation?: UseMutationOptions< Awaited>, TError, { listId: string; itemId: string }, TContext - >(mutationFn, mutationOptions); + >; +}): UseMutationResult< + Awaited>, + TError, + { listId: string; itemId: string }, + TContext +> => { + const mutationOptions = getRemoveItemMutationOptions(options); + + return useMutation(mutationOptions); }; diff --git a/src/core/material-list-api/model/collectionIdsParameter.ts b/src/core/material-list-api/model/collectionIdsParameter.ts index 2a96912a04..93c40bc586 100644 --- a/src/core/material-list-api/model/collectionIdsParameter.ts +++ b/src/core/material-list-api/model/collectionIdsParameter.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 diff --git a/src/core/material-list-api/model/getListParams.ts b/src/core/material-list-api/model/getListParams.ts index 6c79331771..969f722bd6 100644 --- a/src/core/material-list-api/model/getListParams.ts +++ b/src/core/material-list-api/model/getListParams.ts @@ -1,9 +1,14 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 */ import type { CollectionIdsParameter } from "./collectionIdsParameter"; -export type GetListParams = { collection_ids?: CollectionIdsParameter }; +export type GetListParams = { + /** + * Filter the list reply down to the given collection identifiers. This is the recommended way to check for existence of multiple collections on the list. + */ + collection_ids?: CollectionIdsParameter; +}; diff --git a/src/core/material-list-api/model/index.ts b/src/core/material-list-api/model/index.ts index 3ed0a3f2ba..f87617425c 100644 --- a/src/core/material-list-api/model/index.ts +++ b/src/core/material-list-api/model/index.ts @@ -1,6 +1,13 @@ -export * from "./listId"; +/** + * Generated by orval v7.2.0 🍺 + * Do not edit manually. + * Collection List + * OpenAPI spec version: 2.0.0 + */ + +export * from "./collectionIdsParameter"; +export * from "./getListParams"; export * from "./itemId"; export * from "./legacyUserId"; export * from "./list"; -export * from "./collectionIdsParameter"; -export * from "./getListParams"; +export * from "./listId"; diff --git a/src/core/material-list-api/model/itemId.ts b/src/core/material-list-api/model/itemId.ts index d8cb6f9a39..2389651836 100644 --- a/src/core/material-list-api/model/itemId.ts +++ b/src/core/material-list-api/model/itemId.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 @@ -7,5 +7,6 @@ /** * A collection identifier in the form -:. + * @pattern ^\d+-\w+:\w+$ */ export type ItemId = string; diff --git a/src/core/material-list-api/model/legacyUserId.ts b/src/core/material-list-api/model/legacyUserId.ts index 4e2fced561..5f3c9ad8a8 100644 --- a/src/core/material-list-api/model/legacyUserId.ts +++ b/src/core/material-list-api/model/legacyUserId.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 diff --git a/src/core/material-list-api/model/list.ts b/src/core/material-list-api/model/list.ts index 88a58d527e..98f9effa68 100644 --- a/src/core/material-list-api/model/list.ts +++ b/src/core/material-list-api/model/list.ts @@ -1,13 +1,13 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 */ -import type { ListId } from "./listId"; import type { ItemId } from "./itemId"; +import type { ListId } from "./listId"; export interface List { - id: ListId; collections: ItemId[]; + id: ListId; } diff --git a/src/core/material-list-api/model/listId.ts b/src/core/material-list-api/model/listId.ts index 31432f1b7b..ea26164611 100644 --- a/src/core/material-list-api/model/listId.ts +++ b/src/core/material-list-api/model/listId.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.8.1 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Collection List * OpenAPI spec version: 2.0.0 diff --git a/src/core/publizon/model/apiResponseCode.ts b/src/core/publizon/model/apiResponseCode.ts index 6d96e31d1d..9a61b8bf38 100644 --- a/src/core/publizon/model/apiResponseCode.ts +++ b/src/core/publizon/model/apiResponseCode.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/apiResult.ts b/src/core/publizon/model/apiResult.ts index da3c9a19c5..94f17d10c3 100644 --- a/src/core/publizon/model/apiResult.ts +++ b/src/core/publizon/model/apiResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/bookTypes.ts b/src/core/publizon/model/bookTypes.ts index 5ae6e8a95f..7ed0903748 100644 --- a/src/core/publizon/model/bookTypes.ts +++ b/src/core/publizon/model/bookTypes.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/checklistItem.ts b/src/core/publizon/model/checklistItem.ts index 1a698b7cdf..e109dec290 100644 --- a/src/core/publizon/model/checklistItem.ts +++ b/src/core/publizon/model/checklistItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/checklistResult.ts b/src/core/publizon/model/checklistResult.ts index 4027c97941..c78c54278f 100644 --- a/src/core/publizon/model/checklistResult.ts +++ b/src/core/publizon/model/checklistResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/contentLoanStatusEnum.ts b/src/core/publizon/model/contentLoanStatusEnum.ts index b72d0eaed7..5609eb7268 100644 --- a/src/core/publizon/model/contentLoanStatusEnum.ts +++ b/src/core/publizon/model/contentLoanStatusEnum.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/createLoanResult.ts b/src/core/publizon/model/createLoanResult.ts index 37f568c981..755df076d1 100644 --- a/src/core/publizon/model/createLoanResult.ts +++ b/src/core/publizon/model/createLoanResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/fileExtensionType.ts b/src/core/publizon/model/fileExtensionType.ts index 2fb61e5c68..1fe29fc2e0 100644 --- a/src/core/publizon/model/fileExtensionType.ts +++ b/src/core/publizon/model/fileExtensionType.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/friendlyCardResult.ts b/src/core/publizon/model/friendlyCardResult.ts index 649e8cdc03..7c96cba709 100644 --- a/src/core/publizon/model/friendlyCardResult.ts +++ b/src/core/publizon/model/friendlyCardResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/getV1UserLoansParams.ts b/src/core/publizon/model/getV1UserLoansParams.ts index 0f1f47c107..ae26bd4b3d 100644 --- a/src/core/publizon/model/getV1UserLoansParams.ts +++ b/src/core/publizon/model/getV1UserLoansParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/identifierTypeEnum.ts b/src/core/publizon/model/identifierTypeEnum.ts index b3b4154e7b..1e80318bb3 100644 --- a/src/core/publizon/model/identifierTypeEnum.ts +++ b/src/core/publizon/model/identifierTypeEnum.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/index.ts b/src/core/publizon/model/index.ts index dd63840abe..ffa8647de6 100644 --- a/src/core/publizon/model/index.ts +++ b/src/core/publizon/model/index.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryBook.ts b/src/core/publizon/model/libraryBook.ts index 1d2dbca40e..94308034a1 100644 --- a/src/core/publizon/model/libraryBook.ts +++ b/src/core/publizon/model/libraryBook.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryData.ts b/src/core/publizon/model/libraryData.ts index 2940e50e80..d235b4226d 100644 --- a/src/core/publizon/model/libraryData.ts +++ b/src/core/publizon/model/libraryData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryProductCategory.ts b/src/core/publizon/model/libraryProductCategory.ts index c700064fc0..edc0021eea 100644 --- a/src/core/publizon/model/libraryProductCategory.ts +++ b/src/core/publizon/model/libraryProductCategory.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryProductContributor.ts b/src/core/publizon/model/libraryProductContributor.ts index 38bd7fa1fd..5bea2655fb 100644 --- a/src/core/publizon/model/libraryProductContributor.ts +++ b/src/core/publizon/model/libraryProductContributor.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryProductExternalId.ts b/src/core/publizon/model/libraryProductExternalId.ts index ae62abda9a..b7cd35364c 100644 --- a/src/core/publizon/model/libraryProductExternalId.ts +++ b/src/core/publizon/model/libraryProductExternalId.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/libraryProfile.ts b/src/core/publizon/model/libraryProfile.ts index 53eb0e022b..404a366b26 100644 --- a/src/core/publizon/model/libraryProfile.ts +++ b/src/core/publizon/model/libraryProfile.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loan.ts b/src/core/publizon/model/loan.ts index d613f6444a..85f0aef436 100644 --- a/src/core/publizon/model/loan.ts +++ b/src/core/publizon/model/loan.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loanListResult.ts b/src/core/publizon/model/loanListResult.ts index 387f8f11de..d29f2e3398 100644 --- a/src/core/publizon/model/loanListResult.ts +++ b/src/core/publizon/model/loanListResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loanResult.ts b/src/core/publizon/model/loanResult.ts index fcc851e0bf..8c07955fae 100644 --- a/src/core/publizon/model/loanResult.ts +++ b/src/core/publizon/model/loanResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loanStatusItem.ts b/src/core/publizon/model/loanStatusItem.ts index 5810816270..c9e7469a2a 100644 --- a/src/core/publizon/model/loanStatusItem.ts +++ b/src/core/publizon/model/loanStatusItem.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loanStatusListResult.ts b/src/core/publizon/model/loanStatusListResult.ts index d63c16b67e..4a8bbbef7b 100644 --- a/src/core/publizon/model/loanStatusListResult.ts +++ b/src/core/publizon/model/loanStatusListResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/loanStatusResult.ts b/src/core/publizon/model/loanStatusResult.ts index 073132f3dc..b81f1e5d8f 100644 --- a/src/core/publizon/model/loanStatusResult.ts +++ b/src/core/publizon/model/loanStatusResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/postV1UserLoansIdentifierParams.ts b/src/core/publizon/model/postV1UserLoansIdentifierParams.ts index 6bfb126c51..57839cac6d 100644 --- a/src/core/publizon/model/postV1UserLoansIdentifierParams.ts +++ b/src/core/publizon/model/postV1UserLoansIdentifierParams.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/product.ts b/src/core/publizon/model/product.ts index 907ed5269e..a4ed4d3506 100644 --- a/src/core/publizon/model/product.ts +++ b/src/core/publizon/model/product.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/productListResult.ts b/src/core/publizon/model/productListResult.ts index f1c51b493c..2f5e6cd160 100644 --- a/src/core/publizon/model/productListResult.ts +++ b/src/core/publizon/model/productListResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/productResult.ts b/src/core/publizon/model/productResult.ts index 2a6af7f7cf..a93405cc15 100644 --- a/src/core/publizon/model/productResult.ts +++ b/src/core/publizon/model/productResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/reservation.ts b/src/core/publizon/model/reservation.ts index 75f0a4309f..f929def599 100644 --- a/src/core/publizon/model/reservation.ts +++ b/src/core/publizon/model/reservation.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/reservationInput.ts b/src/core/publizon/model/reservationInput.ts index a883f129e7..b7c5052a5c 100644 --- a/src/core/publizon/model/reservationInput.ts +++ b/src/core/publizon/model/reservationInput.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/reservationListResult.ts b/src/core/publizon/model/reservationListResult.ts index 437b9ab386..a5f7bf8b5c 100644 --- a/src/core/publizon/model/reservationListResult.ts +++ b/src/core/publizon/model/reservationListResult.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/testCard.ts b/src/core/publizon/model/testCard.ts index 53417c7abf..8a250bcb5f 100644 --- a/src/core/publizon/model/testCard.ts +++ b/src/core/publizon/model/testCard.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/model/userData.ts b/src/core/publizon/model/userData.ts index a2c3cd4df3..bb0a7997a0 100644 --- a/src/core/publizon/model/userData.ts +++ b/src/core/publizon/model/userData.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. diff --git a/src/core/publizon/publizon.ts b/src/core/publizon/publizon.ts index 6cae42e572..d1ffe369fe 100644 --- a/src/core/publizon/publizon.ts +++ b/src/core/publizon/publizon.ts @@ -1,5 +1,5 @@ /** - * Generated by orval v6.26.0 🍺 + * Generated by orval v7.2.0 🍺 * Do not edit manually. * Publizon Library API * Pubhub exists in two separate environments, each with their own server, code and database. Please use the web service located at library-api.qa.pubhub.dk when developing and testing. @@ -91,7 +91,8 @@ export type GetV1UserCardnumberFriendlyQueryError = ErrorType; /** * @summary Gets the user's friendly card number. */ -export const useGetV1UserCardnumberFriendly = < + +export function useGetV1UserCardnumberFriendly< TData = Awaited>, TError = ErrorType >(options?: { @@ -100,7 +101,7 @@ export const useGetV1UserCardnumberFriendly = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1UserCardnumberFriendlyQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -110,7 +111,7 @@ export const useGetV1UserCardnumberFriendly = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary List all checklist items of the user. @@ -160,7 +161,8 @@ export type GetV1UserChecklistQueryError = ErrorType; /** * @summary List all checklist items of the user. */ -export const useGetV1UserChecklist = < + +export function useGetV1UserChecklist< TData = Awaited>, TError = ErrorType >(options?: { @@ -169,7 +171,7 @@ export const useGetV1UserChecklist = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1UserChecklistQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -179,7 +181,7 @@ export const useGetV1UserChecklist = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Add a book to the user's checklist. @@ -365,7 +367,7 @@ export type GetV1LibraryProfileQueryResult = NonNullable< >; export type GetV1LibraryProfileQueryError = ErrorType; -export const useGetV1LibraryProfile = < +export function useGetV1LibraryProfile< TData = Awaited>, TError = ErrorType >(options?: { @@ -374,7 +376,7 @@ export const useGetV1LibraryProfile = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1LibraryProfileQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -384,7 +386,7 @@ export const useGetV1LibraryProfile = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Lists all active loans of the user. @@ -441,7 +443,8 @@ export type GetV1UserLoansQueryError = ErrorType; /** * @summary Lists all active loans of the user. */ -export const useGetV1UserLoans = < + +export function useGetV1UserLoans< TData = Awaited>, TError = ErrorType >( @@ -453,7 +456,7 @@ export const useGetV1UserLoans = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1UserLoansQueryOptions(params, options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -463,7 +466,7 @@ export const useGetV1UserLoans = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Gets details of a specific loan. @@ -525,7 +528,8 @@ export type GetV1UserLoansIdentifierQueryError = ErrorType; /** * @summary Gets details of a specific loan. */ -export const useGetV1UserLoansIdentifier = < + +export function useGetV1UserLoansIdentifier< TData = Awaited>, TError = ErrorType >( @@ -537,7 +541,7 @@ export const useGetV1UserLoansIdentifier = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1UserLoansIdentifierQueryOptions( identifier, options @@ -550,7 +554,7 @@ export const useGetV1UserLoansIdentifier = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Creates a new loan. @@ -682,7 +686,8 @@ export type GetV1LoanstatusIdentifierQueryError = ErrorType; /** * @summary Get loan status of a specific product. */ -export const useGetV1LoanstatusIdentifier = < + +export function useGetV1LoanstatusIdentifier< TData = Awaited>, TError = ErrorType >( @@ -692,7 +697,7 @@ export const useGetV1LoanstatusIdentifier = < TError, TData > -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const options = getGetV1LoanstatusIdentifierQueryOptions( identifier, queryOptions @@ -705,7 +710,7 @@ export const useGetV1LoanstatusIdentifier = < query.queryKey = options.queryKey; return query; -}; +} /** * @summary Get loan status of all products. @@ -839,7 +844,8 @@ export type GetV1ProductsIdentifierQueryError = ErrorType; /** * @summary Get a specific product. */ -export const useGetV1ProductsIdentifier = < + +export function useGetV1ProductsIdentifier< TData = Awaited>, TError = ErrorType >( @@ -851,7 +857,7 @@ export const useGetV1ProductsIdentifier = < TData >; } -): UseQueryResult & { queryKey: QueryKey } => { +): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1ProductsIdentifierQueryOptions( identifier, options @@ -864,7 +870,7 @@ export const useGetV1ProductsIdentifier = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary List all products. @@ -914,7 +920,8 @@ export type GetV1ProductsQueryError = ErrorType; /** * @summary List all products. */ -export const useGetV1Products = < + +export function useGetV1Products< TData = Awaited>, TError = ErrorType >(options?: { @@ -923,7 +930,7 @@ export const useGetV1Products = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1ProductsQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -933,7 +940,7 @@ export const useGetV1Products = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Lists all reservations of the user. @@ -983,7 +990,8 @@ export type GetV1UserReservationsQueryError = ErrorType; /** * @summary Lists all reservations of the user. */ -export const useGetV1UserReservations = < + +export function useGetV1UserReservations< TData = Awaited>, TError = ErrorType >(options?: { @@ -992,7 +1000,7 @@ export const useGetV1UserReservations = < TError, TData >; -}): UseQueryResult & { queryKey: QueryKey } => { +}): UseQueryResult & { queryKey: QueryKey } { const queryOptions = getGetV1UserReservationsQueryOptions(options); const query = useQuery(queryOptions) as UseQueryResult & { @@ -1002,7 +1010,7 @@ export const useGetV1UserReservations = < query.queryKey = queryOptions.queryKey; return query; -}; +} /** * @summary Creates a new reservation. From fbef28f15792ebc9ceaf915351589419314afe00 Mon Sep 17 00:00:00 2001 From: Jacob Pihl Date: Fri, 15 Nov 2024 12:13:07 +0100 Subject: [PATCH 3/5] Invalidate favourites inside `button-favourite.tsx` Previously we would invalidate react query with a manual override of autogenerated orval code. To avoid this we perform the invalidation inside the favourite component instead. There is no need to invalidate adding favourites, because we only have the option to remove favourites from the favourite list - elsewhere we update the state per material. --- .../button-favourite/button-favourite.tsx | 34 +++++++++++++------ .../card-list-item/card-list-item.tsx | 4 +-- src/components/material/MaterialHeader.tsx | 4 +-- .../simple-material/SimpleMaterial.tsx | 4 +-- src/core/guardedRequests.slice.ts | 6 ++-- 5 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/components/button-favourite/button-favourite.tsx b/src/components/button-favourite/button-favourite.tsx index 36c1234de8..c12942579c 100644 --- a/src/components/button-favourite/button-favourite.tsx +++ b/src/components/button-favourite/button-favourite.tsx @@ -1,10 +1,11 @@ import React, { useCallback, useEffect, useState } from "react"; -import { useQueryClient } from "react-query"; import LoadIcon from "@danskernesdigitalebibliotek/dpl-design-system/build/icons/collection/Reload.svg"; +import { useQueryClient } from "react-query"; import { IconFavourite } from "../icon-favourite/icon-favourite"; import { - removeItem, - useHasItem + getGetListQueryKey, + useHasItem, + useRemoveItem } from "../../core/material-list-api/material-list"; import { useText } from "../../core/utils/text"; import { Pid, WorkId } from "../../core/utils/types/ids"; @@ -25,20 +26,23 @@ const ButtonFavourite: React.FC = ({ darkBackground, title }) => { - const queryClient = useQueryClient(); const [fillState, setFillState] = useState(false); const [isLoadingHeart, setIsLoadingHeart] = useState(true); const t = useText(); - const { mutate } = useHasItem(); + const { mutate: hasItem } = useHasItem(); + const { mutate: removeItem } = useRemoveItem(); const { track } = useStatistics(); + const queryClient = useQueryClient(); + + const listId = "default"; useEffect(() => { // The heart icon needs to change into a loading icon while the material // is being removed from the favorite list setIsLoadingHeart(true); - mutate( + hasItem( { - listId: "default", + listId, itemId: id }, { @@ -55,13 +59,21 @@ const ButtonFavourite: React.FC = ({ } } ); - }, [id, mutate]); + }, [id, hasItem]); const handleClick = useCallback( (e: React.MouseEvent) => { if (fillState) { - removeItem("default", id, queryClient); - setFillState(false); + removeItem( + { listId, itemId: id }, + { + onSuccess: () => { + // Invalidate the query to remove any faved materials from favorites list + queryClient.invalidateQueries(getGetListQueryKey(listId)); + setFillState(false); + } + } + ); } else { track("click", { id: statistics.addToFavorites.id, @@ -75,7 +87,7 @@ const ButtonFavourite: React.FC = ({ // this wont interfere with their click handler. e.stopPropagation(); }, - [addToListRequest, fillState, id, queryClient, track] + [addToListRequest, fillState, id, removeItem, track, queryClient] ); return ( diff --git a/src/components/card-item-list/card-list-item/card-list-item.tsx b/src/components/card-item-list/card-list-item/card-list-item.tsx index 20c763451b..4bf477b982 100644 --- a/src/components/card-item-list/card-list-item/card-list-item.tsx +++ b/src/components/card-item-list/card-list-item/card-list-item.tsx @@ -1,6 +1,5 @@ import React, { useCallback, useId } from "react"; import { useDispatch } from "react-redux"; -import { useQueryClient } from "react-query"; import { useText } from "../../../core/utils/text"; import { WorkId } from "../../../core/utils/types/ids"; import Arrow from "../../atoms/icons/arrow/arrow"; @@ -75,7 +74,6 @@ const CardListItem: React.FC = ({ const bookManifestation = getFirstBookManifestation(manifestations); const dispatch = useDispatch(); - const queryClient = useQueryClient(); const author = creatorsToString(flattenCreators(creators), t); const manifestationPids = getManifestationsPids(manifestations); const materialFullUrl = constructMaterialUrl( @@ -106,7 +104,7 @@ const CardListItem: React.FC = ({ dispatch( guardedRequest({ type: "addFavorite", - args: { id, queryClient }, + args: { id }, app: "search-result" }) ); diff --git a/src/components/material/MaterialHeader.tsx b/src/components/material/MaterialHeader.tsx index a0225836f2..2ba7af1f0b 100644 --- a/src/components/material/MaterialHeader.tsx +++ b/src/components/material/MaterialHeader.tsx @@ -1,7 +1,6 @@ import React, { useId } from "react"; import { useDispatch } from "react-redux"; import { useDeepCompareEffect } from "react-use"; -import { useQueryClient } from "react-query"; import { guardedRequest } from "../../core/guardedRequests.slice"; import { TypedDispatch } from "../../core/store"; import { @@ -65,12 +64,11 @@ const MaterialHeader: React.FC = ({ const { itemRef, hasBeenVisible: showItem } = useItemHasBeenVisible(); const t = useText(); const dispatch = useDispatch(); - const queryClient = useQueryClient(); const addToListRequest = (id: ButtonFavouriteId) => { dispatch( guardedRequest({ type: "addFavorite", - args: { id, queryClient }, + args: { id }, app: "material" }) ); diff --git a/src/components/simple-material/SimpleMaterial.tsx b/src/components/simple-material/SimpleMaterial.tsx index a6bcfefa36..e78fa3ee83 100644 --- a/src/components/simple-material/SimpleMaterial.tsx +++ b/src/components/simple-material/SimpleMaterial.tsx @@ -1,7 +1,6 @@ import * as React from "react"; import { FC } from "react"; import { useDispatch } from "react-redux"; -import { useQueryClient } from "react-query"; import ButtonFavourite, { ButtonFavouriteId } from "../button-favourite/button-favourite"; @@ -35,7 +34,6 @@ const SimpleMaterial: FC = ({ const materialUrl = u("materialUrl"); const dispatch = useDispatch(); - const queryClient = useQueryClient(); const materialFullUrl = constructMaterialUrl(materialUrl, workId); // Create authors string @@ -52,7 +50,7 @@ const SimpleMaterial: FC = ({ dispatch( guardedRequest({ type: "addFavorite", - args: { id, queryClient }, + args: { id }, app }) ); diff --git a/src/core/guardedRequests.slice.ts b/src/core/guardedRequests.slice.ts index f694bc3d8d..25f75e4f6e 100644 --- a/src/core/guardedRequests.slice.ts +++ b/src/core/guardedRequests.slice.ts @@ -1,6 +1,4 @@ import { createSlice, createAsyncThunk, PayloadAction } from "@reduxjs/toolkit"; -// eslint-disable-next-line import/no-cycle -import { QueryClient } from "react-query"; import { addItem } from "./material-list-api/material-list"; // TODO: Fix dependency cycle problem // There is not an obvious solution but we need access to the persistor @@ -26,8 +24,8 @@ interface Callback { const requestCallbacks: { [key: string]: Callback>; } = { - addFavorite: ({ id, queryClient }) => { - return addItem("default", id as string, queryClient as QueryClient); + addFavorite: ({ id }) => { + return addItem("default", id as string); } }; From 8e38f1bdd209eecb7d5e5998494127a6239f2d3e Mon Sep 17 00:00:00 2001 From: Jacob Pihl Date: Fri, 15 Nov 2024 12:13:29 +0100 Subject: [PATCH 4/5] Rewrite method type to match methods in generated orval files --- src/core/material-list-api/mutator/fetcher.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/material-list-api/mutator/fetcher.ts b/src/core/material-list-api/mutator/fetcher.ts index 9232509839..35228148ab 100644 --- a/src/core/material-list-api/mutator/fetcher.ts +++ b/src/core/material-list-api/mutator/fetcher.ts @@ -14,7 +14,7 @@ export const fetcher = async ({ data }: { url: string; - method: "get" | "post" | "put" | "delete" | "patch" | "head"; + method: "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "HEAD"; params?: unknown; data?: BodyType; signal?: AbortSignal; @@ -55,7 +55,7 @@ export const fetcher = async ({ } // Return the response body in JSON format if the method is GET. - if (method === "get") { + if (method === "GET") { try { return (await response.json()) as ResponseType; } catch (error) { From f03f073f807773effba0df32067dca2022433fee Mon Sep 17 00:00:00 2001 From: Jacob Pihl Date: Tue, 19 Nov 2024 16:24:52 +0100 Subject: [PATCH 5/5] Update Favorite UI optimistically Instead of waiting for the request to complete, we remove the fill state optimistically --- src/components/button-favourite/button-favourite.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/button-favourite/button-favourite.tsx b/src/components/button-favourite/button-favourite.tsx index c12942579c..86e1a323e8 100644 --- a/src/components/button-favourite/button-favourite.tsx +++ b/src/components/button-favourite/button-favourite.tsx @@ -64,13 +64,13 @@ const ButtonFavourite: React.FC = ({ const handleClick = useCallback( (e: React.MouseEvent) => { if (fillState) { + setFillState(false); removeItem( { listId, itemId: id }, { onSuccess: () => { // Invalidate the query to remove any faved materials from favorites list queryClient.invalidateQueries(getGetListQueryKey(listId)); - setFillState(false); } } );