Skip to content

feat: integrate collabora - WPB-21651 #3956

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

Jump to bottom
Merged
samwyndham merged 43 commits into from
Dec 11, 2025
Merged

feat: integrate collabora - WPB-21651 #3956

samwyndham merged 43 commits into from
Dec 11, 2025
+714 −111

Conversation

@samwyndham
Copy link
Contributor

@samwyndham samwyndham commented Dec 1, 2025 •
edited
Loading

TaskWPB-21651 [iOS] Collabora integration

Issue

This PR integrates Collabora allowing editing of certain file types. The backend returns a URL which we open in a WebView. Currently we filter the types which can be edited locally but this will soon be updated on the backend so that the backend tells us which files can be edited with collabora.

ScreenRecording_12-01-2025.12-44-51_1.mov

Testing

  1. navigate to cells enabled conversation.
  2. Send an editable file of one of the following types: ODF, DOCX, XLSX, PPTX
  3. navigate to the files list view
  4. Tap the menu button and select edit file.
  5. Make some changes and close the file.
  6. After a few seconds, view the file. You should notice that it has been updated with your changes. (It takes some seconds for the updates to be applied.)

Checklist

  • Title contains a reference JIRA issue number like [WPB-XXX].
  • Description is filled and free of optional paragraphs.
  • Adds/updates automated tests.

@samwyndham
Add strings
a7e277f
@samwyndham
add helpers to error type
40cea11
@samwyndham
add rest API method for moving folders.
87912b0
@samwyndham
Create a new version of Fetch Nodes Use Case, renaming the old versio…
2355b2e 
…n to Fetch Nodes Page Use Case.
@samwyndham
Add convenience method for getting the name of a node
12c6cb6
@samwyndham
create WireCellsMoveNodeUseCase
023a80b
@samwyndham
move CreateFolderCTA to its own file
9618344
@samwyndham
Create Move to Folder feature views.
9bc7fae
@samwyndham
Integrate move to folder views
12b0cd8
@samwyndham
Lint & format
ff43480
@samwyndham
delete Old comment?
fa70f4e
@samwyndham
update cells sdk
b5f37d7
@samwyndham
Add a method to fetch editor URL to the nodes API.
316c769
@samwyndham
Add WireCellsGetEditingURLUseCase
d2cb5c1
@samwyndham
Integrate use case
a5a98f6
@samwyndham
Add edit button.
b8c18eb
@samwyndham
Add edit file as a sheet navigation case.
694a6e6
@samwyndham
Add EditFileView
0c7b27b
@samwyndham
Refactor View Model
b99cdb8
@samwyndham
conditionally enable editing files
694eb11
@samwyndham
Handle errors.
be23b58
@samwyndham
Fix not opening the latest version in the conversation
9f783b8
@samwyndham
Fix not opening the latest version in the Files view.
c422882
@samwyndham
Use items name in navigation bar title.
f01f328
@samwyndham
Reload files after closing the editing view.
1be1c41
@samwyndham
Tiny refactor.
3491cea
@samwyndham
Fix memory leak.
84a6c02
@samwyndham
add polling
4009049
@samwyndham
Rename polling methods.
8f3b787
@samwyndham
Fix tests
041dc6c
@github-actions
Copy link
Contributor

github-actions bot commented Dec 1, 2025 •
edited
Loading

Test Results

2 383 tests   2 356 ✅  4m 10s ⏱️
  394 suites     27 💤
    3 files        0 ❌

Results for commit bcb4695.

♻️ This comment has been updated with latest results.

@samwyndham samwyndham requested review from OlivellaO, WilhelmOks and jullianm and removed request for WilhelmOks December 2, 2025 08:06
@samwyndham
Merge branch 'develop' into feat/move-file-folder-WPB-21619-v2
1053b05 
# Conflicts:
#	WireMessaging/Sources/WireMessagingDomain/WireCells/UseCases/WireCellsFetchNodesUseCase.swift
#	WireMessaging/Sources/WireMessagingUI/Resources/Localization/en.lproj/Accessibility.strings
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesItemViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesView.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewItemView.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewProtocol.swift
@samwyndham
Rename onTap to action.
ab34a8e
@samwyndham
Rename MoveToFolderContent to MoveToFolderPageViewModel.MainContent.
bd59a78
@samwyndham
Rename MoveButtonState to MoveToFolderPageViewModel.MoveButtonState.
5b6b520
@samwyndham
Merge branch 'feat/move-file-folder-WPB-21619-v2' into feat/integrate…
ae363f1 
…-collabora-WPB-21651

# Conflicts:
#	WireMessaging/Sources/WireMessagingAssembly/WireMessagingFactory.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesItemViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesPreviewHelpers.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewContainer.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewItemView.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewProtocol.swift
#	WireMessaging/Tests/WireMessagingTests/WireCells/UITests/Components/Files/FilesBrowserViewTests.swift
#	WireMessaging/Tests/WireMessagingTests/WireCells/UITests/Components/Files/FilesViewModelTests.swift
#	WireMessaging/Tests/WireMessagingTests/WireCells/UITests/Components/Files/FilesViewTests.swift
Base automatically changed from feat/move-file-folder-WPB-21619-v2 to develop December 2, 2025 17:56
@samwyndham
Merge branch 'develop' into feat/integrate-collabora-WPB-21651
c0c7fb7 
# Conflicts:
#	WireMessaging/Sources/WireMessagingData/WireCells/NodesAPI/RestAPI.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesItemViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewItemView.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewModel.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/FilesViewProtocol.swift
#	WireMessaging/Sources/WireMessagingUI/WireCells/Components/Files/MoveToFolderPage.swift
#	wire-ios-utilities/Source/DeveloperFlag.swift
@samwyndham
Fix editing being available in recycle bin
29884d2
@samwyndham
Remove from menu when it's in the recycle bin.
bcb4695
jullianm
jullianm approved these changes Dec 10, 2025
View reviewed changes
Copy link
Contributor

@jullianm jullianm left a comment

Choose a reason for hiding this comment

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

Looks good, nice work, approving with some suggestions

@samwyndham samwyndham added this pull request to the merge queue Dec 10, 2025
github-merge-queue bot pushed a commit that referenced this pull request Dec 10, 2025
@samwyndham
feat: integrate collabora - WPB-21651 (#3956)
dafb70a
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 10, 2025
@samwyndham samwyndham added this pull request to the merge queue Dec 10, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 10, 2025
@samwyndham samwyndham added this pull request to the merge queue Dec 11, 2025
Merged via the queue into develop with commit 1e01568 Dec 11, 2025
14 checks passed
@samwyndham samwyndham deleted the feat/integrate-collabora-WPB-21651 branch December 11, 2025 12:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jullianm jullianm jullianm approved these changes

@WilhelmOks WilhelmOks WilhelmOks approved these changes

@OlivellaO OlivellaO Awaiting requested review from OlivellaO

Assignees

@samwyndham samwyndham

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@samwyndham @jullianm @WilhelmOks