Merge pull request #2 from sssonline/master

2016-01-29
moqui · Jan 30, 2016 · d51c035 · d51c035
2 parents 34b3e08 + c623c2a
commit d51c035
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 12 deletions.
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
@@ -1,6 +1,20 @@
 
 Moqui Runtime Release Notes
 
+===========================================================================
+Release 1.6.2 - TBD
+===========================================================================
+
+Moqui Runtime 1.6.2 is a minor new feature and bug fix release, in parallel
+with the release of Moqui Framework.
+
+New Features
+
+- The Tools app can now be run in Tenant instances, with the entities in
+  the tenantcommon group excluded from various screens
+
+Bug Fixes
+
 ===========================================================================
 Release 1.6.1 - 24 Jan 2016
 ===========================================================================

diff --git a/base-component/tools/screen/Tools.xml b/base-component/tools/screen/Tools.xml
@@ -13,7 +13,7 @@ along with this software (see the LICENSE.md file). If not, see
 <http://creativecommons.org/publicdomain/zero/1.0/>.
 -->
 <screen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://moqui.org/xsd/xml-screen-1.6.xsd"
-        include-child-content="true" tenants-allowed="DEFAULT" menu-image="glyphicon glyphicon-wrench" menu-image-type="icon">
+        include-child-content="true" menu-image="glyphicon glyphicon-wrench" menu-image-type="icon">
     <subscreens default-item="dashboard">
     </subscreens>
     <widgets>

diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml b/base-component/tools/screen/Tools/AutoScreen/AutoEdit.xml
@@ -19,9 +19,13 @@ along with this software (see the LICENSE.md file). If not, see
     <parameter name="aen" required="true"/>
 
     <actions>
-        <set field="masterPrimaryKeyMap" from="ec.entity.getEntityDefinition(aen).getPrimaryKeys(context)"/>
+        <set field="aenDef" from="ec.entity.getEntityDefinition(aen)"/>
+        <if condition="aenDef == null || aenDef.getEntityGroupName() == 'tenantcommon'">
+            <message error="true">Could not find entity with name: ${aen}</message><return/></if>
+
+        <set field="masterPrimaryKeyMap" from="aenDef.getPrimaryKeys(context)"/>
         <!-- only include dependent entities for tabs -->
-        <set field="relationshipInfoList" from="ec.entity.getEntityDefinition(aen).getRelationshipsInfo(true)"/>
+        <set field="relationshipInfoList" from="aenDef.getRelationshipsInfo(true)"/>
     </actions>
     <widgets>
         <!-- NOTE: this template will take care of the active subscreen, if needed; it's not needed for the dynamic menu -->

diff --git a/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml b/base-component/tools/screen/Tools/AutoScreen/AutoFind.xml
@@ -46,6 +46,10 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
+        <set field="aenDef" from="ec.entity.getEntityDefinition(aen)"/>
+        <if condition="aenDef == null || aenDef.getEntityGroupName() == 'tenantcommon'">
+            <message error="true">Could not find entity with name: ${aen}</message><return/></if>
+
         <entity-find entity-name="${aen}" list="entityValueList" offset="0" limit="50">
             <search-form-inputs/></entity-find>
     </actions>

diff --git a/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml b/base-component/tools/screen/Tools/AutoScreen/MainEntityList.xml
@@ -19,8 +19,8 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="find"><default-response url="../AutoFind"/></transition>
 
     <actions>
-        <set field="allEntityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', null, false, false)"/>
-        <set field="masterEntityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', null, true, true)"/>
+        <set field="allEntityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', null, false, false, true)"/>
+        <set field="masterEntityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', null, true, true, true)"/>
     </actions>
     <widgets>
         <form-single name="SelectEntity" transition="find">

diff --git a/base-component/tools/screen/Tools/DataView/EditDbView.xml b/base-component/tools/screen/Tools/DataView/EditDbView.xml
@@ -155,7 +155,7 @@ along with this software (see the LICENSE.md file). If not, see
                     <field-map field-name="dbViewEntityName"/>
                     <field-map field-name="entityAlias" value="MASTER"/>
                 </entity-find-one>
