fix: Make sure that rollback hook is triggered on all version backends #36690

juliusknorr · 2023-02-13T13:30:57Z

Summary

Alternative to nextcloud/groupfolders#2260 to apply to any version backend.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

juliusknorr · 2023-02-13T16:25:03Z

Will have a look into the failing tests...

apps/files_versions/lib/Versions/VersionManager.php

apps/files_versions/lib/Versions/LegacyVersionsBackend.php

-		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$nodes = $userFolder->getById($file->getId());
-		$file2 = array_pop($nodes);
+			$userFolder = $this->rootFolder->getUserFolder($user->getUID());


apps/files_versions/lib/Versions/LegacyVersionsBackend.php

-		$versionEntity->setTimestamp($file2->getMTime());
-		$versionEntity->setSize($file2->getSize());
-		$versionEntity->setMimetype($this->mimeTypeLoader->getId($file2->getMimetype()));
+		$versionEntity->setFileId($file->getId());


apps/files_versions/lib/Versions/LegacyVersionsBackend.php


 		// Insert entries in the DB for existing versions.
-		$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file2->getPath()));
+		$versionsOnFS = Storage::getVersions($user->getUID(), $userFolder->getRelativePath($file->getPath()));


apps/files_versions/lib/Versions/LegacyVersionsBackend.php

 		foreach ($versionsOnFS as $version) {
 			$versionEntity = new VersionEntity();
-			$versionEntity->setFileId($file2->getId());
+			$versionEntity->setFileId($file->getId());


apps/files_versions/lib/Versions/LegacyVersionsBackend.php

-		$nodes = $userFolder->getById($file->getId());
-		$file2 = array_pop($nodes);
+			$userFolder = $this->rootFolder->getUserFolder($user->getUID());
+			$nodes = $userFolder->getById($file->getId());


Signed-off-by: Julius Härtl <[email protected]>

Signed-off-by: Robin Appelman <[email protected]>

Signed-off-by: Julius Härtl <[email protected]>

juliusknorr · 2023-03-15T09:01:56Z

Thanks a lot @icewind1991 💙

juliusknorr · 2023-03-24T14:07:42Z

@icewind1991 Kindly also asking for a review :)

AndyXheli · 2023-03-28T16:16:05Z

Hello, Is there any updates on this. We created a ticket with onlyoffice regarding this since we're enterprise user with them. Looks like there was a sugestion fix via nextcloud/groupfolders#2260 Can Nextcloud Devs look into this as our users with onlyofice are effected by this. Thank you!

juliusknorr · 2023-03-29T09:10:46Z

@AndyXheli Please make sure to reach out through support if this is affecting enterprise customers ;)

juliusknorr · 2023-04-03T14:39:20Z

Sorry accidentally cleared the review @artonge Nothing changed since back then.

juliusknorr · 2023-04-14T15:09:28Z

/backport to stable26

juliusknorr · 2023-04-14T15:09:34Z

/backport to stable25

juliusknorr · 2023-04-14T15:09:40Z

/backport to stable24

backportbot-nextcloud · 2023-04-14T16:25:39Z

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

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

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

# 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-stable26

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

backportbot-nextcloud · 2023-04-14T16:25:42Z

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

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

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

# 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-stable25

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

backportbot-nextcloud · 2023-04-14T16:25:46Z

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

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

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

# 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-stable24

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

solracsf · 2023-04-14T17:43:42Z

/backport to stable26

solracsf · 2023-04-14T17:43:52Z

/backport to stable25

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

juliusknorr requested review from artonge, blizzz and icewind1991 February 13, 2023 13:31

juliusknorr self-assigned this Feb 13, 2023

juliusknorr added bug 3. to review Waiting for reviews labels Feb 13, 2023

juliusknorr mentioned this pull request Feb 13, 2023

restore hook in groupfolders versions nextcloud/groupfolders#2260

Closed

artonge reviewed Feb 13, 2023

View reviewed changes

apps/files_versions/lib/Versions/VersionManager.php Outdated Show resolved Hide resolved

juliusknorr force-pushed the bugfix/noid/rollback-hook branch from 6f7fe63 to e6317dd Compare February 14, 2023 11:40

