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 invite guest for new sharing flow #40389

Merged
merged 2 commits into from
Sep 14, 2023
Merged

Conversation

nfebe
Copy link
Contributor

@nfebe nfebe commented Sep 12, 2023

Resolves : #40172
Resolves : #40299

@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch 2 times, most recently from 901f95f to 0f94c99 Compare September 13, 2023 16:27
@nfebe nfebe added the 3. to review Waiting for reviews label Sep 13, 2023
@nfebe nfebe added this to the Nextcloud 28 milestone Sep 13, 2023
@nfebe nfebe changed the title WIP : Fix invite guest for new sharing flow Fix invite guest for new sharing flow Sep 13, 2023
@nfebe nfebe marked this pull request as ready for review September 13, 2023 16:28
@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch from 0f94c99 to 3d3fa76 Compare September 13, 2023 16:47
@nfebe
Copy link
Contributor Author

nfebe commented Sep 13, 2023

/compile amend /

@AndyScherzinger
Copy link
Member

Important point here is the backport then, which from what I understood will differ from the main branch one.

@nextcloud-command nextcloud-command force-pushed the 40172-invite-guests-and-others branch from 3d3fa76 to 7474a9b Compare September 13, 2023 17:10
@nfebe
Copy link
Contributor Author

nfebe commented Sep 13, 2023

/backport to stable27

@nfebe
Copy link
Contributor Author

nfebe commented Sep 13, 2023

Important point here is the backport then, which from what I understood will differ from the main branch one.

I did this on stable27 and realized it would work on master so decide to send the PR here at once, would backport to stable27 from this. (If your comment is related to this)

@nfebe nfebe mentioned this pull request Sep 13, 2023
@blizzz
Copy link
Member

blizzz commented Sep 13, 2023

conflicts and red cypress

@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch 2 times, most recently from 0ec31ed to 00fdea4 Compare September 13, 2023 20:39
@nfebe
Copy link
Contributor Author

nfebe commented Sep 13, 2023

/compile amend /

@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch from 00fdea4 to 171b921 Compare September 14, 2023 07:12
@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the 40172-invite-guests-and-others branch from 171b921 to 6257c51 Compare September 14, 2023 07:24
Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Tested and works

@nfebe nfebe enabled auto-merge September 14, 2023 08:18
@artonge artonge force-pushed the 40172-invite-guests-and-others branch from 6257c51 to 419eb0d Compare September 14, 2023 09:51
@artonge
Copy link
Contributor

artonge commented Sep 14, 2023

Rebased

@artonge artonge force-pushed the 40172-invite-guests-and-others branch from 419eb0d to 694f990 Compare September 14, 2023 09:56
@artonge artonge disabled auto-merge September 14, 2023 10:06
@blizzz blizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 14, 2023
Call external handlers such as the one in the guess app
https://github.com/nextcloud/guests/blob/master/src/main.js#L30
if present.

Signed-off-by: fenn-cs <[email protected]>
@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch from 694f990 to 1f74c88 Compare September 14, 2023 11:01
@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the 40172-invite-guests-and-others branch from 1f74c88 to 7b0099f Compare September 14, 2023 14:06
@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch from 7b0099f to d3f2212 Compare September 14, 2023 14:42
@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

Threw in a commit to fix share entry alignments

Before Now
Screenshot from 2023-09-14 14-46-42 Screenshot from 2023-09-14 15-37-15

@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

/compile amend /

@artonge
Copy link
Contributor

artonge commented Sep 14, 2023

Threw in a commit to fix share entry alignments

This commit will need to be backported as well, as the rest is already merged into stable27

@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

This commit will need to be backported as well, as the rest is already merged into stable27

Exactly! already did :)

@nextcloud-command nextcloud-command force-pushed the 40172-invite-guests-and-others branch from d3f2212 to 84609d6 Compare September 14, 2023 15:17
@nfebe nfebe force-pushed the 40172-invite-guests-and-others branch 2 times, most recently from 25a4037 to 7c4248f Compare September 14, 2023 15:37
@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

/compile amend /

SharingEntryLink and regular ShareEntry were not properly visually aligned
before this commit.

Signed-off-by: fenn-cs <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
@nextcloud-command nextcloud-command force-pushed the 40172-invite-guests-and-others branch from 7c4248f to 2755976 Compare September 14, 2023 16:10
@nfebe nfebe enabled auto-merge September 14, 2023 16:11
@AndyScherzinger
Copy link
Member

This commit will need to be backported as well, as the rest is already merged into stable27

Well this one is too late for 27.1.0 but would then go into 27.1.1 - it that a problem? @artonge @fenn-cs ?

@nfebe nfebe merged commit 62e4d16 into master Sep 14, 2023
38 checks passed
@nfebe nfebe deleted the 40172-invite-guests-and-others branch September 14, 2023 17:33
@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

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

@nfebe
Copy link
Contributor Author

nfebe commented Sep 14, 2023

Well this one is too late for 27.1.0 but would then go into 27.1.1 - it that a problem? @artonge @fenn-cs ?

It went in via this backport : #40415 thanks to @artonge the only thing that didn't go with that is the alignment commit which is non critical and is already back-ported now too.

cc: @AndyScherzinger

@AndyScherzinger
Copy link
Member

The backport et alignment we will probably need to dig in a bit deeper so it is also aligned with related resources (if present).

So I expect the alignment will see a further small update.

Do you happen to have a screenshot with shares and related resources?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish backport-request feature: sharing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Unable to invite guest ⛑️ Polishing for new sharing design and flow 🤝
5 participants