diff --git a/cmd/cli/resources_test.go b/cmd/cli/resources_test.go index 8b33112e..e9f8557c 100644 --- a/cmd/cli/resources_test.go +++ b/cmd/cli/resources_test.go @@ -266,7 +266,7 @@ func TestResourceCommands(t *testing.T) { { name: "user update", command: newUserUpdateCmd, - args: []string{"user-1", "--username", "sigma", "--password", "secret", "--email", "sigma@example.test", "--role", enums.UserRoleAdmin.String(), "--status", enums.UserStatusDeactive.String(), "--namespace-limit", "10"}, + args: []string{"user-1", "--username", "sigma", "--password", "secret", "--email", "sigma@example.test", "--role", enums.UserRoleAdmin.String(), "--status", enums.UserStatusInactive.String(), "--namespace-limit", "10"}, method: http.MethodPut, path: "/api/v1/users/user-1", body: map[string]any{ @@ -274,7 +274,7 @@ func TestResourceCommands(t *testing.T) { "password": "secret", "email": "sigma@example.test", "role": enums.UserRoleAdmin.String(), - "status": enums.UserStatusDeactive.String(), + "status": enums.UserStatusInactive.String(), "namespace_limit": float64(10), }, outputMatch: `"status": "updated"`, diff --git a/pkg/api/enums/enums.go b/pkg/api/enums/enums.go index 1d05df30..0364ac42 100644 --- a/pkg/api/enums/enums.go +++ b/pkg/api/enums/enums.go @@ -265,7 +265,7 @@ type SigningType string // UserStatus x ENUM( // Active, -// Deactive, +// Inactive, // ) type UserStatus string diff --git a/pkg/api/enums/enums_generated.go b/pkg/api/enums/enums_generated.go index 7e3de093..6390edcb 100644 --- a/pkg/api/enums/enums_generated.go +++ b/pkg/api/enums/enums_generated.go @@ -3031,8 +3031,8 @@ func (x UserRole) Value() (driver.Value, error) { const ( // UserStatusActive is a UserStatus of type Active. UserStatusActive UserStatus = "Active" - // UserStatusDeactive is a UserStatus of type Deactive. - UserStatusDeactive UserStatus = "Deactive" + // UserStatusInactive is a UserStatus of type Inactive. + UserStatusInactive UserStatus = "Inactive" ) var ErrInvalidUserStatus = errors.New("not a valid UserStatus") @@ -3051,7 +3051,7 @@ func (x UserStatus) IsValid() bool { var _UserStatusValue = map[string]UserStatus{ "Active": UserStatusActive, - "Deactive": UserStatusDeactive, + "Inactive": UserStatusInactive, } // ParseUserStatus attempts to convert a string to a UserStatus. diff --git a/tools/skill/sigma-api-operator/swagger.yaml b/tools/skill/sigma-api-operator/swagger.yaml index 35cbeff2..2c2ea6c3 100644 --- a/tools/skill/sigma-api-operator/swagger.yaml +++ b/tools/skill/sigma-api-operator/swagger.yaml @@ -1945,11 +1945,11 @@ definitions: enums.UserStatus: enum: - Active - - Deactive + - Inactive type: string x-enum-varnames: - UserStatusActive - - UserStatusDeactive + - UserStatusInactive enums.Visibility: enum: - private diff --git a/web/src/pages/Setting/Users.tsx b/web/src/pages/Setting/Users.tsx index 072e0153..72acb4df 100644 --- a/web/src/pages/Setting/Users.tsx +++ b/web/src/pages/Setting/Users.tsx @@ -333,7 +333,7 @@ function TableItemRow({ localServer, user, setRefresh, selfUsername }: { localSe { - axios.put(localServer + `/api/v1/users/${user.id}`, { status: "Deactive" }).then(response => { + axios.put(localServer + `/api/v1/users/${user.id}`, { status: "Inactive" }).then(response => { if (response?.status === 204) { Toast({ level: "success", title: "Success", message: "Deactivate user success" }); setRefresh({}); @@ -345,7 +345,7 @@ function TableItemRow({ localServer, user, setRefresh, selfUsername }: { localSe }} > - Deactive + Inactive