From f6c0b2ba347a1abf478c2e67e8973b1c4bdf0ba9 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 30 Oct 2023 16:09:10 +0800 Subject: [PATCH] add import_item_state to set integration api payload --- packages/api/src/entity/integration.ts | 8 ++++---- packages/api/src/generated/graphql.ts | 9 +++++++++ packages/api/src/generated/schema.graphql | 8 ++++++++ packages/api/src/resolvers/integrations/index.ts | 10 +++++++++- packages/api/src/schema.ts | 8 ++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/packages/api/src/entity/integration.ts b/packages/api/src/entity/integration.ts index 72855e7dc..e446f10c3 100644 --- a/packages/api/src/entity/integration.ts +++ b/packages/api/src/entity/integration.ts @@ -15,10 +15,10 @@ export enum IntegrationType { } export enum ImportItemState { - UNREAD = 'UNREAD', - UNARCHIVED = 'UNARCHIVED', - ARCHIVED = 'ARCHIVED', - ALL = 'ALL', + Unread = 'UNREAD', + Unarchived = 'UNARCHIVED', + Archived = 'ARCHIVED', + All = 'ALL', } @Entity({ name: 'integrations' }) diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index e42282815..8041b6beb 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -970,6 +970,13 @@ export type ImportFromIntegrationSuccess = { success: Scalars['Boolean']; }; +export enum ImportItemState { + All = 'ALL', + Archived = 'ARCHIVED', + Unarchived = 'UNARCHIVED', + Unread = 'UNREAD' +} + export type Integration = { __typename?: 'Integration'; createdAt: Scalars['Date']; @@ -2375,6 +2382,7 @@ export enum SetIntegrationErrorCode { export type SetIntegrationInput = { enabled: Scalars['Boolean']; id?: InputMaybe; + importItemState?: InputMaybe; name: Scalars['String']; syncedAt?: InputMaybe; token: Scalars['String']; @@ -3495,6 +3503,7 @@ export type ResolversTypes = { ImportFromIntegrationErrorCode: ImportFromIntegrationErrorCode; ImportFromIntegrationResult: ResolversTypes['ImportFromIntegrationError'] | ResolversTypes['ImportFromIntegrationSuccess']; ImportFromIntegrationSuccess: ResolverTypeWrapper; + ImportItemState: ImportItemState; Int: ResolverTypeWrapper; Integration: ResolverTypeWrapper; IntegrationType: IntegrationType; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index dfb7c1677..335c93409 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -863,6 +863,13 @@ type ImportFromIntegrationSuccess { success: Boolean! } +enum ImportItemState { + ALL + ARCHIVED + UNARCHIVED + UNREAD +} + type Integration { createdAt: Date! enabled: Boolean! @@ -1834,6 +1841,7 @@ enum SetIntegrationErrorCode { input SetIntegrationInput { enabled: Boolean! id: ID + importItemState: ImportItemState name: String! syncedAt: Date token: String! diff --git a/packages/api/src/resolvers/integrations/index.ts b/packages/api/src/resolvers/integrations/index.ts index 82a67e6b5..fe9b9c33d 100644 --- a/packages/api/src/resolvers/integrations/index.ts +++ b/packages/api/src/resolvers/integrations/index.ts @@ -1,5 +1,9 @@ import { DeepPartial } from 'typeorm' -import { Integration, IntegrationType } from '../../entity/integration' +import { + ImportItemState, + Integration, + IntegrationType, +} from '../../entity/integration' import { env } from '../../env' import { DeleteIntegrationError, @@ -47,6 +51,10 @@ export const setIntegrationResolver = authorized< id: input.id || undefined, type: input.type || IntegrationType.Export, syncedAt: input.syncedAt ? new Date(input.syncedAt) : undefined, + importItemState: + input.type === IntegrationType.Import + ? input.importItemState ?? ImportItemState.Unarchived // default to unarchived + : undefined, } if (input.id) { // Update diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index d257b5069..c6bb63f9d 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -1972,6 +1972,13 @@ const schema = gql` ALREADY_EXISTS } + enum ImportItemState { + UNREAD + UNARCHIVED + ARCHIVED + ALL + } + input SetIntegrationInput { id: ID name: String! @@ -1979,6 +1986,7 @@ const schema = gql` token: String! enabled: Boolean! syncedAt: Date + importItemState: ImportItemState } union IntegrationsResult = IntegrationsSuccess | IntegrationsError