rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: fix ContentType usage (#2353)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/snjs/lib/Migrations/Applicators/TagsToFolders.ts
View File

@@ -2,11 +2,11 @@ import { MutatorClientInterface } from '@standardnotes/services'
import { SNTag, TagMutator, TagFolderDelimitter } from '@standardnotes/models'
import { ItemManager } from '@Lib/Services'
import { lastElement, sortByKey, withoutLastElement } from '@standardnotes/utils'
import { ContentType } from '@standardnotes/common'
import { ContentType } from '@standardnotes/domain-core'
export class TagsToFoldersMigrationApplicator {
public static isApplicableToCurrentData(itemManager: ItemManager): boolean {
const tags = itemManager.getItems<SNTag>(ContentType.Tag)
const tags = itemManager.getItems<SNTag>(ContentType.TYPES.Tag)
for (const tag of tags) {
if (tag.title.includes(TagFolderDelimitter) && !tag.parentId) {
return true
@@ -17,7 +17,7 @@ export class TagsToFoldersMigrationApplicator {
}
public static async run(itemManager: ItemManager, mutator: MutatorClientInterface): Promise<void> {
const tags = itemManager.getItems(ContentType.Tag) as SNTag[]
const tags = itemManager.getItems(ContentType.TYPES.Tag) as SNTag[]
const sortedTags = sortByKey(tags, 'title')
for (const tag of sortedTags) {

3
packages/snjs/lib/Migrations/Versions/2_20_0.ts
View File

@@ -1,5 +1,4 @@
import { Migration } from '@Lib/Migrations/Migration'
import { ContentType } from '@standardnotes/common'
import { ApplicationStage } from '@standardnotes/services'
export class Migration2_20_0 extends Migration {
@@ -15,7 +14,7 @@ export class Migration2_20_0 extends Migration {
}
private async deleteMfaItems(): Promise<void> {
const contentType = 'SF|MFA' as ContentType
const contentType = 'SF|MFA'
const items = this.services.itemManager.getItems(contentType)
for (const item of items) {

3
packages/snjs/lib/Migrations/Versions/2_36_0.ts
View File

@@ -1,5 +1,4 @@
import { Migration } from '@Lib/Migrations/Migration'
import { ContentType } from '@standardnotes/common'
import { ApplicationStage } from '@standardnotes/services'
export class Migration2_36_0 extends Migration {
@@ -15,7 +14,7 @@ export class Migration2_36_0 extends Migration {
}
private async removeServerExtensionsLocally(): Promise<void> {
const contentType = 'SF|Extension' as ContentType
const contentType = 'SF|Extension'
const items = this.services.itemManager.getItems(contentType)
for (const item of items) {

4
packages/snjs/lib/Migrations/Versions/2_42_0.ts
View File

@@ -1,8 +1,8 @@
import { ContentType } from '@standardnotes/common'
import { ApplicationStage } from '@standardnotes/services'
import { FeatureIdentifier } from '@standardnotes/features'
import { Migration } from '@Lib/Migrations/Migration'
import { SNTheme } from '@standardnotes/models'
import { ContentType } from '@standardnotes/domain-core'
const NoDistractionIdentifier = 'org.standardnotes.theme-no-distraction' as FeatureIdentifier
@@ -19,7 +19,7 @@ export class Migration2_42_0 extends Migration {
}
private async deleteNoDistraction(): Promise<void> {
const themes = (this.services.itemManager.getItems(ContentType.Theme) as SNTheme[]).filter((theme) => {
const themes = (this.services.itemManager.getItems(ContentType.TYPES.Theme) as SNTheme[]).filter((theme) => {
return theme.identifier === NoDistractionIdentifier
})

6
packages/snjs/lib/Migrations/Versions/2_7_0.ts
View File

@@ -1,7 +1,7 @@
import { CompoundPredicate, Predicate, SNComponent } from '@standardnotes/models'
import { Migration } from '@Lib/Migrations/Migration'
import { ContentType } from '@standardnotes/common'
import { ApplicationStage } from '@standardnotes/services'
import { ContentType } from '@standardnotes/domain-core'
export class Migration2_7_0 extends Migration {
static override version(): string {
@@ -19,11 +19,11 @@ export class Migration2_7_0 extends Migration {
const batchMgrId = 'org.standardnotes.batch-manager'
const batchMgrPred = new CompoundPredicate('and', [
new Predicate<SNComponent>('content_type', '=', ContentType.Component),
new Predicate<SNComponent>('content_type', '=', ContentType.TYPES.Component),
new Predicate<SNComponent>('identifier', '=', batchMgrId),
])
const batchMgrSingleton = this.services.singletonManager.findSingleton(ContentType.Component, batchMgrPred)
const batchMgrSingleton = this.services.singletonManager.findSingleton(ContentType.TYPES.Component, batchMgrPred)
if (batchMgrSingleton) {
await this.services.mutator.setItemToBeDeleted(batchMgrSingleton)