Merge pull request #22 from ansibleguy76/release/v2.2.2

v2.2.2 into main

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.2.2] - 2022-02-09
+
+### Fixed
+
+-   Dropdown box gets clipped at the bottom (was new bug since 2.2.1)
+-   Dependencies either with valueColumn or dot-notation
+
 ## [2.2.1] - 2022-02-07
 
 ### Added
@@ -141,7 +148,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Allow change password for current local user
 -   Start tracking versions
 
-[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.1...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.2...HEAD
+
+[2.2.2]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.1...2.2.2
 
 [2.2.1]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.0...2.2.1
 

app_versions.gradle

@@ -1,2 +1,2 @@
-ext.version_code = 20201
-ext.version_name = "2.2.1"
+ext.version_code = 20202
+ext.version_name = "2.2.2"

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",

client/src/components/Form.vue

@@ -5,7 +5,7 @@
     </BulmaQuickView>
     <div class="container" v-if="formIsReady">
       <div class="columns">
-        <div class="column is-clipped">
+        <div class="column is-clipped-horizontal">
           <h1 class="title">{{ currentForm.name }} <span v-if="currentForm.help" class="tag is-info is-clickable" @click="showHelp=!showHelp"><span class="icon"><font-awesome-icon icon="question-circle" /></span><span v-if="showHelp">Hide help</span><span v-else>Show help</span></span></h1>
           <article v-if="currentForm.help && showHelp" class="message is-info">
             <div class="message-body content"><VueShowdown :markdown="currentForm.help" flavor="github" :options="{ghCodeBlocks:true}" /></div>
@@ -272,7 +272,7 @@
             <span>Close output</span>
           </button>
         </div>
-        <div v-if="showJson" class="column is-clipped">
+        <div v-if="showJson" class="column is-clipped-horizontal">
           <h1 class="title">Extravars</h1>
           <button @click="showJson=false" class="button is-danger is-small">
             <span class="icon">
@@ -531,7 +531,25 @@
         var result=true                          // checks if a field can be show, based on the value of other fields
         if("dependencies" in field){
           field.dependencies.forEach((item, i) => {
-            if(!item.values.includes(ref.form[item.name])){
+            var value=undefined
+            var column=undefined
+            var fieldname=item.name
+            var columnRegex = /(.+)\.(.+)/g;                                        // detect a "." in the field
+            var tmpArr=columnRegex.exec(field)                             // found aaa.bbb
+            if(tmpArr && tmpArr.length>0){
+              fieldname = tmpArr[1]                                            // aaa
+              column=tmpArr[2]                                                  // bbb
+            }else{
+              if(fieldname in ref.fieldOptions){
+                column=ref.fieldOptions[fieldname].valueColumn||""        // get placeholder column
+              }
+            }
+            if(column){
+              value=ref.getFieldValue(ref.form[fieldname],column,false)
+            }else{
+              value=ref.form[field]
+            }
+            if(!item.values.includes(value)){
               if(ref.visibility[field.name]){
                 Vue.set(ref.visibility,field.name,false)
               }
@@ -759,7 +777,6 @@
               if(foundfield in ref.fieldOptions){
                 column=ref.fieldOptions[foundfield].placeholderColumn||""        // get placeholder column
               }
-
             }
             fieldvalue = ""
             targetflag = undefined
@@ -1421,6 +1438,9 @@ pre{
   white-space: -o-pre-wrap;    /* Opera 7 */
   word-wrap: break-word;       /* Internet Explorer 5.5+ */
 }
+.is-clipped-horizontal{
+  overflox-x:hidden;
+}
 .is-limited {
   text-overflow: ellipsis;
   width:100%;

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/ansibleguy76/ansibleforms.git"

server/src/swagger.json

@@ -2,7 +2,7 @@
   "swagger": "2.0",
   "info": {
     "description": "This is the swagger interface for AnsibleForms.\r\nUse the `/auth/login` api with basic authentication to obtain a JWT token.\r\nThen use the access token, prefixed with the word '**Bearer**' to use all other api's.\r\nNote that the access token is limited in time.  You can then either login again and get a new set of tokens or use the `/token` api and the refresh token to obtain a new set (preferred).",
-    "version": "2.2.1",
+    "version": "2.2.2",
     "title": "AnsibleForms",
     "contact": {
       "email": "[email protected]"