@afeefa/vue-app 0.0.116 → 0.0.118

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

@@ -1 +1 @@
-0.0.116
+0.0.118

package/package.json

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

package/src/components/ARadioGroup.vue

@@ -3,6 +3,7 @@
     ref="radios"
     :rules="validationRules"
     :class="{hasLabel: $has.label}"
+    :valueComparator="compareValues"
     v-bind="$attrs"
     @change="$emit('input', $event)"
   >
@@ -22,6 +23,7 @@
 
 <script>
 import { Component, Vue, Watch } from '@a-vue'
+import { Model } from '@afeefa/api-resources-client'
 
 @Component({
   props: ['options', 'validator']
@@ -56,6 +58,13 @@ export default class ARadioGroup extends Vue {
     }
   }
 
+  compareValues (a, b) {
+    if (a instanceof Model && b instanceof Model) {
+      return a.equals(b)
+    }
+    return JSON.stringify(a) === JSON.stringify(b)
+  }
+
   get validationRules () {
     const label = this.$attrs.label
     return (this.validator && this.validator.getRules(label)) || []

package/src/components/ARow.vue

@@ -1,7 +1,7 @@
 <template>
   <div
+    :style="cwm_widthStyle + ' ' + displayStyle"
     :class="['a-row', directionClass, gapClass, classes]"
-    :style="cwm_widthStyle"
   >
     <slot />
   </div>
@@ -14,7 +14,7 @@ import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
 
 @Component({
   props: [
-    { vertical: false },
+    { vertical: false, inline: false },
     'gap'
   ]
 })
@@ -27,6 +27,10 @@ export default class ARow extends Mixins(ComponentWidthMixin) {
     return classes
   }
 
+  get displayStyle () {
+    return 'display: ' + (this.inline ? 'inline-flex' : 'flex') + ';'
+  }
+
   get gapClass () {
     if (this.gap) {
       return 'gap-' + this.gap
@@ -44,7 +48,6 @@ export default class ARow extends Mixins(ComponentWidthMixin) {
 
 <style scoped lang="scss">
 .a-row {
-  display: flex;
   align-items: center;
 
   &.vertical {

package/src/components/ASelect.vue

@@ -53,7 +53,7 @@ export default class ASelect extends Mixins(ComponentWidthMixin) {
     }
 
     if (a instanceof Model && b instanceof Model) {
-      return a.id === b.id && a.type === b.type
+      return a.equals(b)
     }
 
     return JSON.stringify(a) === JSON.stringify(b)

package/src/components/form/FormFieldMixin.js

@@ -62,10 +62,22 @@ export class FormFieldMixin extends Vue {
         .fromRequest(request)
         .load()
 
-      return models.map(model => ({
-        itemText: model.getTitle(),
-        itemValue: model
-      }))
+      const options = []
+
+      if (!this.validator || !this.validator.getParams().filled) {
+        options.push({
+          itemText: 'Keine Auswahl',
+          itemValue: null
+        })
+      }
+
+      return [
+        ...options,
+        ...models.map(model => ({
+          itemText: model.getTitle(),
+          itemValue: model
+        }))
+      ]
     }
 
     if (field.hasOptions()) {

package/src/components/form/fields/FormFieldRadioGroup.vue

@@ -18,9 +18,7 @@ export default class FormFieldRadioGroup extends Mixins(FormFieldMixin) {
   options = null
 
   created () {
-    if (this.fieldHasOptionsRequest()) {
-      this.options = this.getSelectOptions()
-    } else if (this.fieldHasOptions()) {
+    if (this.fieldHasOptionsRequest() || this.fieldHasOptions()) {
       this.options = this.getSelectOptions()
     }
   }

package/src-admin/components/App.vue

@@ -50,8 +50,8 @@
             <div>
               <div class="accountName">
                 {{ account.first_name }}
-                <template v-if="$auth.roles()[0]">
-                  ({{ $auth.roles()[0].title }})
+                <template v-if="$auth.roles[0]">
+                  ({{ $auth.roles[0].title }})
                 </template>
               </div>
 
@@ -63,7 +63,7 @@
               </div>
             </div>
 
-            <a-context-menu>
+            <a-context-menu v-if="$has.settings">
               <a-context-menu-item
                 :to="{name: 'settings', params: {accountId: account.id}}"
               >
@@ -144,6 +144,8 @@ import '../styles.scss'
   }
 })
 export default class App extends Vue {
+  $hasOptions = ['settings']
+
   drawer = true
   isLoading = false
 

package/src-admin/plugins/AuthPlugin.js

@@ -10,7 +10,9 @@ class AuthPlugin {
 
       hasRole: name => authService.currentAccountHasRole(name),
 
-      roles: () => authService.getCurrentAccountRoles(),
+      get roles () {
+        return authService.getCurrentAccountRoles()
+      },
 
       logout: () => authService.forwardToLogoutEndpoint()
     }