From 9ebb095aaa415f04823905cad0e542ccd49359f8 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Wed, 13 Sep 2023 16:37:45 +0530 Subject: [PATCH] chore: fix typos --- .../Runtime/Collection/Item/ItemCounter.ts | 4 +-- .../Runtime/Display/ItemDisplayController.ts | 4 +-- .../Runtime/Display/VaultDisplayOptions.ts | 28 +++++++++---------- .../Display/VaultDisplayOptionsTypes.ts | 10 +++---- .../src/Vaults/VaultDisplayService.ts | 6 ++-- .../Vaults/VaultDisplayServiceInterface.ts | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/packages/models/src/Domain/Runtime/Collection/Item/ItemCounter.ts b/packages/models/src/Domain/Runtime/Collection/Item/ItemCounter.ts index 1279f5846..0f1fca4bf 100644 --- a/packages/models/src/Domain/Runtime/Collection/Item/ItemCounter.ts +++ b/packages/models/src/Domain/Runtime/Collection/Item/ItemCounter.ts @@ -11,7 +11,7 @@ import { ExclusiveVaultCriteriaValidator } from '../../Display/Validator/Exclusi import { HiddenContentCriteriaValidator } from '../../Display/Validator/HiddenContentCriteriaValidator' import { CustomFilterCriteriaValidator } from '../../Display/Validator/CustomFilterCriteriaValidator' import { AnyDisplayOptions, VaultDisplayOptions } from '../../Display' -import { isExclusioanaryOptionsValue } from '../../Display/VaultDisplayOptionsTypes' +import { isExclusionaryOptionsValue } from '../../Display/VaultDisplayOptionsTypes' import { ContentType } from '@standardnotes/domain-core' type AllNotesUuidSignifier = undefined @@ -83,7 +83,7 @@ export class ItemCounter implements SNIndex { if (this.vaultDisplayOptions) { const options = this.vaultDisplayOptions.getOptions() - if (isExclusioanaryOptionsValue(options)) { + if (isExclusionaryOptionsValue(options)) { filters.push(new ExcludeVaultsCriteriaValidator([...options.exclude, ...options.locked], element)) } else { filters.push(new ExclusiveVaultCriteriaValidator(options.exclusive, element)) diff --git a/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts b/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts index 68b0b2d22..34d1c83a6 100644 --- a/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts +++ b/packages/models/src/Domain/Runtime/Display/ItemDisplayController.ts @@ -11,7 +11,7 @@ import { ExcludeVaultsCriteriaValidator } from './Validator/ExcludeVaultsCriteri import { ExclusiveVaultCriteriaValidator } from './Validator/ExclusiveVaultCriteriaValidator' import { HiddenContentCriteriaValidator } from './Validator/HiddenContentCriteriaValidator' import { VaultDisplayOptions } from './VaultDisplayOptions' -import { isExclusioanaryOptionsValue } from './VaultDisplayOptionsTypes' +import { isExclusionaryOptionsValue } from './VaultDisplayOptionsTypes' export class ItemDisplayController { private sortMap: UuidToSortedPositionMap = {} @@ -61,7 +61,7 @@ export class ItemDisplayController excludedVault === vault.systemIdentifier) } else if (this.options.exclusive) { return this.options.exclusive !== vault.systemIdentifier @@ -42,18 +42,18 @@ export class VaultDisplayOptions { } isVaultExclusivelyShown(vault: VaultListingInterface): boolean { - return !isExclusioanaryOptionsValue(this.options) && this.options.exclusive === vault.systemIdentifier + return !isExclusionaryOptionsValue(this.options) && this.options.exclusive === vault.systemIdentifier } isVaultDisabledOrLocked(vault: VaultListingInterface): boolean { - if (isExclusioanaryOptionsValue(this.options)) { + if (isExclusionaryOptionsValue(this.options)) { const matchingLocked = this.options.locked.find((lockedVault) => lockedVault === vault.systemIdentifier) if (matchingLocked) { return true } } - return this.isVaultExplicitelyExcluded(vault) + return this.isVaultExplicitlyExcluded(vault) } getPersistableValue(): VaultDisplayOptionsPersistable { @@ -61,7 +61,7 @@ export class VaultDisplayOptions { } newOptionsByIntakingLockedVaults(lockedVaults: VaultListingInterface[]): VaultDisplayOptions { - if (isExclusioanaryOptionsValue(this.options)) { + if (isExclusionaryOptionsValue(this.options)) { return new VaultDisplayOptions({ exclude: this.options.exclude, locked: KeySystemIdentifiers(lockedVaults) }) } else { return new VaultDisplayOptions({ exclusive: this.options.exclusive }) @@ -76,7 +76,7 @@ export class VaultDisplayOptions { vaults: VaultListingInterface[], lockedVaults: VaultListingInterface[], ): VaultDisplayOptions { - if (isExclusioanaryOptionsValue(this.options)) { + if (isExclusionaryOptionsValue(this.options)) { return new VaultDisplayOptions({ exclude: uniqueArray([...this.options.exclude, ...KeySystemIdentifiers(vaults)]), locked: KeySystemIdentifiers(lockedVaults), @@ -93,7 +93,7 @@ export class VaultDisplayOptions { vault: VaultListingInterface, lockedVaults: VaultListingInterface[], ): VaultDisplayOptions { - if (isExclusioanaryOptionsValue(this.options)) { + if (isExclusionaryOptionsValue(this.options)) { return new VaultDisplayOptions({ exclude: this.options.exclude.filter((excludedVault) => excludedVault !== vault.systemIdentifier), locked: KeySystemIdentifiers(lockedVaults), diff --git a/packages/models/src/Domain/Runtime/Display/VaultDisplayOptionsTypes.ts b/packages/models/src/Domain/Runtime/Display/VaultDisplayOptionsTypes.ts index 78a964fad..4d81d39ea 100644 --- a/packages/models/src/Domain/Runtime/Display/VaultDisplayOptionsTypes.ts +++ b/packages/models/src/Domain/Runtime/Display/VaultDisplayOptionsTypes.ts @@ -1,12 +1,12 @@ import { KeySystemIdentifier } from '../../Syncable/KeySystemRootKey/KeySystemIdentifier' -export type ExclusioanaryOptions = { exclude: KeySystemIdentifier[]; locked: KeySystemIdentifier[] } +export type ExclusionaryOptions = { exclude: KeySystemIdentifier[]; locked: KeySystemIdentifier[] } export type ExclusiveOptions = { exclusive: KeySystemIdentifier } -export function isExclusioanaryOptionsValue( - options: ExclusioanaryOptions | ExclusiveOptions, -): options is ExclusioanaryOptions { +export function isExclusionaryOptionsValue( + options: ExclusionaryOptions | ExclusiveOptions, +): options is ExclusionaryOptions { return 'exclude' in options || 'locked' in options } -export type VaultDisplayOptionsPersistable = ExclusioanaryOptions | ExclusiveOptions +export type VaultDisplayOptionsPersistable = ExclusionaryOptions | ExclusiveOptions diff --git a/packages/ui-services/src/Vaults/VaultDisplayService.ts b/packages/ui-services/src/Vaults/VaultDisplayService.ts index 3d98d8b3e..75c20aaa4 100644 --- a/packages/ui-services/src/Vaults/VaultDisplayService.ts +++ b/packages/ui-services/src/Vaults/VaultDisplayService.ts @@ -37,7 +37,7 @@ export class VaultDisplayService makeObservable(this, { options: observable, - isVaultExplicitelyExcluded: observable, + isVaultExplicitlyExcluded: observable, isVaultExclusivelyShown: observable, exclusivelyShownVault: observable, @@ -81,8 +81,8 @@ export class VaultDisplayService return this.options } - isVaultExplicitelyExcluded = (vault: VaultListingInterface): boolean => { - return this.options.isVaultExplicitelyExcluded(vault) ?? false + isVaultExplicitlyExcluded = (vault: VaultListingInterface): boolean => { + return this.options.isVaultExplicitlyExcluded(vault) ?? false } isVaultDisabledOrLocked(vault: VaultListingInterface): boolean { diff --git a/packages/ui-services/src/Vaults/VaultDisplayServiceInterface.ts b/packages/ui-services/src/Vaults/VaultDisplayServiceInterface.ts index 00993679d..f7056569f 100644 --- a/packages/ui-services/src/Vaults/VaultDisplayServiceInterface.ts +++ b/packages/ui-services/src/Vaults/VaultDisplayServiceInterface.ts @@ -7,7 +7,7 @@ export interface VaultDisplayServiceInterface extends AbstractUIServiceInterface getOptions(): VaultDisplayOptions isVaultDisabledOrLocked(vault: VaultListingInterface): boolean - isVaultExplicitelyExcluded: (vault: VaultListingInterface) => boolean + isVaultExplicitlyExcluded: (vault: VaultListingInterface) => boolean isVaultExclusivelyShown: (vault: VaultListingInterface) => boolean isInExclusiveDisplayMode(): boolean