@afeefa/vue-app 0.0.256 → 0.0.257

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

@@ -1 +1 @@
-0.0.256
+0.0.257

package/package.json

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

package/src/components/ASearchSelect.vue

@@ -60,6 +60,7 @@
         v-if="isOpen"
         ref="list"
         :listAction="listAction"
+        :specialItems="specialItems"
         :q="q"
         :selectedItems="selectedItems"
         :isDisabled="isDisabled"
@@ -115,6 +116,7 @@ import { ComponentWidthMixin } from './mixins/ComponentWidthMixin'
     'listAction',
     'q',
     {
+      specialItems: [],
       diffXControls: '-1rem',
       diffYControls: '-1rem',
       getSearchInput: {

package/src/components/form/EditForm.vue

@@ -101,9 +101,12 @@ export default class EditForm extends Vue {
     if (this.forcedUnchange) {
       return false
     }
-    // console.log(this.lastJson)
-    // console.log(this.json)
-    // console.log(JSON.stringify(getDiff(this.lastJson, this.json)))
+
+    // if (this.lastJson) {
+    //   console.log(this.lastJson)
+    //   console.log(this.json)
+    //   console.log(JSON.stringify(getDiff(this.lastJson, this.json)))
+    // }
 
     return this.json !== this.lastJson
   }

package/src/components/list/ListViewMixin.js

@@ -51,7 +51,7 @@ export class ListViewMixin extends Vue {
       : undefined
 
     if (this.models) {
-      this.models_ = this.models
+      this.lwm_setModels(this.models)
       this.meta_ = this.meta
     }
 
@@ -93,7 +93,7 @@ export class ListViewMixin extends Vue {
 
   @Watch('models')
   modelsChanged () {
-    this.models_ = this.models
+    this.lwm_setModels(this.models)
     this.meta_ = this.meta
   }
 
@@ -130,7 +130,7 @@ export class ListViewMixin extends Vue {
 
   async load () {
     if (this.loadOnlyIfKeyword && !this.filters.q.value) {
-      this.models_ = []
+      this.lwm_setModels([])
       this.meta_ = {}
       this.$emit('update:count', 0)
       return
@@ -160,7 +160,7 @@ export class ListViewMixin extends Vue {
       return
     }
 
-    this.models_ = models
+    this.lwm_setModels(models)
     this.meta_ = meta
 
     if (this.meta_.used_filters) {
@@ -179,4 +179,8 @@ export class ListViewMixin extends Vue {
 
     this._listLoaded()
   }
+
+  lwm_setModels (models) {
+    this.models_ = models
+  }
 }

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

@@ -2,6 +2,7 @@
   <a-search-select
     ref="select"
     :listAction="listAction"
+    :specialItems="specialItems"
     :selectedItems="selectedItems"
     :getSearchInput="() => $refs.searchInput"
     diffXControls="-.5rem"
@@ -52,11 +53,11 @@
         class="pr-0"
       >
         <v-icon
-          :color="model.getIcon().color"
+          :color="getIcon(model).color"
           size="1.5rem"
           class="mr-2"
           v-on="on"
-          v-text="model.getIcon().icon"
+          v-text="getIcon(model).icon"
         />
       </div>
 
@@ -81,12 +82,14 @@
 import { Component, Mixins } from '@a-vue'
 import { ListFilterMixin } from '../ListFilterMixin'
 import { ListAction, GetAction } from '@a-vue/api-resources/ApiActions'
+import { Category } from '@/models'
 
 @Component({
   props: ['itemTitle', 'itemValue', {
     selectedKey: 'id',
     getTitle: {type: Function, default: m => m.getTitle()},
-    getSubtitle: {type: Function, default: m => m.getSubtitle()}
+    getSubtitle: {type: Function, default: m => m.getSubtitle()},
+    getIcon: {type: Function, default: m => m.getIcon()}
   }]
 })
 export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
@@ -128,6 +131,17 @@ export default class ListFilterSearchSelect extends Mixins(ListFilterMixin) {
     return this.createListAction()
   }
 
+  get specialItems () {
+    // make array-typed options to proper models in order to show them
+    // alongside the other list items
+    return this.filter.options.map(o => {
+      return Category.defaults({
+        id: o.value,
+        title: o.title
+      })
+    })
+  }
+
   createListAction () {
     const request = this.filter
       .createOptionsRequest()

package/src/components/search-select/SearchSelectList.vue

@@ -53,7 +53,7 @@ import { Component, Mixins } from '@a-vue'
 import { ListViewMixin } from '@a-vue/components/list/ListViewMixin'
 
 @Component({
-  props: ['q', 'selectedItems', 'isDisabled']
+  props: ['specialItems', 'q', 'selectedItems', 'isDisabled']
 })
 export default class SearchSelectList extends Mixins(ListViewMixin) {
   activeModelIndex = -1
@@ -182,6 +182,17 @@ export default class SearchSelectList extends Mixins(ListViewMixin) {
 
     return this.activeModelIndex
   }
+
+  lwm_setModels (models) {
+    // put in special items only on first page and only if not searched
+    const specialItems = this.filters.page.value === 1 && !this.filters.q.value ? this.specialItems : []
+
+    models = [
+      ...specialItems,
+      ...models
+    ]
+    this.models_ = models
+  }
 }
 </script>