closes #13 - menu orders; also new finders for ApplicationTenancy

namely: - ApplicationTenancies#findTenancyByName - ApplicationTenancies#findTenancyByPath
isisaddons-legacy · Mar 5, 2015 · 21714d1 · 21714d1
1 parent 2a2e979
commit 21714d1
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 23 deletions.
diff --git a/dom/pom.xml b/dom/pom.xml
@@ -53,7 +53,7 @@ language governing permissions and limitations under the License.
         <compileSource>1.7</compileSource>
         <compileTarget>1.7</compileTarget>
 
-        <isis.version>1.8.0</isis.version>
+        <isis.version>1.9.0-SNAPSHOT</isis.version>
 
         <datanucleus-maven-plugin.version>3.3.2</datanucleus-maven-plugin.version>
 

diff --git a/...rc/main/java/org/isisaddons/module/security/app/feature/ApplicationFeatureViewModels.java b/...rc/main/java/org/isisaddons/module/security/app/feature/ApplicationFeatureViewModels.java
@@ -104,7 +104,7 @@ public AllPackagesDomainEvent(final ApplicationFeatureViewModels source, final I
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "10")
+    @MemberOrder(sequence = "100.40.1")
     public List<ApplicationPackage> allPackages() {
         return asViewModels(applicationFeatures.allPackages(), ApplicationPackage.class);
     }
@@ -126,7 +126,7 @@ public AllClassesDomainEvent(final ApplicationFeatureViewModels source, final Id
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "20")
+    @MemberOrder(sequence = "100.40.2")
     public List<ApplicationClass> allClasses() {
         return asViewModels(applicationFeatures.allClasses(), ApplicationClass.class);
     }
@@ -150,7 +150,7 @@ public AllActionsDomainEvent(final ApplicationFeatureViewModels source, final Id
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "40")
+    @MemberOrder(sequence = "100.40.3")
     public List<ApplicationClassAction> allActions() {
         return asViewModels(applicationFeatures.allActions(), ApplicationClassAction.class);
     }
@@ -172,7 +172,7 @@ public AllPropertiesDomainEvent(final ApplicationFeatureViewModels source, final
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "50")
+    @MemberOrder(sequence = "100.40.4")
     public List<ApplicationClassProperty> allProperties() {
         return asViewModels(applicationFeatures.allProperties(), ApplicationClassProperty.class);
     }
@@ -196,7 +196,7 @@ public AllCollectionsDomainEvent(final ApplicationFeatureViewModels source, fina
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "60")
+    @MemberOrder(sequence = "100.40.5")
     public List<ApplicationClassCollection> allCollections() {
         return asViewModels(applicationFeatures.allCollections(), ApplicationClassCollection.class);
     }

diff --git a/dom/src/main/java/org/isisaddons/module/security/dom/permission/ApplicationPermissions.java b/dom/src/main/java/org/isisaddons/module/security/dom/permission/ApplicationPermissions.java
@@ -277,7 +277,7 @@ public AllPermissionsDomainEvent(final ApplicationPermissions source, final Iden
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "60.9")
+    @MemberOrder(sequence = "100.50.1")
     public List<ApplicationPermission> allPermissions() {
         return container.allInstances(ApplicationPermission.class);
     }

