feat: search files in conversation - WPB-21647 (#4051)

jullianm · web-flow · commit 9197c4011ea8 · 2026-01-08T10:21:28.000Z
diff --git a/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift b/WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift
@@ -464,10 +464,11 @@ private extension WireCellsGetNodesRequest {
                     deleted: .not,
                     isDraft: false
                 ),
+                text: LookupFilterTextSearch(searchIn: .baseName, term: searchTerm ?? "*"),
                 type: isFoldersEnabled ? .unknown : .leaf // .unknown includes files (leafs) & folders (collections)
             )
             request.scope = RestLookupScope(
-                recursive: isFoldersEnabled ? false : true,
+                recursive: searchTerm?.isEmpty == false,
                 root: RestNodeLocator(root)
             )
         case let .recycleBinView(root: root, isFoldersEnabled):
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilenameValidator.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilenameValidator.swift
@@ -38,7 +38,7 @@ struct FilenameValidator {
             .failure(.dotPrefix)
         } else if input.count > Constants.maxInputLength {
             .failure(.tooLong)
-        } else if input.contains("/") {
+        } else if input.contains("/") || input.contains("\\") {
             .failure(.slashCharacter)
         } else {
             .success(())
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesBrowserView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesBrowserView.swift
@@ -111,7 +111,7 @@ private extension FilesBrowserView {
 
 // MARK: - Helper
 
-private extension View {
+extension View {
     @ViewBuilder
     func `if`(
         _ condition: Bool,
diff --git a/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift b/WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift
@@ -70,6 +70,13 @@ package struct FilesView: FilesViewProtocol {
             .toolbarBackground(.visible, for: .navigationBar) // shows navigation bar divider
             .toolbarBackground(ColorTheme.Backgrounds.background.color, for: .navigationBar)
             .toolbar { toolbarContent }
+            .if(viewModel.showSearchBar) { view in
+                view.searchable(
+                    text: $viewModel.searchText,
+                    placement: .navigationBarDrawer,
+                    prompt: Strings.Files.Search.title
+                )
+            }
             .onAppear { reloadTask() }
             .onReceive(viewModel.triggerReload) { _ in
                 Task {
diff --git a/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_LoadingState.dark.png b/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_LoadingState.dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f4117f1d2bd4149a44e4df205ed89d393e25674dd2612b154fb3ebe8930d0ad4
-size 61629
+oid sha256:ffa87366a71f264a5574061abcf933ec0071811d52eb01c4681e613a54883ab3
+size 71116
diff --git a/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_LoadingState.light.png b/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_LoadingState.light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:195860ca8356930f6ef84a29f2fbcb7a86e20ce870d5f64bafd14ac622323614
-size 60889
+oid sha256:681eb52c197f33e845eff816316a9b8fecae9e402f0bb42fe854d04fd05acf41
+size 69547
diff --git a/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_NoDataState.dark.png b/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_NoDataState.dark.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5afb0347ab806fd7ffd3f11f84bf7373d7ab9c10bbd077314bfd623ba4e72c4e
-size 87630
+oid sha256:768c069f2886096b594653702acf9535b26611055fef2468dc668df2863b49b4
+size 96488
diff --git a/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_NoDataState.light.png b/WireMessaging/Tests/WireMessagingTests/Resources/ReferenceImages/FilesViewTests/testFilesView_NoDataState.light.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ddac003bdf010cc8fc2a45c8af21ac9022870b88fd63d1d59b5cc44be7256b28
-size 87023
+oid sha256:cc7c4b4ffdb4be2cb3c6ec4bee64dda8c9fe480b356ced6d8049fe6df5e2c34e
+size 95106
diff --git a/WireUI/Sources/WireDesign/Colors/ColorTheme.swift b/WireUI/Sources/WireDesign/Colors/ColorTheme.swift
@@ -109,9 +109,9 @@ public enum ColorTheme {
 
     public enum Buttons {
 
-        enum Primary {
+        public enum Primary {
 
-            static let enabled = UIColor(light: .blue500Light, dark: .blue500Dark)
+            public static let enabled = UIColor(light: .blue500Light, dark: .blue500Dark)
             static let onEnabled = UIColor(light: .white, dark: .black)
 
             static let disabled = UIColor(light: .gray50, dark: .gray80)
diff --git a/wire-ios/Wire-iOS Tests/Collection/CollectionsViewControllerTests.swift b/wire-ios/Wire-iOS Tests/Collection/CollectionsViewControllerTests.swift
@@ -126,6 +126,7 @@ final class CollectionsViewControllerTests: XCTestCase {
     func testThatNoElementStateIsShownWhenCollectionIsEmpty() {
         let controller = CollectionsViewController(
             collection: emptyCollection,
+            isCellsEnabled: false,
             fetchingDone: true,
             userSession: userSession,
             mainCoordinator: mockMainCoordinator,
@@ -138,6 +139,7 @@ final class CollectionsViewControllerTests: XCTestCase {
     func testThatLoadingIsShownWhenFetching() {
         let controller = CollectionsViewController(
             collection: emptyCollection,
+            isCellsEnabled: false,
             fetchingDone: false,
             userSession: userSession,
             mainCoordinator: mockMainCoordinator,
@@ -244,6 +246,7 @@ final class CollectionsViewControllerTests: XCTestCase {
 
         let controller = CollectionsViewController(
             collection: collection,
+            isCellsEnabled: false,
             userSession: userSession,
             mainCoordinator: mockMainCoordinator,
             selfProfileUIBuilder: MockSelfProfileViewControllerBuilderProtocol(),
diff --git a/wire-ios/Wire-iOS/Generated/Strings+Generated.swift b/wire-ios/Wire-iOS/Generated/Strings+Generated.swift
@@ -1653,6 +1653,16 @@ internal enum L10n {
           /// Links
           internal static let title = L10n.tr("Localizable", "collections.section.links.title", fallback: "Links")
         }
+        internal enum SearchFiles {
+          /// Search files
+          internal static let description = L10n.tr("Localizable", "collections.section.searchFiles.description", fallback: "Search files")
+          internal enum Alert {
+            /// Find files shared in conversations with file collaboration
+            internal static let message = L10n.tr("Localizable", "collections.section.searchFiles.alert.message", fallback: "Find files shared in conversations with file collaboration")
+            /// File collaboration (Cells beta version)
+            internal static let title = L10n.tr("Localizable", "collections.section.searchFiles.alert.title", fallback: "File collaboration (Cells beta version)")
+          }
+        }
         internal enum Videos {
           /// Videos
           internal static let title = L10n.tr("Localizable", "collections.section.videos.title", fallback: "Videos")
diff --git a/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings b/wire-ios/Wire-iOS/Resources/Localization/Base.lproj/Localizable.strings
@@ -1868,6 +1868,10 @@ Enter your identity provider’s credentials in the next step to update the cert
 "collections.search.field.placeholder" = "Search text messages";
 "collections.search.no_items" = "No results";
 
+"collections.section.searchFiles.description" = "Search files";
+"collections.section.searchFiles.alert.title" = "File collaboration (Cells beta version)";
+"collections.section.searchFiles.alert.message" = "Find files shared in conversations with file collaboration";
+
 
 
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionSearchFilesCell.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionSearchFilesCell.swift
@@ -0,0 +1,104 @@
+//
+// Wire
+// Copyright (C) 2026 Wire Swiss GmbH
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see http://www.gnu.org/licenses/.
+//
+
+import UIKit
+import WireCommonComponents
+import WireDataModel
+import WireDesign
+import WireFoundation
+
+final class CollectionSearchFilesCell: CollectionCell {
+    private let containerView = UIView()
+
+    private let label: UILabel = {
+        let label = UILabel()
+        label.text = L10n.Localizable.Collections.Section.SearchFiles.description
+        return label
+    }()
+
+    private let chevronImageView: UIImageView = {
+        let imageView = UIImageView(image: UIImage(systemName: "chevron.right"))
+        imageView.tintColor = ColorTheme.Base.secondaryText
+        return imageView
+    }()
+
+    private let informationButton: UIButton = {
+        var config = UIButton.Configuration.plain()
+        config.image = UIImage(systemName: "info.circle")
+        config.baseForegroundColor = ColorTheme.Buttons.Primary.enabled
+
+        return UIButton(configuration: config)
+    }()
+
+    @available(*, unavailable)
+    required init?(coder aDecoder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        loadView()
+    }
+
+    private func loadView() {
+        let views = [label, containerView, chevronImageView, informationButton]
+        views.forEach { $0.translatesAutoresizingMaskIntoConstraints = false }
+        views.forEach(secureContentsView.addSubview)
+        secureContentsView.layer.cornerRadius = 16
+
+        NSLayoutConstraint.activate([
+            // label
+            label.topAnchor.constraint(equalTo: secureContentsView.topAnchor),
+            label.bottomAnchor.constraint(equalTo: secureContentsView.bottomAnchor),
+            label.leadingAnchor.constraint(equalTo: secureContentsView.leadingAnchor, constant: 16),
+            label.trailingAnchor.constraint(greaterThanOrEqualTo: informationButton.trailingAnchor),
+
+            // information button
+            informationButton.heightAnchor.constraint(equalToConstant: 18),
+            informationButton.widthAnchor.constraint(equalToConstant: 18),
+            informationButton.trailingAnchor.constraint(equalTo: chevronImageView.leadingAnchor, constant: -16),
+            informationButton.centerYAnchor.constraint(equalTo: secureContentsView.centerYAnchor),
+
+            // chevron icon
+            chevronImageView.heightAnchor.constraint(equalToConstant: 20),
+            chevronImageView.widthAnchor.constraint(equalToConstant: 12),
+            chevronImageView.centerYAnchor.constraint(equalTo: secureContentsView.centerYAnchor),
+            chevronImageView.trailingAnchor.constraint(equalTo: secureContentsView.trailingAnchor, constant: -16),
+
+            // containerView
+            containerView.topAnchor.constraint(equalTo: secureContentsView.bottomAnchor, constant: 4),
+            containerView.leadingAnchor.constraint(equalTo: secureContentsView.leadingAnchor, constant: 4),
+            containerView.trailingAnchor.constraint(equalTo: secureContentsView.trailingAnchor, constant: 4),
+            containerView.bottomAnchor.constraint(equalTo: secureContentsView.bottomAnchor, constant: 4)
+        ])
+    }
+
+    func configure(
+        accentColor: WireAccentColor?,
+        informationButtonHandler: @escaping () -> Void
+    ) {
+        if let accentColor {
+            var config = UIButton.Configuration.plain()
+            config.image = UIImage(systemName: "info.circle")
+            config.baseForegroundColor = ColorTheme.Base.primary(accentColor)
+            informationButton.configuration = config
+        }
+        let action = UIAction { _ in informationButtonHandler() }
+        informationButton.addAction(action, for: .touchUpInside)
+    }
+}
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsSectionSet.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsSectionSet.swift
@@ -27,8 +27,8 @@ struct CollectionsSectionSet: OptionSet, Hashable {
         self.rawValue = rawValue
     }
 
-    init?(index: UInt) {
-        self = type(of: self).visible[Int(index)]
+    init?(index: UInt, isCellsEnabled: Bool) {
+        self = isCellsEnabled ? type(of: self).visibleWithSearchFiles[Int(index)] : type(of: self).visible[Int(index)]
     }
 
     static let none = CollectionsSectionSet([])
@@ -37,10 +37,14 @@ struct CollectionsSectionSet: OptionSet, Hashable {
     static let videos = CollectionsSectionSet(rawValue: 1 << 2)
     static let links = CollectionsSectionSet(rawValue: 1 << 3)
     static let loading = CollectionsSectionSet(rawValue: 1 << 4) // special section that shows the loading view
+    static let searchFiles = CollectionsSectionSet(rawValue: 1 << 5)
 
     /// Returns all possible section types
     static let all: CollectionsSectionSet = [.images, .filesAndAudio, .videos, .links, .loading]
 
     /// Returns visible sections in the display order
     static let visible: [CollectionsSectionSet] = [images, videos, links, filesAndAudio, loading]
+
+    /// Returns visible sections with search files in the display order
+    static let visibleWithSearchFiles = [CollectionsSectionSet.searchFiles] + CollectionsSectionSet.visible
 }
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsView.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsView.swift
@@ -62,6 +62,10 @@ final class CollectionsView: UIView {
             forSupplementaryViewOfKind: UICollectionView.elementKindSectionHeader,
             withReuseIdentifier: CollectionHeaderView.reuseIdentifier
         )
+        collectionView.register(
+            CollectionSearchFilesCell.self,
+            forCellWithReuseIdentifier: CollectionSearchFilesCell.reuseIdentifier
+        )
         collectionView.contentInset = UIEdgeInsets(top: 8, left: 0, bottom: 0, right: 0)
         collectionView.translatesAutoresizingMaskIntoConstraints = false
         collectionView.allowsMultipleSelection = false
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Collections/CollectionsViewController.swift
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+NavigationBar.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController+NavigationBar.swift
diff --git a/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift b/wire-ios/Wire-iOS/Sources/UserInterface/Conversation/ConversationViewController.swift

Original file line number	Diff line number	Diff line change
`@@ -464,10 +464,11 @@ private extension WireCellsGetNodesRequest {`
`464`	`464`	`deleted: .not,`
`465`	`465`	`isDraft: false`
`466`	`466`	`),`
	`467`	`+ text: LookupFilterTextSearch(searchIn: .baseName, term: searchTerm ?? "*"),`
`467`	`468`	`type: isFoldersEnabled ? .unknown : .leaf // .unknown includes files (leafs) & folders (collections)`
`468`	`469`	`)`
`469`	`470`	`request.scope = RestLookupScope(`
`470`		`- recursive: isFoldersEnabled ? false : true,`
	`471`	`+ recursive: searchTerm?.isEmpty == false,`
`471`	`472`	`root: RestNodeLocator(root)`
`472`	`473`	`)`
`473`	`474`	`case let .recycleBinView(root: root, isFoldersEnabled):`