1 files changed, 20 insertions, 22 deletions

diff --git a/archinstall/lib/user_interaction/manage_users_conf.py b/archinstall/lib/user_interaction/manage_users_conf.py
index 567a2964..33c31342 100644
--- a/archinstall/lib/user_interaction/manage_users_conf.py
+++ b/archinstall/lib/user_interaction/manage_users_conf.py
@@ -7,6 +7,7 @@ from .utils import get_password
 from ..menu import Menu
 from ..menu.list_manager import ListManager
 from ..models.users import User
+from ..output import FormattedOutput
 
 if TYPE_CHECKING:
 	_: Any
@@ -18,13 +19,6 @@ class UserList(ListManager):
 	"""
 
 	def __init__(self, prompt: str, lusers: List[User]):
-		"""
-		param: prompt
-		type: str
-		param: lusers dict with the users already defined for the system
-		type: Dict
-		param: sudo. boolean to determine if we handle superusers or users. If None handles both types
-		"""
 		self._actions = [
 			str(_('Add a user')),
 			str(_('Change password')),
@@ -34,21 +28,25 @@ class UserList(ListManager):
 		super().__init__(prompt, lusers, self._actions, self._actions[0])
 
 	def reformat(self, data: List[User]) -> Dict[str, User]:
-		return {e.display(): e for e in data}
+		table = FormattedOutput.as_table(data)
+		rows = table.split('\n')
 
-	def action_list(self):
-		active_user = self.target if self.target else None
+		# these are the header rows of the table and do not map to any User obviously
+		# we're adding 2 spaces as prefix because the menu selector '> ' will be put before
+		# the selectable rows so the header has to be aligned
+		display_data = {f'  {rows[0]}': None, f'  {rows[1]}': None}
+
+		for row, user in zip(rows[2:], data):
+			row = row.replace('|', '\\|')
+			display_data[row] = user
 
-		if active_user is None:
-			return [self._actions[0]]
-		else:
-			return self._actions[1:]
+		return display_data
+
+	def selected_action_display(self, user: User) -> str:
+		return user.username
 
 	def exec_action(self, data: List[User]) -> List[User]:
-		if self.target:
-			active_user = self.target
-		else:
-			active_user = None
+		active_user = self.target if self.target else None
 
 		if self.action == self._actions[0]:  # add
 			new_user = self._add_user()
@@ -77,8 +75,7 @@ class UserList(ListManager):
 		return False
 
 	def _add_user(self) -> Optional[User]:
-		print(_('\nDefine a new user\n'))
-		prompt = str(_('Enter username (leave blank to skip): '))
+		prompt = '\n\n' + str(_('Enter username (leave blank to skip): '))
 
 		while True:
 			username = input(prompt).strip(' ')
@@ -94,7 +91,9 @@ class UserList(ListManager):
 		choice = Menu(
 			str(_('Should "{}" be a superuser (sudo)?')).format(username), Menu.yes_no(),
 			skip=False,
-			default_option=Menu.no()
+			default_option=Menu.no(),
+			clear_screen=False,
+			show_search_hint=False
 		).run()
 
 		sudo = True if choice.value == Menu.yes() else False
@@ -102,6 +101,5 @@ class UserList(ListManager):
 
 
 def ask_for_additional_users(prompt: str = '', defined_users: List[User] = []) -> List[User]:
-	prompt = prompt if prompt else _('Enter username (leave blank to skip): ')
 	users = UserList(prompt, defined_users).run()
 	return users