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

fix(federatedfilesharing): import external federated share script #45606

Merged
merged 2 commits into from
Jun 5, 2024

Conversation

skjnldsv
Copy link
Member

@skjnldsv skjnldsv commented May 31, 2024

Fix #44824

  • Adjust the script
  • Fix the broken way of checking if notifications is enabled
  • Fix the display of the remote in the dialog

Notes

There are much more room to really improve and make it clean, but this is a fix with backport, and I will create a ticket once it's merged for technical debt

@skjnldsv skjnldsv added this to the Nextcloud 30 milestone May 31, 2024
@skjnldsv skjnldsv requested review from ShGKme and a team May 31, 2024 13:30
@skjnldsv skjnldsv self-assigned this May 31, 2024
@skjnldsv skjnldsv requested review from nfebe, szaimen and sorbaugh and removed request for a team May 31, 2024 13:30
@skjnldsv
Copy link
Member Author

/backport to stable29

@skjnldsv
Copy link
Member Author

/backport to stable28

@skjnldsv skjnldsv force-pushed the fix/sharedialog-28-new-files branch 2 times, most recently from 0cb0272 to b8be96a Compare May 31, 2024 13:34
@szaimen szaimen removed their request for review May 31, 2024 13:35
@skjnldsv skjnldsv force-pushed the fix/sharedialog-28-new-files branch from b8be96a to 1c097fa Compare May 31, 2024 13:36
ShGKme
ShGKme previously approved these changes May 31, 2024
@ShGKme ShGKme dismissed their stale review May 31, 2024 15:06

Pending shares is empty

@ShGKme
Copy link
Contributor

ShGKme commented May 31, 2024

Do I understand it correctly that this is only about showing a dialog when the notification app is disabled, but federated shares are still not visible in pending shares?

image

Copy link
Contributor

@ShGKme ShGKme left a comment

Choose a reason for hiding this comment

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

Fixes the issue with disabled notification app

image

@skjnldsv
Copy link
Member Author

skjnldsv commented Jun 5, 2024

/compile rebase /

@skjnldsv skjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 5, 2024
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@nextcloud-command nextcloud-command force-pushed the fix/sharedialog-28-new-files branch from 1c097fa to cd1394f Compare June 5, 2024 08:45
@skjnldsv skjnldsv merged commit 90a9191 into master Jun 5, 2024
152 of 154 checks passed
@skjnldsv skjnldsv deleted the fix/sharedialog-28-new-files branch June 5, 2024 09:17
processSharesToConfirm()
}

$('body').on('window.OCA.Notification.Action', function(e) {
Copy link
Member

Choose a reason for hiding this comment

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

Could be also updated to non-jquery code by now:
https://github.com/nextcloud/notifications/blob/master/src/Components/Action.vue#L131

Is needed anyway as we phase out jQuery and an issue got raised in notifications to either ship it's own or migrate away.

Copy link
Contributor

Choose a reason for hiding this comment

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

It can be much refactored, but for now just restored the previously working module as it was in past

@skjnldsv
Copy link
Member Author

skjnldsv commented Jun 7, 2024

/backport to stable29

Copy link

backportbot bot commented Jun 7, 2024

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

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

# Create the new backport branch
git checkout -b backport/45606/stable29

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 7f0ffac7 cd1394f5

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/45606/stable29

Error: Failed to create pull request: Validation Failed: {"resource":"PullRequest","code":"custom","message":"A pull request already exists for nextcloud:backport/45606/stable29."}


Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Federated file sharing plugin for Files app needs to be adjusted to the changes in Nextcloud 28
5 participants