Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -519,15 +519,27 @@ private extension WireDriveGetNodesRequest {
root: RestNodeLocator(root)
)
case let .recycleBinView(root: root):
let lookupFilterTextSearch: LookupFilterTextSearch? = if let searchTerm {
LookupFilterTextSearch(searchIn: .baseName, term: searchTerm)
} else {
nil
}

if searchTerm != nil {
request.sortField = "mtime"
request.sortDirDesc = true
}

request.filters = RestLookupFilter(
status: LookupFilterStatusFilter(
deleted: .only,
isDraft: false // Backend filtering is not available; filtering is handled on the client side.
),
text: lookupFilterTextSearch,
type: .unknown // .unknown includes files (leafs) & folders (collections)
)
request.scope = RestLookupScope(
recursive: false,
recursive: searchTerm?.isEmpty == false,
root: RestNodeLocator(root)
)
case .filesBrowserView:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ private extension FilesView {
Text(Strings.Files.List.createFolder)
} icon: {
Image(systemName: "folder.badge.plus")
<<<<<<< HEAD:WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesView.swift
.tint(SemanticColors.Icon.foregroundDefaultBlack.color)
}
}
Expand All @@ -222,6 +223,8 @@ private extension FilesView {
Text(Strings.Files.List.createFile)
} icon: {
Image(systemName: "document.badge.plus")
=======
>>>>>>> 7a21673b87 (fix: search not working in recycle bin - WPB-23202 (#4249)):WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift
.tint(SemanticColors.Icon.foregroundDefaultBlack.color)
}
}
Expand Down
Loading