Update query params

Author: balbatross

packages/app/hiveflow-backend/src/schema/schedule.ts

@@ -261,7 +261,7 @@ export default (prisma: PrismaClient) => {
             }
         },
         Query: {
-            calendarItems: async (root: any, args: any) => {
+            calendarItems: async (root: any, args: any, context: any) => {
                 let query : any = {};
 
                 if(args.where?.end_GTE) query['end'] = {...query['end'], gt: args.where.end_GTE};
@@ -270,7 +270,8 @@ export default (prisma: PrismaClient) => {
 
                 return await prisma.calendarItem.findMany({
                     where: {
-                        ...query
+                        ...query,
+                        organisation: context?.jwt?.organisation
                     },
                     include: {
                         permissions: true,

packages/app/hiveflow-frontend/src/views/schedule/modal/index.tsx

@@ -177,7 +177,7 @@ export const SchedulingModal = (props: any) => {
                     <Autocomplete
                         options={rowOptions || []}
                         value={rowOptions?.find((a) => a.id == schedule.groupBy?.id) || null}
-                        onChange={(e, newValue) => setSchedule({ ...schedule, groupBy: newValue })}
+                        onChange={(e, newValue) => setSchedule({ ...schedule, groupBy: {id: newValue?.id} })}
                         groupBy={(option) => option.project ? 'Project' : 'Estimate'}
                         getOptionLabel={(option: any) => typeof (option) == 'string' ? option : option.name}
                         renderInput={(params) => <TextField {...params} label="Row" size="small" />} />