Skip to content
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.

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

feat: add loadingMessage() to show different loadingMsg #3311

Merged
merged 1 commit into from
Dec 29, 2023

Conversation

Rash419
Copy link
Contributor

@Rash419 Rash419 commented Nov 20, 2023

  • Resolves: #
  • Target version: main

Summary

Basically when using indirection it might happen that there cluster is scaling and there is request to open the document
COOL will retry after a interval to get the new routeToken but until then we update the user with the loading message that "Cluster is scaling" or something even better
corresponding COOL pr: CollaboraOnline/online#7683

Checklist

  • Code is properly formatted
  • Sign-off message is added to all commits
  • Documentation (manuals or wiki) has been updated or is not required

src/view/Office.vue Outdated Show resolved Hide resolved
src/view/Office.vue Outdated Show resolved Hide resolved
Signed-off-by: Rashesh Padia <rashesh.padia@collabora.com>
@juliushaertl
Copy link
Member

I pushed some changes in also include handling of CollaboraOnline/online@d4918c7 so this also includes what is needed for #3217

@juliushaertl juliushaertl added bug Something isn't working 3. to review Ready to be reviewed labels Dec 29, 2023
@juliushaertl juliushaertl merged commit 85ae148 into nextcloud:main Dec 29, 2023
46 checks passed
@juliushaertl
Copy link
Member

/backport to stable28

@juliushaertl
Copy link
Member

/backport to stable27

@backportbot-nextcloud
Copy link

The backport to stable28 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable28
git pull origin stable28

# Create the new backport branch
git checkout -b fix/foo-stable28

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable28

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

Error: Unknown error

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3. to review Ready to be reviewed bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants