Merge pull request #139 from ansibleguy76/release/v5.0.0

v5.0.0 into main
ansibleguy76 · Jan 25, 2024 · 49aff4d · 49aff4d
2 parents 9b1dd13 + fa5c63e
commit 49aff4d
Show file tree

Hide file tree

Showing 74 changed files with 2,236 additions and 1,323 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [5.0.0] - 2024-01-25
+
+### Added
+
+-   in remote expression functions, we throw errors so they show up in the form.
+-   added valueColumn "\*" and placeholderColumn "\*", to return all column, this also means that valueColumn "\*" results in the same as outputObject: true. 
+-   jobid is passed now as extravar and passed to nextform, incase an action exists
+-   you can now hide a text field
+-   more advanced ldap properties for non active directory ldap servers
+-   git repositories generic (for forms and playbook for example)
+-   added expiryDays to login api, for longlived tokens (admin only)
+-   added jwt tokenPrefix property on jwt functions
+-   allow admin role fallback for local/admins group in case no forms are found
+-   radio button values property can now have array of objects (label, value)
+-   instanceGroups property on forms => choose awx instanceGroups
+-   enable verbose checkbox for quick ansible verbose mode
+
+### Removed
+
+-   git repo type, you can no longer target git repo's from a form, this is breaking when you upgrade to 5.0.0 and use the formtype 'git'
+
+### Fixed
+
+-   awx workflow template failed with 404
+-   ldap usernameattribute not used
+-   fixed database query issue for postgres
+-   use ldap-authentication main code (no npm)
+-   try ldap group objectName first
+
 ## [4.0.19] - 2023-11-22
 
 ### Fixed
@@ -621,7 +650,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.19...HEAD
+[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/5.0.0...HEAD
+
+[5.0.0]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.19...5.0.0
 
 [4.0.19]: https://github.com/ansibleguy76/ansibleforms/compare/4.0.18...4.0.19
 

diff --git a/app_versions.gradle b/app_versions.gradle
@@ -1,2 +1,2 @@
-ext.version_code = 40019
-ext.version_name = "4.0.19"
+ext.version_code = 50000
+ext.version_name = "5.0.0"
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ansible_forms_vue",
-  "version": "4.0.19",
+  "version": "5.0.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,9 +12,9 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "core-js": "~3.33.2",
+    "core-js": "~3.34.0",
     "vue": "~2.7.15",
-    "axios": "~1.6.0",
+    "axios": "~1.6.2",
     "es6-promise": "~4.2.8",
     "vuelidate": "~0.7.7",
     "vue-router": "~3.5.4",
@@ -54,7 +54,7 @@
     "eslint": "~6.8.0",
     "eslint-plugin-vue": "~6.2.2",
     "vue-template-compiler": "~2.6.11",
-    "nodemon": "~3.0.1",
+    "nodemon": "~3.0.2",
     "sass" :"~1.49.11",
     "sass-loader":"10.1.1"
   },

diff --git a/client/src/App.vue b/client/src/App.vue
@@ -112,7 +112,7 @@
         loadVersion(){
           var ref=this;
 
-          axios.get('/api/v1/version')                               // check database
+          axios.get(`${process.env.BASE_URL}api/v1/version`)                               // check database
             .then((result)=>{
               if(result.data.status=="success"){
                 ref.version=result.data.message
@@ -124,7 +124,7 @@
         },
         loadApprovals(){
           var ref=this;
-          axios.get('/api/v1/job/approvals',TokenStorage.getAuthentication())                               // check database
+          axios.get(`${process.env.BASE_URL}api/v1/job/approvals`,TokenStorage.getAuthentication())                               // check database
             .then((result)=>{
               if(result.data.status=="success"){
                 ref.approvals=result.data.data.output || 0
@@ -138,13 +138,12 @@
           var ref=this;
 
           // Check if the current route is '/install' and skip the database check
-          if (this.$route.path === '/install') {
+          if (this.$route.path === `${process.env.BASE_URL}install`) {
             this.isLoaded = true;
             return; // Skip the database check
           }
-
           console.log("Checking database")
-          axios.get('/api/v1/schema')                               // check database
+          axios.get(`${process.env.BASE_URL}api/v1/schema`)                               // check database
           .then((result)=>{
             if(result.data.status=="error"){
               ref.errorMessage=result.data.message;
@@ -159,6 +158,8 @@
               }
               ref.isLoaded=true
             }else{
+              ref.errorMessage=result.data.message;
+              ref.errorData=result.data.data;              
               this.loadVersion()
               this.login()
               ref.isLoaded=true

diff --git a/client/src/components/BulmaAdminTable.vue b/client/src/components/BulmaAdminTable.vue
@@ -37,14 +37,18 @@
               <span :key="'action_'+a.name" v-else class="icon has-text-grey-light"><font-awesome-icon :icon="a.icon" /></span>
             </template>
           </td>
-          <td
+          <template v-for="column,i in columns">
+          <td v-if="(icons.length<=i)?true:!icons[i]"
             class="is-clickable"
             @click="(identifier)?action(actions[0].name,item[identifier]):action(actions[0].name,item)"
-            v-for="column in columns"
             :key="'item_'+item.name+'_value_'+column"
           >
             {{ (column)?item[column]:item }}
           </td>
+          <td v-else :key="'item_'+item.name+'_value_'+column">
+            <span v-if="(column)?item[column]:item" class="icon"><font-awesome-icon :icon="(column)?item[column]:item" /></span>
+          </td>
+          </template>
         </tr>
       </tbody>
     </table>
@@ -67,6 +71,7 @@
       labels:{type:Array},
       columns:{type:Array},
       filters:{type:Array,default:()=>{return []}},
+      icons:{type:Array,default:()=>{return []}},
       actions:{type:Array},
       identifier:{type:String},
       currentItem:{type:[String,Number]},

diff --git a/client/src/components/BulmaNav.vue b/client/src/components/BulmaNav.vue
@@ -2,9 +2,9 @@
   <nav class="navbar is-primary is-spaced has-shadow" role="navigation" aria-label="main navigation">
       <div class="container">
           <div class="navbar-brand">
-          <a class="navbar-item" href="/">
+            <router-link class="navbar-item" to="/">
               <img src="/assets/img/logo_ansible_forms_full_white.svg" />
-          </a>
+            </router-link>
 
           <a role="button" class="navbar-burger burger" aria-label="menu" aria-expanded="false" data-target="navbarAnsibleForms" v-on:click="showNav = !showNav" v-bind:class="{ 'is-active' : showNav }">
               <span aria-hidden="true"></span>
@@ -36,7 +36,7 @@
                     <router-link class="navbar-item" to="/reference-guide/forms">
                       <span class="icon"><font-awesome-icon icon="question-circle" /></span><span>Reference Guide</span>
                     </router-link>
-                    <a class="navbar-item" href="/api-docs" target="_blank">
+                    <a class="navbar-item" :href="`${baseUrl}api-docs`" target="_blank">
                       <span class="icon"><font-awesome-icon icon="code" /></span><span>Api docs</span>
                     </a>
                     <hr class="navbar-divider">
@@ -78,13 +78,15 @@
     },
     data(){
       return  {
-          showNav: false
+          showNav: false,
+          baseUrl: "/"
       }
     },methods:{
       logout(){
         this.$emit("logout");
       }
     },mounted(){
+      this.baseUrl = process.env.BASE_URL
     }
   }
 </script>