From 019aace5e283222b80b34ac0f1087bd990026da1 Mon Sep 17 00:00:00 2001
From: bergatco <129839305+bergatco@users.noreply.github.com>
Date: Tue, 4 Mar 2025 14:58:45 +0100
Subject: [PATCH 1/3] BC-8685 - fix file input handling (#3579)

---
 .../administration/SchoolPolicyFormDialog.vue | 26 ++++++++++++-------
 .../administration/SchoolTermsFormDialog.vue  | 14 +++++++---
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/components/organisms/administration/SchoolPolicyFormDialog.vue b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
index b9cad8855a..e0fe1ea419 100644
--- a/src/components/organisms/administration/SchoolPolicyFormDialog.vue
+++ b/src/components/organisms/administration/SchoolPolicyFormDialog.vue
@@ -2,7 +2,7 @@
 	<v-custom-dialog
 		:is-open="isOpen"
 		:size="425"
-		@dialog-closed="cancel"
+		@dialog-canceled="cancel"
 		has-buttons
 		confirm-btn-title-key="pages.administration.school.index.schoolPolicy.replace"
 		:confirm-btn-icon="mdiFileReplaceOutline"
@@ -29,7 +29,6 @@
 					ref="input-file"
 					class="input-file mb-2"
 					data-testid="input-file"
-					v-model="files"
 					density="compact"
 					accept="application/pdf"
 					truncate-length="30"
@@ -44,6 +43,7 @@
 					:persistent-hint="true"
 					:rules="[rules.required, rules.mustBePdf, rules.maxSize(4194304)]"
 					@blur="onBlur"
+					@update:modelValue="onFileChange"
 				>
 					<template v-slot:append-inner>
 						<v-icon
@@ -61,19 +61,19 @@
 
 <script lang="ts">
 import vCustomDialog from "@/components/organisms/vCustomDialog.vue";
-import { computed, ComputedRef, defineComponent, ref, Ref } from "vue";
+import { currentDate } from "@/plugins/datetime";
+import { CreateConsentVersionPayload } from "@/store/types/consent-version";
+import { School } from "@/store/types/schools";
+import { toBase64 } from "@/utils/fileHelper";
 import {
 	injectStrict,
 	NOTIFIER_MODULE_KEY,
 	PRIVACY_POLICY_MODULE_KEY,
 	SCHOOLS_MODULE_KEY,
 } from "@/utils/inject";
-import { useI18n } from "vue-i18n";
 import { mdiAlert, mdiFileReplaceOutline } from "@icons/material";
-import { School } from "@/store/types/schools";
-import { currentDate } from "@/plugins/datetime";
-import { toBase64 } from "@/utils/fileHelper";
-import { CreateConsentVersionPayload } from "@/store/types/consent-version";
+import { computed, ComputedRef, defineComponent, ref, Ref } from "vue";
+import { useI18n } from "vue-i18n";
 
 export default defineComponent({
 	name: "SchoolPolicyFormDialog",
@@ -115,6 +115,14 @@ export default defineComponent({
 				),
 		};
 
+		const onFileChange = (_files: File[] | File) => {
+			if (Array.isArray(_files)) {
+				files.value = _files;
+			} else {
+				files.value = [_files];
+			}
+		};
+
 		const onBlur = () => {
 			isTouched.value = true;
 		};
@@ -156,11 +164,11 @@ export default defineComponent({
 
 		return {
 			t,
-			files,
 			rules,
 			cancel,
 			submit,
 			onBlur,
+			onFileChange,
 			isValid,
 			isTouched,
 			policyForm,
diff --git a/src/components/organisms/administration/SchoolTermsFormDialog.vue b/src/components/organisms/administration/SchoolTermsFormDialog.vue
index 19f577d181..4d3c82d171 100644
--- a/src/components/organisms/administration/SchoolTermsFormDialog.vue
+++ b/src/components/organisms/administration/SchoolTermsFormDialog.vue
@@ -2,7 +2,7 @@
 	<v-custom-dialog
 		:is-open="isOpen"
 		:size="425"
-		@dialog-closed="cancel"
+		@dialog-canceled="cancel"
 		has-buttons
 		confirm-btn-title-key="pages.administration.school.index.termsOfUse.replace"
 		:confirm-btn-icon="mdiFileReplaceOutline"
@@ -29,7 +29,6 @@
 					ref="input-file"
 					class="input-file mb-2"
 					data-testid="input-file"
-					v-model="files"
 					:multiple="false"
 					density="compact"
 					accept="application/pdf"
@@ -43,6 +42,7 @@
 					:persistent-hint="true"
 					:rules="[rules.required, rules.mustBePdf, rules.maxSize(4194304)]"
 					@blur="onBlur"
+					@update:modelValue="onFileChange"
 				>
 					<template v-slot:append-inner>
 						<v-icon
@@ -116,6 +116,14 @@ export default defineComponent({
 			isFormTouched.value = true;
 		};
 
+		const onFileChange = (_files: File[] | File) => {
+			if (Array.isArray(_files)) {
+				files.value = _files;
+			} else {
+				files.value = [_files];
+			}
+		};
+
 		const resetForm = () => {
 			termsForm.value = [];
 			isFormValid.value = false;
@@ -153,11 +161,11 @@ export default defineComponent({
 
 		return {
 			t,
-			files,
 			rules: validationRules,
 			cancel,
 			submit,
 			onBlur,
+			onFileChange,
 			isValid: isFormValid,
 			isTouched: isFormTouched,
 			termsForm,

From b49a2db9e8eb70fda9f0ea3e68879ffa0be49d83 Mon Sep 17 00:00:00 2001
From: NFriedo <69233063+NFriedo@users.noreply.github.com>
Date: Tue, 4 Mar 2025 16:56:52 +0100
Subject: [PATCH 2/3] BC-9140 - Update pinia to 3.0.0 (#3581)

Update pinia from 2.1.7 to 3.0.0
---
 package-lock.json | 129 ++++++++++++++++++++++++++++++++++++++++++----
 package.json      |   2 +-
 2 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95fc414f0a..6d641578a6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
 				"maska": "^2.1.10",
 				"mobile-drag-drop": "^3.0.0-rc.0",
 				"object-hash": "^3.0.0",
-				"pinia": "^2.1.7",
+				"pinia": "^3.0.0",
 				"socket.io-client": "^4.7.5",
 				"sortablejs": "^1.15.2",
 				"sortablejs-vue3": "^1.2.11",
@@ -3935,6 +3935,30 @@
 			"version": "6.6.4",
 			"license": "MIT"
 		},
+		"node_modules/@vue/devtools-kit": {
+			"version": "7.7.2",
+			"resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.2.tgz",
+			"integrity": "sha512-CY0I1JH3Z8PECbn6k3TqM1Bk9ASWxeMtTCvZr7vb+CHi+X/QwQm5F1/fPagraamKMAHVfuuCbdcnNg1A4CYVWQ==",
+			"license": "MIT",
+			"dependencies": {
+				"@vue/devtools-shared": "^7.7.2",
+				"birpc": "^0.2.19",
+				"hookable": "^5.5.3",
+				"mitt": "^3.0.1",
+				"perfect-debounce": "^1.0.0",
+				"speakingurl": "^14.0.1",
+				"superjson": "^2.2.1"
+			}
+		},
+		"node_modules/@vue/devtools-shared": {
+			"version": "7.7.2",
+			"resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.2.tgz",
+			"integrity": "sha512-uBFxnp8gwW2vD6FrJB8JZLUzVb6PNRG0B0jBnHsOH8uKyva2qINY8PTF5Te4QlTbMDqU5K6qtJDr6cNsKWhbOA==",
+			"license": "MIT",
+			"dependencies": {
+				"rfdc": "^1.4.1"
+			}
+		},
 		"node_modules/@vue/eslint-config-typescript": {
 			"version": "14.1.3",
 			"dev": true,
@@ -4938,6 +4962,15 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/birpc": {
+			"version": "0.2.19",
+			"resolved": "https://registry.npmjs.org/birpc/-/birpc-0.2.19.tgz",
+			"integrity": "sha512-5WeXXAvTmitV1RqJFppT5QtUiz2p1mRSYU000Jkft5ZUCLJIk4uQriYNO50HknxKwM6jd8utNc66K1qGIwwWBQ==",
+			"license": "MIT",
+			"funding": {
+				"url": "https://github.com/sponsors/antfu"
+			}
+		},
 		"node_modules/bl": {
 			"version": "4.1.0",
 			"license": "MIT",
@@ -5703,6 +5736,21 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/copy-anything": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+			"integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+			"license": "MIT",
+			"dependencies": {
+				"is-what": "^4.1.8"
+			},
+			"engines": {
+				"node": ">=12.13"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mesqueeb"
+			}
+		},
 		"node_modules/copy-webpack-plugin": {
 			"version": "12.0.2",
 			"dev": true,
@@ -7784,6 +7832,12 @@
 				"he": "bin/he"
 			}
 		},
+		"node_modules/hookable": {
+			"version": "5.5.3",
+			"resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
+			"integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
+			"license": "MIT"
+		},
 		"node_modules/hpack.js": {
 			"version": "2.1.6",
 			"dev": true,
@@ -8435,6 +8489,18 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/is-what": {
+			"version": "4.1.16",
+			"resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
+			"integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.13"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mesqueeb"
+			}
+		},
 		"node_modules/is-wsl": {
 			"version": "3.1.0",
 			"dev": true,
@@ -10953,6 +11019,12 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/mitt": {
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
+			"integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
+			"license": "MIT"
+		},
 		"node_modules/mkdirp": {
 			"version": "1.0.4",
 			"devOptional": true,
@@ -11616,6 +11688,12 @@
 			"dev": true,
 			"license": "MIT"
 		},
+		"node_modules/perfect-debounce": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
+			"integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+			"license": "MIT"
+		},
 		"node_modules/picocolors": {
 			"version": "1.1.1",
 			"license": "ISC"
@@ -11632,29 +11710,35 @@
 			}
 		},
 		"node_modules/pinia": {
-			"version": "2.2.4",
+			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.1.tgz",
+			"integrity": "sha512-WXglsDzztOTH6IfcJ99ltYZin2mY8XZCXujkYWVIJlBjqsP6ST7zw+Aarh63E1cDVYeyUcPCxPHzJpEOmzB6Wg==",
 			"license": "MIT",
 			"dependencies": {
-				"@vue/devtools-api": "^6.6.3",
-				"vue-demi": "^0.14.10"
+				"@vue/devtools-api": "^7.7.2"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/posva"
 			},
 			"peerDependencies": {
-				"@vue/composition-api": "^1.4.0",
 				"typescript": ">=4.4.4",
-				"vue": "^2.6.14 || ^3.3.0"
+				"vue": "^2.7.0 || ^3.5.11"
 			},
 			"peerDependenciesMeta": {
-				"@vue/composition-api": {
-					"optional": true
-				},
 				"typescript": {
 					"optional": true
 				}
 			}
 		},
+		"node_modules/pinia/node_modules/@vue/devtools-api": {
+			"version": "7.7.2",
+			"resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.2.tgz",
+			"integrity": "sha512-1syn558KhyN+chO5SjlZIwJ8bV/bQ1nOVTG66t2RbG66ZGekyiYNmRO7X9BJCXQqPsFHlnksqvPhce2qpzxFnA==",
+			"license": "MIT",
+			"dependencies": {
+				"@vue/devtools-kit": "^7.7.2"
+			}
+		},
 		"node_modules/pirates": {
 			"version": "4.0.6",
 			"dev": true,
@@ -12359,6 +12443,12 @@
 				"node": ">=0.10.0"
 			}
 		},
+		"node_modules/rfdc": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+			"integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+			"license": "MIT"
+		},
 		"node_modules/run-applescript": {
 			"version": "7.0.0",
 			"dev": true,
@@ -12962,6 +13052,15 @@
 				"wbuf": "^1.7.3"
 			}
 		},
+		"node_modules/speakingurl": {
+			"version": "14.0.1",
+			"resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz",
+			"integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==",
+			"license": "BSD-3-Clause",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
 		"node_modules/sprintf-js": {
 			"version": "1.0.3",
 			"dev": true,
@@ -13090,6 +13189,18 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/superjson": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
+			"integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
+			"license": "MIT",
+			"dependencies": {
+				"copy-anything": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
 		"node_modules/supports-color": {
 			"version": "5.5.0",
 			"dev": true,
diff --git a/package.json b/package.json
index 702f50ac73..9fb2240f62 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
 		"maska": "^2.1.10",
 		"mobile-drag-drop": "^3.0.0-rc.0",
 		"object-hash": "^3.0.0",
-		"pinia": "^2.1.7",
+		"pinia": "^3.0.0",
 		"socket.io-client": "^4.7.5",
 		"sortablejs": "^1.15.2",
 		"sortablejs-vue3": "^1.2.11",

From c59a05697ab85ce15a70e54d55dd55eb99e55a7e Mon Sep 17 00:00:00 2001
From: NFriedo <69233063+NFriedo@users.noreply.github.com>
Date: Thu, 6 Mar 2025 08:52:23 +0100
Subject: [PATCH 3/3] BC-9146 - Update vue-router from 4.4.5 to 4.5.0 (#3582)

---
 package-lock.json | 6 ++++--
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6d641578a6..e4ed7bb959 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,7 +29,7 @@
 				"vue": "^3.4.21",
 				"vue-dompurify-html": "^4.1.4",
 				"vue-i18n": "^9.14.2",
-				"vue-router": "^4.2.4",
+				"vue-router": "^4.5.0",
 				"vue3-mq": "^3.1.3",
 				"vuedraggable": "^4.1.0",
 				"vuetify": "^3.7.12",
@@ -14282,7 +14282,9 @@
 			}
 		},
 		"node_modules/vue-router": {
-			"version": "4.4.5",
+			"version": "4.5.0",
+			"resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.5.0.tgz",
+			"integrity": "sha512-HDuk+PuH5monfNuY+ct49mNmkCRK4xJAV9Ts4z9UFc4rzdDnxQLyCMGGc8pKhZhHTVzfanpNwB/lwqevcBwI4w==",
 			"license": "MIT",
 			"dependencies": {
 				"@vue/devtools-api": "^6.6.4"
diff --git a/package.json b/package.json
index 9fb2240f62..a0e7f8cec9 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
 		"vue": "^3.4.21",
 		"vue-dompurify-html": "^4.1.4",
 		"vue-i18n": "^9.14.2",
-		"vue-router": "^4.2.4",
+		"vue-router": "^4.5.0",
 		"vue3-mq": "^3.1.3",
 		"vuedraggable": "^4.1.0",
 		"vuetify": "^3.7.12",