github-advanced-security bot found potential problems Mar 10, 2023

View reviewed changes

icewind1991 force-pushed the bugfix/noid/rollback-hook branch from 771cd47 to 5f478a9 Compare March 10, 2023 18:52

github-advanced-security bot found potential problems Mar 10, 2023

View reviewed changes

juliusknorr requested a review from artonge March 13, 2023 09:35

artonge approved these changes Mar 13, 2023

View reviewed changes

juliusknorr and others added 4 commits March 13, 2023 10:52

fix: Make sure that rollback hook is triggered on all version backends

cf46bd6

Signed-off-by: Julius Härtl <[email protected]>

tests(files_versions): Tear down fs to clear mount cache before testing

c22d51c

Signed-off-by: Julius Härtl <[email protected]>

don't re-get fileinfo for versioned file if it's not shared

62e6a32

Signed-off-by: Robin Appelman <[email protected]>

fix: Check return type on rollback

f00f424

Signed-off-by: Julius Härtl <[email protected]>

juliusknorr force-pushed the bugfix/noid/rollback-hook branch from 5f478a9 to f00f424 Compare March 13, 2023 09:59

juliusknorr requested a review from mejo- March 15, 2023 09:02

juliusknorr added this to the Nextcloud 27 milestone Mar 15, 2023

juliusknorr requested review from artonge and come-nc and removed request for blizzz and mejo- April 3, 2023 14:38

icewind1991 approved these changes Apr 14, 2023

View reviewed changes

juliusknorr merged commit 2e1a560 into master Apr 14, 2023

juliusknorr deleted the bugfix/noid/rollback-hook branch April 14, 2023 15:09

backportbot-nextcloud bot added the backport-request label Apr 14, 2023

This was referenced Apr 14, 2023

[stable26] fix: Make sure that rollback hook is triggered on all version backends #37743

Merged

[stable25] fix: Make sure that rollback hook is triggered on all version backends #37744

Merged

backportbot-nextcloud bot removed the backport-request label Apr 14, 2023

artonge added a commit that referenced this pull request May 25, 2023

Fix initialisation of versions in the DB

1c6f4f8

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

artonge mentioned this pull request May 25, 2023

Fix initialisation of versions in the DB #38469

Merged

artonge added a commit that referenced this pull request May 25, 2023

Fix initialisation of versions in the DB

c3475f4

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

artonge added a commit that referenced this pull request May 30, 2023

Fix initialisation of versions in the DB

ce45507

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

artonge added a commit that referenced this pull request May 30, 2023

Fix initialisation of versions in the DB

e54bfc0

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

nextcloud-command pushed a commit that referenced this pull request May 31, 2023

Fix initialisation of versions in the DB

84f0d3c

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

nextcloud-command pushed a commit that referenced this pull request Jun 5, 2023

Fix initialisation of versions in the DB

8482fb1

Broken after #36690 Signed-off-by: Louis Chemineau <[email protected]>

Uh oh!

fix: Make sure that rollback hook is triggered on all version backends #36690

fix: Make sure that rollback hook is triggered on all version backends #36690

Uh oh!

Conversation

juliusknorr commented Feb 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

Uh oh!

juliusknorr commented Feb 13, 2023

Uh oh!

Uh oh!

Check notice

Uh oh!

Check notice

Check notice

Check notice

Check notice

juliusknorr commented Mar 15, 2023

Uh oh!

juliusknorr commented Mar 24, 2023

Uh oh!

AndyXheli commented Mar 28, 2023

Uh oh!

juliusknorr commented Mar 29, 2023

Uh oh!

juliusknorr commented Apr 3, 2023

Uh oh!

juliusknorr commented Apr 14, 2023

Uh oh!

juliusknorr commented Apr 14, 2023

Uh oh!

juliusknorr commented Apr 14, 2023

Uh oh!

backportbot-nextcloud bot commented Apr 14, 2023

Uh oh!

backportbot-nextcloud bot commented Apr 14, 2023

Uh oh!

backportbot-nextcloud bot commented Apr 14, 2023

Uh oh!

solracsf commented Apr 14, 2023

Uh oh!

solracsf commented Apr 14, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

juliusknorr commented Feb 13, 2023 •

edited

Loading