From 298c8d74f7973cdf0175233c2fc6684e48f161d8 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Tue, 18 Jan 2022 15:53:49 +0100
Subject: [PATCH] fixes

---
 .../app/components/ui-check-list.vue          |  1 +
 .../app/editor/ui-editor-page.vue             | 38 ++++++++++++++++---
 .../modules/languages/ui-languagepicker.vue   |  4 +-
 zero.Backoffice.UI/app/utils/arrays.ts        | 24 +++++++++++-
 4 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/zero.Backoffice.UI/app/components/ui-check-list.vue b/zero.Backoffice.UI/app/components/ui-check-list.vue
index 7c32f623..aeb38411 100644
--- a/zero.Backoffice.UI/app/components/ui-check-list.vue
+++ b/zero.Backoffice.UI/app/components/ui-check-list.vue
@@ -101,6 +101,7 @@
         }
 
         this.$emit('input', value);
+        this.$emit('update:value', value);
       }
     }
   }
diff --git a/zero.Backoffice.UI/app/editor/ui-editor-page.vue b/zero.Backoffice.UI/app/editor/ui-editor-page.vue
index 0a6b2589..4a82cce3 100644
--- a/zero.Backoffice.UI/app/editor/ui-editor-page.vue
+++ b/zero.Backoffice.UI/app/editor/ui-editor-page.vue
@@ -1,5 +1,5 @@
 <template>
-  <ui-form ref="form" class="editor-page" v-slot="form" @submit="onSubmit" @load="onLoad" :route="route">
+  <ui-form ref="form" class="editor-page" v-slot="form" @submit="onInternalSubmit" @load="onInternalLoad" :route="route">
     <ui-form-header v-model:value="model" :prefix="prefix" :title="title" :disabled="readonly" :is-create="!id" :state="form.state" :can-delete="canDelete" @delete="onInternalDelete" />
     <ui-editor :config="editor" v-model="model" :meta="meta" :disabled="readonly" :scope="true">
       <template v-slot:below>
@@ -45,6 +45,14 @@
         type: Function,
         default: null
       },
+      onLoad: {
+        type: Function,
+        default: null
+      },
+      onSubmit: {
+        type: Function,
+        default: null
+      },
       disabled: {
         type: [Boolean, Function],
         default: false
@@ -71,22 +79,40 @@
 
     methods: {
 
-      async onLoad(form)
+      async onInternalLoad(form)
       {
         var config = { system: this.$route.query['zero.scope'] == 'system' };
-        const response = await form.load(() => this.id ? this.api.getById(this.id, undefined, config) : this.api.getEmpty(this.$route.query['zero.flavor'], config));
-        this.model = response;
+
+        if (typeof this.onLoad === 'function')
+        {
+          this.model = await this.onLoad({ id: this.id, api: this.api, form, config});
+        }
+        else
+        {
+          const response = await form.load(() => this.id ? this.api.getById(this.id, undefined, config) : this.api.getEmpty(this.$route.query['zero.flavor'], config));
+          this.model = response;
+        }
+        
       },
 
 
-      async onSubmit(form)
+      async onInternalSubmit(form)
       {
         form.setState('loading');
 
         let isCreate = !this.id;
         var config = { system: this.$route.query['zero.scope'] == 'system' };
+        let response = null;
+
+        if (typeof this.onSubmit === 'function')
+        {
+          response = await this.onSubmit({ id: this.id, isCreate, config, form, model: this.model });
+        }
+        else
+        {
+          response = !isCreate ? await this.api.update(this.model, config) : await this.api.create(this.model, config);
+        }
 
-        const response = !isCreate ? await this.api.update(this.model, config) : await this.api.create(this.model, config);
         await form.handle(response);
 
         if (response.success)
diff --git a/zero.Backoffice.UI/app/modules/languages/ui-languagepicker.vue b/zero.Backoffice.UI/app/modules/languages/ui-languagepicker.vue
index 0e28d7f1..0103c9ce 100644
--- a/zero.Backoffice.UI/app/modules/languages/ui-languagepicker.vue
+++ b/zero.Backoffice.UI/app/modules/languages/ui-languagepicker.vue
@@ -13,7 +13,7 @@
     name: 'uiLanguagepicker',
 
     props: {
-      modelValue: {
+      value: {
         type: [String, Array],
         default: null
       },
@@ -52,7 +52,7 @@
       onChange(value)
       {
         this.$emit('input', value);
-        this.$emit('update:modelValue', value);
+        this.$emit('update:value', value);
       }
     }
   }
diff --git a/zero.Backoffice.UI/app/utils/arrays.ts b/zero.Backoffice.UI/app/utils/arrays.ts
index 06d239ee..2165074c 100644
--- a/zero.Backoffice.UI/app/utils/arrays.ts
+++ b/zero.Backoffice.UI/app/utils/arrays.ts
@@ -1,5 +1,5 @@
 
-import { groupBy as _groupBy } from 'underscore';
+import { groupBy as _groupBy, difference as _difference } from 'underscore';
 
 const arrayMoveMutate = (array: any[], from: number, to: number) =>
 {
@@ -79,4 +79,24 @@ export function selectorToArray(selector: string): string[]
   selector = selector.replace(/\[(\w+)\]/g, '.$1');
   selector = selector.replace(/^\./, '');
   return selector.split('.');
-};
\ No newline at end of file
+};
+
+
+/**
+ * Removes duplicate items from an array
+ * @returns {any[]} Unique array
+ */
+export function arrayUnique(array: any[]): any[]
+{
+  return [...new Set(array)];
+}
+
+
+/**
+ * Returns the different items from two arrays
+ * @returns {any[]} Difference
+ */
+export function arrayDifference(array: any[], other: any[]): any[]
+{
+  return _difference(array, other);
+}
\ No newline at end of file