-                <set field="masterEntityList" from="ec.entity.getAllEntitiesInfo('entityName', null, false, false)"/>
+                <set field="masterEntityList" from="ec.entity.getAllEntitiesInfo('entityName', null, false, false, true)"/>
                 <set field="masterFieldList"
                     from="ec.entity.getAllEntityRelatedFields(fieldValues?.entityName, orderByField?:'+entityName', dbViewEntityName)"/>
             </actions>

diff --git a/base-component/tools/screen/Tools/DataView/ViewDbView.xml b/base-component/tools/screen/Tools/DataView/ViewDbView.xml
@@ -28,6 +28,12 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
+        <entity-find-one entity-name="moqui.entity.view.DbViewEntityMember" value-field="masterMember">
+            <field-map field-name="dbViewEntityName"/><field-map field-name="entityAlias" value="MASTER"/></entity-find-one>
+        <set field="masterDef" from="ec.entity.getEntityDefinition(masterMember.entityName)"/>
+        <if condition="masterDef == null || masterDef.getEntityGroupName() == 'tenantcommon'">
+            <message error="true">Could not find master entity with name: ${masterMember.entityName}</message><return/></if>
+
         <entity-find-one entity-name="moqui.entity.view.DbViewEntity" value-field="fieldValues"/>
         <entity-find entity-name="${dbViewEntityName}" list="dbViewList">
             <search-form-inputs/>

diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataEdit.xml
@@ -27,6 +27,10 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
+        <set field="entityDefinition" from="ec.entity.getEntityDefinition(entityName)"/>
+        <if condition="entityDefinition.getEntityGroupName() == 'tenantcommon'">
+            <message error="true">Data find and edit not allowed for entities in the tenantcommon group</message><return/></if>
+
         <set field="dependentLevels" from="(dependentLevels ?: '0') as int"/>
         <entity-find-one entity-name="${entityName}" value-field="entityValue"/>
         <set field="relationshipInfoList" from="ec.entity.getEntityDefinition(entityName).getRelationshipsInfo(false)"/>

diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityDataFind.xml
@@ -37,6 +37,10 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
+        <set field="entityDefinition" from="ec.entity.getEntityDefinition(entityName)"/>
+        <if condition="entityDefinition.getEntityGroupName() == 'tenantcommon'">
+            <message error="true">Data find and edit not allowed for entities in the tenantcommon group</message><return/></if>
+
         <entity-find entity-name="${entityName}" list="entityValueList" offset="0" limit="50">
             <search-form-inputs/>
         </entity-find>

diff --git a/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml b/base-component/tools/screen/Tools/Entity/DataEdit/EntityList.xml
@@ -25,7 +25,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <actions>
         <set field="pageSize" from="pageSize ?: 60"/>
-        <set field="entityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', filterRegexp, false, false)"/>
+        <set field="entityList" from="ec.entity.getAllEntitiesInfo(orderByField?:'fullEntityName', filterRegexp, false, false, false)"/>
         <script>StupidUtilities.paginateList("entityList", null, context)</script>
     </actions>
     <widgets>

diff --git a/base-component/tools/screen/Tools/Entity/DataExport.xml b/base-component/tools/screen/Tools/Entity/DataExport.xml
@@ -29,7 +29,23 @@ along with this software (see the LICENSE.md file). If not, see
                     ec.message.addError("No entity names specified, not exporting anything.")
                     return
                 }
-                if (entityNames instanceof List) edw.entityNames(entityNames) else edw.entityName(entityNames)
+
+                // check for entities in the tenantcommon group, not allowed in Tools app for multi-tenant security
+                if (entityNames instanceof List) {
+                    for (String entityName in entityNames) {
+                        def entDef = ec.entity.getEntityDefinition(entityName)
+                        if (entDef == null || entDef.getEntityGroupName() == 'tenantcommon')
+                            ec.message.addError("Could not find entity with name ${entityName}")
+                    }
+                    edw.entityNames(entityNames)
+                } else {
+                    def entDef = ec.entity.getEntityDefinition(entityNames)
+                    if (entDef == null || entDef.getEntityGroupName() == 'tenantcommon')
+                        ec.message.addError("Could not find entity with name ${entityNames}")
+                    edw.entityName(entityNames)
+                }
+
+                if (ec.message.hasError()) return
 
                 if (dependentLevels) edw.dependentLevels(dependentLevels as int)
                 if (fromDate) edw.fromDate(ec.l10n.parseTimestamp(fromDate, null))
