Merge pull request #1 from moqui/master

merge from moqui/moqui-runtime
moqui · Jan 15, 2019 · a4ad677 · a4ad677
2 parents 7e30b2f + cc90c6f
commit a4ad677
Show file tree

Hide file tree

Showing 30 changed files with 347 additions and 167 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![license](http://img.shields.io/badge/license-CC0%201.0%20Universal-blue.svg)](https://github.com/moqui/moqui-runtime/blob/master/LICENSE.md)
 [![release](http://img.shields.io/github/release/moqui/moqui-runtime.svg)](https://github.com/moqui/moqui-runtime/releases)
-[![commits since release](http://img.shields.io/github/commits-since/moqui/moqui-runtime/v2.1.0.svg)](https://github.com/moqui/moqui-runtime/commits/master)
+[![commits since release](http://img.shields.io/github/commits-since/moqui/moqui-runtime/v2.1.1.svg)](https://github.com/moqui/moqui-runtime/commits/master)
 
 [![LinkedIn Group](https://img.shields.io/badge/linked%20in%20group-moqui-blue.svg)](https://www.linkedin.com/groups/4640689)
 [![Google Group](https://img.shields.io/badge/google%20group-moqui-blue.svg)](https://groups.google.com/d/forum/moqui)

diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -1,6 +1,28 @@
 
 # Moqui Runtime Release Notes
 
+## Release 2.1.1 - 29 Nov 2018
+
+Moqui Runtime 2.1.1 is a patch level new feature and bug fix release, in parallel with the release of Moqui Framework.
+
+In this release there are significant refinements and fixes for the Vue JS based vuet/vapps mode and it is now the default 
+(ie default under webroot is /vapps instead of /apps). The standard HTML mode is still available under /apps and there are still 
+links to switch on the app list screen. There is also now support for Vue component based XML Screens using a .js file and 
+optional .vuet file that gets merged into the Vue component as the template. For an example see the DynamicExampleItems.xml screen 
+in the example component.
+
+Moqui has an improved look and feel with simplified and less cluttered CSS styling. These changes are implemented as overrides in a 
+section at the bottom of webroot-theme.css so they can be easily changed or overridden. 
+
+QZ Tray is now supported (only in vuet mode, QZ connection maintained across screens) with a print options dialog in the header. 
+Screens can use QZ Tray in custom JavaScript to print, communicate with devices, etc. 
+
+Various screens in the System and Tools apps have been improved and modernized using newer XML Form functionality. There are also
+some improvements to work better in vuet/vapps mode (now the default).
+
+HTML and JavaScript generated for html and vuet render modes has a few output encoding fixes which fixes the rendering of screens 
+in various conditions (especially under vuet) for HTML and JS reserved characters, and for XSS mitigation.   
+
 ## Release 2.1.0 - 22 Oct 2017
 
 Moqui Runtime 2.1.0 is a major new feature and bug fix release, in parallel with the release of Moqui Framework.

diff --git a/base-component/tools/screen/System/DataDocument/Search.xml b/base-component/tools/screen/System/DataDocument/Search.xml
@@ -38,7 +38,7 @@ along with this software (see the LICENSE.md file). If not, see
                 </drop-down>
             </default-field></field>
             <field name="queryString"><default-field title="">
-                <text-line size="40"/>
+                <text-line size="100"/>
                 <!-- TODO: at some point impl this, once we figure out how to get suggest results from ElasticSearch:
                     <text-line ac-transition="searchSuggest" ac-min-length="3" size="40"/> -->
             </default-field></field>

diff --git a/base-component/tools/screen/System/Instance/InstanceDetail.xml b/base-component/tools/screen/System/Instance/InstanceDetail.xml
@@ -34,6 +34,13 @@ along with this software (see the LICENSE.md file). If not, see
     <transition name="deleteAppInstanceLink"><service-call name="delete#moqui.server.instance.AppInstanceLink"/>
         <default-response url="."/></transition>
 
+    <transition name="createAppInstanceVol"><service-call name="create#moqui.server.instance.AppInstanceVolume"/>
+        <default-response url="."/></transition>
+    <transition name="updateAppInstanceVol"><service-call name="update#moqui.server.instance.AppInstanceVolume"/>
+        <default-response url="."/></transition>
+    <transition name="deleteAppInstanceVol"><service-call name="delete#moqui.server.instance.AppInstanceVolume"/>
+        <default-response url="."/></transition>
+
     <transition name="provisionAppInstance"><service-call name="org.moqui.impl.InstanceServices.provision#AppInstance"/>
         <default-response url="."/></transition>
     <transition name="createAppDatabase"><service-call name="org.moqui.impl.InstanceServices.create#AppDatabase"/>
@@ -52,6 +59,7 @@ along with this software (see the LICENSE.md file). If not, see
         <entity-find-one entity-name="moqui.server.instance.AppInstance" value-field="appInstance"/>
         <set field="envList" from="appInstance.envs"/>
         <set field="linkList" from="appInstance.links"/>
+        <set field="volumeList" from="appInstance.vols"/>
 
         <service-call name="org.moqui.impl.InstanceServices.check#AppInstance" in-map="[appInstanceId:appInstanceId]" out-map="context"/>
         <service-call name="org.moqui.impl.InstanceServices.check#AppDatabase" in-map="[appInstanceId:appInstanceId]" out-map="context"/>
@@ -103,9 +111,13 @@ along with this software (see the LICENSE.md file). If not, see
             <container-dialog id="MoquiServerDetail" button-text="Moqui Server Detail">
                 <label text="${groovy.json.JsonOutput.prettyPrint(groovy.json.JsonOutput.toJson(moquiStatusMap))}" type="pre" style="pre-plain"/>
             </container-dialog>
+            <container-dialog id="InstanceLog" button-text="Instance Log" width="900">
+                <label text="${instanceLog}" type="pre" style="pre-plain"/>
+            </container-dialog>
             <link url="http://${appInstance.hostName}" url-type="plain" text="http://${appInstance.hostName}" link-type="anchor-button" target-window="_blank"/>
 
             <form-single name="UpdateInstance" transition="updateAppInstance" map="appInstance">
+                <field name="appInstanceId"><default-field><hidden/></default-field></field>
                 <field name="instanceName"><default-field><text-line size="50"/></default-field></field>
                 <field name="instanceUuid"><default-field title="Instance UUID"><display/></default-field></field>
                 <field name="hostName"><default-field tooltip="Hostname for access to the instance, generally a virtual host name">
@@ -138,7 +150,7 @@ along with this software (see the LICENSE.md file). If not, see
                 <field name="networkMode"><default-field><text-line size="30"/></default-field></field>
                 <field name="jsonConfig"><default-field title="JSON Config"><text-area cols="50" rows="5"/></default-field></field>
 
-                <field name="submitButton"><default-field title="Create"><submit/></default-field></field>
+                <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
             </form-single>
         </box-body></container-box>
     </row-col><row-col md="5">
@@ -165,6 +177,29 @@ along with this software (see the LICENSE.md file). If not, see
                 </default-field></field>
             </form-list>
         </box-body-nopad></container-box>
+        <container-box><box-header><label text="Volumes" type="h5"/></box-header><box-toolbar>
+            <container-dialog id="AddVolDialog" button-text="Add Volume">
+                <form-single name="AddVol" transition="createAppInstanceVol">
+                    <field name="appInstanceId"><default-field><hidden/></default-field></field>
+                    <field name="mountPoint"><default-field title="Mountpoint"><text-line size="30"/></default-field></field>
+                    <field name="volumeName"><default-field title="Name"><text-line size="30"/></default-field></field>
+                    <field name="submitButton"><default-field title="Add Volume"><submit/></default-field></field>
+                </form-single>
+            </container-dialog>
+        </box-toolbar><box-body>
+            <label text="After updating volumes the instance must be removed and re-initialized for them to take effect, note that these operations may result in loss of data"/>
+        </box-body><box-body-nopad>
+            <form-list name="VolList" list="volumeList" transition="updateAppInstanceVol">
+                <field name="appInstanceId"><default-field><hidden/></default-field></field>
+                <field name="mountPoint"><default-field title="Mountpoint"><display/></default-field></field>
+                <field name="volumeName"><default-field title="Volume Name"><text-line size="30"/></default-field></field>
+                <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
+                <field name="deleteLink"><default-field title="">
+                    <link url="deleteAppInstanceVol" text="X" parameter-map="[appInstanceId:appInstanceId, mountPoint:mountPoint]"
+                            confirmation="Really delete volume ${volumeName}?"/>
+                </default-field></field>
+            </form-list>
+        </box-body-nopad></container-box>
         <container-box><box-header><label text="Instance (Container) Links" type="h5"/></box-header><box-toolbar>
             <container-dialog id="AddLinkDialog" button-text="Add Link">
                 <form-single name="AddLink" transition="createAppInstanceLink">

diff --git a/base-component/tools/screen/System/Localization/EntityFields.xml b/base-component/tools/screen/System/Localization/EntityFields.xml
@@ -30,19 +30,18 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
-        <entity-find entity-name="moqui.basic.LocalizedEntityField" list="localizedEntityFieldList" offset="0" limit="50">
-            <search-form-inputs default-order-by="entityName,fieldName,locale"/>
-        </entity-find>
+        <entity-find entity-name="moqui.basic.LocalizedEntityField" list="localizedEntityFieldList">
+            <search-form-inputs default-order-by="entityName,fieldName,locale"/></entity-find>
     </actions>
     <widgets>
         <container>
             <container-dialog id="CreateEntityFieldDialog" button-text="New Field L10n">
                 <form-single name="CreateLocalizedEntityField" transition="createLocalizedEntityField">
-                    <field name="entityName"><default-field><text-line size="15"/></default-field></field>
-                    <field name="fieldName"><default-field><text-line size="15"/></default-field></field>
+                    <field name="entityName"><default-field><text-line size="80"/></default-field></field>
+                    <field name="fieldName"><default-field><text-line size="30"/></default-field></field>
                     <field name="pkValue"><default-field><text-line size="20"/></default-field></field>
                     <field name="locale"><default-field><text-line size="5"/></default-field></field>
-                    <field name="localized"><default-field><text-area rows="5" cols="60"/></default-field></field>
+                    <field name="localized"><default-field><text-area rows="5" cols="80"/></default-field></field>
                     <field name="submitButton"><default-field title="Create"><submit/></default-field></field>
                 </form-single>
             </container-dialog>

diff --git a/base-component/tools/screen/System/Localization/Messages.xml b/base-component/tools/screen/System/Localization/Messages.xml
@@ -30,22 +30,21 @@ along with this software (see the LICENSE.md file). If not, see
     </transition>
 
     <actions>
-        <entity-find entity-name="moqui.basic.LocalizedMessage" list="localizedMessageList" offset="0" limit="50">
-            <search-form-inputs default-order-by="^original,locale"/>
-        </entity-find>
+        <entity-find entity-name="moqui.basic.LocalizedMessage" list="localizedMessageList">
+            <search-form-inputs default-order-by="^original,locale"/></entity-find>
     </actions>
     <widgets>
         <container>
             <container-dialog id="CreateMessageDialog" button-text="New Message">
                 <form-single name="CreateLocalizedMessage" transition="createLocalizedMessage">
                     <field name="original">
-                        <default-field><text-line size="15"/></default-field>
+                        <default-field><text-line size="80" maxlength="255"/></default-field>
                     </field>
                     <field name="locale">
                         <default-field><text-line size="5"/></default-field>
                     </field>
                     <field name="localized">
-                        <default-field><text-area rows="5" cols="60"/></default-field>
+                        <default-field><text-area rows="5" cols="80"/></default-field>
                     </field>
                     <field name="submitButton"><default-field title="Create"><submit/></default-field></field>
                 </form-single>

diff --git a/base-component/tools/screen/System/Resource/ElFinder.xml b/base-component/tools/screen/System/Resource/ElFinder.xml
@@ -19,6 +19,7 @@ along with this software (see the LICENSE.md file). If not, see
     <parameter name="resourceRoot"/>
     <always-actions>
         <set field="mantleContentRoot" from="ec.user.getPreference('mantle.content.root') ?: 'dbresource://mantle/content'"/>
+        <set field="mantleContentLargeRoot" from="ec.user.getPreference('mantle.content.large.root') ?: 'dbresource://mantle/content'"/>
         <set field="resourceRoot" from="resourceRoot ?: mantleContentRoot"/>
     </always-actions>
 
@@ -38,6 +39,7 @@ along with this software (see the LICENSE.md file). If not, see
 
     <actions>
         <set field="rootOptions" from="[mantleContentRoot, 'dbresource://', 'component://webroot', 'file:runtime']"/>
+        <if condition="mantleContentLargeRoot != mantleContentRoot"><script>rootOptions.add(mantleContentLargeRoot)</script></if>
     </actions>
     <widgets>
         <form-single name="SelectRoot" transition=".">

diff --git a/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml b/base-component/tools/screen/System/Security/UserAccount/UserAccountDetail.xml
@@ -125,6 +125,8 @@ along with this software (see the LICENSE.md file). If not, see
                     <field name="successiveFailedLogins"><default-field title="Failed Logins"><display/></default-field></field>
                     <field name="disabled"><default-field><display text="${disabled ?: 'N'}"/></default-field></field>
                     <field name="disabledDateTime"><default-field title="Disabled Date"><display/></default-field></field>
+                    <field name="ipAllowed"><default-field title="IPs Allowed" tooltip="Comma separated IP4 patterns, each may use '*' for wildcard or '-' separated min/max numbers">
+                        <text-line size="80"/></default-field></field>
 
                     <field name="locale"><default-field>
                         <drop-down allow-empty="true"><list-options list="localeStringList" key="${locale}" text="${locale} - ${name}"/></drop-down>

diff --git a/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml b/base-component/tools/screen/System/Security/UserGroup/UserGroupDetail.xml
@@ -73,6 +73,8 @@ along with this software (see the LICENSE.md file). If not, see
                     <widget-template-include location="component://webroot/template/screen/BasicWidgetTemplates.xml#enumDropDown">
                         <set field="enumTypeId" value="UserGroupType"/><set field="allowEmpty" value="true"/></widget-template-include>
                 </default-field></field>
+                <field name="ipAllowed"><default-field title="IPs Allowed" tooltip="Comma separated IP4 patterns, each may use '*' for wildcard or '-' separated min/max numbers">
+                    <text-line size="80"/></default-field></field>
 
                 <field name="submitButton"><default-field title="Update"><submit/></default-field></field>
             </form-single>

diff --git a/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml b/base-component/tools/screen/System/ServiceJob/Jobs/ServiceJobDetail.xml
@@ -78,6 +78,8 @@ along with this software (see the LICENSE.md file). If not, see
                     <auto-fields-entity entity-name="moqui.service.job.ServiceJob" field-type="edit" include="nonpk"/>
                     <field name="description"><default-field><text-line size="60"/></default-field></field>
                     <field name="serviceName"><default-field><text-line size="60"/></default-field></field>
+                    <field name="expireLockTime"><default-field title="Expire Lock Minutes" tooltip="Defaults to 1440 (24 hours)">
+                        <text-line size="4"/></default-field></field>
                     <field name="submitButton"><default-field title="Update Job"><submit/></default-field></field>
                     <field-layout>
                         <field-ref name="jobName"/><field-ref name="description"/><field-ref name="serviceName"/>

diff --git a/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml b/base-component/tools/screen/System/SystemMessage/Message/SystemMessageDetail.xml
@@ -22,8 +22,11 @@ along with this software (see the LICENSE.md file). If not, see
 
     <transition name="sendMessage"><service-call name="org.moqui.impl.SystemMessageServices.send#ProducedSystemMessage"/>
         <default-response url="."/></transition>
-    <transition name="consumeMessage"><service-call name="org.moqui.impl.SystemMessageServices.consume#ReceivedSystemMessage"/>
-        <default-response url="."/></transition>
+    <transition name="consumeMessage">
+        <service-call name="org.moqui.impl.SystemMessageServices.consume#ReceivedSystemMessage" async="true"/>
+        <actions><message>Consume started in background</message></actions>
+        <default-response url="."/>
+    </transition>
     <transition name="queueAckMessage"><service-call name="org.moqui.impl.SystemMessageServices.queue#AckSystemMessage"/>
         <default-response url="."/></transition>