From da3fede3a4405b096de86d9fa9d2757e840ef486 Mon Sep 17 00:00:00 2001
From: Hongbo Wu <hongbo@omnivore.app>
Date: Fri, 8 Dec 2023 19:58:41 +0800
Subject: [PATCH] fix saved search bug: undefined category in input

---
 packages/api/src/generated/graphql.ts                         | 4 ++++
 packages/api/src/generated/schema.graphql                     | 3 +++
 packages/api/src/resolvers/filters/index.ts                   | 1 +
 packages/api/src/schema.ts                                    | 3 +++
 packages/web/lib/networking/fragments/savedSearchFragment.ts  | 4 ++++
 packages/web/lib/networking/mutations/saveFilterMutation.ts   | 3 +++
 packages/web/lib/networking/mutations/updateFilterMutation.ts | 1 +
 7 files changed, 19 insertions(+)

diff --git a/packages/api/src/generated/graphql.ts b/packages/api/src/generated/graphql.ts
index d485da3a2..e5c815027 100644
--- a/packages/api/src/generated/graphql.ts
+++ b/packages/api/src/generated/graphql.ts
@@ -815,6 +815,7 @@ export type FeedsSuccess = {
 
 export type Filter = {
   __typename?: 'Filter';
+  category?: Maybe<Scalars['String']>;
   createdAt: Scalars['Date'];
   defaultFilter?: Maybe<Scalars['Boolean']>;
   description?: Maybe<Scalars['String']>;
@@ -2238,6 +2239,7 @@ export enum SaveFilterErrorCode {
 }
 
 export type SaveFilterInput = {
+  category?: InputMaybe<Scalars['String']>;
   description?: InputMaybe<Scalars['String']>;
   filter: Scalars['String'];
   folder?: InputMaybe<Scalars['String']>;
@@ -2902,6 +2904,7 @@ export enum UpdateFilterErrorCode {
 }
 
 export type UpdateFilterInput = {
+  category?: InputMaybe<Scalars['String']>;
   description?: InputMaybe<Scalars['String']>;
   filter?: InputMaybe<Scalars['String']>;
   folder?: InputMaybe<Scalars['String']>;
@@ -4967,6 +4970,7 @@ export type FeedsSuccessResolvers<ContextType = ResolverContext, ParentType exte
 };
 
 export type FilterResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Filter'] = ResolversParentTypes['Filter']> = {
+  category?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   createdAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
   defaultFilter?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
diff --git a/packages/api/src/generated/schema.graphql b/packages/api/src/generated/schema.graphql
index 15cb6e347..816abbd5a 100644
--- a/packages/api/src/generated/schema.graphql
+++ b/packages/api/src/generated/schema.graphql
@@ -722,6 +722,7 @@ type FeedsSuccess {
 }
 
 type Filter {
+  category: String
   createdAt: Date!
   defaultFilter: Boolean
   description: String
@@ -1691,6 +1692,7 @@ enum SaveFilterErrorCode {
 }
 
 input SaveFilterInput {
+  category: String
   description: String
   filter: String!
   folder: String
@@ -2306,6 +2308,7 @@ enum UpdateFilterErrorCode {
 }
 
 input UpdateFilterInput {
+  category: String
   description: String
   filter: String
   folder: String
diff --git a/packages/api/src/resolvers/filters/index.ts b/packages/api/src/resolvers/filters/index.ts
index 052a4d299..8a8187715 100644
--- a/packages/api/src/resolvers/filters/index.ts
+++ b/packages/api/src/resolvers/filters/index.ts
@@ -43,6 +43,7 @@ export const saveFilterResolver = authorized<
         filter: input.filter,
         defaultFilter: false,
         visible: true,
+        category: input.category ?? 'Search',
       })
     })
 
diff --git a/packages/api/src/schema.ts b/packages/api/src/schema.ts
index aba01f9e2..b84976126 100755
--- a/packages/api/src/schema.ts
+++ b/packages/api/src/schema.ts
@@ -2201,6 +2201,7 @@ const schema = gql`
     folder: String
     description: String
     position: Int
+    category: String
   }
 
   union SaveFilterResult = SaveFilterSuccess | SaveFilterError
@@ -2220,6 +2221,7 @@ const schema = gql`
     updatedAt: Date
     defaultFilter: Boolean
     visible: Boolean
+    category: String
   }
 
   type SaveFilterError {
@@ -2271,6 +2273,7 @@ const schema = gql`
     folder: String
     description: String
     visible: Boolean
+    category: String
   }
 
   enum UpdateFilterErrorCode {
diff --git a/packages/web/lib/networking/fragments/savedSearchFragment.ts b/packages/web/lib/networking/fragments/savedSearchFragment.ts
index 70bd3b4fd..8efd47d77 100644
--- a/packages/web/lib/networking/fragments/savedSearchFragment.ts
+++ b/packages/web/lib/networking/fragments/savedSearchFragment.ts
@@ -7,6 +7,8 @@ export type SavedSearch = {
   position: number
   visible: boolean
   defaultFilter: boolean
+  folder: string
+  category: string
 }
 
 export const savedSearchFragment = gql`
@@ -17,5 +19,7 @@ export const savedSearchFragment = gql`
     position
     visible
     defaultFilter
+    folder
+    category
   }
 `
diff --git a/packages/web/lib/networking/mutations/saveFilterMutation.ts b/packages/web/lib/networking/mutations/saveFilterMutation.ts
index 1bdef13bc..6c6becac5 100644
--- a/packages/web/lib/networking/mutations/saveFilterMutation.ts
+++ b/packages/web/lib/networking/mutations/saveFilterMutation.ts
@@ -7,6 +7,7 @@ export type AddFilterInput = {
   filter: string
   category: string
   position: number
+  folder?: string
 }
 
 type AddFilterOutput = {
@@ -27,6 +28,8 @@ export async function saveFilterMutation (
             position
             visible
             defaultFilter
+            folder
+            category
           }
         }
 
diff --git a/packages/web/lib/networking/mutations/updateFilterMutation.ts b/packages/web/lib/networking/mutations/updateFilterMutation.ts
index 8ae562362..62885cd65 100644
--- a/packages/web/lib/networking/mutations/updateFilterMutation.ts
+++ b/packages/web/lib/networking/mutations/updateFilterMutation.ts
@@ -10,6 +10,7 @@ export type UpdateFilterInput = {
   category?: string
   description?: string
   visible?: boolean
+  folder?: string
 }
 
 type UpdateFilterOutput = {