Add cancel button for when user entry is being edited #38952

JeaNugroho · 2023-06-23T01:02:34Z

Resolves: Add a Cancel button when editing a user #22608

Summary

Add a cancel button between checkmark button and three-dot button for when user entry is being edited.

Before

After

Potential next steps

This comment may be the next fix to make user experience more intuitive and straightforward. I personally would think that the user editing process would be like this if I were a new user to the app. I can certainly implement a way to make this happen, either in the same PR or in the next PR after this one's completed.

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included or are not applicable
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)

Fenn-CS

Thank you so far! Left an inline comment.

apps/settings/src/components/Users/UserRow.vue

artonge

Watch out as the component has been heavily modified recently, so your change might need to be adapted.

#38839

nimishavijay

Super nice! :) Only one tiny thing to nitpick: All the icons in a column should be center-aligned ideally. So the buttons should be moved slightly to the right, so that the close icon is nicely aligned with all the edit icons above it :)

Fenn-CS

This now looks ok to me however,

There's a review about alignment which you should address
Update the screenshot in the description to reflect the new changes

And we would be good to go! Thank you for your contribution :)

susnux · 2023-07-01T14:04:01Z

This needs to be rebased as the @artonge said it was heavily modified.
The settings are not saved when pressing the check button "done" but when you save a field. Similar to all other settings on Nextcloud which are saved on change rather than that there is a "save" button.

Rebase add cancel button Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

Omit checkmark button since it has the same functionality as the cancel button - Editing User Entry Co-authored-by: F. E Noel Nfebe <fenn25.fn@gmail.com> Signed-off-by: Jean Benedict Nugroho <35510082+JeaNugroho@users.noreply.github.com>

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

JeaNugroho · 2023-07-04T04:18:14Z

Have just rebased! I'll try to fix the alignment and update the original commit with the new screenshot of the layout. And then when any of the required CI checks fail, I hope someone can provide guidance for that 😊

@Fenn-CS @susnux @artonge @nimishavijay

JeaNugroho · 2023-07-04T21:48:55Z

@Fenn-CS @artonge @susnux
We now clearly know that we need to fix eslint and Node. I recall from a different PR I'm doing, we need to run npm run build to fix Node and run npm run lint:fix to fix eslint. So I don't mess this PR like the other one, in what sequence do I have to run these? And are there any other commands or things should I do before, after, or in between these two commands?

Fenn-CS · 2023-07-04T22:23:37Z

@JeaNugroho you should lint and then build ideally!

However there are some merge conflicts in your PR, check the files tab closely. I would leave some inline comments to help you see them.

Fenn-CS · 2023-07-04T22:24:56Z

apps/settings/src/components/Users/UserRow.vue

+				<div class="icon-checkmark" />
+				{{ feedbackMessage }}
+			</div>
+>>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)


Suggested change

>>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)

Merge conflict, and deleting this line is not the solution though you want to work with perhaps your code editor to help you resolve the conflicts.

Fenn-CS · 2023-07-04T22:25:16Z

apps/settings/src/components/Users/UserRow.vue

@@ -221,10 +221,36 @@
 		</div>

 		<div class="userActions">
+<<<<<<< HEAD


Suggested change

<<<<<<< HEAD

Another conflict marker

Fenn-CS · 2023-07-04T22:25:43Z

apps/settings/src/components/Users/UserRow.vue

 			<UserRowActions v-if="!loading.all"
 				:actions="userActions"
 				:edit="true"
 				@update:edit="toggleEdit" />
+=======


Suggested change

=======

Conflict.

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

Pytal · 2023-07-06T02:13:50Z

Thanks @JeaNugroho! We have some more modifications incoming, would it be fine with you if we revisit this after merging #39050 to prevent conflicts?

joshtrichards · 2023-12-28T02:35:50Z

#39050 has been merged, @JeaNugroho. So feel free to proceed. :)

solracsf requested review from JuliaKirschenheuter and Pytal June 23, 2023 05:33

solracsf added the 3. to review Waiting for reviews label Jun 23, 2023

solracsf added this to the Nextcloud 28 milestone Jun 23, 2023

