From 3634129f2e5007e8c80afb3ab6a380d6e661fe9b Mon Sep 17 00:00:00 2001
From: DeluzeDEV <bartramaekers99@gmail.com>
Date: Tue, 21 Jul 2020 16:12:05 +0200
Subject: [PATCH] Update Resource.vue

---
 .../Authorisation/src/api/endpoints/user.js   |  15 ++-
 .../Crud/src/components/Resource.vue          | 105 ++++++------------
 .../templates/Crud/src/views/UserResource.vue |  13 ++-
 3 files changed, 57 insertions(+), 76 deletions(-)

diff --git a/generator/templates/Authorisation/src/api/endpoints/user.js b/generator/templates/Authorisation/src/api/endpoints/user.js
index 00ba992..97d3481 100644
--- a/generator/templates/Authorisation/src/api/endpoints/user.js
+++ b/generator/templates/Authorisation/src/api/endpoints/user.js
@@ -1,4 +1,15 @@
-import axios from '../implementation/app';
+import axios, {getPaginated} from '../implementation/app';
+
+function index(page, perPage, search, sortBy, descending, params) {
+    return getPaginated('user', page, perPage, search, sortBy, descending, params);
+}
+
+/**
+ * @param id {number}
+ */
+function show(id) {
+    return axios.get(`user/${id}`);
+}
 
 /**
  * @param user {User}
@@ -22,6 +33,8 @@ function destroy(userId) {
 }
 
 export {
+    index,
+    show,
     create,
     update,
     destroy,
diff --git a/generator/templates/Crud/src/components/Resource.vue b/generator/templates/Crud/src/components/Resource.vue
index d376f24..28a30ff 100644
--- a/generator/templates/Crud/src/components/Resource.vue
+++ b/generator/templates/Crud/src/components/Resource.vue
@@ -3,15 +3,15 @@
         <vuetify-resource
             :beforeCreateCallback="beforeOpenCreateHandler"
             :beforeUpdateCallback="beforeOpenUpdateHandler"
-            :createCallback="createEvent"
-            :deleteCallback="deleteEvent"
-            :getDataCallback="getDataFromApi"
-            :getItemCallback="getItemFromApi"
+            :deleteCallback="handleDeleteRequest"
+            :createCallback="handleCreateRequest"
+            :getDataCallback="handleIndexRequest"
+            :getItemCallback="handleShowRequest"
+            :updateCallback="handleUpdateRequest"
             @row-click="onRowClick"
             :meta="meta"
             :tableContent="tableContent"
             :texts="require('../VuetifyResourceTexts.js').default"
-            :updateCallback="updateEvent"
             ref="resourceList"
             v-model="selected"
             v-bind="$attrs"
@@ -38,7 +38,6 @@
 </template>
 
 <script>
-import axios from '../api/implementation/app';
 import VuetifyResource from '@kingscode/vuetify-resource';
 
 export default {
@@ -71,32 +70,21 @@ export default {
                 return {name: 'item', namePlural: 'items'};
             },
         },
-        resourceUri: {
-            type: String,
+        indexRequest: {
+            type: Function,
             required: true,
         },
-        showResourceUri: {
-            type: String,
-            required: false,
-        },
-        updateHandler: {
+        showRequest: {
             type: Function,
-            required: false,
         },
-        deleteHandler: {
+        createRequest: {
             type: Function,
-            required: false,
         },
-        createHandler: {
+        updateRequest: {
             type: Function,
-            required: false,
         },
-        mapDataResponse: {
+        deleteRequest: {
             type: Function,
-            required: false,
-            default: (data) => {
-                return data;
-            },
         },
         beforeOpenUpdate: {
             type: Function,
@@ -106,14 +94,6 @@ export default {
             type: Function,
             required: false,
         },
-        afterUpdate: {
-            type: Function,
-            required: false,
-        },
-        afterCreate: {
-            type: Function,
-            required: false,
-        },
     },
     methods: {
         onRowClick(item) {
@@ -123,7 +103,7 @@ export default {
          * @param pagination
          * @param search
          */
