@afeefa/vue-app 0.0.114 → 0.0.116

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

@@ -1 +1 @@
-0.0.114
+0.0.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@afeefa/vue-app",
-  "version": "0.0.114",
+  "version": "0.0.116",
   "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/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/SidebarMenu.vue

@@ -4,7 +4,7 @@
     flex-column
   >
     <v-list class="pa-0">
-      <template v-for="item in config.items">
+      <template v-for="item in items">
         <v-list-group
           v-if="item.group"
           :key="item.title"
@@ -36,7 +36,7 @@ import { Component, Vue } from '@a-vue'
 import SidebarMenuItem from './menu/SidebarMenuItem'
 
 @Component({
-  props: ['config'],
+  props: ['items'],
   components: {
     SidebarMenuItem
   }
@@ -50,11 +50,12 @@ export default class SidebarMenu extends Vue {
 :deep(.v-list-group) {
   > .v-list-item {
     padding: 0;
+
     > .v-list-item {
-        padding: 0;
-        padding-left: 19px;
-        flex: 0;
-        color: #999999 !important;
+      padding: 0;
+      padding-left: 19px;
+      flex: 0;
+      color: #999999 !important;
 
       .v-list-item__icon {
         margin-right: 18px !important;

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