From 3323664f54261140fc9bfa9b21dd320c888beb90 Mon Sep 17 00:00:00 2001 From: Grigory Vodyanov Date: Mon, 2 Mar 2026 22:54:55 +0100 Subject: [PATCH] feat(EditCalendarModal): add setting for default reminder per calendar Signed-off-by: Grigory Vodyanov --- package-lock.json | 32 +++- package.json | 2 +- .../AppNavigation/EditCalendarModal.vue | 147 +++++++++++++++++- src/components/AppNavigation/Settings.vue | 6 +- src/components/AppointmentConfigModal.vue | 4 +- src/env.d.ts | 2 + src/models/calendar.js | 7 + src/store/calendarObjectInstance.js | 16 +- src/store/calendars.js | 24 +++ src/types/oc.ts | 8 + src/utils/nextcloudVersion.ts | 22 +++ tests/javascript/unit/models/calendar.test.js | 13 ++ tests/javascript/unit/setup.js | 6 + 13 files changed, 270 insertions(+), 19 deletions(-) create mode 100644 src/types/oc.ts create mode 100644 src/utils/nextcloudVersion.ts diff --git a/package-lock.json b/package-lock.json index 199462f54a..4d472db24b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@nextcloud/axios": "^2.5.2", "@nextcloud/calendar-availability-vue": "^3.0.0", "@nextcloud/calendar-js": "^8.1.6", - "@nextcloud/cdav-library": "^2.1.1", + "@nextcloud/cdav-library": "^2.2.0", "@nextcloud/dialogs": "^7.3.0", "@nextcloud/event-bus": "^3.3.3", "@nextcloud/initial-state": "^3.0.0", @@ -3675,16 +3675,16 @@ } }, "node_modules/@nextcloud/cdav-library": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/@nextcloud/cdav-library/-/cdav-library-2.1.1.tgz", - "integrity": "sha512-pKjlfaqRGtUxcHvRsBJp0jLHxyl97sryOEBwXzi9qd+UBCbfd3GYO9EIhLBZTqU9LAKRmGPY3P5XQH2C3UxvSA==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@nextcloud/cdav-library/-/cdav-library-2.2.0.tgz", + "integrity": "sha512-vaikb6JFji8MjeNSl8rsbRm97sDI8f9+Qa4ixLtubYYomm6SuNxhTau7hVC+v7sIlzrBhQlz4h0Gmq9nEsZrug==", "license": "AGPL-3.0-or-later", "dependencies": { - "@nextcloud/axios": "^2.5.1" + "@nextcloud/axios": "^2.5.2" }, "engines": { - "node": "^20.0.0", - "npm": "^10.0.0" + "node": "^24.0.0", + "npm": "^11.3.0" } }, "node_modules/@nextcloud/dialogs": { @@ -4284,6 +4284,9 @@ "arm" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4306,6 +4309,9 @@ "arm" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4328,6 +4334,9 @@ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4350,6 +4359,9 @@ "arm64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -4372,6 +4384,9 @@ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -4394,6 +4409,9 @@ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ diff --git a/package.json b/package.json index 2d7eaf7704..2f1eabab3a 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "@nextcloud/axios": "^2.5.2", "@nextcloud/calendar-availability-vue": "^3.0.0", "@nextcloud/calendar-js": "^8.1.6", - "@nextcloud/cdav-library": "^2.1.1", + "@nextcloud/cdav-library": "^2.2.0", "@nextcloud/dialogs": "^7.3.0", "@nextcloud/event-bus": "^3.3.3", "@nextcloud/initial-state": "^3.0.0", diff --git a/src/components/AppNavigation/EditCalendarModal.vue b/src/components/AppNavigation/EditCalendarModal.vue index 9bd7f3d3d8..dcd2da5a90 100644 --- a/src/components/AppNavigation/EditCalendarModal.vue +++ b/src/components/AppNavigation/EditCalendarModal.vue @@ -43,6 +43,24 @@ {{ $t('calendar', 'Never show me as busy (set this calendar to transparent)') }} +