Merge pull request #78 from ansibleguy76/release/v4.0.7

v4.0.7 into main

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [4.0.7] - 2023-05-01
+
+### Fixed
+
+-   Default dependency bug
+-   nested placeholder expressions
+
 ## [4.0.5] - 2023-04-15
 
 ### Added
@@ -463,7 +470,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/4.0.5...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.7...HEAD
+
+[4.0.7]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.5...4.0.7
 
 [4.0.5]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.3...4.0.5
 

app_versions.gradle

@@ -1,2 +1,2 @@
-ext.version_code = 40005
-ext.version_name = "4.0.5"
+ext.version_code = 40007
+ext.version_name = "4.0.7"

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "4.0.5",
+  "version": "4.0.7",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,9 +12,9 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "~3.29.1",
+    "core-js": "~3.30.1",
     "vue": "~2.6.14",
-    "axios": "~1.3.2",
+    "axios": "~1.3.5",
     "es6-promise": "~4.2.8",
     "vuelidate": "~0.7.7",
     "vue-router": "~3.5.4",
@@ -36,7 +36,7 @@
     "yaml": "1.10.2",
     "thenby": "*",
     "vue-showdown": "2.4.1",
-    "bulma-calendar": "*",
+    "bulma-calendar": "6.1.19",
     "@fortawesome/fontawesome-svg-core":"~6.2.1",
     "@fortawesome/free-solid-svg-icons":"~6.2.1",
     "@fortawesome/free-regular-svg-icons":"~6.2.1",

client/public/assets/_overrides.scss

@@ -1,6 +1,30 @@
 // Overrides
-@if $bulmaswatch-import-font {
-  @import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap");
+// @if $bulmaswatch-import-font {
+//   @import url("https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700&display=swap");
+// }
+
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Regular.ttf");
+  font-weight: 400;
+  font-style: normal;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Italic.ttf");
+  font-weight: 400;
+  font-style: italic;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Bold.ttf");
+  font-weight: 700;
+  font-style: normal;
+}
+@font-face {
+  font-family: "Open Sans";
+  src: url("/assets/fonts/OpenSans-Light.ttf");
+  font-weight: 300;
 }
 
 .button {

client/src/components/BulmaAdvancedSelect.vue

@@ -189,13 +189,14 @@ export default {
                   //calculate if we need to do a dropup
                   var dd = ref.$refs["dd"]?.getBoundingClientRect()
                   var dt = ref.$refs["dt"]?.getBoundingClientRect()
-                  var wh = window.innerHeight
-                  var ww = window.innerWidth
-                  // if dropdown is out out of view AND there is space for dropup, do dropup
-                  ref.isUp=((dd.bottom>wh) && (dd.height<(dt.top-100)))
-                  ref.isRight=(dt.left>ww/2)
-                  this.calcDropdownMenuWidth()        
-                  
+                  if(dt){
+                    var wh = window.innerHeight
+                    var ww = window.innerWidth
+                    // if dropdown is out out of view AND there is space for dropup, do dropup
+                    ref.isUp=((dd.bottom>wh) && (dd.height<(dt.top-100)))
+                    ref.isRight=(dt.left>ww/2)
+                    this.calcDropdownMenuWidth()   
+                  }
               })
           }
       },
@@ -210,10 +211,12 @@ export default {
         var columnsCount=this.columns?.length || valueLength
         if(this.horizontal || (columnsCount>1)){
             var dt = this.$refs["dt"]?.getBoundingClientRect()
+            var dtleft = dt?.left||0
+            var dtright = (dt?.right||0)
             var ww = this.containerSize.width
             var wx = this.containerSize.x         
-            var widthIfLeft = (ww+wx-dt.left-25)
-            var widthIfRight = (dt.right-wx-25)
+            var widthIfLeft = (ww+wx-dtleft-25)
+            var widthIfRight = (dtright-wx-25)
             var width=((this.isRight)?widthIfRight:widthIfLeft)
             this.dropdownMenuWidth=width+"px"
         }
@@ -228,8 +231,8 @@ export default {
     },
     mounted() {
         var ref = this
-            // this.$refs.input.blur()
-            // this.$refs.content.blur()
+        // this.$refs.input.blur()
+        // this.$refs.content.blur()
     },
     directives: {
         'click-outside': {

client/src/components/BulmaEditTable.vue

@@ -1,7 +1,7 @@
 <template>
     <div>
         <BulmaModal type="large" v-if="showEdit" :title="action" action="Save" @click="saveItem()" @close="showEdit=false" @cancel="showEdit=false">
-          <div v-for="field,index in tableFields" :key="field.name" class="field mt-3">
+          <div v-for="field,index in editFields" :key="field.name" class="field mt-3">
 
               <!-- add field label -->
               <label class="label has-text-dark">{{ field.label }} <span v-if="field.required" class="has-text-danger">*</span></label>
@@ -210,6 +210,7 @@
             deleteMarker:{type: String, default: ""},
             insertMarker:{type: String, default: ""},
             readonlyColumns:{type: Array},
+            insertColumns:{type: Array},
             hasError:{type: Boolean}
         },
         data: function(){
@@ -307,6 +308,9 @@
           //this.input()
         },
         computed: {
+            editFields: function(){
+              return this.tableFields.filter(x => (this.action!="Add" || this.insertColumns.length==0 || this.insertColumns.includes(x.name)))
+            },
             filterRow: function () {
                 return this.tableFields.findIndex( (e) => e.filterable ) >= 0;
             },

client/src/components/BulmaNav.vue

@@ -51,8 +51,12 @@
                     <router-link class="navbar-item" to="/profile" v-if="authenticated && profile.type=='local' && profile.id">
                       <span class="icon"><font-awesome-icon icon="key" /></span><span>Change password</span>
                     </router-link>
-                    <router-link class="navbar-item" to="/login" v-on:click.native="logout()" replace><span class="icon"><font-awesome-icon icon="sign-out-alt" /></span><span>Logout</span></router-link>
-                    <span @click="$emit('profile')" class="navbar-item is-clickable"><span class="icon"><font-awesome-icon icon="address-card" /></span> <span>About me</span></span>
+                    <router-link class="navbar-item" to="/login" v-on:click.native="logout()" replace>
+                      <span class="icon"><font-awesome-icon icon="sign-out-alt" /></span><span>Logout</span>
+                    </router-link>
+                    <a href="javascript:void" @click="$emit('profile')" class="navbar-item">
+                      <span class="icon"><font-awesome-icon icon="address-card" /></span> <span>About me</span>
+                    </a>
                   </div>
                 </div>
               </div>