Merge branch 'malj/2414' into staging

equinor · Aug 8, 2024 · d11da50 · d11da50
2 parents db05eae + 9a0b0e1
commit d11da50
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 17 deletions.
diff --git a/sanityv3/schemas/components/EventPromotion/EventPromotionInput.tsx b/sanityv3/schemas/components/EventPromotion/EventPromotionInput.tsx
@@ -1,4 +1,4 @@
-import { Text, Card, Grid, Stack, Heading, Radio, Inline, Flex, Switch } from '@sanity/ui'
+import { Text, Card, Grid, Stack, Heading, Radio, Inline, Flex, Switch, TextInput } from '@sanity/ui'
 import { set, MemberField } from 'sanity'
 import { getObjectMemberField } from '../utils/getObjectMemberField'
 import type { ObjectInputProps } from 'sanity'
@@ -12,7 +12,7 @@ const InlinePreview = ({ value }: { value: EventPromotion | undefined }) => {
   if (!value) return null
 
   const time = value?.promotePastEvents ? 'past' : 'upcoming'
-  const number = value?.promotePastEvents ? value?.pastEventsCount || '50 (max)' : ''
+  const number = value?.pastEventsCount
   const withTags = value?.useTags ? 'from selected tags' : ''
   const automaticPromotion = value?.promoteSingleUpcomingEvent
     ? 'Automatically promoting single upcoming event'
@@ -31,10 +31,11 @@ export const EventPromotionInput = (props: EventPromotionInputProps) => {
   const useTags = getObjectMemberField(members, 'useTags')
   const promotePastEvents = getObjectMemberField(members, 'promotePastEvents')
   const pastEventsCount = getObjectMemberField(members, 'pastEventsCount')
+  const upcomingEventsCount = getObjectMemberField(members, 'upcomingEventsCount') 
   const selectedTags = getObjectMemberField(members, 'tags')
   const promotedEvents = getObjectMemberField(members, 'promotedEvents')
 
-  if (!promotePastEvents || !pastEventsCount || !useTags || !selectedTags || !promotedEvents)
+  if (!promotePastEvents || !pastEventsCount || !upcomingEventsCount || !useTags || !selectedTags || !promotedEvents)
     return renderDefault(props)
 
   return (
@@ -110,18 +111,29 @@ export const EventPromotionInput = (props: EventPromotionInputProps) => {
               />
             )}
           </Grid>
-          <Card padding={2} radius={2} shadow={1}>
-            <Inline space={2}>
-              <Switch
-                id="selectSingleUpcomingPromotion"
-                checked={value?.promoteSingleUpcomingEvent}
-                onChange={() => onChange(set(!value?.promoteSingleUpcomingEvent, ['promoteSingleUpcomingEvent']))}
+          <Grid columns={2} gap={3}>
+            <Card padding={2} radius={2} shadow={1}>
+              <MemberField
+                member={upcomingEventsCount}
+                renderInput={renderInput}
+                renderField={renderField}
+                renderItem={renderItem}
+                renderPreview={renderPreview}
               />
-              <Text as="label" htmlFor="selectSingleUpcomingPromotion">
-                Promote single upcoming event
-              </Text>
-            </Inline>
-          </Card>
+            </Card>
+            <Card padding={2} radius={2} shadow={1}>
+              <Inline space={2}>
+                <Switch
+                  id="selectSingleUpcomingPromotion"
+                  checked={value?.promoteSingleUpcomingEvent}
+                  onChange={() => onChange(set(!value?.promoteSingleUpcomingEvent, ['promoteSingleUpcomingEvent']))}
+                />
+                <Text as="label" htmlFor="selectSingleUpcomingPromotion">
+                  Promote single upcoming event
+                </Text>
+              </Inline>
+            </Card>
+          </Grid>
 
           {value?.useTags && (
             <MemberField

diff --git a/sanityv3/schemas/objects/promotion/promoteEvents.tsx b/sanityv3/schemas/objects/promotion/promoteEvents.tsx
@@ -2,7 +2,8 @@ import type { Reference, Rule, ValidationContext } from 'sanity'
 import { filterByRouteEvents } from '../../../helpers/referenceFilters'
 import { Flags } from '../../../src/lib/datasetHelpers'
 import routes from '../../routes'
-import { EventPromotionInput, EventPromotionPreview } from '../../components/EventPromotion'
+import { EventPromotionPreview } from '../../components/EventPromotion'
+import { EventPromotionInput } from '../../components/EventPromotion/EventPromotionInput'
 
 export type EventPromotion = {
   _key: string

diff --git a/web/lib/queries/common/pageContentFields.ts b/web/lib/queries/common/pageContentFields.ts
@@ -360,19 +360,20 @@ _type == "keyNumbers" =>{
           manuallySelectEvents,
           promotePastEvents,
           pastEventsCount,
+          upcomingEventsCount,
           promoteSingleUpcomingEvent
         },
         !manuallySelectEvents => {
           tags,
          // @TODO: This query is not done yet
           (!promotePastEvents || !defined(promotePastEvents)) => {
             !useTags => {
-              "promotions": ${futureEventsQuery(false)}[0...3]{
+              "promotions": ${futureEventsQuery(false)}[]{
                 ${eventPromotionFields}
               },
             },
             useTags => {
-              "promotions": ${futureEventsQuery(true)}[0...3]{
+              "promotions": ${futureEventsQuery(true)}[]{
                 ${eventPromotionFields}
               },
             },

diff --git a/web/pageComponents/topicPages/promotions/MultipleEventCards.tsx b/web/pageComponents/topicPages/promotions/MultipleEventCards.tsx
@@ -28,6 +28,10 @@ const MultipleEventCards = ({
       )
     })
   }
+  if (eventPromotionSettings?.upcomingEventsCount) {
+    data = data.slice(0, eventPromotionSettings.upcomingEventsCount)
+  }
+
   if (eventPromotionSettings?.promotePastEvents && eventPromotionSettings?.pastEventsCount) {
     data = data.slice(0, eventPromotionSettings.pastEventsCount)
   }

diff --git a/web/types/types.ts b/web/types/types.ts
@@ -133,6 +133,7 @@ export type EventPromotionSettings = {
   promotePastEvents: boolean
   promoteSingleUpcomingEvent: boolean
   pastEventsCount?: number
+  upcomingEventsCount?: number
 }
 
 export type EventCardData = {