@asd20/ui 3.2.880 → 3.2.881

package/package.json

@@ -5,7 +5,7 @@
     "*.scss",
     "*.vue"
   ],
-  "version": "3.2.880",
+  "version": "3.2.881",
   "private": false,
   "license": "MIT",
   "repository": {

package/src/components/organisms/Asd20SiteSearch/index.vue

@@ -106,7 +106,7 @@ import mapFilesToListItems from '../../../helpers/mapFilesToListItems'
 import globalPropMixinFactory from '../../../mixins/globalPropMixinFactory.js'
 
 export default {
-  name: 'Asd20SearchMenu',
+  name: 'Asd20SiteSearch',
 
   mixins: [
     globalPropMixinFactory(

package/src/data/events/district-events.json

@@ -48,6 +48,33 @@
       "calendarFormat": "ical",
       "calendarColor": "#213f94"
     },
+    {
+      "@search.score": 1,
+      "id": null,
+      "uid": "MDQwMDAwMDA4MjAwRTAwMDc0QzVCNzEwMUE4MkUwMDgwMDAwMDAwMERFRTE5NzcxNThBQ0RBMDEwMDAwMDAwMDAwMDAwMDAwMTAwMDAwMDBFOEVBMjc5NkM0MDI3RjRGODFFNzY1QzQ0M0VGMDA0Mw==",
+      "type": "event",
+      "summary": "Winter Break - Break",
+      "description": "",
+      "location": "AAHS",
+      "start": "2022-12-25T17:00:00Z",
+      "end": "2022-12-25T17:30:00Z",
+      "dtstamp": "2022-12-25T17:00:00Z",
+      "class": "",
+      "priority": "",
+      "transparency": "",
+      "status": "",
+      "sequence": "",
+      "url": null,
+      "calendarId": "a0c92470-27a0-11ec-a6e3-c76d885e64a4",
+      "calendarName": "Choir",
+      "calendarOrganizationId": "bb6e9cd6-da25-9e6f-5e8d-072b9a7df4f0",
+      "calendarOrganizationTitle": "Air Academy High School",
+      "calendarCategories": [],
+      "calendarKeywords": [],
+      "calendarUrl": "https://outlook.office365.com/owa/calendar/6a1a45f079b7416f8b301747cd731778@asd20.org/93eb354f1a6b446bb533e2f40613f8a310360980508845501669/calendar.ics",
+      "calendarFormat": "ical",
+      "calendarColor": "#eb28c7"
+    },
     {
       "@search.score": 1,
       "id": null,

package/src/helpers/expandEvents.js

@@ -14,65 +14,65 @@ import isSameDay from 'date-fns/is_same_day'
 export default function expandEvents(events) {
   return events
     .reduce((a, event) => {
-      // Handle multi-day events
-      const diffTime = Math.abs(
-        parse(event.end || event.start).getTime() - parse(event.start).getTime()
-      )
+      // Parse the event start and end times
+      const start = parse(event.start)
+      const end = event.end ? parse(event.end) : start
+
+      const diffTime = Math.abs(end.getTime() - start.getTime())
       const diffHours = Math.ceil(diffTime / (1000 * 60 * 60))
       const diffDays = Math.ceil(diffTime / (1000 * 60 * 60 * 24))
-      const multiDay = !isSameDay(event.start, event.end)
+      const multiDay = !isSameDay(start, end)
       const allDay = !event.end || (diffHours > 23 && diffHours < 25)
       const endTimeUndetermined = event.end && event.end === event.start
 
       if (multiDay && !allDay) {
+        // Expand multi-day events
         for (let d = 0; d < diffDays; d++) {
-          const today = new Date()
-          today.setDate(today.getDate() - 1)
-          const newStart = addDays(event.start, d)
-          if (newStart > today) {
-            a.push(
-              Object.assign({}, event, {
-                start: newStart,
-                end: event.end ? event.end : null,
-                originalStart: event.start,
-                allDay: parse(event.start).getHours() === 0,
-                endTimeUndetermined,
-                multiDay,
-                weekday: format(parse(newStart), 'dddd'),
-                day: format(parse(newStart), 'DD'),
-                number: format(parse(newStart), 'D'),
-                month: format(parse(newStart), 'MMMM'),
-                year: format(parse(newStart), 'YYYY'),
-              })
-            )
-          }
-        }
-      } else {
-        a.push(
-          Object.assign({}, event, {
-            start: event.start,
-            end: event.end ? event.end : null,
-            originalStart: null,
-            allDay,
+          const newStart = addDays(start, d)
+          a.push({
+            ...event,
+            start: newStart,
+            end: end,
+            originalStart: start,
+            allDay: start.getHours() === 0,
             endTimeUndetermined,
             multiDay,
-            weekday: format(parse(event.start), 'dddd'),
-            day: format(parse(event.start), 'DD'),
-            number: format(parse(event.start), 'D'),
-            month: format(parse(event.start), 'MMMM'),
-            year: format(parse(event.start), 'YYYY'),
+            weekday: format(newStart, 'dddd'),
+            day: format(newStart, 'DD'),
+            number: format(newStart, 'D'),
+            month: format(newStart, 'MMMM'),
+            year: format(newStart, 'YYYY'),
           })
-        )
+        }
+      } else {
+        // Add single-day events
+        a.push({
+          ...event,
+          start: start,
+          end: end,
+          originalStart: null,
+          allDay,
+          endTimeUndetermined,
+          multiDay,
+          weekday: format(start, 'dddd'),
+          day: format(start, 'DD'),
+          number: format(start, 'D'),
+          month: format(start, 'MMMM'),
+          year: format(start, 'YYYY'),
+        })
       }
       return a
     }, [])
     .reduce((a, e) => {
-      const hasDuplicate =
-        a.filter(
-          ae =>
-            ae.summary === e.summary && ae.start === e.start && ae.end === e.end
-        ).length > 0
+      // Remove duplicates
+      const hasDuplicate = a.some(
+        ae => ae.summary === e.summary && ae.start.getTime() === e.start.getTime() && ae.end.getTime() === e.end.getTime()
+      )
       if (!hasDuplicate) a.push(e)
       return a
     }, [])
+    .sort((a, b) => {
+      // Sort events by start date
+      return a.start.getTime() - b.start.getTime()
+    })
 }