Skip to content

Commit

Permalink
Merge pull request #30 from ansibleguy76/release/v2.2.4
Browse files Browse the repository at this point in the history
v2.2.4 into main
  • Loading branch information
ansibleguy76 authored Feb 15, 2022
2 parents d2927aa + 988098c commit b1e561d
Show file tree
Hide file tree
Showing 17 changed files with 633 additions and 273 deletions.
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,36 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [2.2.4] - 2022-02-15

### Added

- Allow field named \_\_inventory\_\_ to have array to launch against multiple inventories (ansible only)
- Add new validation `validIf` and `validIfNot`. Use an expression field as validation.
- Add new `refresh` property to manually or auto refresh expression/query fields.
- Add table enhancements
- prepopulate with `query` and `expression`
- insertMarker and deleteMarker (to mark deleted or new records)
- allowDelete and allowInsert (to allow insert/delete)
- readonlyField
With this table feature you can now load existing data and use table to modify it.
The allowInsert set to false will focus on modification only.
The deleteMarker set to value of choice, will allow you to use ansible `absent` for deleted records.
Read the wiki for more details.

### Fixed

- Fixed a bug in notIn and in validation
- Fixed (dependency + expression) bug
- Fixed execute bug (read proper exit code)
- Fixed Warning color to orange
- Removed constants from new form in designer

### Changed

- Upgrade from fontawesome 5 to 6
- Label is no longer a required property

## [2.2.3] - 2022-02-11

### Added
Expand Down Expand Up @@ -161,7 +191,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.3...HEAD
[Unreleased]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.4...HEAD

[2.2.4]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.3...2.2.4

[2.2.3]: https://github.com/ansibleguy76/ansibleforms/compare/2.2.2...2.2.3

Expand Down
4 changes: 2 additions & 2 deletions app_versions.gradle
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ext.version_code = 20203
ext.version_name = "2.2.3"
ext.version_code = 20204
ext.version_name = "2.2.4"
9 changes: 4 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ansible_forms_vue",
"version": "2.2.3",
"version": "2.2.4",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -24,7 +24,6 @@
"bulma" : "*",
"bulma-quickview" : "*",
"bulma-checkradio": "~2.1.3",
"typeface-source-sans-pro": "*",
"brace": "~0.11.1",
"highlight.js": "9.11.0",
"vue-highlight.js": "3.1.0",
Expand All @@ -33,9 +32,9 @@
"yaml": "*",
"thenby": "*",
"vue-showdown": "2.4.1",
"@fortawesome/fontawesome-svg-core":"~1.2.36",
"@fortawesome/free-solid-svg-icons":"~5",
"@fortawesome/free-regular-svg-icons":"~5",
"@fortawesome/fontawesome-svg-core":"~1.3.0",
"@fortawesome/free-solid-svg-icons":"~6",
"@fortawesome/free-regular-svg-icons":"~6",
"@fortawesome/vue-fontawesome":"2.0.6"

},
Expand Down
5 changes: 3 additions & 2 deletions client/public/assets/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
// LUMEN
////////////////////////////////////////////////

$orange: #ff851b;
$orange: #efaf31;
$green: #28b62c;
$blue: #5bb7db;
$red: #ff4136;
$red: #ea4141;
$warning: $orange;
$danger: $red;
$primary: #158cba !default;

Expand Down
9 changes: 6 additions & 3 deletions client/src/components/BulmaAdvancedSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
class="input"
ref="input"
:class="{'is-danger':hasError}"
readonly
:readonly="!disabled"
type="text"
:value="(isLoading)?'':preview"
:placeholder="(isLoading)?'Loading...':placeholder"
Expand All @@ -19,6 +19,7 @@
@keydown.space="toggle()"
@mousedown="toggle()"
@keydown="doFilter"
:disabled="disabled"
>
<span v-if="icon!=undefined" class="icon is-small is-left">
<font-awesome-icon :icon="icon" />
Expand Down Expand Up @@ -97,7 +98,8 @@
valueColumn:{type:String},
pctColumns:{type:Array},
filterColumns:{type:Array},
sticky:{type:Boolean}
sticky:{type:Boolean},
disabled:{type:Boolean}
},
data () {
return {
Expand Down Expand Up @@ -130,6 +132,7 @@
// this.queryfilter=""
},
toggle(){
if(this.disabled)return
var ref=this
this.isActive=!this.isActive
if(this.isActive){
Expand Down Expand Up @@ -192,6 +195,6 @@
border-radius: 4px;
}
.hasError{
border-color: red!important;
border-color: #ea4141!important;
}
</style>
4 changes: 2 additions & 2 deletions client/src/components/BulmaCheckRadio.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<span>
<input :type="checktype" :id="_uid" class="is-checkradio" :class="type" :value="val" v-model="checked" focus="prevent">
<input :type="checktype" :id="_uid" class="is-checkradio" :disabled="disabled" :class="type" :value="val" v-model="checked" focus="prevent">
<label :for="_uid"> {{ label }}</label>
</span>
</template>
Expand All @@ -10,7 +10,7 @@
import "../../public/assets/bulma_checkradio.scss"
export default{
name:"BulmaRadio",
props: ['type','value', 'val','label','checktype'],
props: ['type','value', 'val','label','checktype','disabled'],
data () {
return {
}
Expand Down
Loading

0 comments on commit b1e561d

Please sign in to comment.