Merge pull request #3135 from omnivore-app/change-folder-to-state

Change category to folder in saved search

packages/api/src/entity/filter.ts

@@ -46,4 +46,7 @@ export class Filter {
 
   @Column('boolean', { default: true })
   visible!: boolean
+
+  @Column('text')
+  folder!: string
 }

packages/api/src/generated/graphql.ts

@@ -809,11 +809,11 @@ export type FeedsSuccess = {
 
 export type Filter = {
   __typename?: 'Filter';
-  category: Scalars['String'];
   createdAt: Scalars['Date'];
   defaultFilter?: Maybe<Scalars['Boolean']>;
   description?: Maybe<Scalars['String']>;
   filter: Scalars['String'];
+  folder: Scalars['String'];
   id: Scalars['ID'];
   name: Scalars['String'];
   position: Scalars['Int'];
@@ -2223,9 +2223,9 @@ export enum SaveFilterErrorCode {
 }
 
 export type SaveFilterInput = {
-  category?: InputMaybe<Scalars['String']>;
   description?: InputMaybe<Scalars['String']>;
   filter: Scalars['String'];
+  folder?: InputMaybe<Scalars['String']>;
   name: Scalars['String'];
   position?: InputMaybe<Scalars['Int']>;
 };
@@ -2857,9 +2857,9 @@ export enum UpdateFilterErrorCode {
 }
 
 export type UpdateFilterInput = {
-  category?: InputMaybe<Scalars['String']>;
   description?: InputMaybe<Scalars['String']>;
   filter?: InputMaybe<Scalars['String']>;
+  folder?: InputMaybe<Scalars['String']>;
   id: Scalars['String'];
   name?: InputMaybe<Scalars['String']>;
   position?: InputMaybe<Scalars['Int']>;
@@ -4911,11 +4911,11 @@ export type FeedsSuccessResolvers<ContextType = ResolverContext, ParentType exte
 };
 
 export type FilterResolvers<ContextType = ResolverContext, ParentType extends ResolversParentTypes['Filter'] = ResolversParentTypes['Filter']> = {
-  category?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   createdAt?: Resolver<ResolversTypes['Date'], ParentType, ContextType>;
   defaultFilter?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
   description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
   filter?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  folder?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
   name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
   position?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;

packages/api/src/generated/schema.graphql

@@ -716,11 +716,11 @@ type FeedsSuccess {
 }
 
 type Filter {
-  category: String!
   createdAt: Date!
   defaultFilter: Boolean
   description: String
   filter: String!
+  folder: String!
   id: ID!
   name: String!
   position: Int!
@@ -1683,9 +1683,9 @@ enum SaveFilterErrorCode {
 }
 
 input SaveFilterInput {
-  category: String
   description: String
   filter: String!
+  folder: String
   name: String!
   position: Int
 }
@@ -2270,9 +2270,9 @@ enum UpdateFilterErrorCode {
 }
 
 input UpdateFilterInput {
-  category: String
   description: String
   filter: String
+  folder: String
   id: String!
   name: String
   position: Int

packages/api/src/resolvers/filters/index.ts

@@ -37,7 +37,7 @@ export const saveFilterResolver = authorized<
       return t.getRepository(Filter).save({
         user: { id: uid },
         name: input.name,
-        category: 'Search',
+        folder: input.folder ?? undefined,
         description: '',
         position: input.position ?? 0,
         filter: input.filter,

packages/api/src/schema.ts

@@ -2190,7 +2190,7 @@ const schema = gql`
   input SaveFilterInput {
     name: String!
     filter: String!
-    category: String
+    folder: String
     description: String
     position: Int
   }
@@ -2206,7 +2206,7 @@ const schema = gql`
     name: String!
     filter: String!
     position: Int!
-    category: String!
+    folder: String!
     description: String
     createdAt: Date!
     updatedAt: Date
@@ -2260,7 +2260,7 @@ const schema = gql`
     name: String
     filter: String
     position: Int
-    category: String
+    folder: String
     description: String
     visible: Boolean
   }

packages/db/migrations/0147.do.add_folder_to_filters.sql

@@ -0,0 +1,9 @@
+-- Type: DO
+-- Name: update_category_in_filters
+-- Description: Update category column in filters table
+
+BEGIN;
+
+ALTER TABLE omnivore.filters ADD COLUMN folder text NOT NULL DEFAULT 'inbox';
+
+COMMIT;

packages/db/migrations/0147.undo.add_folder_to_filters.sql

@@ -0,0 +1,9 @@
+-- Type: UNDO
+-- Name: add_folder_to_filters
+-- Description: Add folder column to filters table
+
+BEGIN;
+
+ALTER TABLE omnivore.filters DROP COLUMN folder;
+
+COMMIT;