chore: fix typos
This commit is contained in:
@@ -11,7 +11,7 @@ import { ExclusiveVaultCriteriaValidator } from '../../Display/Validator/Exclusi
|
|||||||
import { HiddenContentCriteriaValidator } from '../../Display/Validator/HiddenContentCriteriaValidator'
|
import { HiddenContentCriteriaValidator } from '../../Display/Validator/HiddenContentCriteriaValidator'
|
||||||
import { CustomFilterCriteriaValidator } from '../../Display/Validator/CustomFilterCriteriaValidator'
|
import { CustomFilterCriteriaValidator } from '../../Display/Validator/CustomFilterCriteriaValidator'
|
||||||
import { AnyDisplayOptions, VaultDisplayOptions } from '../../Display'
|
import { AnyDisplayOptions, VaultDisplayOptions } from '../../Display'
|
||||||
import { isExclusioanaryOptionsValue } from '../../Display/VaultDisplayOptionsTypes'
|
import { isExclusionaryOptionsValue } from '../../Display/VaultDisplayOptionsTypes'
|
||||||
import { ContentType } from '@standardnotes/domain-core'
|
import { ContentType } from '@standardnotes/domain-core'
|
||||||
|
|
||||||
type AllNotesUuidSignifier = undefined
|
type AllNotesUuidSignifier = undefined
|
||||||
@@ -83,7 +83,7 @@ export class ItemCounter implements SNIndex {
|
|||||||
|
|
||||||
if (this.vaultDisplayOptions) {
|
if (this.vaultDisplayOptions) {
|
||||||
const options = this.vaultDisplayOptions.getOptions()
|
const options = this.vaultDisplayOptions.getOptions()
|
||||||
if (isExclusioanaryOptionsValue(options)) {
|
if (isExclusionaryOptionsValue(options)) {
|
||||||
filters.push(new ExcludeVaultsCriteriaValidator([...options.exclude, ...options.locked], element))
|
filters.push(new ExcludeVaultsCriteriaValidator([...options.exclude, ...options.locked], element))
|
||||||
} else {
|
} else {
|
||||||
filters.push(new ExclusiveVaultCriteriaValidator(options.exclusive, element))
|
filters.push(new ExclusiveVaultCriteriaValidator(options.exclusive, element))
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import { ExcludeVaultsCriteriaValidator } from './Validator/ExcludeVaultsCriteri
|
|||||||
import { ExclusiveVaultCriteriaValidator } from './Validator/ExclusiveVaultCriteriaValidator'
|
import { ExclusiveVaultCriteriaValidator } from './Validator/ExclusiveVaultCriteriaValidator'
|
||||||
import { HiddenContentCriteriaValidator } from './Validator/HiddenContentCriteriaValidator'
|
import { HiddenContentCriteriaValidator } from './Validator/HiddenContentCriteriaValidator'
|
||||||
import { VaultDisplayOptions } from './VaultDisplayOptions'
|
import { VaultDisplayOptions } from './VaultDisplayOptions'
|
||||||
import { isExclusioanaryOptionsValue } from './VaultDisplayOptionsTypes'
|
import { isExclusionaryOptionsValue } from './VaultDisplayOptionsTypes'
|
||||||
|
|
||||||
export class ItemDisplayController<I extends DisplayItem, O extends AnyDisplayOptions = GenericDisplayOptions> {
|
export class ItemDisplayController<I extends DisplayItem, O extends AnyDisplayOptions = GenericDisplayOptions> {
|
||||||
private sortMap: UuidToSortedPositionMap = {}
|
private sortMap: UuidToSortedPositionMap = {}
|
||||||
@@ -61,7 +61,7 @@ export class ItemDisplayController<I extends DisplayItem, O extends AnyDisplayOp
|
|||||||
|
|
||||||
if (this.vaultOptions) {
|
if (this.vaultOptions) {
|
||||||
const options = this.vaultOptions.getOptions()
|
const options = this.vaultOptions.getOptions()
|
||||||
if (isExclusioanaryOptionsValue(options)) {
|
if (isExclusionaryOptionsValue(options)) {
|
||||||
filters.push(new ExcludeVaultsCriteriaValidator([...options.exclude, ...options.locked], element))
|
filters.push(new ExcludeVaultsCriteriaValidator([...options.exclude, ...options.locked], element))
|
||||||
} else {
|
} else {
|
||||||
filters.push(new ExclusiveVaultCriteriaValidator(options.exclusive, element))
|
filters.push(new ExclusiveVaultCriteriaValidator(options.exclusive, element))
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
import { VaultListingInterface } from '../../Syncable/VaultListing/VaultListingInterface'
|
import { VaultListingInterface } from '../../Syncable/VaultListing/VaultListingInterface'
|
||||||
import { uniqueArray } from '@standardnotes/utils'
|
import { uniqueArray } from '@standardnotes/utils'
|
||||||
import {
|
import {
|
||||||
ExclusioanaryOptions,
|
ExclusionaryOptions,
|
||||||
ExclusiveOptions,
|
ExclusiveOptions,
|
||||||
VaultDisplayOptionsPersistable,
|
VaultDisplayOptionsPersistable,
|
||||||
isExclusioanaryOptionsValue,
|
isExclusionaryOptionsValue,
|
||||||
} from './VaultDisplayOptionsTypes'
|
} from './VaultDisplayOptionsTypes'
|
||||||
import { KeySystemIdentifier } from '../../Syncable/KeySystemRootKey/KeySystemIdentifier'
|
import { KeySystemIdentifier } from '../../Syncable/KeySystemRootKey/KeySystemIdentifier'
|
||||||
|
|
||||||
@@ -13,14 +13,14 @@ function KeySystemIdentifiers(vaults: VaultListingInterface[]): KeySystemIdentif
|
|||||||
}
|
}
|
||||||
|
|
||||||
export class VaultDisplayOptions {
|
export class VaultDisplayOptions {
|
||||||
constructor(private readonly options: ExclusioanaryOptions | ExclusiveOptions) {}
|
constructor(private readonly options: ExclusionaryOptions | ExclusiveOptions) {}
|
||||||
|
|
||||||
public getOptions(): ExclusioanaryOptions | ExclusiveOptions {
|
public getOptions(): ExclusionaryOptions | ExclusiveOptions {
|
||||||
return this.options
|
return this.options
|
||||||
}
|
}
|
||||||
|
|
||||||
public getExclusivelyShownVault(): KeySystemIdentifier {
|
public getExclusivelyShownVault(): KeySystemIdentifier {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
throw new Error('Not in exclusive display mode')
|
throw new Error('Not in exclusive display mode')
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,11 +28,11 @@ export class VaultDisplayOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public isInExclusiveDisplayMode(): boolean {
|
public isInExclusiveDisplayMode(): boolean {
|
||||||
return !isExclusioanaryOptionsValue(this.options)
|
return !isExclusionaryOptionsValue(this.options)
|
||||||
}
|
}
|
||||||
|
|
||||||
public isVaultExplicitelyExcluded(vault: VaultListingInterface): boolean {
|
public isVaultExplicitlyExcluded(vault: VaultListingInterface): boolean {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
return this.options.exclude.some((excludedVault) => excludedVault === vault.systemIdentifier)
|
return this.options.exclude.some((excludedVault) => excludedVault === vault.systemIdentifier)
|
||||||
} else if (this.options.exclusive) {
|
} else if (this.options.exclusive) {
|
||||||
return this.options.exclusive !== vault.systemIdentifier
|
return this.options.exclusive !== vault.systemIdentifier
|
||||||
@@ -42,18 +42,18 @@ export class VaultDisplayOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
isVaultExclusivelyShown(vault: VaultListingInterface): boolean {
|
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 {
|
isVaultDisabledOrLocked(vault: VaultListingInterface): boolean {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
const matchingLocked = this.options.locked.find((lockedVault) => lockedVault === vault.systemIdentifier)
|
const matchingLocked = this.options.locked.find((lockedVault) => lockedVault === vault.systemIdentifier)
|
||||||
if (matchingLocked) {
|
if (matchingLocked) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.isVaultExplicitelyExcluded(vault)
|
return this.isVaultExplicitlyExcluded(vault)
|
||||||
}
|
}
|
||||||
|
|
||||||
getPersistableValue(): VaultDisplayOptionsPersistable {
|
getPersistableValue(): VaultDisplayOptionsPersistable {
|
||||||
@@ -61,7 +61,7 @@ export class VaultDisplayOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
newOptionsByIntakingLockedVaults(lockedVaults: VaultListingInterface[]): VaultDisplayOptions {
|
newOptionsByIntakingLockedVaults(lockedVaults: VaultListingInterface[]): VaultDisplayOptions {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
return new VaultDisplayOptions({ exclude: this.options.exclude, locked: KeySystemIdentifiers(lockedVaults) })
|
return new VaultDisplayOptions({ exclude: this.options.exclude, locked: KeySystemIdentifiers(lockedVaults) })
|
||||||
} else {
|
} else {
|
||||||
return new VaultDisplayOptions({ exclusive: this.options.exclusive })
|
return new VaultDisplayOptions({ exclusive: this.options.exclusive })
|
||||||
@@ -76,7 +76,7 @@ export class VaultDisplayOptions {
|
|||||||
vaults: VaultListingInterface[],
|
vaults: VaultListingInterface[],
|
||||||
lockedVaults: VaultListingInterface[],
|
lockedVaults: VaultListingInterface[],
|
||||||
): VaultDisplayOptions {
|
): VaultDisplayOptions {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
return new VaultDisplayOptions({
|
return new VaultDisplayOptions({
|
||||||
exclude: uniqueArray([...this.options.exclude, ...KeySystemIdentifiers(vaults)]),
|
exclude: uniqueArray([...this.options.exclude, ...KeySystemIdentifiers(vaults)]),
|
||||||
locked: KeySystemIdentifiers(lockedVaults),
|
locked: KeySystemIdentifiers(lockedVaults),
|
||||||
@@ -93,7 +93,7 @@ export class VaultDisplayOptions {
|
|||||||
vault: VaultListingInterface,
|
vault: VaultListingInterface,
|
||||||
lockedVaults: VaultListingInterface[],
|
lockedVaults: VaultListingInterface[],
|
||||||
): VaultDisplayOptions {
|
): VaultDisplayOptions {
|
||||||
if (isExclusioanaryOptionsValue(this.options)) {
|
if (isExclusionaryOptionsValue(this.options)) {
|
||||||
return new VaultDisplayOptions({
|
return new VaultDisplayOptions({
|
||||||
exclude: this.options.exclude.filter((excludedVault) => excludedVault !== vault.systemIdentifier),
|
exclude: this.options.exclude.filter((excludedVault) => excludedVault !== vault.systemIdentifier),
|
||||||
locked: KeySystemIdentifiers(lockedVaults),
|
locked: KeySystemIdentifiers(lockedVaults),
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
import { KeySystemIdentifier } from '../../Syncable/KeySystemRootKey/KeySystemIdentifier'
|
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 type ExclusiveOptions = { exclusive: KeySystemIdentifier }
|
||||||
|
|
||||||
export function isExclusioanaryOptionsValue(
|
export function isExclusionaryOptionsValue(
|
||||||
options: ExclusioanaryOptions | ExclusiveOptions,
|
options: ExclusionaryOptions | ExclusiveOptions,
|
||||||
): options is ExclusioanaryOptions {
|
): options is ExclusionaryOptions {
|
||||||
return 'exclude' in options || 'locked' in options
|
return 'exclude' in options || 'locked' in options
|
||||||
}
|
}
|
||||||
|
|
||||||
export type VaultDisplayOptionsPersistable = ExclusioanaryOptions | ExclusiveOptions
|
export type VaultDisplayOptionsPersistable = ExclusionaryOptions | ExclusiveOptions
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ export class VaultDisplayService
|
|||||||
makeObservable(this, {
|
makeObservable(this, {
|
||||||
options: observable,
|
options: observable,
|
||||||
|
|
||||||
isVaultExplicitelyExcluded: observable,
|
isVaultExplicitlyExcluded: observable,
|
||||||
isVaultExclusivelyShown: observable,
|
isVaultExclusivelyShown: observable,
|
||||||
exclusivelyShownVault: observable,
|
exclusivelyShownVault: observable,
|
||||||
|
|
||||||
@@ -81,8 +81,8 @@ export class VaultDisplayService
|
|||||||
return this.options
|
return this.options
|
||||||
}
|
}
|
||||||
|
|
||||||
isVaultExplicitelyExcluded = (vault: VaultListingInterface): boolean => {
|
isVaultExplicitlyExcluded = (vault: VaultListingInterface): boolean => {
|
||||||
return this.options.isVaultExplicitelyExcluded(vault) ?? false
|
return this.options.isVaultExplicitlyExcluded(vault) ?? false
|
||||||
}
|
}
|
||||||
|
|
||||||
isVaultDisabledOrLocked(vault: VaultListingInterface): boolean {
|
isVaultDisabledOrLocked(vault: VaultListingInterface): boolean {
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ export interface VaultDisplayServiceInterface extends AbstractUIServiceInterface
|
|||||||
getOptions(): VaultDisplayOptions
|
getOptions(): VaultDisplayOptions
|
||||||
|
|
||||||
isVaultDisabledOrLocked(vault: VaultListingInterface): boolean
|
isVaultDisabledOrLocked(vault: VaultListingInterface): boolean
|
||||||
isVaultExplicitelyExcluded: (vault: VaultListingInterface) => boolean
|
isVaultExplicitlyExcluded: (vault: VaultListingInterface) => boolean
|
||||||
isVaultExclusivelyShown: (vault: VaultListingInterface) => boolean
|
isVaultExclusivelyShown: (vault: VaultListingInterface) => boolean
|
||||||
isInExclusiveDisplayMode(): boolean
|
isInExclusiveDisplayMode(): boolean
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user