Merge branch 'develop' into simple-homepage

# Conflicts: # src/domain/timeline/calendar/views/EventCardHeader.tsx
alkem-io · Nov 11, 2024 · 0d83d06 · 0d83d06
2 parents d324397 + 4a93755
commit 0d83d06
Show file tree

Hide file tree

Showing 19 changed files with 280 additions and 115 deletions.
diff --git a/src/core/apollo/generated/apollo-helpers.ts b/src/core/apollo/generated/apollo-helpers.ts
@@ -703,8 +703,10 @@ export type CalendarEventKeySpecifier = (
   | 'nameID'
   | 'profile'
   | 'startDate'
+  | 'subspace'
   | 'type'
   | 'updatedDate'
+  | 'visibleOnParentCalendar'
   | 'wholeDay'
   | CalendarEventKeySpecifier
 )[];
@@ -720,8 +722,10 @@ export type CalendarEventFieldPolicy = {
   nameID?: FieldPolicy<any> | FieldReadFunction<any>;
   profile?: FieldPolicy<any> | FieldReadFunction<any>;
   startDate?: FieldPolicy<any> | FieldReadFunction<any>;
+  subspace?: FieldPolicy<any> | FieldReadFunction<any>;
   type?: FieldPolicy<any> | FieldReadFunction<any>;
   updatedDate?: FieldPolicy<any> | FieldReadFunction<any>;
+  visibleOnParentCalendar?: FieldPolicy<any> | FieldReadFunction<any>;
   wholeDay?: FieldPolicy<any> | FieldReadFunction<any>;
 };
 export type CalloutKeySpecifier = (
@@ -3130,12 +3134,14 @@ export type SpaceSettingsFieldPolicy = {
   privacy?: FieldPolicy<any> | FieldReadFunction<any>;
 };
 export type SpaceSettingsCollaborationKeySpecifier = (
+  | 'allowEventsFromSubspaces'
   | 'allowMembersToCreateCallouts'
   | 'allowMembersToCreateSubspaces'
   | 'inheritMembershipRights'
   | SpaceSettingsCollaborationKeySpecifier
 )[];
 export type SpaceSettingsCollaborationFieldPolicy = {
+  allowEventsFromSubspaces?: FieldPolicy<any> | FieldReadFunction<any>;
   allowMembersToCreateCallouts?: FieldPolicy<any> | FieldReadFunction<any>;
   allowMembersToCreateSubspaces?: FieldPolicy<any> | FieldReadFunction<any>;
   inheritMembershipRights?: FieldPolicy<any> | FieldReadFunction<any>;

diff --git a/src/core/apollo/generated/apollo-hooks.ts b/src/core/apollo/generated/apollo-hooks.ts
@@ -2437,6 +2437,7 @@ export const SpaceSettingsFragmentDoc = gql`
       allowMembersToCreateCallouts
       allowMembersToCreateSubspaces
       inheritMembershipRights
+      allowEventsFromSubspaces
     }
   }
 `;
@@ -3021,9 +3022,17 @@ export const CalendarEventInfoFragmentDoc = gql`
     durationMinutes
     wholeDay
     multipleDays
+    visibleOnParentCalendar
     profile {
       ...EventProfile
     }
+    subspace @include(if: $includeSubspace) {
+      id
+      profile {
+        id
+        displayName
+      }
+    }
   }
   ${EventProfileFragmentDoc}
 `;
@@ -3038,7 +3047,7 @@ export const CollaborationTimelineInfoFragmentDoc = gql`
           id
           myPrivileges
         }
-        events(limit: $limit) {
+        events {
           ...CalendarEventInfo
         }
       }
@@ -17479,6 +17488,7 @@ export const UpdateSpaceSettingsDocument = gql`
           allowMembersToCreateCallouts
           allowMembersToCreateSubspaces
           inheritMembershipRights
+          allowEventsFromSubspaces
         }
       }
     }
@@ -21197,7 +21207,7 @@ export function refetchCreatePostInputQuery(variables: SchemaTypes.CreatePostInp
 }
 
 export const SpaceCalendarEventsDocument = gql`
-  query SpaceCalendarEvents($spaceId: UUID!, $limit: Float) {
+  query SpaceCalendarEvents($spaceId: UUID!, $includeSubspace: Boolean = false) {
     lookup {
       space(ID: $spaceId) {
         id
@@ -21223,7 +21233,7 @@ export const SpaceCalendarEventsDocument = gql`
  * const { data, loading, error } = useSpaceCalendarEventsQuery({
  *   variables: {
  *      spaceId: // value for 'spaceId'
- *      limit: // value for 'limit'
+ *      includeSubspace: // value for 'includeSubspace'
  *   },
  * });
  */
@@ -21264,7 +21274,7 @@ export function refetchSpaceCalendarEventsQuery(variables: SchemaTypes.SpaceCale
 }
 
 export const CalendarEventDetailsDocument = gql`
-  query calendarEventDetails($eventId: UUID!) {
+  query calendarEventDetails($eventId: UUID!, $includeSubspace: Boolean = false) {
     lookup {
       calendarEvent(ID: $eventId) {
         ...CalendarEventDetails
@@ -21287,6 +21297,7 @@ export const CalendarEventDetailsDocument = gql`
  * const { data, loading, error } = useCalendarEventDetailsQuery({
  *   variables: {
  *      eventId: // value for 'eventId'
+ *      includeSubspace: // value for 'includeSubspace'
  *   },
  * });
  */
@@ -21327,7 +21338,7 @@ export function refetchCalendarEventDetailsQuery(variables: SchemaTypes.Calendar
 }
 
 export const CreateCalendarEventDocument = gql`
-  mutation createCalendarEvent($eventData: CreateCalendarEventOnCalendarInput!) {
+  mutation createCalendarEvent($eventData: CreateCalendarEventOnCalendarInput!, $includeSubspace: Boolean = false) {
     createEventOnCalendar(eventData: $eventData) {
       ...CalendarEventDetails
     }
@@ -21353,6 +21364,7 @@ export type CreateCalendarEventMutationFn = Apollo.MutationFunction<
  * const [createCalendarEventMutation, { data, loading, error }] = useCreateCalendarEventMutation({
  *   variables: {
  *      eventData: // value for 'eventData'
+ *      includeSubspace: // value for 'includeSubspace'
  *   },
  * });
  */
@@ -21376,7 +21388,7 @@ export type CreateCalendarEventMutationOptions = Apollo.BaseMutationOptions<
   SchemaTypes.CreateCalendarEventMutationVariables
 >;
 export const UpdateCalendarEventDocument = gql`
-  mutation updateCalendarEvent($eventData: UpdateCalendarEventInput!) {
+  mutation updateCalendarEvent($eventData: UpdateCalendarEventInput!, $includeSubspace: Boolean = false) {
     updateCalendarEvent(eventData: $eventData) {
       ...CalendarEventDetails
     }
@@ -21402,6 +21414,7 @@ export type UpdateCalendarEventMutationFn = Apollo.MutationFunction<
  * const [updateCalendarEventMutation, { data, loading, error }] = useUpdateCalendarEventMutation({
  *   variables: {
  *      eventData: // value for 'eventData'
+ *      includeSubspace: // value for 'includeSubspace'
  *   },
  * });
  */