@afeefa/vue-app 0.0.84 → 0.0.86

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

@@ -1 +1 @@
-0.0.84
+0.0.86

package/package.json

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

package/src/api-resources/ApiAction.js

@@ -85,3 +85,7 @@ export class ApiAction extends ApiResourcesApiAction {
 
 export class BulkAction extends ApiAction {
 }
+
+export class SequentialBulkAction extends ApiAction {
+  _bulkIsSequential = true
+}

package/src/api-resources/ApiActions.js

@@ -1,310 +1,14 @@
-import { AlertEvent, DialogEvent, LoadingEvent, SaveEvent } from '@a-vue/events'
-import { eventBus } from '@a-vue/plugins/event-bus/EventBus'
-import { sleep } from '@a-vue/utils/timeout'
-
-export class GetAction {
-  action = null
-  id = null
-  fields = null
-  events = true
-
-  setAction (action) {
-    this.action = action
-    return this
-  }
-
-  setId (id) {
-    this.id = id
-    return this
-  }
-
-  setFields (fields) {
-    this.fields = fields
-    return this
-  }
-
-  noEvents (noEvents) {
-    this.events = noEvents === undefined ? false : !noEvents
-    return this
-  }
-
-  async load () {
-    if (this.events) {
-      eventBus.dispatch(new LoadingEvent(LoadingEvent.START_LOADING))
-    }
-
-    const result = await this.action.createRequest()
-      .params({
-        id: this.id
-      })
-      .fields(this.fields)
-      .send()
-
-    if (this.events) {
-      eventBus.dispatch(new LoadingEvent(LoadingEvent.STOP_LOADING))
-    }
-
-    if (result.error) {
-      eventBus.dispatch(new AlertEvent(AlertEvent.ERROR, {
-        headline: 'Die Daten konntent nicht geladen werden.',
-        message: result.message,
-        detail: result.detail
-      }))
-    }
-
-    return result.data || false
-  }
-}
-
-export class SaveAction {
-  action = null
-  id = null
-  fields = null
-  data = null
-  afterSaveHook = null
-  returnAfterSaveHookResult = false
-  dialog = null
-
-  setAction (action) {
-    this.action = action
-    return this
-  }
-
-  setId (id) {
-    this.id = id
-    return this
-  }
-
-  setFields (fields) {
-    this.fields = fields
-    return this
-  }
-
-  setData (data) {
-    this.data = data
-    return this
-  }
-
-  setAfterSaveHook (afterSaveHook, returnAfterSaveHookResult = false) {
-    this.afterSaveHook = afterSaveHook
-    this.returnAfterSaveHookResult = returnAfterSaveHookResult
-    return this
-  }
-
-  setDialog (dialog) {
-    this.dialog = dialog
-    return this
-  }
-
-  async save () {
-    if (this.dialog) {
-      const result = await eventBus.dispatch(new DialogEvent(DialogEvent.SHOW, this.dialog))
-
-      if (result !== DialogEvent.RESULT_YES) {
-        return null
-      }
-    }
-
-    eventBus.dispatch(new SaveEvent(SaveEvent.START_SAVING))
-
-    const startTime = Date.now()
-
-    const result = await this.action.createRequest()
-      .params({
-        id: this.id || undefined
-      })
-      .fields(this.fields)
-      .data(this.data)
-      .send()
-
-    const model = result.data
-
-    let afterSaveHookResult = null
-
-    if (!result.error) {
-      if (this.afterSaveHook) {
-        afterSaveHookResult = await this.afterSaveHook(model)
-      }
-    }
-
-    const diffTime = Date.now() - startTime
-    const restTime = Math.max(0, 400 - diffTime)
-    if (restTime) {
-      await sleep(restTime / 1000)
-    }
-
-    eventBus.dispatch(new SaveEvent(SaveEvent.STOP_SAVING))
-
-    if (result.error) {
-      eventBus.dispatch(new SaveEvent(SaveEvent.STOP_SAVING))
-
-      eventBus.dispatch(new AlertEvent(AlertEvent.ERROR, {
-        headline: 'Die Daten wurden nicht gespeichert',
-        message: result.message,
-        detail: result.detail
-      }))
-      return null
-    }
-
-    eventBus.dispatch(new AlertEvent(AlertEvent.MESSAGE, {
-      message: 'Die Daten wurden gespeichert.'
-    }))
-
-    if (this.returnAfterSaveHookResult) {
-      return afterSaveHookResult
-    }
-
-    return model
-  }
-}
-
-export class RemoveAction {
-  action = null
-  id = null
-  fields = null
-  afterRemoveHook = null
-  dialog = null
-
-  setAction (action) {
-    this.action = action
-    return this
-  }
-
-  setId (id) {
-    this.id = id
-    return this
-  }
-
-  setAfterRemoveHook (afterRemoveHook) {
-    this.afterRemoveHook = afterRemoveHook
-    return this
-  }
-
-  setDialog (dialog) {
-    this.dialog = dialog
-    return this
-  }
-
-  async delete () {
-    const result = await eventBus.dispatch(new DialogEvent(DialogEvent.SHOW, this.dialog))
-
-    if (result === DialogEvent.RESULT_YES) {
-      eventBus.dispatch(new SaveEvent(SaveEvent.START_SAVING))
-
-      const startTime = Date.now()
-
-      const result = await this.action.createRequest()
-        .params({
-          id: this.id
-        })
-        .data(null)
-        .send()
-
-      if (this.afterRemoveHook) {
-        await this.afterRemoveHook()
-      }
-
-      const diffTime = Date.now() - startTime
-      const restTime = Math.max(0, 400 - diffTime)
-      if (restTime) {
-        await sleep(restTime / 1000)
-      }
-
-      eventBus.dispatch(new SaveEvent(SaveEvent.STOP_SAVING))
-
-      if (result) {
-        eventBus.dispatch(new AlertEvent(AlertEvent.MESSAGE, {
-          message: 'Die Daten wurden gelöscht.'
-        }))
-        return true
-      } else {
-        eventBus.dispatch(new AlertEvent(AlertEvent.ERROR, {
-          message: 'Die Daten wurden nicht gelöscht.'
-        }))
-      }
-    }
-    return false
-  }
-}
-
-export class ListAction {
-  action = null
-  request = null
-  params = {}
-  fields = {}
-  filters = {}
-  events = true
-
-  setAction (action) {
-    this.action = action
-    return this
-  }
-
-  setRequest (request) {
-    this.request = request
-    return this
-  }
-
-  setParams (params) {
-    this.params = params
-    return this
-  }
-
-  setFields (fields) {
-    this.fields = fields
-    return this
-  }
-
-  setFilters (filters) {
-    this.filters = filters
-    return this
-  }
-
-  noEvents (noEvents) {
-    this.events = noEvents === undefined ? false : !noEvents
-    return this
-  }
-
-  async load () {
-    if (this.events) {
-      eventBus.dispatch(new LoadingEvent(LoadingEvent.START_LOADING))
-    }
-
-    if (!this.request) {
-      this.request = this.action.createRequest()
-        .params(this.params)
-        .fields(this.fields)
-        .filters(this.filters)
-    }
-
-    const result = await this.request.send()
-
-    if (result.error) {
-      if (this.events) {
-        eventBus.dispatch(new LoadingEvent(LoadingEvent.STOP_LOADING))
-      }
-
-      eventBus.dispatch(new AlertEvent(AlertEvent.ERROR, {
-        headline: 'Die Daten konntent nicht geladen werden.',
-        message: result.message,
-        detail: result.detail
-      }))
-
-      return false
-    }
-
-    const models = result.data
-    const meta = result.meta
-
-    // await sleep(2)
-
-    if (this.events) {
-      eventBus.dispatch(new LoadingEvent(LoadingEvent.STOP_LOADING))
-    }
-
-    return {
-      models,
-      meta
-    }
-  }
+import { BulkAction, SequentialBulkAction } from './ApiAction'
+import { DeleteAction } from './DeleteAction'
+import { GetAction } from './GetAction'
+import { ListAction } from './ListAction'
+import { SaveAction } from './SaveAction'
+
+export {
+  BulkAction,
+  SequentialBulkAction,
+  ListAction,
+  GetAction,
+  SaveAction,
+  DeleteAction
 }

package/src/api-resources/DeleteAction.js

@@ -4,9 +4,13 @@ export class DeleteAction extends ApiAction {
   _minDuration = 400
 
   delete () {
+    return this.execute()
+  }
+
+  execute () {
     this.data(null)
 
-    return this.execute()
+    return super.execute()
   }
 
   async afterRequest () {

package/src/components/form/FormFieldMixin.js

@@ -2,7 +2,7 @@ import { Component, Vue } from '@a-vue'
 import { ListAction } from '@a-vue/api-resources/ApiActions'
 
 @Component({
-  props: ['name', 'label', 'additionalRules']
+  props: ['name', 'label', 'additionalRules', 'optionRequestParams']
 })
 export class FormFieldMixin extends Vue {
   get model () {
@@ -55,11 +55,11 @@ export class FormFieldMixin extends Vue {
     if (field.hasOptionsRequest()) {
       const request = field
         .getOptionsRequest()
+        .addParams(this.optionRequestParams || {})
         .addFilters(filters)
 
-      const {models} = await new ListAction()
-        .setRequest(request)
-        .noEvents()
+      const {models} = await ListAction
+        .fromRequest(request)
         .load()
 
       return models.map(model => ({

package/src/components/list/ListViewMixin.js

@@ -143,9 +143,9 @@ export class ListViewMixin extends Vue {
 
     const request = this.listViewModel.getApiRequest()
 
-    const {models, meta} = await new ListAction()
-      .setRequest(request)
-      .noEvents(!this.events)
+    const {models, meta} = await ListAction
+      .fromRequest(request)
+      .dispatchGlobalLoadingEvents(this.events)
       .load()
 
     if (!models) { // error happened

package/src/components/list/filters/ListFilterSelect.vue

@@ -55,9 +55,8 @@ export default class ListFilterSelect extends Mixins(ListFilterMixin) {
   }
 
   async loadRequestOptions () {
-    const {models} = await new ListAction()
-      .setRequest(this.filter.createOptionsRequest())
-      .noEvents()
+    const {models} = await ListAction
+      .fromRequest(this.filter.createOptionsRequest())
       .load()
 
     return [

package/src-admin/components/list/ListView.vue

@@ -129,6 +129,7 @@ export default class ListView extends Mixins(ListViewMixin) {
     } // else { a: true, b: true, c: true }
 
     classes = {
+      clickable: this.hasClickListener,
       selectable: this.hasFlyingContext,
       ...classes
     }
@@ -144,6 +145,10 @@ export default class ListView extends Mixins(ListViewMixin) {
     return !!this.$listeners.flyingContext
   }
 
+  get hasClickListener () {
+    return !!this.getRowListeners().click
+  }
+
   emitFlyingContext (model) {
     if (window.getSelection().toString()) { // do not open if text selected
       // console.log(window.getSelection().toString())
@@ -171,4 +176,8 @@ export default class ListView extends Mixins(ListViewMixin) {
 .a-table-row > :last-child {
   width: 100%;
 }
+
+.a-table-row.clickable {
+  cursor: pointer;
+}
 </style>

package/src/api-resources/ApiActions2.js

@@ -1,13 +0,0 @@
-import { BulkAction } from './ApiAction'
-import { DeleteAction } from './DeleteAction'
-import { GetAction } from './GetAction'
-import { ListAction } from './ListAction'
-import { SaveAction } from './SaveAction'
-
-export {
-  BulkAction,
-  ListAction,
-  GetAction,
-  SaveAction,
-  DeleteAction
-}