Skip to content

fix(dav): Add ID / label to timezone picker in availablility settings #41285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
susnux merged 4 commits into from
Nov 6, 2023
Merged

fix(dav): Add ID / label to timezone picker in availablility settings #41285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f7af3f
chore(deps): Update `@nextcloud/vue`
susnux Nov 4, 2023
755f18e
fix(dav): Make timezone picker label a real label element
susnux Nov 4, 2023
7f0ff40
chore: Compile assets
susnux Nov 4, 2023
3d63be2
fix(tests): Adjust test snapshots for changes dependencies
susnux Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions apps/dav/src/views/Availability.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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 {
Expand Down
70 changes: 35 additions & 35 deletions apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dist/4107-4107.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/4107-4107.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/4978-4978.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/4978-4978.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/6318-6318.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/6318-6318.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/7608-7608.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/7608-7608.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/comments-comments-app.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/comments-comments-app.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-common.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-login.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-login.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-profile.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-profile.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-unified-search.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unified-search.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/core-unsupported-browser.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-unsupported-browser.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/dashboard-main.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/dashboard-main.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading