You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2021/05/13 22:30:11 UTC
[isis] 01/03: ISIS-2619: updates secman to use
@ActionLayout(associateWith=) and @Action(choicesFrom=)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2619
in repository https://gitbox.apache.org/repos/asf/isis.git
commit b7db0222bd312b4abd4be61bdd2d4065156bc351
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu May 13 09:05:40 2021 +0100
ISIS-2619: updates secman to use @ActionLayout(associateWith=) and @Action(choicesFrom=)
rather than @Action(associateWith=)
---
.../ApplicationOrphanedPermissionManager_relocateSelected.java | 2 +-
.../api/permission/dom/mixins/ApplicationPermission_allow.java | 2 +-
.../permission/dom/mixins/ApplicationPermission_changing.java | 2 +-
.../permission/dom/mixins/ApplicationPermission_delete.java | 2 +-
.../dom/mixins/ApplicationPermission_updateRole.java | 2 +-
.../api/permission/dom/mixins/ApplicationPermission_veto.java | 2 +-
.../permission/dom/mixins/ApplicationPermission_viewing.java | 2 +-
.../api/role/dom/mixins/ApplicationRole_addPermission.java | 2 +-
.../secman/api/role/dom/mixins/ApplicationRole_addUser.java | 2 +-
.../secman/api/role/dom/mixins/ApplicationRole_delete.java | 2 +-
.../api/role/dom/mixins/ApplicationRole_removePermissions.java | 2 +-
.../api/role/dom/mixins/ApplicationRole_removeUsers.java | 2 +-
.../api/role/dom/mixins/ApplicationRole_updateDescription.java | 2 +-
.../secman/api/role/dom/mixins/ApplicationRole_updateName.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_addChild.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_addUser.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_delete.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_removeChild.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_removeUser.java | 2 +-
.../api/tenancy/dom/mixins/ApplicationTenancy_updateName.java | 2 +-
.../app/mixins/ApplicationUserManager_newDelegateUser.java | 9 +++++++--
.../user/app/mixins/ApplicationUserManager_newLocalUser.java | 9 +++++++--
.../secman/api/user/contributions/HasUsername_open.java | 10 ++++++----
.../secman/api/user/dom/mixins/ApplicationUser_addRole.java | 2 +-
.../secman/api/user/dom/mixins/ApplicationUser_delete.java | 2 +-
.../secman/api/user/dom/mixins/ApplicationUser_duplicate.java | 2 +-
.../secman/api/user/dom/mixins/ApplicationUser_lock.java | 4 ++--
.../api/user/dom/mixins/ApplicationUser_removeRoles.java | 5 +++--
.../api/user/dom/mixins/ApplicationUser_resetPassword.java | 2 +-
.../secman/api/user/dom/mixins/ApplicationUser_unlock.java | 4 ++--
.../api/user/dom/mixins/ApplicationUser_updateAccountType.java | 2 +-
.../api/user/dom/mixins/ApplicationUser_updateAtPath.java | 2 +-
.../user/dom/mixins/ApplicationUser_updateEmailAddress.java | 2 +-
.../api/user/dom/mixins/ApplicationUser_updateFaxNumber.java | 2 +-
.../secman/api/user/dom/mixins/ApplicationUser_updateName.java | 2 +-
.../api/user/dom/mixins/ApplicationUser_updatePassword.java | 2 +-
.../api/user/dom/mixins/ApplicationUser_updatePhoneNumber.java | 2 +-
.../api/user/dom/mixins/ApplicationUser_updateUsername.java | 2 +-
.../dom/mixins/perms/ApplicationUser_filterPermissions.java | 7 +++++--
39 files changed, 64 insertions(+), 48 deletions(-)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/app/mixins/ApplicationOrphanedPermissionManager_relocateSelected.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/app/mixins/ApplicationOrphanedPermissionManager_relocateSelected.java
index 561efd3..42a876f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/app/mixins/ApplicationOrphanedPermissionManager_relocateSelected.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/app/mixins/ApplicationOrphanedPermissionManager_relocateSelected.java
@@ -41,11 +41,11 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "orphanedPermissions",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT_ARE_YOU_SURE
)
@ActionLayout(
+ associateWith = "orphanedPermissions",
describedAs = "For the selected permissions, relocates to the specified namespace"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_allow.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_allow.java
index 217bd95..d021e24 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_allow.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_allow.java
@@ -29,11 +29,11 @@ import org.apache.isis.extensions.secman.api.permission.dom.mixins.ApplicationPe
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "rule",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "rule",
sequence = "1"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_changing.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_changing.java
index a2525ca..9e0e998 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_changing.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_changing.java
@@ -29,11 +29,11 @@ import org.apache.isis.extensions.secman.api.permission.dom.mixins.ApplicationPe
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "mode",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "mode",
sequence = "2"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_delete.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_delete.java
index 3d38ec0..cd39f63 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_delete.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_delete.java
@@ -33,11 +33,11 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "role",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT_ARE_YOU_SURE
)
@ActionLayout(
+ associateWith = "role",
position = ActionLayout.Position.PANEL,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_updateRole.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_updateRole.java
index 66069c3..6b2b085 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_updateRole.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_updateRole.java
@@ -36,11 +36,11 @@ import org.apache.isis.extensions.secman.api.role.dom.ApplicationRoleRepository;
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "role",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "role",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_veto.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_veto.java
index 9853827..a8faf24 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_veto.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_veto.java
@@ -29,11 +29,11 @@ import org.apache.isis.extensions.secman.api.permission.dom.mixins.ApplicationPe
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "rule",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "rule",
sequence = "2"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_viewing.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_viewing.java
index ebec4fc..ca1f0fe 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_viewing.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/permission/dom/mixins/ApplicationPermission_viewing.java
@@ -29,11 +29,11 @@ import org.apache.isis.extensions.secman.api.permission.dom.mixins.ApplicationPe
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "mode",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "mode",
sequence = "1"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addPermission.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addPermission.java
index 794af06..e5bf577 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addPermission.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addPermission.java
@@ -44,11 +44,11 @@ import lombok.Value;
import lombok.experimental.Accessors;
@Action(
- associateWith = "permissions",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.NON_IDEMPOTENT
)
@ActionLayout(
+ associateWith = "permissions",
named = "Add",
promptStyle = PromptStyle.DIALOG_MODAL,
sequence = "1"
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addUser.java
index a65f9ac..8afb2a5 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_addUser.java
@@ -38,11 +38,11 @@ import org.apache.isis.extensions.secman.api.user.dom.ApplicationUserRepository;
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "users",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "users",
named = "Add",
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_delete.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_delete.java
index 1881754..ccd1681 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_delete.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_delete.java
@@ -34,11 +34,11 @@ import org.apache.isis.extensions.secman.api.role.dom.mixins.ApplicationRole_del
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "name",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT_ARE_YOU_SURE
)
@ActionLayout(
+ associateWith = "name",
position = ActionLayout.Position.PANEL,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removePermissions.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removePermissions.java
index fe7fcde..d13c048 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removePermissions.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removePermissions.java
@@ -41,11 +41,11 @@ import org.apache.isis.extensions.secman.api.role.dom.mixins.ApplicationRole_rem
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "permissions",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "permissions",
named = "Remove",
promptStyle = PromptStyle.DIALOG_MODAL,
sequence = "2"
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removeUsers.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removeUsers.java
index 3c00b88..d9ff159 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removeUsers.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_removeUsers.java
@@ -38,11 +38,11 @@ import org.apache.isis.extensions.secman.api.user.dom.ApplicationUserRepository;
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "users",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "users",
named = "Remove",
sequence = "2"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateDescription.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateDescription.java
index 498aa4e..b2aaf80 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateDescription.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateDescription.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.role.dom.mixins.ApplicationRole_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "description",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "description",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateName.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateName.java
index 4e6ee99..5201f08 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateName.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/role/dom/mixins/ApplicationRole_updateName.java
@@ -29,11 +29,11 @@ import org.apache.isis.extensions.secman.api.role.dom.mixins.ApplicationRole_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "name",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "name",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addChild.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addChild.java
index b7dee84..bd4e95f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addChild.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addChild.java
@@ -32,11 +32,11 @@ import org.apache.isis.extensions.secman.api.tenancy.dom.mixins.ApplicationTenan
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "children",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "children",
named = "Add",
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addUser.java
index d78be8e..a8dd896 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_addUser.java
@@ -38,11 +38,11 @@ import org.apache.isis.extensions.secman.api.user.dom.ApplicationUserRepository;
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "users",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "users",
named = "Add",
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_delete.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_delete.java
index da41557..05e1c80 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_delete.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_delete.java
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "name",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT_ARE_YOU_SURE
)
@ActionLayout(
+ associateWith = "name",
position = ActionLayout.Position.PANEL,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeChild.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeChild.java
index c85cb13..f3fbfcc 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeChild.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeChild.java
@@ -34,11 +34,11 @@ import org.apache.isis.extensions.secman.api.tenancy.dom.mixins.ApplicationTenan
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "children",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "children",
named = "Remove",
sequence = "2"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeUser.java
index cd22568..a4d1e07 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_removeUser.java
@@ -36,11 +36,11 @@ import org.apache.isis.extensions.secman.api.user.dom.ApplicationUserRepository;
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "users",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "users",
named = "Remove",
sequence = "2"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_updateName.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_updateName.java
index 203b32d..80a4618 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_updateName.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/tenancy/dom/mixins/ApplicationTenancy_updateName.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.tenancy.dom.mixins.ApplicationTenan
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "name",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "name",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newDelegateUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newDelegateUser.java
index 44d93db..4fff829 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newDelegateUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newDelegateUser.java
@@ -21,6 +21,7 @@ package org.apache.isis.extensions.secman.api.user.app.mixins;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
@@ -42,8 +43,12 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- domainEvent = DomainEvent.class,
- associateWith = "allUsers")
+ domainEvent = DomainEvent.class
+)
+@ActionLayout(
+ associateWith = "allUsers",
+ sequence = "1"
+)
@RequiredArgsConstructor
public class ApplicationUserManager_newDelegateUser {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newLocalUser.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newLocalUser.java
index 723c50a..0a12b9f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newLocalUser.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/app/mixins/ApplicationUserManager_newLocalUser.java
@@ -23,6 +23,7 @@ import java.util.Objects;
import javax.inject.Inject;
import org.apache.isis.applib.annotation.Action;
+import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.MemberSupport;
import org.apache.isis.applib.annotation.Optionality;
import org.apache.isis.applib.annotation.Parameter;
@@ -44,8 +45,12 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- domainEvent = DomainEvent.class,
- associateWith = "allUsers")
+ domainEvent = DomainEvent.class
+)
+@ActionLayout(
+ associateWith = "allUsers",
+ sequence = "1"
+)
@RequiredArgsConstructor
public class ApplicationUserManager_newLocalUser
extends ApplicationUserManager_newLocalUserAbstract {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/contributions/HasUsername_open.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/contributions/HasUsername_open.java
index eacbe6b..5f65b10 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/contributions/HasUsername_open.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/contributions/HasUsername_open.java
@@ -33,10 +33,12 @@ import lombok.RequiredArgsConstructor;
@Action(
semantics = SemanticsOf.SAFE,
- domainEvent = HasUsername_open.ActionDomainEvent.class,
- associateWith = "User" // associate with a 'User' property (if any)
- )
-@ActionLayout(sequence = "1")
+ domainEvent = HasUsername_open.ActionDomainEvent.class
+)
+@ActionLayout(
+ associateWith = "user", // associate with a 'User' property (if any)
+ sequence = "1"
+)
@RequiredArgsConstructor
public class HasUsername_open {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_addRole.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_addRole.java
index e2aebb9..cd90b87 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_addRole.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_addRole.java
@@ -36,11 +36,11 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "roles",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "roles",
named="Add",
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_delete.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_delete.java
index f0d9105..f9932dd 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_delete.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_delete.java
@@ -35,11 +35,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_del
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "username",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT_ARE_YOU_SURE
)
@ActionLayout(
+ associateWith = "username",
position = ActionLayout.Position.PANEL,
sequence = "2"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_duplicate.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_duplicate.java
index 1f98ce3..2e08142 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_duplicate.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_duplicate.java
@@ -37,11 +37,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_dup
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "username",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.NON_IDEMPOTENT
)
@ActionLayout(
+ associateWith = "username",
position = ActionLayout.Position.PANEL,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_lock.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_lock.java
index 426a4fe..a8e1781 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_lock.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_lock.java
@@ -34,12 +34,12 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_loc
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "status",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
- named="Disable",
+ associateWith = "status",
+ cssClassFa = "fa-lock",
sequence = "2"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_removeRoles.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_removeRoles.java
index 28b3fb9..e9f51e9 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_removeRoles.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_removeRoles.java
@@ -38,12 +38,13 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_rem
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "roles",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
- named="Remove", sequence = "2"
+ associateWith = "roles",
+ named="Remove",
+ sequence = "2"
)
@RequiredArgsConstructor
public class ApplicationUser_removeRoles {
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_resetPassword.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_resetPassword.java
index 03c3277..26a0c15 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_resetPassword.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_resetPassword.java
@@ -35,11 +35,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_res
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "hasPassword",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "hasPassword",
sequence = "20"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_unlock.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_unlock.java
index 000e6da..5cb2b4f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_unlock.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_unlock.java
@@ -30,12 +30,12 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_unl
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "status",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
- named="Enable", // symmetry with lock (disable)
+ associateWith = "status",
+ named = "fa-lock-open",
sequence = "1"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAccountType.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAccountType.java
index 6ce99ec..edcd85b 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAccountType.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAccountType.java
@@ -34,11 +34,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "accountType",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "accountType",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAtPath.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAtPath.java
index 50cea68..9cd2032 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAtPath.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateAtPath.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "atPath",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "atPath",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateEmailAddress.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateEmailAddress.java
index 74449ab..071333d 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateEmailAddress.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateEmailAddress.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "emailAddress",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "emailAddress",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateFaxNumber.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateFaxNumber.java
index 60e4953..bd8f4b7 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateFaxNumber.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateFaxNumber.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "faxNumber",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "faxNumber",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateName.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateName.java
index 347a4bf..8a5efd6 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateName.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateName.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "familyName",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "familyName",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePassword.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePassword.java
index 55df991..5bc3c1f 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePassword.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePassword.java
@@ -39,11 +39,11 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "hasPassword",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "hasPassword",
sequence = "10"
)
@RequiredArgsConstructor
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePhoneNumber.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePhoneNumber.java
index e8f8f8a..be088da 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePhoneNumber.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updatePhoneNumber.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "phoneNumber",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "phoneNumber",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateUsername.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateUsername.java
index 2b68ad2..1dc6f3e 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateUsername.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/ApplicationUser_updateUsername.java
@@ -30,11 +30,11 @@ import org.apache.isis.extensions.secman.api.user.dom.mixins.ApplicationUser_upd
import lombok.RequiredArgsConstructor;
@Action(
- associateWith = "username",
domainEvent = DomainEvent.class,
semantics = SemanticsOf.IDEMPOTENT
)
@ActionLayout(
+ associateWith = "username",
promptStyle = PromptStyle.INLINE_AS_IF_EDIT,
sequence = "1"
)
diff --git a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms/ApplicationUser_filterPermissions.java b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms/ApplicationUser_filterPermissions.java
index 12f826d..d1d828d 100644
--- a/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms/ApplicationUser_filterPermissions.java
+++ b/extensions/security/secman/api/src/main/java/org/apache/isis/extensions/secman/api/user/dom/mixins/perms/ApplicationUser_filterPermissions.java
@@ -47,11 +47,14 @@ import lombok.RequiredArgsConstructor;
import lombok.val;
@Action(
- associateWith = "permissions",
domainEvent = ApplicationUser_filterPermissions.DomainEvent.class,
semantics = SemanticsOf.SAFE
)
-@ActionLayout(sequence = "1", promptStyle = PromptStyle.DIALOG_MODAL)
+@ActionLayout(
+ associateWith = "permissions",
+ promptStyle = PromptStyle.DIALOG_MODAL,
+ sequence = "1"
+)
@RequiredArgsConstructor
public class ApplicationUser_filterPermissions {