From 24f31ce1eb00fee262e65560f8f7b0cc5df3ac57 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Fri, 17 Nov 2023 11:06:44 +0800 Subject: [PATCH] add folder to the updates api params --- packages/api/src/generated/graphql.ts | 1 + packages/api/src/generated/schema.graphql | 2 +- packages/api/src/resolvers/article/index.ts | 4 ++-- packages/api/src/schema.ts | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts index 164ac7de4..f8cc23f9d 100644 --- a/packages/api/src/generated/graphql.ts +++ b/packages/api/src/generated/graphql.ts @@ -1867,6 +1867,7 @@ export type QueryTypeaheadSearchArgs = { export type QueryUpdatesSinceArgs = { after?: InputMaybe; first?: InputMaybe; + folder?: InputMaybe; since: Scalars['Date']; sort?: InputMaybe; }; diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql index 52e666e42..de7dca8e7 100644 --- a/packages/api/src/generated/schema.graphql +++ b/packages/api/src/generated/schema.graphql @@ -1368,7 +1368,7 @@ type Query { sendInstallInstructions: SendInstallInstructionsResult! subscriptions(sort: SortParams, type: SubscriptionType): SubscriptionsResult! typeaheadSearch(first: Int, query: String!): TypeaheadSearchResult! - updatesSince(after: String, first: Int, since: Date!, sort: SortParams): UpdatesSinceResult! + updatesSince(after: String, first: Int, folder: String, since: Date!, sort: SortParams): UpdatesSinceResult! user(userId: ID, username: String): UserResult! users: UsersResult! validateUsername(username: String!): Boolean! diff --git a/packages/api/src/resolvers/article/index.ts b/packages/api/src/resolvers/article/index.ts index 42b209349..b9de1f73c 100644 --- a/packages/api/src/resolvers/article/index.ts +++ b/packages/api/src/resolvers/article/index.ts @@ -737,7 +737,7 @@ export const updatesSinceResolver = authorized< UpdatesSinceSuccess, UpdatesSinceError, QueryUpdatesSinceArgs ->(async (_obj, { since, first, after, sort: sortParams }, { uid }) => { +>(async (_obj, { since, first, after, sort: sortParams, folder }, { uid }) => { const sort = sortParamsToSort(sortParams) const startCursor = after || '' @@ -755,7 +755,7 @@ export const updatesSinceResolver = authorized< includeDeleted: true, dateFilters: [{ field: 'updatedAt', startDate }], sort, - inFilter: InFilter.ALL, + inFilter: (folder as InFilter) || InFilter.ALL, }, uid ) diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts index c869bb8ce..42da53bfd 100755 --- a/packages/api/src/schema.ts +++ b/packages/api/src/schema.ts @@ -2826,6 +2826,7 @@ const schema = gql` first: Int since: Date! sort: SortParams + folder: String ): UpdatesSinceResult! integrations: IntegrationsResult! recentSearches: RecentSearchesResult!