@afeefa/vue-app 0.0.115 → 0.0.117

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

@@ -1 +1 @@
-0.0.115
+0.0.117

package/package.json

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

package/src/api-resources/ListAction.js

@@ -1,4 +1,6 @@
 import { NextRouteFilterSource } from '@a-vue/components/list/NextRouteFilterSource'
+import { AlertEvent } from '@a-vue/events'
+import { eventBus } from '@a-vue/plugins/event-bus/EventBus'
 import { ListViewModel } from '@afeefa/api-resources-client'
 
 import { ApiAction } from './ApiAction'
@@ -24,4 +26,14 @@ export class ListAction extends ApiAction {
 
     return ListAction.fromRequest(request)
   }
+
+  processError (result) {
+    if (this._showError) {
+      eventBus.dispatch(new AlertEvent(AlertEvent.ERROR, {
+        headline: 'Die Daten konntent nicht geladen werden.',
+        message: result.message,
+        detail: result.detail
+      }))
+    }
+  }
 }

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/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/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/components/form/fields/FormFieldTime.vue

@@ -0,0 +1,51 @@
+<template>
+  <v-menu
+    ref="menu"
+    v-model="menu"
+    :close-on-content-click="false"
+    :nudge-right="40"
+    :return-value.sync="model[name]"
+    transition="scale-transition"
+    offset-y
+    max-width="290px"
+    min-width="290px"
+  >
+    <template #activator="{ on, attrs }">
+      <v-text-field
+        v-model="model[name]"
+        :label="label || name"
+        prepend-icon="mdi-clock-time-four-outline"
+        readonly
+        dense
+        outlined
+        v-bind="attrs"
+        v-on="on"
+      />
+    </template>
+    <v-time-picker
+      v-if="menu"
+      ref="timePicker"
+      v-model="model[name]"
+      :validator="validator"
+      v-bind="$attrs"
+      full-width
+      scrollable
+      format="24hr"
+      v-on="$listeners"
+      @click:minute="$refs.menu.save(model[name])"
+    />
+  </v-menu>
+</template>
+
+<script>
+import { Component, Mixins } from '@a-vue'
+import { FormFieldMixin } from '../FormFieldMixin'
+
+@Component
+export default class FormFieldTime extends Mixins(FormFieldMixin) {
+  menu = false
+  validate () {
+    this.$refs.timePicker.validate()
+  }
+}
+</script>

package/src/components/index.js

@@ -4,6 +4,7 @@ import EditForm from './form/EditForm'
 import EditModal from './form/EditModal'
 import FormFieldCheckbox from './form/fields/FormFieldCheckbox'
 import FormFieldDate from './form/fields/FormFieldDate'
+import FormFieldTime from './form/fields/FormFieldTime'
 import FormFieldRadioGroup from './form/fields/FormFieldRadioGroup'
 import FormFieldRichTextArea from './form/fields/FormFieldRichTextArea'
 import FormFieldSearchSelect from './form/fields/FormFieldSearchSelect'
@@ -25,6 +26,7 @@ Vue.component('FormFieldRichTextArea', FormFieldRichTextArea)
 Vue.component('FormFieldRadioGroup', FormFieldRadioGroup)
 Vue.component('FormFieldCheckbox', FormFieldCheckbox)
 Vue.component('FormFieldDate', FormFieldDate)
+Vue.component('FormFieldTime', FormFieldTime)
 Vue.component('FormFieldSearchSelect', FormFieldSearchSelect)
 Vue.component('FormFieldSelect', FormFieldSelect)
 Vue.component('FormFieldSelect2', FormFieldSelect2)

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>
 

package/src-admin/components/routes/DataRouteMixin.js

@@ -47,7 +47,6 @@ export class DataRouteMixin extends Vue {
     })
   }
 
-
   // watches (if defined) route idKey and reloads data if changed
   @Watch('drm_id')
   async drm_routeParamsChanged () {
@@ -68,14 +67,18 @@ export class DataRouteMixin extends Vue {
   }
 
   drm_onLoad (result) {
-    onLoadCallback(this, result)
+    const wrapped = this.$children.find(c => c.constructor.drm_getActions)
+    onLoadCallback(wrapped || this, result)
     lastResult = result
   }
 
   created () {
     // hmr reload creates vm but not triggers route enter
     if (!routerHookCalled) {
-      onLoadCallback(this, lastResult)
+      this.$nextTick(() => { // next tick bc c.constructor else not available
+        const wrapped = this.$children.find(c => c.constructor.drm_getActions)
+        onLoadCallback(wrapped || this, lastResult)
+      })
     }
   }
 }

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()
     }