frontend: fix locked user display (#367)

h44z · Feb 17, 2025 · f6d7a85 · f6d7a85
1 parent fc712eb
commit f6d7a85
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/frontend/src/components/UserEditModal.vue b/frontend/src/components/UserEditModal.vue
@@ -51,6 +51,7 @@ watch(() => props.visible, async (newValue, oldValue) => {
           formData.value.Notes = selectedUser.value.Notes
           formData.value.Password = ""
           formData.value.Disabled = selectedUser.value.Disabled
+          formData.value.Locked = selectedUser.value.Locked
         }
       }
     }

diff --git a/internal/app/api/v0/model/models_user.go b/internal/app/api/v0/model/models_user.go
@@ -97,10 +97,16 @@ func NewDomainUser(src *User) *domain.User {
 
 	if src.Disabled {
 		res.Disabled = &now
+		if src.DisabledReason == "" {
+			res.DisabledReason = domain.DisabledReasonAdmin
+		}
 	}
 
 	if src.Locked {
 		res.Locked = &now
+		if src.LockedReason == "" {
+			res.LockedReason = domain.LockedReasonAdmin
+		}
 	}
 
 	return res

diff --git a/internal/app/api/v1/models/models_user.go b/internal/app/api/v1/models/models_user.go
@@ -115,10 +115,16 @@ func NewDomainUser(src *User) *domain.User {
 
 	if src.Disabled {
 		res.Disabled = &now
+		if src.DisabledReason == "" {
+			res.DisabledReason = domain.DisabledReasonApi
+		}
 	}
 
 	if src.Locked {
 		res.Locked = &now
+		if src.LockedReason == "" {
+			res.LockedReason = domain.LockedReasonApi
+		}
 	}
 
 	return res

diff --git a/internal/domain/base.go b/internal/domain/base.go
@@ -51,14 +51,13 @@ const (
 	DisabledReasonDeleted          = "deleted"
 	DisabledReasonUserDisabled     = "user disabled"
 	DisabledReasonUserDeleted      = "user deleted"
-	DisabledReasonUserEdit         = "user edit action"
-	DisabledReasonUserCreate       = "user create action"
-	DisabledReasonAdminEdit        = "admin edit action"
-	DisabledReasonAdminCreate      = "admin create action"
-	DisabledReasonApiEdit          = "api edit action"
-	DisabledReasonApiCreate        = "api create action"
+	DisabledReasonAdmin            = "disabled by admin"
+	DisabledReasonApi              = "disabled through api"
 	DisabledReasonLdapMissing      = "missing in ldap"
 	DisabledReasonUserMissing      = "missing user"
 	DisabledReasonMigrationDummy   = "migration dummy user"
 	DisabledReasonInterfaceMissing = "missing WireGuard interface"
+
+	LockedReasonAdmin = "locked by admin"
+	LockedReasonApi   = "locked by admin"
 )