Merge pull request #41285 from nextcloud/fix/id-timezone

fix(dav): Add ID / label to timezone picker in availablility settings
nextcloud · Nov 6, 2023 · 4154ba3 · 4154ba3
2 parents 81a9e19 + 3d63be2
commit 4154ba3
Show file tree

Hide file tree

Showing 94 changed files with 190 additions and 184 deletions.
diff --git a/apps/dav/src/views/Availability.vue b/apps/dav/src/views/Availability.vue
@@ -2,11 +2,11 @@
 	<NcSettingsSection :name="$t('dav', 'Availability')"
 		:description="$t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.')">
 		<div class="time-zone">
-			<strong class="time-zone__heading">
+			<label :for="`vs${timeZonePickerId}__combobox`" class="time-zone__heading">
 				{{ $t('dav', 'Time zone:') }}
-			</strong>
+			</label>
 			<span class="time-zone-text">
-				<NcTimezonePicker v-model="timezone" />
+				<NcTimezonePicker v-model="timezone" :uid="timeZonePickerId" />
 			</span>
 		</div>
 
@@ -78,6 +78,11 @@ export default {
 			automated: loadState('dav', 'user_status_automation') === 'yes',
 		}
 	},
+	computed: {
+		timeZonePickerId() {
+			return `tz-${(Math.random() + 1).toString(36).substring(7)}`
+		},
+	},
 	async mounted() {
 		try {
 			const slotData = await findScheduleInboxAvailability()
@@ -156,12 +161,13 @@ export default {
 }
 .time-zone {
 	padding: 32px 12px 12px 0;
-    display: flex;
-    flex-wrap: wrap;
+	display: flex;
+	flex-wrap: wrap;
 
 	&__heading {
 		margin-right: calc(var(--default-grid-baseline) * 2);
 		line-height: var(--default-clickable-area);
+		font-weight: bold;
 	}
 }
 .grid-table {

diff --git a/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap b/apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
@@ -70,31 +70,31 @@ exports[`CalDavSettings interactions 1`] = `
       <span
         class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
         data-v-375ea653=""
-        data-v-dcc8fabc=""
+        data-v-cd8a5db4=""
         style="--icon-size: 36px;"
       >
         <input
           class="checkbox-radio-switch__input"
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
           id="caldavSendInvitations"
           type="checkbox"
           value=""
         />
         <label
           class="checkbox-content checkbox-radio-switch__content"
-          data-v-ad1f8733=""
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
+          data-v-fae4dec7=""
           for="caldavSendInvitations"
         >
           <span
             aria-hidden="true"
             class="checkbox-content__icon checkbox-radio-switch__icon"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             <span
               aria-hidden="true"
               class="material-design-icon toggle-switch-icon"
-              data-v-ad1f8733=""
+              data-v-fae4dec7=""
               role="img"
             >
               <svg
@@ -114,7 +114,7 @@ exports[`CalDavSettings interactions 1`] = `
           </span>
           <span
             class="checkbox-content__text checkbox-radio-switch__text"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             
 			Send invitations to attendees
@@ -142,31 +142,31 @@ exports[`CalDavSettings interactions 1`] = `
       <span
         class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
         data-v-375ea653=""
-        data-v-dcc8fabc=""
+        data-v-cd8a5db4=""
         style="--icon-size: 36px;"
       >
         <input
           class="checkbox-radio-switch__input"
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
           id="caldavGenerateBirthdayCalendar"
           type="checkbox"
           value=""
         />
         <label
           class="checkbox-content checkbox-radio-switch__content"
-          data-v-ad1f8733=""
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
+          data-v-fae4dec7=""
           for="caldavGenerateBirthdayCalendar"
         >
           <span
             aria-hidden="true"
             class="checkbox-content__icon checkbox-radio-switch__icon"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             <span
               aria-hidden="true"
               class="material-design-icon toggle-switch-icon"
-              data-v-ad1f8733=""
+              data-v-fae4dec7=""
               role="img"
             >
               <svg
@@ -186,7 +186,7 @@ exports[`CalDavSettings interactions 1`] = `
           </span>
           <span
             class="checkbox-content__text checkbox-radio-switch__text"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             
 			Automatically generate a birthday calendar
@@ -222,31 +222,31 @@ exports[`CalDavSettings interactions 1`] = `
       <span
         class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
         data-v-375ea653=""
-        data-v-dcc8fabc=""
+        data-v-cd8a5db4=""
         style="--icon-size: 36px;"
       >
         <input
           class="checkbox-radio-switch__input"
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
           id="caldavSendEventReminders"
           type="checkbox"
           value=""
         />
         <label
           class="checkbox-content checkbox-radio-switch__content"
-          data-v-ad1f8733=""
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
+          data-v-fae4dec7=""
           for="caldavSendEventReminders"
         >
           <span
             aria-hidden="true"
             class="checkbox-content__icon checkbox-radio-switch__icon"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             <span
               aria-hidden="true"
               class="material-design-icon toggle-switch-icon"
-              data-v-ad1f8733=""
+              data-v-fae4dec7=""
               role="img"
             >
               <svg
@@ -266,7 +266,7 @@ exports[`CalDavSettings interactions 1`] = `
           </span>
           <span
             class="checkbox-content__text checkbox-radio-switch__text"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             
 			Send notifications for events
@@ -307,31 +307,31 @@ exports[`CalDavSettings interactions 1`] = `
       <span
         class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
         data-v-375ea653=""
-        data-v-dcc8fabc=""
+        data-v-cd8a5db4=""
         style="--icon-size: 36px;"
       >
         <input
           class="checkbox-radio-switch__input"
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
           id="caldavSendEventRemindersToSharedGroupMembers"
           type="checkbox"
           value=""
         />
         <label
           class="checkbox-content checkbox-radio-switch__content"
-          data-v-ad1f8733=""
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
+          data-v-fae4dec7=""
           for="caldavSendEventRemindersToSharedGroupMembers"
         >
           <span
             aria-hidden="true"
             class="checkbox-content__icon checkbox-radio-switch__icon"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             <span
               aria-hidden="true"
               class="material-design-icon toggle-switch-icon"
-              data-v-ad1f8733=""
+              data-v-fae4dec7=""
               role="img"
             >
               <svg
@@ -351,7 +351,7 @@ exports[`CalDavSettings interactions 1`] = `
           </span>
           <span
             class="checkbox-content__text checkbox-radio-switch__text"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             
 			Send reminder notifications to calendar sharees as well
@@ -376,31 +376,31 @@ exports[`CalDavSettings interactions 1`] = `
       <span
         class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
         data-v-375ea653=""
-        data-v-dcc8fabc=""
+        data-v-cd8a5db4=""
         style="--icon-size: 36px;"
       >
         <input
           class="checkbox-radio-switch__input"
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
           id="caldavSendEventRemindersPush"
           type="checkbox"
           value=""
         />
         <label
           class="checkbox-content checkbox-radio-switch__content"
-          data-v-ad1f8733=""
-          data-v-dcc8fabc=""
+          data-v-cd8a5db4=""
+          data-v-fae4dec7=""
           for="caldavSendEventRemindersPush"
         >
           <span
             aria-hidden="true"
             class="checkbox-content__icon checkbox-radio-switch__icon"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             <span
               aria-hidden="true"
               class="material-design-icon toggle-switch-icon"
-              data-v-ad1f8733=""
+              data-v-fae4dec7=""
               role="img"
             >
               <svg
@@ -420,7 +420,7 @@ exports[`CalDavSettings interactions 1`] = `
           </span>
           <span
             class="checkbox-content__text checkbox-radio-switch__text"
-            data-v-ad1f8733=""
+            data-v-fae4dec7=""
           >
             
 			Enable notifications for events via push

diff --git a/dist/4107-4107.js b/dist/4107-4107.js
diff --git a/dist/4107-4107.js.map b/dist/4107-4107.js.map
diff --git a/dist/4978-4978.js b/dist/4978-4978.js
diff --git a/dist/4978-4978.js.map b/dist/4978-4978.js.map
diff --git a/dist/6318-6318.js b/dist/6318-6318.js
diff --git a/dist/6318-6318.js.map b/dist/6318-6318.js.map
diff --git a/dist/7608-7608.js b/dist/7608-7608.js
diff --git a/dist/7608-7608.js.map b/dist/7608-7608.js.map
diff --git a/dist/comments-comments-app.js b/dist/comments-comments-app.js
diff --git a/dist/comments-comments-app.js.map b/dist/comments-comments-app.js.map
diff --git a/dist/core-common.js b/dist/core-common.js
diff --git a/dist/core-common.js.map b/dist/core-common.js.map
diff --git a/dist/core-login.js b/dist/core-login.js
diff --git a/dist/core-login.js.map b/dist/core-login.js.map
diff --git a/dist/core-main.js b/dist/core-main.js
diff --git a/dist/core-main.js.map b/dist/core-main.js.map
diff --git a/dist/core-profile.js b/dist/core-profile.js
diff --git a/dist/core-profile.js.map b/dist/core-profile.js.map
diff --git a/dist/core-unified-search.js b/dist/core-unified-search.js
diff --git a/dist/core-unified-search.js.map b/dist/core-unified-search.js.map
diff --git a/dist/core-unsupported-browser.js b/dist/core-unsupported-browser.js
diff --git a/dist/core-unsupported-browser.js.map b/dist/core-unsupported-browser.js.map
diff --git a/dist/dashboard-main.js b/dist/dashboard-main.js
diff --git a/dist/dashboard-main.js.map b/dist/dashboard-main.js.map