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

Author: sywhb

packages/api/src/generated/graphql.ts

@@ -1867,6 +1867,7 @@ export type QueryTypeaheadSearchArgs = {
 export type QueryUpdatesSinceArgs = {
   after?: InputMaybe<Scalars['String']>;
   first?: InputMaybe<Scalars['Int']>;
+  folder?: InputMaybe<Scalars['String']>;
   since: Scalars['Date'];
   sort?: InputMaybe<SortParams>;
 };
@@ -2466,6 +2467,7 @@ export type SetIntegrationInput = {
   importItemState?: InputMaybe<ImportItemState>;
   name: Scalars['String'];
   syncedAt?: InputMaybe<Scalars['Date']>;
+  taskName?: InputMaybe<Scalars['String']>;
   token: Scalars['String'];
   type?: InputMaybe<IntegrationType>;
 };

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!
@@ -1909,6 +1909,7 @@ input SetIntegrationInput {
   importItemState: ImportItemState
   name: String!
   syncedAt: Date
+  taskName: String
   token: String!
   type: IntegrationType
 }

packages/api/src/repository/label.ts

@@ -32,7 +32,10 @@ const convertToLabel = (label: CreateLabelInput, userId: string) => {
   return {
     user: { id: userId },
     name: label.name,
-    color: label.color || generateRandomColor(), // assign a random color if not provided
+    color:
+      label.color ||
+      getInternalLabelWithColor(label.name)?.color ||
+      generateRandomColor(), // assign a random color if not provided
     description: label.description,
     internal: isLabelInternal(label.name),
   }

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

@@ -5,8 +5,9 @@
 /* eslint-disable @typescript-eslint/no-floating-promises */
 import { Readability } from '@omnivore/readability'
 import graphqlFields from 'graphql-fields'
+import { IsNull } from 'typeorm'
 import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity'
-import { LibraryItem } from '../../entity/library_item'
+import { LibraryItem, LibraryItemState } from '../../entity/library_item'
 import { env } from '../../env'
 import {
   ArticleError,
@@ -390,7 +391,10 @@ export const getArticleResolver = authorized<
     const libraryItem = await authTrx((tx) =>
       tx.withRepository(libraryItemRepository).findOne({
         select: selectColumns,
-        where,
+        where: {
+          ...where,
+          deletedAt: IsNull(),
+        },
         relations: {
           labels: true,
           highlights: {
@@ -406,7 +410,7 @@ export const getArticleResolver = authorized<
       })
     )
 
-    if (!libraryItem || libraryItem.folder === InFilter.TRASH) {
+    if (!libraryItem) {
       return { errorCodes: [ArticleErrorCode.NotFound] }
     }
 
@@ -528,8 +532,8 @@ export const setBookmarkArticleResolver = authorized<
   const deletedLibraryItem = await updateLibraryItem(
     articleID,
     {
-      folder: InFilter.TRASH,
-      savedAt: new Date(),
+      state: LibraryItemState.Deleted,
+      deletedAt: new Date(),
     },
     uid,
     pubsub
@@ -737,7 +741,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 +759,7 @@ export const updatesSinceResolver = authorized<
       includeDeleted: true,
       dateFilters: [{ field: 'updatedAt', startDate }],
       sort,
-      inFilter: InFilter.ALL,
+      inFilter: (folder as InFilter) || InFilter.ALL,
     },
     uid
   )
@@ -867,7 +871,7 @@ export const setFavoriteArticleResolver = authorized<
 })
 
 const getUpdateReason = (libraryItem: LibraryItem, since: Date) => {
-  if (libraryItem.folder === InFilter.TRASH) {
+  if (libraryItem.deletedAt) {
     return UpdateReason.Deleted
   }
   if (libraryItem.createdAt >= since) {

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

@@ -216,8 +216,6 @@ export const importFromIntegrationResolver = authorized<
   ImportFromIntegrationError,
   MutationImportFromIntegrationArgs
 >(async (_, { integrationId }, { claims: { uid }, log }) => {
-  log.info('importFromIntegrationResolver')
-
   try {
     const integration = await findIntegration({ id: integrationId }, uid)
 

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

@@ -1,3 +1,4 @@
+import { LibraryItemState } from '../../entity/library_item'
 import { env } from '../../env'
 import {
   ArchiveLinkError,
@@ -8,7 +9,6 @@ import {
 import { updateLibraryItem } from '../../services/library_item'
 import { analytics } from '../../utils/analytics'
 import { authorized } from '../../utils/helpers'
-import { InFilter } from '../../utils/search'
 
 // export const updateLinkShareInfoResolver = authorized<
 //   UpdateLinkShareInfoSuccess,
@@ -54,9 +54,20 @@ export const setLinkArchivedResolver = authorized<
   ArchiveLinkError,
   MutationSetLinkArchivedArgs
 >(async (_obj, args, { uid }) => {
+  let state = LibraryItemState.Archived
+  let archivedAt: Date | null = new Date()
+  let event = 'link_archived'
+
+  const isUnarchive = !args.input.archived
+  if (isUnarchive) {
+    state = LibraryItemState.Succeeded
+    archivedAt = null
+    event = 'link_unarchived'
+  }
+
   analytics.track({
     userId: uid,
-    event: args.input.archived ? 'link_archived' : 'link_unarchived',
+    event,
     properties: {
       env: env.server.apiEnv,
     },
@@ -66,8 +77,8 @@ export const setLinkArchivedResolver = authorized<
     await updateLibraryItem(
       args.input.linkId,
       {
-        savedAt: new Date(),
-        folder: args.input.archived ? InFilter.ARCHIVE : InFilter.INBOX,
+        state,
+        archivedAt,
       },
       uid
     )
@@ -80,6 +91,6 @@ export const setLinkArchivedResolver = authorized<
 
   return {
     linkId: args.input.linkId,
-    message: 'Link Archived',
+    message: event,
   }
 })

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

@@ -1,3 +1,4 @@
+import { LibraryItemState } from '../../entity/library_item'
 import {
   MutationUpdatePageArgs,
   UpdatePageError,
@@ -20,6 +21,9 @@ export const updatePageResolver = authorized<
       savedAt: input.savedAt ? new Date(input.savedAt) : undefined,
       publishedAt: input.publishedAt ? new Date(input.publishedAt) : undefined,
       thumbnail: input.previewImage ?? undefined,
+      state: input.state
+        ? (input.state as unknown as LibraryItemState)
+        : undefined,
     },
     uid
   )

packages/api/src/routers/svc/following.ts

@@ -1,5 +1,9 @@
 /* eslint-disable @typescript-eslint/no-misused-promises */
 import express from 'express'
+import {
+  findOrCreateLabels,
+  saveLabelsInLibraryItem,
+} from '../../services/labels'
 import { saveFeedItemInFollowing } from '../../services/library_item'
 import { logger } from '../../utils/logger'
 
@@ -19,6 +23,7 @@ export interface SaveFollowingItemRequest {
   previewContentType?: string
   publishedAt?: Date
   savedAt?: Date
+  thumbnail?: string
 }
 
 function isSaveFollowingItemRequest(
@@ -49,16 +54,40 @@ export function followingServiceRouter() {
       return res.status(400).send('INVALID_REQUEST_BODY')
     }
 
-    if (req.body.addedToFollowingFrom === 'feed') {
-      logger.info('saving feed item')
+    if (
+      req.body.addedToFollowingFrom === 'feed' &&
+      req.body.userIds.length > 0
+    ) {
+      const userId = req.body.userIds[0]
+      logger.info('saving feed item', userId)
 
-      const result = await saveFeedItemInFollowing(req.body)
+      const result = await saveFeedItemInFollowing(req.body, userId)
       if (result.identifiers.length === 0) {
         logger.error('error saving feed item in following')
         return res.status(500).send('ERROR_SAVING_FEED_ITEM')
       }
 
       logger.info('feed item saved in following')
+
+      // add RSS label to the item
+      const labels = await findOrCreateLabels(
+        [
+          {
+            name: 'RSS',
+          },
+        ],
+        userId
+      )
+      await saveLabelsInLibraryItem(
+        labels,
+        result.identifiers[0].id,
+        userId,
+        undefined,
+        true
+      )
+
+      logger.info('RSS label added to the item')
+
       return res.sendStatus(200)
     }
 

packages/api/src/schema.ts

@@ -1997,6 +1997,7 @@ const schema = gql`
     enabled: Boolean!
     syncedAt: Date
     importItemState: ImportItemState
+    taskName: String
   }
 
   union IntegrationsResult = IntegrationsSuccess | IntegrationsError
@@ -2826,6 +2827,7 @@ const schema = gql`
       first: Int
       since: Date!
       sort: SortParams
+      folder: String
     ): UpdatesSinceResult!
     integrations: IntegrationsResult!
     recentSearches: RecentSearchesResult!

packages/api/src/services/labels.ts

@@ -69,7 +69,8 @@ export const saveLabelsInLibraryItem = async (
   labels: Label[],
   libraryItemId: string,
   userId: string,
-  pubsub = createPubSubClient()
+  pubsub = createPubSubClient(),
+  skipPubSub = false
 ) => {
   await authTrx(
     async (tx) => {
@@ -92,6 +93,10 @@ export const saveLabelsInLibraryItem = async (
     userId
   )
 
+  if (skipPubSub) {
+    return
+  }
+
   // create pubsub event
   await pubsub.entityCreated<AddLabelsToLibraryItemEvent>(
     EntityType.LABEL,
@@ -104,7 +109,8 @@ export const addLabelsToLibraryItem = async (
   labels: Label[],
   libraryItemId: string,
   userId: string,
-  pubsub = createPubSubClient()
+  pubsub = createPubSubClient(),
+  skipPubSub = false
 ) => {
   await authTrx(
     async (tx) => {
@@ -128,6 +134,10 @@ export const addLabelsToLibraryItem = async (
     userId
   )
 
+  if (skipPubSub) {
+    return
+  }
+
   // create pubsub event
   await pubsub.entityCreated<AddLabelsToLibraryItemEvent>(
     EntityType.LABEL,