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.

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

Fix invite guest for new sharing flow #40389

Merged
merged 2 commits into from Sep 14, 2023
Merged

Fix invite guest for new sharing flow #40389

merged 2 commits into from Sep 14, 2023

Conversation

Fenn-CS
Copy link
Contributor

@Fenn-CS Fenn-CS commented Sep 12, 2023 •
edited by solracsf

Resolves : #40172
Resolves : #40299

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

Fenn-CS 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.

@Fenn-CS
Copy link
Contributor Author

Fenn-CS commented Sep 13, 2023

/backport to stable27

@Fenn-CS
Copy link
Contributor Author

Fenn-CS 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)

@Fenn-CS Fenn-CS mentioned this pull request Sep 13, 2023
Merged
@blizzz
Copy link
Member

blizzz commented Sep 13, 2023

conflicts and red cypress

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

Fenn-CS commented Sep 13, 2023

/compile amend /

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

Fenn-CS commented Sep 14, 2023

/compile amend /

juliushaertl
juliushaertl approved these changes Sep 14, 2023
View reviewed changes
Copy link
Member

@juliushaertl juliushaertl 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

@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 mentioned this pull request Sep 14, 2023
Merged
@artonge artonge force-pushed the 40172-invite-guests-and-others branch from 419eb0d to 694f990 Compare September 14, 2023 09:56
@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
@Fenn-CS
Fix invite guest for new sharing flow
1f74c88 
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 <fenn25.fn@gmail.com>
@Fenn-CS Fenn-CS force-pushed the 40172-invite-guests-and-others branch from 694f990 to 1f74c88 Compare September 14, 2023 11:01
@Fenn-CS
Copy link
Contributor Author

Fenn-CS commented Sep 14, 2023

/compile amend /

@Fenn-CS Fenn-CS force-pushed the 40172-invite-guests-and-others branch from 7b0099f to d3f2212 Compare September 14, 2023 14:42
@Fenn-CS
Copy link
Contributor Author

Fenn-CS 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

@Fenn-CS
Copy link
Contributor Author

Fenn-CS 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

@Fenn-CS Fenn-CS mentioned this pull request Sep 14, 2023
Merged
@Fenn-CS
Copy link
Contributor Author

Fenn-CS commented Sep 14, 2023

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

Exactly! already did :)

@Fenn-CS Fenn-CS force-pushed the 40172-invite-guests-and-others branch 2 times, most recently from 25a4037 to 7c4248f Compare September 14, 2023 15:37
@Fenn-CS
Copy link
Contributor Author

Fenn-CS commented Sep 14, 2023

/compile amend /

@Fenn-CS @nextcloud-command
Properly align all sharing-entry types
2755976 
SharingEntryLink and regular ShareEntry were not properly visually aligned
before this commit.

Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@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 ?

@Fenn-CS Fenn-CS merged commit 62e4d16 into master Sep 14, 2023
39 checks passed
@Fenn-CS Fenn-CS 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

@Fenn-CS
Copy link
Contributor Author

Fenn-CS 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?

@ShGKme ShGKme mentioned this pull request Feb 9, 2024
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@juliushaertl juliushaertl juliushaertl approved these changes

@artonge artonge Awaiting requested review from artonge

@sorbaugh sorbaugh Awaiting requested review from sorbaugh

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish backport-request feature: sharing
Projects
None yet
Milestone
Nextcloud 28
Development

Successfully merging this pull request may close these issues.

[Bug]: Unable to invite guest ⛑️ Polishing for new sharing design and flow 🤝
5 participants
@Fenn-CS @AndyScherzinger @blizzz @artonge @juliushaertl