From bcdbaf39fa2ed9fedf416617f21c081410f4dfdc Mon Sep 17 00:00:00 2001
From: JeaNugroho <jeanugroho@yahoo.com>
Date: Thu, 22 Jun 2023 19:36:40 -0500
Subject: [PATCH 1/4] Add cancel button for when user entry is being edited
 Rebase add cancel button Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>

---
 .../settings/src/components/Users/UserRow.vue | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index 6d5850068dea8..824369f0f5a83 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -221,10 +221,40 @@
 		</div>
 
 		<div class="userActions">
+<<<<<<< HEAD
 			<UserRowActions v-if="!loading.all"
 				:actions="userActions"
 				:edit="true"
 				@update:edit="toggleEdit" />
+=======
+			<div v-if="!loading.all"
+				class="toggleUserActions">
+				<NcActions :inline="2">
+					<NcActionButton icon="icon-checkmark"
+						:title="t('settings', 'Done')"
+						:aria-label="t('settings', 'Done')"
+						@click="editing = false" />
+					<NcActionButton icon="icon-close"
+						:title="t('settings', 'Cancel')"
+						:aria-label="t('settings', 'Cancel')"
+						@click="editing = false" />
+				</NcActions>
+				<div v-click-outside="hideMenu" class="userPopoverMenuWrapper">
+					<button class="icon-more"
+						:aria-expanded="openedMenu"
+						:aria-label="t('settings', 'Toggle user actions menu')"
+						@click.prevent="toggleMenu" />
+					<div :class="{ 'open': openedMenu }" class="popovermenu">
+						<NcPopoverMenu :menu="userActions" />
+					</div>
+				</div>
+			</div>
+			<div :style="{opacity: feedbackMessage !== '' ? 1 : 0}"
+				class="feedback">
+				<div class="icon-checkmark" />
+				{{ feedbackMessage }}
+			</div>
+>>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)
 		</div>
 	</div>
 </template>

From 9806b42ffc98b3f09b509fe7ebe9248bd5af21b8 Mon Sep 17 00:00:00 2001
From: Jean Benedict Nugroho <35510082+JeaNugroho@users.noreply.github.com>
Date: Sat, 24 Jun 2023 19:14:31 -0500
Subject: [PATCH 2/4] Update apps/settings/src/components/Users/UserRow.vue

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>
---
 apps/settings/src/components/Users/UserRow.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index 824369f0f5a83..4ecb247844911 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -230,10 +230,6 @@
 			<div v-if="!loading.all"
 				class="toggleUserActions">
 				<NcActions :inline="2">
-					<NcActionButton icon="icon-checkmark"
-						:title="t('settings', 'Done')"
-						:aria-label="t('settings', 'Done')"
-						@click="editing = false" />
 					<NcActionButton icon="icon-close"
 						:title="t('settings', 'Cancel')"
 						:aria-label="t('settings', 'Cancel')"

From d2b2fc372e9ae646613ce998ecd2462b2067fdcd Mon Sep 17 00:00:00 2001
From: JeaNugroho <jeanugroho@yahoo.com>
Date: Sat, 24 Jun 2023 19:41:30 -0500
Subject: [PATCH 3/4] Omit bind property for more than one inside NcActions

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>
---
 apps/settings/src/components/Users/UserRow.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index 4ecb247844911..3f81bb90983be 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -229,7 +229,7 @@
 =======
 			<div v-if="!loading.all"
 				class="toggleUserActions">
-				<NcActions :inline="2">
+				<NcActions>
 					<NcActionButton icon="icon-close"
 						:title="t('settings', 'Cancel')"
 						:aria-label="t('settings', 'Cancel')"

From fc8786563279ab74901989ff82231ed2b26b97dd Mon Sep 17 00:00:00 2001
From: JeaNugroho <jeanugroho@yahoo.com>
Date: Tue, 4 Jul 2023 18:13:51 -0500
Subject: [PATCH 4/4] Omit conflict markers

Signed-off-by: JeaNugroho <jeanugroho@yahoo.com>
---
 apps/settings/src/components/Users/UserRow.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/apps/settings/src/components/Users/UserRow.vue b/apps/settings/src/components/Users/UserRow.vue
index 3f81bb90983be..69918d8b63709 100644
--- a/apps/settings/src/components/Users/UserRow.vue
+++ b/apps/settings/src/components/Users/UserRow.vue
@@ -221,12 +221,10 @@
 		</div>
 
 		<div class="userActions">
-<<<<<<< HEAD
 			<UserRowActions v-if="!loading.all"
 				:actions="userActions"
 				:edit="true"
 				@update:edit="toggleEdit" />
-=======
 			<div v-if="!loading.all"
 				class="toggleUserActions">
 				<NcActions>
@@ -250,7 +248,6 @@
 				<div class="icon-checkmark" />
 				{{ feedbackMessage }}
 			</div>
->>>>>>> 7a2938b01f3 (Add cancel button for when user entry is being edited)
 		</div>
 	</div>
 </template>