diff --git a/dev/prod/public/config-worker.json b/dev/prod/public/config-worker.json index f512f0503e..bc432606f0 100644 --- a/dev/prod/public/config-worker.json +++ b/dev/prod/public/config-worker.json @@ -13,7 +13,7 @@ "DESKTOP_UPDATES_CHANNEL": "front", - "FILES_URL": "https://dl.hc.engineering/blob/:workspace/:blobId", + "FILES_URL": "https://dl.hc.engineering/blob/:workspace/:blobId/:filename", "GITHUB_APP": "huly-github-staging", diff --git a/models/drive/src/index.ts b/models/drive/src/index.ts index 1b48c20eac..5c87783d68 100644 --- a/models/drive/src/index.ts +++ b/models/drive/src/index.ts @@ -349,7 +349,7 @@ function defineResource (builder: Builder): void { key: '', presenter: drive.component.ResourcePresenter, label: drive.string.Name, - sortingKey: 'name' + sortingKey: 'title' }, '$lookup.file.size', 'comments', @@ -366,7 +366,7 @@ function defineResource (builder: Builder): void { } } as FindOptions, configOptions: { - hiddenKeys: ['name', 'parent', 'path', 'file', 'versions'], + hiddenKeys: ['title', 'parent', 'path', 'file', 'versions'], sortable: true } }, @@ -393,7 +393,7 @@ function defineResource (builder: Builder): void { viewOptions: { groupBy: [], orderBy: [ - ['name', SortingOrder.Ascending], + ['title', SortingOrder.Ascending], ['$lookup.file.size', SortingOrder.Ascending], ['$lookup.file.modifiedOn', SortingOrder.Descending] ], @@ -404,14 +404,14 @@ function defineResource (builder: Builder): void { key: '', presenter: drive.component.ResourcePresenter, label: drive.string.Name, - sortingKey: 'name' + sortingKey: 'title' }, '$lookup.file.size', '$lookup.file.modifiedOn', 'createdBy' ], configOptions: { - hiddenKeys: ['name', 'parent', 'path', 'file', 'versions'], + hiddenKeys: ['title', 'parent', 'path', 'file', 'versions'], sortable: true }, /* eslint-disable @typescript-eslint/consistent-type-assertions */ diff --git a/packages/core/src/storage.ts b/packages/core/src/storage.ts index ef9f1ef41e..a7eb9ba51f 100644 --- a/packages/core/src/storage.ts +++ b/packages/core/src/storage.ts @@ -275,3 +275,19 @@ export interface Storage { export interface FulltextStorage { searchFulltext: (query: SearchQuery, options: SearchOptions) => Promise } + +export function shouldShowArchived ( + query: DocumentQuery, + options: FindOptions | undefined +): boolean { + if (options?.showArchived !== undefined) { + return options.showArchived + } + if (query._id !== undefined && typeof query._id === 'string') { + return true + } + if (query.space !== undefined && typeof query.space === 'string') { + return true + } + return false +} diff --git a/packages/presentation/src/components/ObjectPopup.svelte b/packages/presentation/src/components/ObjectPopup.svelte index 4ab8f6da62..6fccfcee41 100644 --- a/packages/presentation/src/components/ObjectPopup.svelte +++ b/packages/presentation/src/components/ObjectPopup.svelte @@ -95,13 +95,17 @@ case 'disabled': return { _id: { $nin: ignoreObjects, ..._idExtra } } case 'fulltext': - return { $search: search, _id: { $nin: ignoreObjects, ..._idExtra } } + return search !== '' + ? { $search: search, _id: { $nin: ignoreObjects, ..._idExtra } } + : { _id: { $nin: ignoreObjects, ..._idExtra } } case 'spotlight': return extraItems.length > 0 ? { _id: { $in: extraItems, $nin: ignoreObjects } } : { _id: { $nin: ignoreObjects, ..._idExtra } } default: - return { [searchField]: { $like: '%' + search + '%' }, _id: { $nin: ignoreObjects, ..._idExtra } } + return search !== '' + ? { [searchField]: { $like: '%' + search + '%' }, _id: { $nin: ignoreObjects, ..._idExtra } } + : { _id: { $nin: ignoreObjects, ..._idExtra } } } })() } diff --git a/packages/presentation/src/components/PDFViewer.svelte b/packages/presentation/src/components/PDFViewer.svelte index 450ae4ae0b..f8a6615fcd 100644 --- a/packages/presentation/src/components/PDFViewer.svelte +++ b/packages/presentation/src/components/PDFViewer.svelte @@ -15,7 +15,7 @@ @@ -85,41 +72,37 @@ - {#await srcRef then src} - {#if !isLoading && src !== ''} - -