diff --git a/dom/src/main/java/org/isisaddons/module/security/dom/role/ApplicationRoles.java b/dom/src/main/java/org/isisaddons/module/security/dom/role/ApplicationRoles.java
@@ -114,7 +114,7 @@ public FindByRoleNameDomainEvent(final ApplicationRoles source, final Identifier
     @ActionLayout(
             cssClassFa = "fa-crosshairs"
     )
-    @MemberOrder(sequence = "20.1")
+    @MemberOrder(sequence = "100.20.1")
     public ApplicationRole findRoleByName(
             @Parameter(maxLength = ApplicationRole.MAX_LENGTH_NAME)
             @ParameterLayout(named="Name", typicalLength=ApplicationRole.TYPICAL_LENGTH_NAME)
@@ -142,7 +142,7 @@ public NewRoleDomainEvent(final ApplicationRoles source, final Identifier identi
     @ActionLayout(
             cssClassFa = "fa-plus"
     )
-    @MemberOrder(sequence = "20.2")
+    @MemberOrder(sequence = "100.20.2")
     public ApplicationRole newRole(
             @Parameter(maxLength = ApplicationRole.MAX_LENGTH_NAME)
             @ParameterLayout(named="Name", typicalLength=ApplicationRole.TYPICAL_LENGTH_NAME)
@@ -177,7 +177,7 @@ public AllRolesDomainEvent(final ApplicationRoles source, final Identifier ident
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "20.3")
+    @MemberOrder(sequence = "100.20.3")
     public List<ApplicationRole> allRoles() {
         return allInstances(ApplicationRole.class);
     }

diff --git a/dom/src/main/java/org/isisaddons/module/security/dom/tenancy/ApplicationTenancies.java b/dom/src/main/java/org/isisaddons/module/security/dom/tenancy/ApplicationTenancies.java
@@ -103,19 +103,51 @@ public void init() {
 
     //endregion
 
-    //region > findTenancyByName (programmatic)
+    //region > findTenancyByName
 
-    @Programmatic
-    public ApplicationTenancy findTenancyByName(final String name) {
+    public static class FindTenancyByNameDomainEvent extends ActionDomainEvent {
+        public FindTenancyByNameDomainEvent(final ApplicationTenancies source, final Identifier identifier, final Object... args) {
+            super(source, identifier, args);
+        }
+    }
+
+    @Action(
+            domainEvent = FindTenancyByNameDomainEvent.class,
+            semantics = SemanticsOf.SAFE
+    )
+    @ActionLayout(
+            cssClassFa = "fa-crosshairs"
+    )
+    @MemberOrder(sequence = "100.30.1")
+    public ApplicationTenancy findTenancyByName(
+            @Parameter(maxLength = ApplicationTenancy.MAX_LENGTH_NAME)
+            @ParameterLayout(named = "Name", typicalLength = ApplicationTenancy.TYPICAL_LENGTH_NAME)
+            final String name) {
         return uniqueMatch(new QueryDefault<>(ApplicationTenancy.class, "findByName", "name", name));
     }
 
     //endregion
 
-    //region > findTenancyByPath (programmatic)
+    //region > findTenancyByPath
 
-    @Programmatic
-    public ApplicationTenancy findTenancyByPath(final String path) {
+    public static class FindTenancyByPathDomainEvent extends ActionDomainEvent {
+        public FindTenancyByPathDomainEvent(final ApplicationTenancies source, final Identifier identifier, final Object... args) {
+            super(source, identifier, args);
+        }
+    }
+
+    @Action(
+            domainEvent = FindTenancyByPathDomainEvent.class,
+            semantics = SemanticsOf.SAFE
+    )
+    @ActionLayout(
+            cssClassFa = "fa-crosshairs"
+    )
+    @MemberOrder(sequence = "100.30.2")
+    public ApplicationTenancy findTenancyByPath(
+            @Parameter(maxLength = ApplicationTenancy.MAX_LENGTH_PATH)
+            @ParameterLayout(named = "Path")
+            final String path) {
         if(path == null) {
             return null;
         }
@@ -140,7 +172,7 @@ public NewTenancyDomainEvent(final ApplicationTenancies source, final Identifier
     @ActionLayout(
             cssClassFa = "fa-plus"
     )
-    @MemberOrder(sequence = "90.3")
+    @MemberOrder(sequence = "100.30.3")
     public ApplicationTenancy newTenancy(
             @Parameter(maxLength = ApplicationTenancy.MAX_LENGTH_NAME)
             @ParameterLayout(named = "Name", typicalLength = ApplicationTenancy.TYPICAL_LENGTH_NAME)
@@ -179,7 +211,7 @@ public AllTenanciesDomainEvent(final ApplicationTenancies source, final Identifi
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "90.4")
+    @MemberOrder(sequence = "100.30.4")
     public List<ApplicationTenancy> allTenancies() {
         return allInstances(ApplicationTenancy.class);
     }

diff --git a/dom/src/main/java/org/isisaddons/module/security/dom/user/ApplicationUsers.java b/dom/src/main/java/org/isisaddons/module/security/dom/user/ApplicationUsers.java
@@ -153,7 +153,7 @@ public FindUserByUserNameDomainEvent(final ApplicationUsers source, final Identi
     @ActionLayout(
             cssClassFa = "fa-crosshairs"
     )
-    @MemberOrder(sequence = "10")
+    @MemberOrder(sequence = "100.10.1")
     public ApplicationUser findUserByUsername(
             @Parameter(maxLength = ApplicationUser.MAX_LENGTH_USERNAME)
             @ParameterLayout(named = "Username")
@@ -191,7 +191,7 @@ public FindUsersByNameDomainEvent(final ApplicationUsers source, final Identifie
     @ActionLayout(
             cssClassFa = "fa-search"
     )
-    @MemberOrder(sequence = "20")
+    @MemberOrder(sequence = "100.10.2")
     public List<ApplicationUser> findUsersByName(
             final @ParameterLayout(named="Name") String name) {
         final String nameRegex = "(?i).*" + name + ".*";
@@ -216,7 +216,7 @@ public NewDelegateUserDomainEvent(final ApplicationUsers source, final Identifie
     @ActionLayout(
             cssClassFa = "fa-plus"
     )
-    @MemberOrder(sequence = "30")
+    @MemberOrder(sequence = "100.10.3")
     public ApplicationUser newDelegateUser(
             @Parameter(maxLength = ApplicationUser.MAX_LENGTH_USERNAME)
             @ParameterLayout(named="Name")
@@ -266,7 +266,7 @@ public NewLocalUserDomainEvent(final ApplicationUsers source, final Identifier i
     @ActionLayout(
             cssClassFa = "fa-plus"
     )
-    @MemberOrder(sequence = "10.4")
+    @MemberOrder(sequence = "100.10.4")
     public ApplicationUser newLocalUser(
             @Parameter(maxLength = ApplicationUser.MAX_LENGTH_USERNAME)
             @ParameterLayout(named="Name")
@@ -338,7 +338,7 @@ public AllUsersDomainEvent(final ApplicationUsers source, final Identifier ident
     @ActionLayout(
             cssClassFa = "fa-list"
     )
-    @MemberOrder(sequence = "10.9")
+    @MemberOrder(sequence = "100.10.5")
     public List<ApplicationUser> allUsers() {
         return allInstances(ApplicationUser.class);
     }