@asd20/ui 3.2.813 → 3.2.815

package/package.json

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

package/src/components/atoms/Asd20CalendarEventButton/index.vue

@@ -7,7 +7,7 @@
     :style="{ '--accent-color': event.calendarColor }"
   >
     <span class="title"
-      ><span>{{ event.summary }}</span></span
+      ><span>{{ sanitizedSummary }}</span></span
     >
     <span class="time">{{ start }}{{ end }}</span>
     <span class="start-time">{{ startTime }}</span>
@@ -36,20 +36,43 @@ export default {
           this.event.allday || this.event.multiDay,
       }
     },
-
     startTime() {
-      return format(parse(this.event.start), 'h:mm aa')
+      return format(
+        parse(this.event.start, "yyyy-MM-dd'T'HH:mm:ssX", new Date()),
+        'h:mm aa'
+      )
     },
     start() {
-      return format(parse(this.event.start), 'h:mm aa, MMMM DD YYYY')
+      return format(
+        parse(this.event.start, "yyyy-MM-dd'T'HH:mm:ssX", new Date()),
+        'h:mm aa, MMMM DD YYYY'
+      )
     },
     end() {
-      return ' to ' + format(parse(this.event.end), 'h:mm aa, MMMM DD YYYY')
+      return (
+        ' to ' +
+        format(
+          parse(this.event.end, "yyyy-MM-dd'T'HH:mm:ssX", new Date()),
+          'h:mm aa, MMMM DD YYYY'
+        )
+      )
+    },
+    sanitizedSummary() {
+      return this.sanitizeSummary(this.event.summary)
+    },
+  },
+  methods: {
+    // specifically for rSchool events that have extraneous school names in the summary
+    sanitizeSummary(summary) {
+      if (!summary) return summary
+      const pattern = /vs\.[^>]*>Multiple Schools/
+      return summary.replace(pattern, 'vs. Multiple Schools')
     },
   },
 }
 </script>
 
+
 <style lang="scss" scoped>
 @import '../../../design/_mixins.scss';
 @import '../../../design/_variables.scss';

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

@@ -2,7 +2,9 @@
   <asd20-modal
     v-if="event"
     :open="open"
-    :title="`${event.calendarOrganizationTitle || event.calendarLocation} Event`"
+    :title="
+      `${event.calendarOrganizationTitle || event.calendarLocation} Event`
+    "
     icon="calendar-alt"
     dismissable
     class="asd20-event-modal"
@@ -127,18 +129,24 @@ export default {
     sanitizeDescription(description) {
       if (!description) return description
 
-      // Remove text between the ">" backwards to the first "." or ":" and replace '>Multiple Schools' with '.'
-      description = description.replace(/([.:][^>]*?)>([^>]*Multiple Schools)/, '$1.')
+      // Check if the description contains ">Multiple Schools"
+      if (description.includes('>Multiple Schools')) {
+        // Remove text between the ">" backwards to the first "." or ":" and replace '>Multiple Schools' with '.'
+        description = description.replace(
+          /([.:][^>]*?)>([^>]*Multiple Schools)/,
+          '$1.'
+        )
 
-      // Separate capital letters preceded by lowercase letters with ', '
-      description = description.replace(/([a-z])([A-Z])/g, '$1, $2')
+        // Separate capital letters preceded by lowercase letters with ', '
+        description = description.replace(/([a-z])([A-Z])/g, '$1, $2')
 
-      // Remove unmatched quotes between "." or ":" and ">"
-      const quotePattern = /[.:][^>]*['"][^'"]*$|[^'"]*['"][^>]*['"]>Multiple Schools/g
-      description = description.replace(quotePattern, match => {
-        const quotes = match.match(/['"]/g) || []
-        return quotes.length % 2 !== 0 ? match.replace(/['"]/g, '') : match
-      })
+        // Remove unmatched quotes between "." or ":" and ">"
+        const quotePattern = /[.:][^>]*['"][^'"]*$|[^'"]*['"][^>]*['"]>Multiple Schools/g
+        description = description.replace(quotePattern, match => {
+          const quotes = match.match(/['"]/g) || []
+          return quotes.length % 2 !== 0 ? match.replace(/['"]/g, '') : match
+        })
+      }
 
       return description
     },

package/src/helpers/mapEventToCard.js

@@ -13,18 +13,24 @@ const sanitizeSummary = summary => {
 const sanitizeDescription = description => {
   if (!description) return description
 
-  // Remove text between the ">" backwards to the first "." or ":"
-  description = description.replace(/([.:][^>]*?)>([^>]*Multiple Schools)/, '$1>$2')
+  // Check if the description contains ">Multiple Schools"
+  if (description.includes('>Multiple Schools')) {
+    // Remove text between the ">" backwards to the first "." or ":" and replace '>Multiple Schools' with '.'
+    description = description.replace(
+      /([.:][^>]*?)>([^>]*Multiple Schools)/,
+      '$1.'
+    )
 
-  // Separate capital letters preceded by lowercase letters with ', '
-  description = description.replace(/([a-z])([A-Z])/g, '$1, $2')
+    // Separate capital letters preceded by lowercase letters with ', '
+    description = description.replace(/([a-z])([A-Z])/g, '$1, $2')
 
-  // Remove unmatched quotes between "." or ":" and ">"
-  const quotePattern = /[.:][^>]*['"][^'"]*$|[^'"]*['"][^>]*['"]>Multiple Schools/g
-  description = description.replace(quotePattern, match => {
-    const quotes = match.match(/['"]/g) || []
-    return quotes.length % 2 !== 0 ? match.replace(/['"]/g, '') : match
-  })
+    // Remove unmatched quotes between "." or ":" and ">"
+    const quotePattern = /[.:][^>]*['"][^'"]*$|[^'"]*['"][^>]*['"]>Multiple Schools/g
+    description = description.replace(quotePattern, match => {
+      const quotes = match.match(/['"]/g) || []
+      return quotes.length % 2 !== 0 ? match.replace(/['"]/g, '') : match
+    })
+  }
 
   return description
 }
@@ -52,7 +58,10 @@ const formattedTime = event => {
   const endTime = parse(event.end, "yyyy-MM-dd'T'HH:mm:ssX", new Date())
   const startHour = startTime.getHours()
 
-  if (startTime.getTime() === endTime.getTime() && (startHour >= 23 || startHour < 3)) {
+  if (
+    startTime.getTime() === endTime.getTime() &&
+    (startHour >= 23 || startHour < 3)
+  ) {
     return 'TBD'
   }