-        getDataFromApi(pagination, search) {
+        handleIndexRequest(pagination, search) {
             const {sortBy, sortDesc, page, itemsPerPage} = pagination;
             return new Promise((resolve, reject) => {
                 const sorting = {};
@@ -142,11 +122,9 @@ export default {
                     params.search = search;
                 }
 
-                axios.get(this.resourceUri, {
-                        params: params,
-                    })
+                this.indexRequest(page, itemsPerPage, search, sorting.sortBy, sorting.desc)
                     .then((response) => {
-                        const items = this.mapDataResponse(response.data.data);
+                        const items = response.data.data;
                         const total = response.data.meta.total;
                         resolve({
                             items,
@@ -156,9 +134,9 @@ export default {
 
             });
         },
-        getItemFromApi(id) {
+        handleShowRequest(id) {
             return new Promise((resolve) => {
-                axios.get((this.showResourceUri || this.resourceUri) + '/' + id)
+                this.showRequest(id)
                     .then((response) => {
                         let item;
 
@@ -176,33 +154,27 @@ export default {
 
             });
         },
-        createEvent() {
+        handleCreateRequest() {
             this.errors = {};
             this.$refs.createForm.validate();
 
             return new Promise((resolve, reject) => {
                 process.nextTick(() => {
                     if (this.createForm.valid) {
-                        this.createHandler(this.createForm.values)
-                            .then((response) => {
+                        this.createRequest(this.createForm.values)
+                            .then(() => {
                                 if (this.modelType) {
                                     this.createForm.values = new this.modelType();
                                 } else {
                                     this.createForm.values = {};
                                 }
 
-                                if (typeof this.afterCreate === 'function') {
-                                    this.afterCreate(response.data).then(() => {
-                                        resolve();
-                                    });
-                                } else {
-                                    resolve();
-                                }
-                            }).catch((error) => {
-                            this.errors = error.response.data.errors;
-                            reject();
-                        });
-
+                                resolve();
+                            })
+                            .catch((error) => {
+                                this.errors = error.response.data.errors;
+                                reject();
+                            });
                     } else {
                         reject();
                     }
@@ -210,7 +182,7 @@ export default {
 
             });
         },
-        updateEvent(selected) {
+        handleUpdateRequest(selected) {
             this.errors = {};
             this.$refs.updateForm.validate();
 
@@ -219,19 +191,12 @@ export default {
                     if (this.updateForm.valid) {
                         this.updateForm.values.id = selected[0].id;
 
-                        this.updateHandler(this.updateForm.values)
-                            .then((response) => {
-                                if (typeof this.afterUpdate === 'function') {
-                                    this.afterUpdate(response.data).then(() => {
-                                        resolve();
-                                    });
-                                } else {
-                                    resolve();
-                                }
-                            }).catch((error) => {
-                            this.errors = error.response.data.errors;
-                            reject();
-                        });
+                        this.updateRequest(this.updateForm.values)
+                            .then(() => resolve())
+                            .catch((error) => {
+                                this.errors = error.response.data.errors;
+                                reject();
+                            });
                     } else {
                         reject();
                     }
@@ -239,11 +204,11 @@ export default {
             });
 
         },
-        deleteEvent(ids) {
+        handleDeleteRequest(ids) {
             return new Promise((resolve, reject) => {
                 const promises = [];
                 ids.forEach((id) => {
-                    promises.push(this.deleteHandler(id));
+                    promises.push(this.deleteRequest(id));
                 });
 
                 Promise.all(promises).then(() => {
@@ -271,7 +236,7 @@ export default {
                 this.updateForm.values = new this.modelType();
                 this.updateForm.values.mapResponse(selected[0]);
             } else {
-                this.updateForm.values = {};
+                this.updateForm.values = selected[0];
             }
         },
     },
diff --git a/generator/templates/Crud/src/views/UserResource.vue b/generator/templates/Crud/src/views/UserResource.vue
index 1cada20..6cdc3a5 100644
--- a/generator/templates/Crud/src/views/UserResource.vue
+++ b/generator/templates/Crud/src/views/UserResource.vue
@@ -4,18 +4,19 @@
             :form-component="() => import('../components/forms/UserForm.vue')"
             :meta="{name: 'gebruiker', namePlural: 'gebruikers'}"
             :table-content="tableContent"
-            :update-handler="updateHandler"
-            :delete-handler="deleteHandler"
-            :create-handler="createHandler"
+            :index-request="indexHandler"
+            :show-request="showHandler"
+            :update-request="updateHandler"
+            :delete-request="deleteHandler"
+            :create-request="createHandler"
             :model-type="modelType"
-            resource-uri="user"
         />
     </v-container>
 </template>
 
 <script lang="js">
 import Resource from '@/components/Resource.vue';
-import {create, destroy, update} from '../api/endpoints/user.js';
+import {create, destroy, index, show, update} from '../api/endpoints/user.js';
 import User from '../application/models/user.js';
 
 export default {
@@ -24,6 +25,8 @@ export default {
         Resource,
     },
     computed: {
+        indexHandler: () => index,
+        showHandler: () => show,
         updateHandler: () => update,
         deleteHandler: () => destroy,
         createHandler: () => create,