chore: fix ContentType usage (#2353)

* chore: fix ContentType usage

* chore: fix specs

packages/services/src/Domain/Item/ItemManagerInterface.ts

@@ -1,4 +1,3 @@
-import { ContentType } from '@standardnotes/common'
 import {
   ItemsKeyInterface,
   DecryptedItemInterface,
@@ -54,13 +53,13 @@ export interface ItemManagerInterface extends AbstractService {
   getCollection(): ItemCollection
 
   addObserver<I extends DecryptedItemInterface = DecryptedItemInterface>(
-    contentType: ContentType | ContentType[],
+    contentType: string | string[],
     callback: ItemManagerChangeObserverCallback<I>,
   ): () => void
 
   get items(): DecryptedItemInterface[]
 
-  getItems<T extends DecryptedItemInterface>(contentType: ContentType | ContentType[]): T[]
+  getItems<T extends DecryptedItemInterface>(contentType: string | string[]): T[]
   get invalidItems(): EncryptedItemInterface[]
   allTrackedItems(): ItemInterface[]
   getDisplayableItemsKeys(): ItemsKeyInterface[]
@@ -69,17 +68,14 @@ export interface ItemManagerInterface extends AbstractService {
     C extends ItemContent = ItemContent,
     I extends DecryptedItemInterface<C> = DecryptedItemInterface<C>,
   >(
-    contentType: ContentType,
+    contentType: string,
     content?: C,
     override?: Partial<DecryptedPayload<C>>,
   ): I
 
-  itemsMatchingPredicate<T extends DecryptedItemInterface>(
-    contentType: ContentType,
-    predicate: PredicateInterface<T>,
-  ): T[]
+  itemsMatchingPredicate<T extends DecryptedItemInterface>(contentType: string, predicate: PredicateInterface<T>): T[]
   itemsMatchingPredicates<T extends DecryptedItemInterface>(
-    contentType: ContentType,
+    contentType: string,
     predicates: PredicateInterface<T>[],
   ): T[]
   subItemsMatchingPredicates<T extends DecryptedItemInterface>(items: T[], predicates: PredicateInterface<T>[]): T[]
@@ -90,11 +86,11 @@ export interface ItemManagerInterface extends AbstractService {
   getSortedTagsForItem(item: DecryptedItemInterface<ItemContent>): SNTag[]
   itemsReferencingItem<I extends DecryptedItemInterface = DecryptedItemInterface>(
     itemToLookupUuidFor: { uuid: string },
-    contentType?: ContentType,
+    contentType?: string,
   ): I[]
   referencesForItem<I extends DecryptedItemInterface = DecryptedItemInterface>(
     itemToLookupUuidFor: DecryptedItemInterface,
-    contentType?: ContentType,
+    contentType?: string,
   ): I[]
   findItem<T extends DecryptedItemInterface = DecryptedItemInterface>(uuid: string): T | undefined
   findItems<T extends DecryptedItemInterface>(uuids: string[]): T[]

packages/services/src/Domain/Item/StaticItemCounter.spec.ts

@@ -1,4 +1,4 @@
-import { ContentType } from '@standardnotes/common'
+import { ContentType } from '@standardnotes/domain-core'
 import { SNNote, SNTag } from '@standardnotes/models'
 import { StaticItemCounter } from './StaticItemCounter'
 
@@ -18,10 +18,10 @@ describe('ItemCounter', () => {
         trashed: true,
       } as jest.Mocked<SNNote>,
       {
-        content_type: ContentType.Note,
+        content_type: ContentType.TYPES.Note,
       } as jest.Mocked<SNNote>,
       {
-        content_type: ContentType.Tag,
+        content_type: ContentType.TYPES.Tag,
       } as jest.Mocked<SNTag>,
     ]
 

packages/services/src/Domain/Item/StaticItemCounter.ts

@@ -1,4 +1,4 @@
-import { ContentType } from '@standardnotes/common'
+import { ContentType } from '@standardnotes/domain-core'
 import { SNNote, SNTag, ItemCounts } from '@standardnotes/models'
 
 export class StaticItemCounter {
@@ -21,12 +21,12 @@ export class StaticItemCounter {
 
         continue
       }
-      if (item.content_type === ContentType.Note && !item.conflictOf) {
+      if (item.content_type === ContentType.TYPES.Note && !item.conflictOf) {
         counts.notes++
 
         continue
       }
-      if (item.content_type === ContentType.Tag) {
+      if (item.content_type === ContentType.TYPES.Tag) {
         counts.tags++
 
         continue