Skip to content

Commit 6a3f8f8

Browse files
cristianscheidnextcloud-command
authored andcommitted
fix(dav): add missing search_supports_creation_time and search_supports_upload_time to Capabilities return type
Signed-off-by: Cristian Scheid <cristianscheid@gmail.com> Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
1 parent 778dfec commit 6a3f8f8

10 files changed

Lines changed: 37 additions & 6 deletions

File tree

apps/dav/lib/Capabilities.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ public function __construct(IConfig $config, IAvailabilityCoordinator $coordinat
2020
}
2121

2222
/**
23-
* @return array{dav: array{chunking: string, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
23+
* @return array{dav: array{chunking: string, search_supports_creation_time: bool, search_supports_upload_time: bool, bulkupload?: string, absence-supported?: bool, absence-replacement?: bool}}
2424
*/
2525
public function getCapabilities() {
2626
$capabilities = [
2727
'dav' => [
2828
'chunking' => '1.0',
29+
'search_supports_creation_time' => true,
2930
'search_supports_upload_time' => true,
3031
]
3132
];

apps/dav/lib/Files/FileSearchBackend.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ public function getPropertyDefinitionsForScope(string $href, ?string $path): arr
8585
new SearchPropertyDefinition('{DAV:}displayname', true, true, true),
8686
new SearchPropertyDefinition('{DAV:}getcontenttype', true, true, true),
8787
new SearchPropertyDefinition('{DAV:}getlastmodified', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
88+
new SearchPropertyDefinition('{DAV:}creationdate', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
8889
new SearchPropertyDefinition('{http://nextcloud.org/ns}upload_time', true, true, true, SearchPropertyDefinition::DATATYPE_DATETIME),
8990
new SearchPropertyDefinition(FilesPlugin::SIZE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_NONNEGATIVE_INTEGER),
9091
new SearchPropertyDefinition(TagsPlugin::FAVORITE_PROPERTYNAME, true, true, true, SearchPropertyDefinition::DATATYPE_BOOLEAN),
@@ -298,6 +299,8 @@ private function getSearchResultProperty(SearchResult $result, SearchPropertyDef
298299
return $node->getName();
299300
case '{DAV:}getlastmodified':
300301
return $node->getLastModified();
302+
case '{DAV:}creationdate':
303+
return $node->getNode()->getCreationTime();
301304
case '{http://nextcloud.org/ns}upload_time':
302305
return $node->getNode()->getUploadTime();
303306
case FilesPlugin::SIZE_PROPERTYNAME:
@@ -454,6 +457,8 @@ private function mapPropertyNameToColumn(SearchPropertyDefinition $property) {
454457
return 'mimetype';
455458
case '{DAV:}getlastmodified':
456459
return 'mtime';
460+
case '{DAV:}creationdate':
461+
return 'creation_time';
457462
case '{http://nextcloud.org/ns}upload_time':
458463
return 'upload_time';
459464
case FilesPlugin::SIZE_PROPERTYNAME:

apps/dav/openapi.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,20 @@
2929
"dav": {
3030
"type": "object",
3131
"required": [
32-
"chunking"
32+
"chunking",
33+
"search_supports_creation_time",
34+
"search_supports_upload_time"
3335
],
3436
"properties": {
3537
"chunking": {
3638
"type": "string"
3739
},
40+
"search_supports_creation_time": {
41+
"type": "boolean"
42+
},
43+
"search_supports_upload_time": {
44+
"type": "boolean"
45+
},
3846
"bulkupload": {
3947
"type": "string"
4048
},

apps/dav/tests/unit/CapabilitiesTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public function testGetCapabilities(): void {
2929
$expected = [
3030
'dav' => [
3131
'chunking' => '1.0',
32+
'search_supports_creation_time' => true,
33+
'search_supports_upload_time' => true,
3234
],
3335
];
3436
$this->assertSame($expected, $capabilities->getCapabilities());
@@ -48,6 +50,8 @@ public function testGetCapabilitiesWithBulkUpload(): void {
4850
$expected = [
4951
'dav' => [
5052
'chunking' => '1.0',
53+
'search_supports_creation_time' => true,
54+
'search_supports_upload_time' => true,
5155
'bulkupload' => '1.0',
5256
],
5357
];
@@ -68,6 +72,8 @@ public function testGetCapabilitiesWithAbsence(): void {
6872
$expected = [
6973
'dav' => [
7074
'chunking' => '1.0',
75+
'search_supports_creation_time' => true,
76+
'search_supports_upload_time' => true,
7177
'absence-supported' => true,
7278
'absence-replacement' => true,
7379
],

apps/files/src/components/FileEntry/FileEntryPreview.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232
<FavoriteIcon v-once />
3333
</span>
3434

35+
<!-- Recently created icon -->
36+
<span v-else-if="isRecentView && isRecentlyCreated" class="files-list__row-icon-recently-created">
37+
<RecentlyCreatedIcon v-once />
38+
</span>
39+
3540
<OverlayIcon :is="fileOverlay"
3641
v-if="fileOverlay"
3742
class="files-list__row-icon-overlay files-list__row-icon-overlay--file" />
@@ -61,6 +66,7 @@ import PlayCircleIcon from 'vue-material-design-icons/PlayCircle.vue'
6166
6267
import CollectivesIcon from './CollectivesIcon.vue'
6368
import FavoriteIcon from './FavoriteIcon.vue'
69+
import RecentlyCreatedIcon from './RecentlyCreatedIcon.vue'
6470
6571
import { isLivePhoto } from '../../services/LivePhotos'
6672
import { useUserConfigStore } from '../../store/userconfig.ts'

dist/files-main.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/files-main.js.license

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ This file is generated from multiple sources. Included packages:
5151
- @linusborg/vue-simple-portal
5252
- version: 0.1.5
5353
- license: Apache-2.0
54+
- @mdi/js
55+
- version: 7.4.47
56+
- license: Apache-2.0
5457
- @mdi/svg
5558
- version: 7.4.47
5659
- license: Apache-2.0

dist/files-main.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/private/Files/Cache/QuerySearchHelper.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public function searchInCaches(ISearchQuery $searchQuery, array $caches): array
152152

153153
$requestedFields = $this->searchBuilder->extractRequestedFields($searchQuery->getSearchOperation());
154154

155-
$joinExtendedCache = in_array('upload_time', $requestedFields);
155+
$joinExtendedCache = in_array('creation_time', $requestedFields) || in_array('upload_time', $requestedFields);
156156

157157
$query = $builder->selectFileCache('file', $joinExtendedCache);
158158

lib/private/Files/Cache/SearchBuilder.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ class SearchBuilder {
6464
'share_with' => 'string',
6565
'share_type' => 'integer',
6666
'owner' => 'string',
67+
'creation_time' => 'integer',
6768
'upload_time' => 'integer',
6869
];
6970

@@ -258,6 +259,7 @@ private function validateComparison(ISearchComparison $operator) {
258259
'share_with' => ['eq'],
259260
'share_type' => ['eq'],
260261
'owner' => ['eq'],
262+
'creation_time' => ['eq', 'gt', 'lt', 'gte', 'lte'],
261263
'upload_time' => ['eq', 'gt', 'lt', 'gte', 'lte'],
262264
];
263265

0 commit comments

Comments
 (0)