szaimen requested review from a team, susnux and Fenn-CS and removed request for a team June 23, 2023 07:18

Fenn-CS requested changes Jun 23, 2023

View reviewed changes

apps/settings/src/components/Users/UserRow.vue Outdated Show resolved Hide resolved

JeaNugroho requested a review from Fenn-CS June 25, 2023 00:49

JeaNugroho mentioned this pull request Jun 30, 2023

Make no-user entry with avatar when there is no others with access #39022

Open

4 tasks

artonge reviewed Jun 30, 2023

View reviewed changes

nimishavijay requested changes Jun 30, 2023

View reviewed changes

Fenn-CS reviewed Jul 1, 2023

View reviewed changes

JeaNugroho and others added 3 commits July 3, 2023 20:40

Add cancel button for when user entry is being edited

bcdbaf3

Rebase add cancel button Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

Omit bind property for more than one inside NcActions

d2b2fc3

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

JeaNugroho force-pushed the JeaNugroho-NextCloudServer/AddCancelButton-EditingUserEntry branch from 2e36db2 to d2b2fc3 Compare July 4, 2023 01:43

Fenn-CS reviewed Jul 4, 2023

View reviewed changes

Omit conflict markers

fc87865

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

skjnldsv mentioned this pull request Nov 1, 2023

chore: 28.0.0 beta 1 #41228

Merged

This was referenced Nov 6, 2023

28.0.0 beta 2 #41314

Merged

28.0.0 beta 3 #41379

Merged

This was referenced Nov 14, 2023

28.0.0 beta 4 #41477

Merged

28.0.0 RC1 #41621

Merged

blizzz modified the milestones: Nextcloud 28, Nextcloud 29 Nov 23, 2023

This was referenced Mar 12, 2024

29.0.0 beta 2 #44152

Merged

29.0.0 beta 3 #44186

Merged

29.0.0 beta 4 #44275

Merged

This was referenced Mar 20, 2024

29.0.0 beta 5 #44361

Merged

29.0.0 beta 6 #44449

Merged

skjnldsv mentioned this pull request Mar 28, 2024

29.0.0 RC1 #44552

Merged

81 tasks

skjnldsv modified the milestones: Nextcloud 29, Nextcloud 30 Mar 28, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add cancel button for when user entry is being edited #38952

Add cancel button for when user entry is being edited #38952

JeaNugroho commented Jun 23, 2023 •

edited

Loading

Fenn-CS left a comment •

edited

Loading

artonge left a comment

nimishavijay left a comment

Fenn-CS left a comment

susnux commented Jul 1, 2023

JeaNugroho commented Jul 4, 2023

JeaNugroho commented Jul 4, 2023

Fenn-CS commented Jul 4, 2023

Fenn-CS Jul 4, 2023

Fenn-CS Jul 4, 2023

Fenn-CS Jul 4, 2023

Pytal commented Jul 6, 2023

joshtrichards commented Dec 28, 2023

Add cancel button for when user entry is being edited #38952

Are you sure you want to change the base?

Add cancel button for when user entry is being edited #38952

Conversation

JeaNugroho commented Jun 23, 2023 • edited Loading

Summary

Before

After

Potential next steps

Checklist

Fenn-CS left a comment • edited Loading

Choose a reason for hiding this comment

artonge left a comment

Choose a reason for hiding this comment

nimishavijay left a comment

Choose a reason for hiding this comment

Fenn-CS left a comment

Choose a reason for hiding this comment

susnux commented Jul 1, 2023

JeaNugroho commented Jul 4, 2023

JeaNugroho commented Jul 4, 2023

Fenn-CS commented Jul 4, 2023

Fenn-CS Jul 4, 2023

Choose a reason for hiding this comment

Fenn-CS Jul 4, 2023

Choose a reason for hiding this comment

Fenn-CS Jul 4, 2023

Choose a reason for hiding this comment

Pytal commented Jul 6, 2023

joshtrichards commented Dec 28, 2023

JeaNugroho commented Jun 23, 2023 •

edited

Loading

Fenn-CS left a comment •

edited

Loading