From 1acaaf1272b040983b7d6dc717b0b22a96b170bd Mon Sep 17 00:00:00 2001 From: Deepak Dixit Date: Wed, 29 Nov 2023 11:28:21 +0530 Subject: [PATCH] Conflicts (#9) * On Login screen fix auto-focus of username field on login tab by moving to trigger on tab set/change allowing auto focus on other tabs, also if there is a username and 2nd factor required then auto focus on that to save a click in that flow on login and change tabs * Add m-mermaid vue component for qvt render mode, use on new StatusFlows screen in the tools app; the results when status items are sorted in Mermaid JS are pretty good, might even be end-user useful but at least here useful for devs * On StatusFlows screen add dialog with Mermaid JS text to make it easier to grab for customization and use elsewhere like in docs * Add ServiceLoadRunner screen, a qvue screen (/qapps only) for managing the new Service LoadRunner and viewing results in real-ish time * On ServiceLoadRunner screen add stats for specific artifact types, some number formatting improvements more needed * On ServiceLoadRunner screen add time bin settings and a few general improvements, prep work for the upcoming charts using time bin data * In WebrootVue.qvt.js in the m-chart component support dynamic charts with a watch; in ServiceLoadRunner add run per second and entity find per second charts, some number formatting and other cleanups and small UI improvements * On ServiceLoadRunner fix a couple of cold init issues from previous commit, add moving averages to entity find per scond chart * On ServiceLoadRunner screen add entity writes per second chart, refactoring and cleanups, add some server hardware stats like heap and load and GC; getting closer * On ServiceLoadrunner small fixes: clear server status interval on leave screen, only show Begin button if executor doesn't exist, can take a while to shut down on big runs, or fail * Add link to Service LoadRunner on Tools Dashboard, and on that screen check new permission, support run delay vary, add Average Run Time chart (should have been the first, is the most basic), other small changes * Create SqlScriptRunner.xml screen and add to dashboard.xml * Add link action button to qvt actions and history * Add sessionId field to list screen for debugging * Changed header color to make it more obviously not production * Added Page Size to Log Viewer * In WebrootVue.qvt.css, updated rule for drawer background to only come into effect in non-mobile layouts. * In DefaultScreenMacros for vuet and qvt add paginate support to section-include when included section is a section-iterate with paginate=true; in qvt js don't show pagination widget if there is only one result * In WebrootVue.qvt.js add qLayoutMinHeight method to calculate a full height, useful for certain types of screens with particular or bottom instead of top focused layouts * Master (#7) * Add sessionId field to list screen for debugging * Changed header color to make it more obviously not production * Added Page Size to Log Viewer * In WebrootVue.qvt.css, updated rule for drawer background to only come into effect in non-mobile layouts. * In DefaultScreenMacros for vuet and qvt add paginate support to section-include when included section is a section-iterate with paginate=true; in qvt js don't show pagination widget if there is only one result * In WebrootVue.qvt.js add qLayoutMinHeight method to calculate a full height, useful for certain types of screens with particular or bottom instead of top focused layouts * In qvt macros for form-list fix issue with first/second/last row and hidden parameters * In qvt screen macros first pass on working support for first, second, and last row forms * In vuet and qvt widgetTextValue macro handle case with drop-down that has dynamic-options plus list-options for pre-loaded values * Update vue to 2.7.14, quasar to 1.22.10; all seems to work well in partial tests of existing screens, minor version updates are hopefully backward compatible but worth keeping an eye out for issues * In qvt default screen macros add support for text-area.@autogrow attribute * Small updates to webroot build.gradle: update gradle-versions and gradle-minify plugins * Currency (#217) * Add currency-hide-symbol attribute as a comlement to currency-unit-field, displaying the value without the currency symbol * Update AUTHORS file * Update ElFinder client to 2.1.62 and jqueryui to 1.13.2, there is a security notice for ElFinder for versions 2.1.61 and earlier, but it appears to only for the server-side PHP code which is not used in moqui; also updated jquery to 3.7.1 while at it * Fix submit on select drop down where there is one result (#219) * Fix submit on select drop down where there is one result * Changes required for new Moqui SSO component (#222) * In Login.ftl, added SSO tab and forms. This will only appear if SSO is configured. * In webroot-layout.css, increased the width of the forms from 340 to 380 so SSO tab doesn't overflow to new line. * In Qapps mode, add a expansion button to the ContainerBox (#216) * In Qapps mode, add a expansion button to the ContainerBox * sign the AUTHORS file * Enable accordion in form field-groups using qvt rendering (#221) * In qvt render mode fix m-form-column-config find parameter handling so they are passed through --------- Co-authored-by: Acetousk Co-authored-by: David E. Jones Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah Co-authored-by: Jens Hardings Co-authored-by: acetousk Co-authored-by: newmann --------- Co-authored-by: David E Jones Co-authored-by: Acetousk Co-authored-by: pandor4u <103976470+pandor4u@users.noreply.github.com> Co-authored-by: aabiabdallah Co-authored-by: Jens Hardings Co-authored-by: acetousk Co-authored-by: newmann --- template/screen-macro/DefaultScreenMacros.qvt.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/template/screen-macro/DefaultScreenMacros.qvt.ftl b/template/screen-macro/DefaultScreenMacros.qvt.ftl index 0f7b12aa5..568417725 100644 --- a/template/screen-macro/DefaultScreenMacros.qvt.ftl +++ b/template/screen-macro/DefaultScreenMacros.qvt.ftl @@ -1140,6 +1140,7 @@ ${sri.renderIncludeScreen(.node["@location"], .node["@share-scope"]!)} <#assign isServerStatic = formInstance.isServerStatic(sri.getRenderMode())> <#assign formDisabled = formListUrlInfo.disableLink> + <#if isServerStatic><#-- client rendered, server static --> <#assign hiddenParameterMap = sri.getFormHiddenParameters(formNode)> <#assign hiddenParameterKeys = hiddenParameterMap.keySet()>