@afeefa/vue-app 0.0.111 → 0.0.113

package/.afeefa/package/release/version.txt

@@ -1 +1 @@
-0.0.111
+0.0.113

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.111",
+  "version": "0.0.113",
   "description": "",
   "author": "Afeefa Kollektiv <kollektiv@afeefa.de>",
   "license": "MIT",

package/src/components/ADatePicker.vue

@@ -158,4 +158,8 @@ export default class ADatePicker extends Mixins(ComponentWidthMixin) {
     cursor: pointer;
   }
 }
+
+.v-text-field :deep(.v-input__icon--clear) { // always show clear icon, https://github.com/vuetifyjs/vuetify/pull/15876
+  opacity: 1;
+}
 </style>

package/src/components/ATextField.vue

@@ -20,7 +20,7 @@ import { debounce } from '@a-vue/utils/debounce'
 import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
 
 @Component({
-  props: ['value', 'debounce', 'validator', 'rules', {dense: true, outlined: true, focus: false, number: false}]
+  props: ['value', 'debounce', 'validator', 'rules', {dense: true, outlined: true, clearable: false, focus: false, number: false}]
 })
 export default class ATextField extends Mixins(ComponentWidthMixin) {
   $hasOptions = ['counter']
@@ -71,14 +71,15 @@ export default class ATextField extends Mixins(ComponentWidthMixin) {
 
     attrs.dense = this.dense
     attrs.outlined = this.outlined
+    attrs.clearable = this.clearable
     return attrs
   }
 
   clear () {
-    if (this.$attrs.clearable || this.escClearable) {
+    if (this.clearable) {
       this.setInternalValue('')
-      this.validate()
       this.$emit('input', this.emptyValue)
+      this.validate()
     }
   }
 
@@ -86,12 +87,19 @@ export default class ATextField extends Mixins(ComponentWidthMixin) {
     this.$emit('input:internal', this.internalValue)
 
     const valid = this.validate()
+
     if (!valid) {
       return
     }
 
     const value = this.stringToNumber(this.internalValue)
 
+    // NaN means: wrong numerical value AND no validator present
+    // otherwise validator would return validate() -> false
+    if (Number.isNaN(value)) {
+      return
+    }
+
     if (this.debounce) {
       if (!this.debounceInputFunction) {
         this.debounceInputFunction = debounce(value => {

package/src/components/form/EditModal.vue

@@ -44,7 +44,7 @@
             small
             angular
             :has="{reset: !!modelToEdit.id}"
-            @save="$emit('save', modelToEdit, ignoreChangesOnClose)"
+            @save="$emit('save', modelToEdit, ignoreChangesOnClose, close)"
             @reset="$refs.form.reset()"
           />
         </a-row>
@@ -68,6 +68,10 @@ export default class EditModal extends Vue {
   ignoreChangesOnClose_ = false
 
   created () {
+    if (!this.model && !this.createModelToEdit) {
+      console.warn('You need to pass either a model or a model factory to <edit-modal>.')
+    }
+
     if (this.show) { // open on create with v-show
       this.open()
     }

package/src-admin/components/App.vue

@@ -50,6 +50,9 @@
             <div>
               <div class="accountName">
                 {{ account.first_name }}
+                <template v-if="$auth.roles()[0]">
+                  ({{ $auth.roles()[0].title }})
+                </template>
               </div>
 
               <div class="body-2 d-flex align-center">

package/src-admin/plugins/AuthPlugin.js

@@ -10,6 +10,8 @@ class AuthPlugin {
 
       hasRole: name => authService.currentAccountHasRole(name),
 
+      roles: () => authService.getCurrentAccountRoles(),
+
       logout: () => authService.forwardToLogoutEndpoint()
     }