Skip to content

fix: FilesViewModel - WPB-24805#4590

Open
WilhelmOks wants to merge 83 commits intodevelopfrom
improvement/WPB-24805-FilesViewModel-2
Open

fix: FilesViewModel - WPB-24805#4590
WilhelmOks wants to merge 83 commits intodevelopfrom
improvement/WPB-24805-FilesViewModel-2

Conversation

@WilhelmOks
Copy link
Copy Markdown
Collaborator

@WilhelmOks WilhelmOks commented Apr 20, 2026 •
edited
Loading

TaskWPB-24805 [iOS] improve FilesViewModel of WireDrive

Issue

The swift file FilesViewModel is almost 1k loc long, is shared by multiple Views and has accumulated a lot of code for different kinds of functionality.
This makes it hard to read and maintain it.

Solution

Many different kinds of refactoring were implemented resulting in the FilesViewModel.swift file being about 50% smaller:

  • extracted FilesViewItem into a separate file
  • refactored SheetNavigation to use Model data instead of SwiftUI Views as payload, eliminating the need for import SwiftUI in ViewModel code
  • refactored sub-views and sheets to consistently use callbacks instead of Combine bindings to notify the parent view about specific events
  • unified creation of sub-views or sheets to only create the ViewModels rather than SwiftUI Views
  • extracted all functions which create ViewModels into the extension FilesViewModel+make_ViewModels.swift
  • extracted the big UseCases nested struct into the extension FilesViewModel+UseCases.swift
  • extracted the big function for loading offline files into LoadOfflineAvailableFilesUIAction
  • extracted logic related to loading paginated lists of (file) items into the components IncrementalListLoader and FilesListLoader
  • moved and grouped all of the remaining functions using // MARK: label comments

Testing

The logic should be exactly the same after the refactoring.

  • Go to the files list, via the Drive tab or the Shared Drive of a conversation
  • Check if the list is loaded correctly and the pagination is right
  • Check offline mode and if the list of offline available files is loaded correctly
  • Check deleting and restoring files via recycle bin

