Skip to content

Update Resource.vue #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 21, 2020
Merged

Update Resource.vue #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion generator/templates/Authorisation/src/api/endpoints/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand All @@ -22,6 +33,8 @@ function destroy(userId) {
}

export {
index,
show,
create,
update,
destroy,
Expand Down
105 changes: 35 additions & 70 deletions generator/templates/Crud/src/components/Resource.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -38,7 +38,6 @@
</template>

<script>
import axios from '../api/implementation/app';
import VuetifyResource from '@kingscode/vuetify-resource';

export default {
Expand Down Expand Up @@ -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,
Expand All @@ -106,14 +94,6 @@ export default {
type: Function,
required: false,
},
afterUpdate: {
type: Function,
required: false,
},
afterCreate: {
type: Function,
required: false,
},
},
methods: {
onRowClick(item) {
Expand All @@ -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 = {};
Expand All @@ -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,
Expand All @@ -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;

Expand All @@ -176,41 +154,35 @@ 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();
}
});

});
},
updateEvent(selected) {
handleUpdateRequest(selected) {
this.errors = {};
this.$refs.updateForm.validate();

Expand All @@ -219,31 +191,24 @@ 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();
}
});
});

},
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(() => {
Expand Down Expand Up @@ -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];
}
},
},
Expand Down
13 changes: 8 additions & 5 deletions generator/templates/Crud/src/views/UserResource.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -24,6 +25,8 @@ export default {
Resource,
},
computed: {
indexHandler: () => index,
showHandler: () => show,
updateHandler: () => update,
deleteHandler: () => destroy,
createHandler: () => create,
Expand Down