Community Milestone Walkthrough Fixes

backend/src/appointment/controller/apis/google_client.py

@@ -98,6 +98,17 @@ def list_calendars(self, token):
 
                 request = service.calendarList().list_next(request, response)
 
+        # Sort calendars by primary first, then selected, then others
+        # since primary is the most likely to be the one the user wants to use
+        def calendar_sort_key(cal):
+            if cal.get('primary'):
+                return 0
+            if cal.get('selected'):
+                return 1
+            return 2
+
+        items.sort(key=calendar_sort_key)
+
         return items
 
     def get_free_busy(self, calendar_ids, time_min, time_max, token):
@@ -231,6 +242,7 @@ def sync_calendars(self, db, subscriber_id: int, token, external_connection_id:
         # Grab all the Google calendars
         calendars = self.list_calendars(token)
         error_occurred = False
+
         for calendar in calendars:
             cal = CalendarConnection(
                 title=calendar.get('summary'),

frontend/src/App.vue

@@ -363,11 +363,11 @@ onMounted(async () => {
 
 main {
   padding-block-start: 1rem;
+  flex-grow: 1;
 
   &.private-route {
     display: flex;
     flex-direction: column;
-    flex-grow: 1;
     min-height: 0;
     margin-inline: 1rem;
   }

frontend/src/locales/de.json

@@ -86,7 +86,6 @@
     "bookingDuration": "Buchungsdauer",
     "videoMeetingLink": "Video-Meeting Link",
     "customVideoMeetingLinkInfo": "Gib eine Video-Meeting URL ein, um diesen Link mit allen neuen Meetings zu verwenden. Dies kann später in den Einstellungen geändert werden.",
-    "customVideoMeetingLinkPlaceholder": "https://meeting.zoom.com/username",
     "zoomIcon": "Zoom",
     "skipThisStep": "diesen Schritt überspringen",
     "setupComplete": "Konto-Setup abgeschlossen",
@@ -413,6 +412,7 @@
     "searchForCalendars": "Nach Kalendern suchen",
     "secondaryTimeZone": "Sekundäre Zeitzone",
     "selectATimeFromTheCalendar": "Wähle einen freien Zeitpunkt aus dem Kalender",
+    "selectAll": "Alle auswählen",
     "selectCalendar": "Kalender auswählen",
     "selectDays": "Wochentage auswählen",
     "selectDateForWeek": "Datum für Woche auswählen",

frontend/src/locales/en.json

@@ -89,7 +89,6 @@
     "connectWithZoomInfo": "Connect your Zoom account to generate meeting links for new bookings.",
     "customVideoMeetingLink": "Custom Video Meeting link",
     "customVideoMeetingLinkInfo": "Enter a video meeting URL to use this link with all new meetings. This can be changed in Settings.",
-    "customVideoMeetingLinkPlaceholder": "https://meeting.zoom.com/username",
     "zoomIcon": "Zoom",
     "skipThisStep": "skip this step",
     "setupComplete": "Account setup complete",
@@ -416,6 +415,7 @@
     "searchForCalendars": "Search for calendars",
     "secondaryTimeZone": "Secondary time zone",
     "selectATimeFromTheCalendar": "Select an open time slot from the calendar.",
+    "selectAll": "Select all",
     "selectCalendar": "Select calendar",
     "selectDays": "Select days",
     "selectDateForWeek": "Select date for week",

frontend/src/views/AvailabilityView/components/AvailabilitySettings/components/AvailabilityCopyDropdown.vue

@@ -53,7 +53,7 @@ watch(
     <template #default>
       <container-box class="flex flex-col gap-2">
         {{ t('label.copyTo') }}
-        <checkbox-input name="all" :label="t('ftue.selectAll')" v-model="allDaysSelected" />
+        <checkbox-input name="all" :label="t('label.selectAll')" v-model="allDaysSelected" />
         <hr>
         <checkbox-input
           v-for="d in isoWeekdays"

frontend/src/views/AvailabilityView/components/BookingPageLink/index.vue

@@ -91,7 +91,7 @@ export default {
 
   <!-- Share your link -->
   <text-input
-    name="shareLink"
+    name="bookingPageLinkInput"
     class="share-link-input"
     :model-value="userStore.myLink"
   >
@@ -153,7 +153,6 @@ h3 {
   position: relative;
   margin-block-end: 1rem;
   width: 100%;
-  max-width: 792px;
 
   button {
     position: absolute;

frontend/src/views/FTUEView/steps/VideoMeetingLinkStep.vue

@@ -108,7 +108,7 @@ onMounted(async () => {
 
   <text-input
     name="customVideoMeetingLink"
-    :placeholder="t('ftue.customVideoMeetingLinkPlaceholder')"
+    placeholder="https://meet.jit.si/room"
     v-model="customMeetingLink"
   />
 

test/e2e/pages/availability-page.ts

@@ -84,7 +84,7 @@ export class AvailabilityPage {
     this.refreshLinkBtn = this.page.getByRole('button', { name: 'Refresh link' });
     this.refreshLinkConfirmTxt = this.page.getByText('Refresh link', { exact: true });
     this.refreshLinkConfirmCancelBtn = this.page.getByRole('button', { name: 'Cancel' });
-    this.shareYourLinkInput = this.page.locator('#shareLink');
+    this.shareYourLinkInput = this.page.locator('#bookingPageLinkInput');
     this.shareLinkCopyBtn = this.page.getByRole('button', { name: 'Copy', exact: true });
   }