jullianm and others added 30 commits March 27, 2026 10:33
@jullianm
chore: update DB version with new attributes on WireCellsLocalAsset…
4596b7a 
… entity - WPB-24208 (#4478)
@jullianm
feat: add button action for file offline availability (UI only) - WPB…
5b1cf5c 
…-23967 (#4500)
@WilhelmOks
removing UI elements for offline mode, changing No-Internet bar
7cf32de
@WilhelmOks
file item menu actions checking for offline mode
6a02c84
@jullianm
offline mode: create use cases, adjust repository logic and views acc…
0a9897d 
…ordingly (wip)
@WilhelmOks
refactored NetworkMonitor to be Observable instead of just exposing a…
2a75ef0 
… Publisher with the need for manually setting up a sink
@WilhelmOks
removed @preconcurrency from import Combine
4d31b4c
@WilhelmOks
Merge branch 'feat/WPB-23967-make-files-available-offline' into feat/…
79ae43a 
…WPB-23967-make-files-available-offline-ui-bl

# Conflicts:
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemViewModel.swift
@WilhelmOks
removed unused property: showOfflineDownload
01ccc4c
@jullianm
Merge branch 'develop' into feat/WPB-23967-make-files-available-offline
685ffd0
@jullianm
fix remaining merge conflicts, adjust offline mode UI code following …
40f38d3 
…merge
@jullianm
add conditional check on downloaded state
61b4a32
@WilhelmOks
loading list of offline files (one dummy file for now) when offline m…
aba8521 
…ode changes.
@jullianm
add localized string
00bf131
@jullianm
fix compilation issue
8a3438c
@WilhelmOks
Merge branch 'feat/WPB-23967-make-files-available-offline' into feat/…
9130c0d 
…WPB-23967-make-files-available-offline-ui-bl

# Conflicts:
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesContentView.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemViewModel.swift
@jullianm
add DEBUG action to delete asset from db and cache
586b87e
@jullianm
lint and format
089c93e
@jullianm
don't automatically open file when file is made available offline
7df2770
@jullianm
fix UTs
b548c28
@WilhelmOks
Merge branch 'feat/WPB-23967-make-files-available-offline' into feat/…
56a811a 
…WPB-23967-make-files-available-offline-ui-bl
@WilhelmOks
moved the DEBUG button to the end of the list
c4effdc
@WilhelmOks
removed the reference to bindNetworkConnection in a comment
1a8c631
@WilhelmOks
moved the DEBUG button to the end of the list
12e912e
@jullianm
add UTs
edf6609
@WilhelmOks
correct design for the offline bar (except for the color, which is a …
a7bf499 
…separate ticket)
@jullianm
add condition checks to display actions, remove available offline fla…
6316025 
…g when deleting to the recycle bin
@jullianm
reverse asset deletion code order (first delete asset locally then in…
dee0dd7 
…-memory objects)
@WilhelmOks
Merge branch 'feat/WPB-23967-make-files-available-offline' into feat/…
a5ce45c 
…WPB-23967-make-files-available-offline-ui-bl

# Conflicts:
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesViewItemView.swift
@WilhelmOks
fetching offline assets in offline mode
edaa8fd
WilhelmOks added 23 commits April 23, 2026 15:02
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
0d5de3f
@WilhelmOks
refactoring FileVersioningViewModel notification mechanism to a closu…
b6a3f1f 
…re and removing the accentColorProvider from all of the places where it's being passed around to ViewModels (because it's not needed)
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
be45dcc
@WilhelmOks
added .quickLookPreview($viewModel.viewingURL) to Versioning View aga…
cf231bf 
…in and removed the obsolete TODO
@WilhelmOks
refactoring notification mechanism to a closure
bdffa97
@WilhelmOks
extracted some types into separate files
85c7729
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
58f1dd2
@WilhelmOks
refactored SheetNavigation to not use View as the payload
06664f4
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
74127c1
@WilhelmOks
refactored creation of multiple Views so that import SwiftUI isn't re…
d47d7ca 
…quired in the FilesViewModel anymore.
@WilhelmOks
moving all functions which create ViewModels into a separate file
fb28997
@WilhelmOks
moved WireDriveNode-to-FilesViewItem mapping function to FilesViewItem
0675d33
@WilhelmOks
removed fileCache: any FileCache (not needed)
613e71e
@WilhelmOks
cleanup, reordering, grouping
0750a76
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
cd627b3
@WilhelmOks
removing a TODO
9c07265
@WilhelmOks
extracted logic of paginated files loading into dedicated components
afa31e5
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
8a938a9
@WilhelmOks
lint&format
c8b5367
@WilhelmOks
lint&format fetchTemplates
6df21c2
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
202084e
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
d085887 
# Conflicts:
#	WireMessaging/Sources/WireMessagingAssembly/WireMessagingFactory.swift
#	WireMessaging/Sources/WireMessagingDomain/WireDrive/UseCases/WireDriveMakeAssetAvailableOfflineUseCase.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesContentView.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesOfflineBarView.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesPreviewHelpers.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesViewContainer.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/FilesViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/Item/FilesItemView.swift
#	WireMessaging/Sources/WireMessagingUI/WireDrive/Components/Files/RecycleBinContainer.swift
#	WireMessaging/Tests/WireMessagingTests/WireDrive/ImplementationTests/WireDriveLocalAssetRepositoryTests.swift
#	WireMessaging/Tests/WireMessagingTests/WireDrive/UITests/Components/Files/FilesViewModelTests.swift
@WilhelmOks
Merge branch 'develop' into improvement/WPB-24805-FilesViewModel-2
f2ad360
@WilhelmOks WilhelmOks marked this pull request as ready for review May 5, 2026 14:41
@WilhelmOks WilhelmOks requested a review from OlivellaO May 5, 2026 14:42
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 5, 2026 •
edited
Loading

Test Results

0 tests   0 ✅  0s ⏱️
0 suites  0 💤
0 files    0 ❌

Results for commit a0bf1e7.

♻️ This comment has been updated with latest results.

Summary: workflow run #25441449176
Allure report (download zip): html-report-29784-improvement_WPB-24805-FilesViewModel-2

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 6, 2026

Quality Gate Passed Quality Gate passed

Issues
12 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.1% Duplication on New Code

See analysis details on SonarQube Cloud

OlivellaO
OlivellaO approved these changes May 7, 2026
View reviewed changes
Copy link
Copy Markdown
Collaborator

@OlivellaO OlivellaO left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@OlivellaO OlivellaO OlivellaO approved these changes

@jullianm jullianm Awaiting requested review from jullianm

At least 2 approving reviews are required to merge this pull request.

Assignees

@WilhelmOks WilhelmOks

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@WilhelmOks @OlivellaO @jullianm