@@ -62,7 +78,7 @@ along with this software (see the LICENSE.md file). If not, see
         <form-single name="ExportData" transition="EntityExport">
             <field name="entityNames">
                 <default-field><drop-down allow-multiple="true" size="80">
-                    <list-options list="ec.entity.getAllEntitiesInfo('fullEntityName', null, false, true)" key="${fullEntityName}"/>
+                    <list-options list="ec.entity.getAllEntitiesInfo('fullEntityName', null, false, true, true)" key="${fullEntityName}"/>
                 </drop-down></default-field>
             </field>
             <field name="dependentLevels"><default-field><text-line size="2" default-value="0"/></default-field></field>

diff --git a/base-component/tools/screen/Tools/dashboard.xml b/base-component/tools/screen/Tools/dashboard.xml
@@ -29,17 +29,38 @@ along with this software (see the LICENSE.md file). If not, see
                 <section name="RestApiSection"><actions>
                     <set field="restUrl" from="sri.buildUrl('/rest').url"/>
                     <set field="rootResources" from="ec.service.restApi.rootResourceMap.values()"/>
+
+                    <set field="masterEntityNameList" from="ec.entity.getAllEntityNamesWithMaster()"/>
                 </actions><widgets>
                     <container-box>
                         <box-header><label text="REST API: Swagger UI" type="h5"/></box-header>
                         <box-body>
                             <section-iterate name="RootResourcesSection" list="rootResources" entry="resource"><widgets>
-                                <link url="/assets/lib/swagger-ui/index.html?url=${restUrl}/service.swagger/${resource.name}"
-                                        url-type="plain" target-window="_blank" text="${resource.displayName ?: resource.name}"
-                                        tooltip="${resource.description ?: ''}"/>
+                                <section name="RootResourceChildren" condition="resource.childMethods &gt; 100"><widgets>
+                                    <container-dialog id="RootResourceSwaggerDialog" button-text="${resource.displayName ?: resource.name} (${resource.childMethods})">
+                                        <section-iterate name="RootResourceSwaggerSection" list="resource.resourceMap.values()" entry="childResource"><widgets>
+                                            <container><link url="/assets/lib/swagger-ui/index.html?url=${restUrl}/service.swagger/${resource.name}/${childResource.name}"
+                                                    text="${childResource.displayName ?: childResource.description ?: childResource.name} (${childResource.childMethods})"
+                                                    link-type="anchor" target-window="_blank"/></container>
+                                        </widgets></section-iterate>
+                                    </container-dialog>
+                                </widgets><fail-widgets>
+                                    <link url="/assets/lib/swagger-ui/index.html?url=${restUrl}/service.swagger/${resource.name}"
+                                            url-type="plain" target-window="_blank" text="${resource.displayName ?: resource.name} (${resource.childMethods})"
+                                            tooltip="${resource.description ?: ''}"/>
+                                </fail-widgets></section>
                             </widgets></section-iterate>
+
+                            <container-dialog id="EntitySwagger" button-text="Entity Master API">
+                                <section-iterate name="EntitySwaggerSection" list="masterEntityNameList" entry="masterEntityName"><widgets>
+                                    <container><link url="/assets/lib/swagger-ui/index.html?url=${restUrl}/master.swagger/${masterEntityName}"
+                                            text="${masterEntityName}" link-type="anchor" target-window="_blank"/></container>
+                                </widgets></section-iterate>
+                            </container-dialog>
+                            <!-- Generates enough that Swagger UI has a hard time loading it, takes a long time or fails:
                             <link url="/assets/lib/swagger-ui/index.html?url=${restUrl}/master.swagger/all"
                                     url-type="plain" target-window="_blank" text="Entity Master API"/>
+                            -->
                             <label text="The larger APIs take a few seconds to load. Runs in same session (already authenticated)." type="p"/>
                         </box-body>
                     </container-box>