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

19
packages/web/src/javascripts/Utils/Items/Search/getSearchResults.ts
View File

@@ -19,7 +19,7 @@ export function getLinkingSearchResults(
application: WebApplicationInterface,
activeItem?: LinkableItem,
options: {
contentType?: ContentType
contentType?: string
returnEmptyIfQueryEmpty?: boolean
} = { returnEmptyIfQueryEmpty: true },
): {
@@ -49,7 +49,7 @@ export function getLinkingSearchResults(
}
const searchableItems = naturalSort(
application.items.getItems([ContentType.Note, ContentType.File, ContentType.Tag]),
application.items.getItems([ContentType.TYPES.Note, ContentType.TYPES.File, ContentType.TYPES.Tag]),
'title',
)
@@ -85,19 +85,26 @@ export function getLinkingSearchResults(
const limitPerContentType = resultLimitForSearchQuery(searchQuery)
if (
item.content_type === ContentType.Tag &&
(!enforceResultLimit || (unlinkedTags.length < limitPerContentType && item.content_type === ContentType.Tag))
item.content_type === ContentType.TYPES.Tag &&
(!enforceResultLimit ||
(unlinkedTags.length < limitPerContentType && item.content_type === ContentType.TYPES.Tag))
) {
unlinkedTags.push(item)
continue
}
if (item.content_type === ContentType.Note && (!enforceResultLimit || unlinkedNotes.length < limitPerContentType)) {
if (
item.content_type === ContentType.TYPES.Note &&
(!enforceResultLimit || unlinkedNotes.length < limitPerContentType)
) {
unlinkedNotes.push(item)
continue
}
if (item.content_type === ContentType.File && (!enforceResultLimit || unlinkedFiles.length < limitPerContentType)) {
if (
item.content_type === ContentType.TYPES.File &&
(!enforceResultLimit || unlinkedFiles.length < limitPerContentType)
) {
unlinkedFiles.push(item)
continue
}

2
packages/web/src/javascripts/Utils/Items/Search/isSearchResultExistingTag.ts
View File

@@ -1,5 +1,5 @@
import { DecryptedItemInterface, ItemContent, ContentType } from '@standardnotes/snjs'
export function isSearchResultExistingTag(result: DecryptedItemInterface<ItemContent>, searchQuery: string) {
return result.content_type === ContentType.Tag && result.title === searchQuery
return result.content_type === ContentType.TYPES.Tag && result.title === searchQuery
}

2
packages/web/src/javascripts/Utils/createEditorMenuGroups.ts
View File

@@ -36,7 +36,7 @@ const insertNonInstalledNativeComponentsInMap = (
application: WebApplication,
): void => {
GetFeatures()
.filter((feature) => feature.content_type === ContentType.Component && feature.area === ComponentArea.Editor)
.filter((feature) => feature.content_type === ContentType.TYPES.Component && feature.area === ComponentArea.Editor)
.forEach((editorFeature) => {
const notInstalled = !components.find((editor) => editor.identifier === editorFeature.identifier)
const isExperimental = application.features.isExperimentalFeature(editorFeature.identifier)