Skip to content

PM-19260: Sorted folders in Add/Edit item view #1441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 18, 2025
Merged

PM-19260: Sorted folders in Add/Edit item view #1441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3198df
PM-19260 sorted folders in edit item view
ezimet-livefront Mar 18, 2025
41ab08c
moved sorting logic to repository
ezimet-livefront Mar 18, 2025
74b3294
added unit tests
ezimet-livefront Mar 18, 2025
cf6b677
updated doc
ezimet-livefront Mar 18, 2025
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
6 changes: 5 additions & 1 deletion BitwardenShared/Core/Platform/Repositories/SettingsRepository.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,11 @@ extension DefaultSettingsRepository: SettingsRepository {
func foldersListPublisher() async throws -> AsyncThrowingPublisher<AnyPublisher<[FolderView], Error>> {
try await folderService.foldersPublisher()
.asyncTryMap { folders in
try await self.clientService.vault().folders().decryptList(folders: folders)
try await self.clientService
.vault()
.folders()
.decryptList(folders: folders)
.sorted { $0.name.localizedStandardCompare($1.name) == .orderedAscending }
}
.eraseToAnyPublisher()
.values
Expand Down
15 changes: 9 additions & 6 deletions BitwardenShared/Core/Platform/Repositories/SettingsRepositoryTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,28 @@ class SettingsRepositoryTests: BitwardenTestCase {
}
}

/// `foldersListPublisher()` returns a decrypted flow of the user's folders.
/// `foldersListPublisher()` returns a decrypted flow of the user's folders in ascending alphabetically order.
func test_foldersListPublisher_emitsDecryptedList() async throws {
// Prepare the publisher.
var iterator = try await subject.foldersListPublisher().makeAsyncIterator()
_ = try await iterator.next()

// Prepare the sample data.
let date = Date(year: 2023, month: 12, day: 25)
let folder = Folder.fixture(revisionDate: date)
let folderView = FolderView.fixture(revisionDate: date)
let folder = Folder.fixture(name: "ZZ", revisionDate: date)
let folderView = FolderView.fixture(name: "ZZ", revisionDate: date)

let folder2 = Folder.fixture(name: "AA", revisionDate: date)
let folderView2 = FolderView.fixture(name: "AA", revisionDate: date)

// Ensure the list of folders is updated as expected.
folderService.foldersSubject.value = [folder]
folderService.foldersSubject.value = [folder, folder2]
let publisherValue = try await iterator.next()
try XCTAssertNotNil(XCTUnwrap(publisherValue))
try XCTAssertEqual(XCTUnwrap(publisherValue), [folderView])
try XCTAssertEqual(XCTUnwrap(publisherValue), [folderView2, folderView])

// Ensure the folders were decrypted by the client vault.
XCTAssertEqual(clientService.mockVault.clientFolders.decryptedFolders, [folder])
XCTAssertEqual(clientService.mockVault.clientFolders.decryptedFolders, [folder, folder2])
}

/// `lastSyncTimePublisher` returns a publisher of the user's last sync time.
Expand Down