🎨 update

Author: BorghildSelle

studio/schemas/documents/event.tsx

@@ -1,8 +1,5 @@
 import { calendar_event, image } from '@equinor/eds-icons'
-import { Stack } from '@sanity/ui'
 import {
-  type ArrayOfObjectsInputProps,
-  type DateTimeInputProps,
   defineField,
   type PortableTextBlock,
   type Rule,
@@ -35,6 +32,12 @@ const validateRelatedLinksTitle = (
   return true
 }
 
+export type EventDayAndTime = {
+  _type: 'eventDayAndTime'
+  dayTime: Date
+  overrideTimeLabel?: string
+}
+
 export default {
   type: 'document',
   title: 'Event',
@@ -204,13 +207,41 @@ export default {
       ],
     },
   ],
+  orderings: [
+    {
+      title: 'Start date ',
+      name: 'startDateAsc',
+      by: [{ field: 'startDayAndTime.dayTime', direction: 'asc' }],
+    },
+  ],
   preview: {
     select: {
       title: 'title',
       date: 'eventDate',
+      startDayAndTime: 'startDayAndTime',
+      endDayAndTime: 'endDayAndTime',
     },
-    prepare({ title, date }: { title: PortableTextBlock[]; date: EventDate }) {
-      const eventDate = date?.date ? `${date.date}` : 'No date set'
+    prepare({
+      title,
+      date,
+      startDayAndTime,
+      endDayAndTime,
+    }: {
+      title?: PortableTextBlock[]
+      date?: EventDate
+      startDayAndTime?: EventDayAndTime
+      endDayAndTime?: EventDayAndTime
+    }) {
+      let eventDate = date?.date ? `${date.date}` : 'No date set'
+      if (startDayAndTime) {
+        if (endDayAndTime && !startDayAndTime?.overrideTimeLabel) {
+          eventDate = `${startDayAndTime?.dayTime} - ${endDayAndTime?.dayTime}`
+        } else {
+          eventDate = startDayAndTime?.overrideTimeLabel
+            ? `${startDayAndTime?.overrideTimeLabel}`
+            : `${startDayAndTime?.dayTime}`
+        }
+      }
       return {
         title: title ? blocksToText(title) : 'Untitled event',
         subtitle: eventDate,

studio/schemas/objects/commonFields/commonFields.tsx

@@ -58,6 +58,7 @@ export const background = {
 }
 
 export const backgroundPosition = (hiddenCallBack?: any, fieldset?: string) => {
+  console.log('hiddenCallBack', hiddenCallBack)
   return defineField({
     title: 'Select positioning of the image',
     description:

studio/schemas/objects/eventDate.tsx

@@ -1,6 +1,5 @@
 import type { Rule, ValidationContext } from 'sanity'
 import TimeInput, { EMPTY, INVALID_TIME_FORMAT } from '../components/TimeInput'
-import TimezoneInput from '../components/TimezoneInput'
 
 export type EventDate = {
   _type: 'eventDate'
@@ -42,13 +41,14 @@ export default {
           const { parent } = context as { parent: EventDate }
           if (!isValid(field)) {
             return INVALID_TIME_FORMAT
-          } else if (!field && parent.endTime) {
+          }
+          if (!field && parent.endTime) {
             return 'Start time must not be empty'
-          } else if (field && !parent.date) {
+          }
+          if (field && !parent.date) {
             return 'Date must be defined'
-          } else {
-            return true
           }
+          return true
         }),
     },
     {
@@ -63,15 +63,17 @@ export default {
           const { parent } = context as { parent: EventDate }
           if (!isValid(field)) {
             return INVALID_TIME_FORMAT
-          } else if (!field && parent.startTime) {
+          }
+          if (!field && parent.startTime) {
             return 'End time must not be empty'
-          } else if (parent.startTime && field && field <= parent.startTime) {
+          }
+          if (parent.startTime && field && field <= parent.startTime) {
             return 'End time must be greather than start time'
-          } else if (field && !parent.date) {
+          }
+          if (field && !parent.date) {
             return 'Date must be defined'
-          } else {
-            return true
           }
+          return true
         }),
     },
   ],

studio/schemas/objects/promotion/promoteEvents.tsx

@@ -119,9 +119,12 @@ export default {
         collapsed: false,
       },
       hidden: ({ parent }: any) =>
-        parent?.promotionType !== 'manual' && parent?.eventsCount > 1,
+        parent?.promotionType !== 'manual' || parent?.eventsCount > 1,
     },
-    backgroundPosition(),
+    backgroundPosition(
+      (parent: any) =>
+        parent?.promotionType !== 'manual' || parent?.eventsCount > 1,
+    ),
     viewAllLink,
     viewAllLinkLabel,
     theme,

web/core/AddToCalendar/AddToCalendar.tsx

@@ -11,6 +11,8 @@ const ics = require('ics')
 
 type AddToCalendarProps = {
   eventDate: EventDateType
+  startDateTime: Date
+  endDateTime: Date
   location?: string
   title: string
 }
@@ -50,25 +52,30 @@ const createICS = (eventData: ICSProps): string | boolean => {
   })
 }
 
-const AddToCalendar = ({ eventDate, title, location }: AddToCalendarProps) => {
+const AddToCalendar = ({
+  eventDate,
+  startDateTime,
+  endDateTime,
+  title,
+  location,
+}: AddToCalendarProps) => {
   const intl = useTranslations()
   const [fileData, setFileData] = useState<string | boolean>(false)
 
   useEffect(() => {
     const { start: startString, end: endString } = getEventDates(eventDate)
+    if (!startString && !eventDate?.date && !startDateTime) return
 
-    if (!startString) return
-
-    const start = new Date(startString)
+    const start = new Date(startDateTime ?? startString ?? eventDate?.date)
 
     let end: Date
-    if (!endString) {
+    if (!endString || !endDateTime) {
       /* If time is not specified add to calendar as a full day */
-      end = new Date(startString)
+      end = new Date(startDateTime ?? startString ?? eventDate?.date)
       start.setHours(0, 0, 0)
       end.setHours(23, 59, 59)
     } else {
-      end = new Date(endString)
+      end = new Date(endDateTime)
     }
 
     if (isUpcoming(end)) {
@@ -82,7 +89,7 @@ const AddToCalendar = ({ eventDate, title, location }: AddToCalendarProps) => {
       }
       setFileData(createICS(eventData))
     }
-  }, [eventDate, location, title])
+  }, [eventDate, startDateTime, endDateTime, location, title])
 
   if (!fileData) return null
   const atc = intl('add_to_calendar_event')

web/core/FormattedDateTime/FormattedDateTime.tsx

@@ -29,6 +29,7 @@ export type FormattedDateTimeProps = {
   /* Render time with timezone */
   /* @default false */
   showTimezone?: boolean
+  timeClassName?: string
 } & HTMLAttributes<HTMLSpanElement> &
   DateTimeFormatOptions
 
@@ -46,6 +47,7 @@ const FormattedDateTime = forwardRef<HTMLSpanElement, FormattedDateTimeProps>(
       showTimezone = false,
       uppercase = false,
       className = '',
+      timeClassName = '',
     },
     ref,
   ) => {
@@ -110,7 +112,7 @@ const FormattedDateTime = forwardRef<HTMLSpanElement, FormattedDateTimeProps>(
         {dateIcon && <DateIcon />}
         {timeIcon && <TimeIcon />}
         <time suppressHydrationWarning dateTime={datetime?.toLocaleString()}>
-          <span className={`mt-auto block leading-6`}>
+          <span className={twMerge(`mt-auto block leading-6`, timeClassName)}>
             {formatter.dateTime(new Date(datetime), config)}
           </span>
         </time>