chore: fix ContentType usage (#2353)

* chore: fix ContentType usage

* chore: fix specs
This commit is contained in:
Karol Sójko
2023-07-12 13:53:29 +02:00
committed by GitHub
parent d057cdff84
commit 325737bfbd
247 changed files with 1092 additions and 1060 deletions

View File

@@ -10,8 +10,8 @@ import {
FillItemContentSpecialized,
KeySystemRootKeyInterface,
} from '@standardnotes/models'
import { ContentType } from '@standardnotes/common'
import { MutatorClientInterface } from '../../Mutator/MutatorClientInterface'
import { ContentType } from '@standardnotes/domain-core'
export class CreateVaultUseCase {
constructor(
@@ -70,7 +70,7 @@ export class CreateVaultUseCase {
description: dto.vaultDescription,
}
return this.mutator.createItem(ContentType.VaultListing, FillItemContentSpecialized(content), true)
return this.mutator.createItem(ContentType.TYPES.VaultListing, FillItemContentSpecialized(content), true)
}
private async createKeySystemItemsKey(keySystemIdentifier: string, rootKeyToken: string): Promise<void> {

View File

@@ -1,12 +1,12 @@
import { VaultListingInterface } from '@standardnotes/models'
import { ItemManagerInterface } from './../../Item/ItemManagerInterface'
import { ContentType } from '@standardnotes/common'
import { ContentType } from '@standardnotes/domain-core'
export class GetVaultUseCase<T extends VaultListingInterface> {
constructor(private items: ItemManagerInterface) {}
execute(query: { keySystemIdentifier: string } | { sharedVaultUuid: string }): T | undefined {
const vaults = this.items.getItems<VaultListingInterface>(ContentType.VaultListing)
const vaults = this.items.getItems<VaultListingInterface>(ContentType.TYPES.VaultListing)
if ('keySystemIdentifier' in query) {
return vaults.find((listing) => listing.systemIdentifier === query.keySystemIdentifier) as T

View File

@@ -2,7 +2,7 @@ import { MutatorClientInterface, SyncServiceInterface } from '@standardnotes/ser
import { ClientDisplayableError } from '@standardnotes/responses'
import { DecryptedItemInterface, FileItem, VaultListingInterface } from '@standardnotes/models'
import { FilesClientInterface } from '@standardnotes/files'
import { ContentType } from '@standardnotes/common'
import { ContentType } from '@standardnotes/domain-core'
export class MoveItemsToVaultUseCase {
constructor(
@@ -25,7 +25,7 @@ export class MoveItemsToVaultUseCase {
await this.sync.sync()
for (const item of dto.items) {
if (item.content_type !== ContentType.File) {
if (item.content_type !== ContentType.TYPES.File) {
continue
}

View File

@@ -1,7 +1,7 @@
import { MutatorClientInterface, SyncServiceInterface } from '@standardnotes/services'
import { ClientDisplayableError } from '@standardnotes/responses'
import { DecryptedItemInterface, FileItem } from '@standardnotes/models'
import { ContentType } from '@standardnotes/common'
import { ContentType } from '@standardnotes/domain-core'
import { FilesClientInterface } from '@standardnotes/files'
export class RemoveItemFromVault {
@@ -19,7 +19,7 @@ export class RemoveItemFromVault {
await this.sync.sync()
if (dto.item.content_type === ContentType.File) {
if (dto.item.content_type === ContentType.TYPES.File) {
await this.files.moveFileOutOfSharedVault(dto.item as FileItem)
}
}

View File

@@ -24,11 +24,11 @@ import { MoveItemsToVaultUseCase } from './UseCase/MoveItemsToVault'
import { RotateVaultRootKeyUseCase } from './UseCase/RotateVaultRootKey'
import { FilesClientInterface } from '@standardnotes/files'
import { ContentType } from '@standardnotes/common'
import { GetVaultUseCase } from './UseCase/GetVault'
import { ChangeVaultKeyOptionsUseCase } from './UseCase/ChangeVaultKeyOptions'
import { MutatorClientInterface } from '../Mutator/MutatorClientInterface'
import { AlertService } from '../Alert/AlertService'
import { ContentType } from '@standardnotes/domain-core'
export class VaultService
extends AbstractService<VaultServiceEvent, VaultServiceEventPayload[VaultServiceEvent]>
@@ -47,13 +47,16 @@ export class VaultService
) {
super(eventBus)
items.addObserver([ContentType.KeySystemItemsKey, ContentType.KeySystemRootKey, ContentType.VaultListing], () => {
void this.recomputeAllVaultsLockingState()
})
items.addObserver(
[ContentType.TYPES.KeySystemItemsKey, ContentType.TYPES.KeySystemRootKey, ContentType.TYPES.VaultListing],
() => {
void this.recomputeAllVaultsLockingState()
},
)
}
getVaults(): VaultListingInterface[] {
return this.items.getItems<VaultListingInterface>(ContentType.VaultListing).sort((a, b) => {
return this.items.getItems<VaultListingInterface>(ContentType.TYPES.VaultListing).sort((a, b) => {
return a.name.localeCompare(b.name)
})
}