From 75f7f0dd24a3df6e0073366f1ce2046984c5a013 Mon Sep 17 00:00:00 2001 From: miteshsavani810 Date: Tue, 25 Jun 2024 14:15:24 +0530 Subject: [PATCH] ZBUG-3997 Meeting Invitation Mail Shows Conflict Banner Even When No Conflict - Added support of excludeUid on freebusy api. --- src/batch-client/index.ts | 5 +++-- src/batch-client/types.ts | 1 + src/schema/generated-schema-types.ts | 1 + src/schema/schema.graphql | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/batch-client/index.ts b/src/batch-client/index.ts index 70cfa390..111e27ee 100644 --- a/src/batch-client/index.ts +++ b/src/batch-client/index.ts @@ -952,13 +952,14 @@ export class ZimbraBatchClient { singleRequest: true }).then(Boolean); - public freeBusy = ({ start, end, names }: FreeBusyOptions) => + public freeBusy = ({ start, end, names, excludeUid }: FreeBusyOptions) => this.jsonRequest({ name: 'GetFreeBusy', body: { s: start, e: end, - name: names.join(',') + name: names.join(','), + ...(excludeUid && { excludeUid }) } }).then(res => normalize(FreeBusy)(res.usr)); diff --git a/src/batch-client/types.ts b/src/batch-client/types.ts index 9b4f9c48..b1b9cc6b 100644 --- a/src/batch-client/types.ts +++ b/src/batch-client/types.ts @@ -75,6 +75,7 @@ export interface ZimbraClientOptions { export interface FreeBusyOptions { end: number; + excludeUid: string; names: Array; start: number; } diff --git a/src/schema/generated-schema-types.ts b/src/schema/generated-schema-types.ts index d8c7ddab..b857cdaf 100644 --- a/src/schema/generated-schema-types.ts +++ b/src/schema/generated-schema-types.ts @@ -3686,6 +3686,7 @@ export type QueryDownloadMessageArgs = { export type QueryFreeBusyArgs = { end?: InputMaybe; + excludeUid?: InputMaybe; names: Array; start?: InputMaybe; }; diff --git a/src/schema/schema.graphql b/src/schema/schema.graphql index 79561596..fe0edfce 100644 --- a/src/schema/schema.graphql +++ b/src/schema/schema.graphql @@ -3472,7 +3472,7 @@ type Query { downloadDocument(id: ID!, url: String!): Attachment listDocumentRevisions(id: ID!, version: Int!, count: Int!): Document discoverRights(right: [DiscoverRightInput!]!): DiscoverRights - freeBusy(names: [String!]!, start: Float, end: Float): [FreeBusy] + freeBusy(names: [String!]!, start: Float, end: Float, excludeUid: String): [FreeBusy] getContact( id: ID ids: [ID!]