Skip to content

Enhancement/confirm delete modal #10

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Enhancement/confirm delete modal #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aeab00b
Confirm Label Delete Modal
margaretmeehan Nov 5, 2019
74e1cf3
Copy styling from delete project modal
margaretmeehan Nov 5, 2019
a37b9e0
fix eslint
margaretmeehan Nov 5, 2019
8d1c9fe
Add Confirm Delete for Users
margaretmeehan Nov 5, 2019
93ba3b9
update terms used
margaretmeehan Nov 5, 2019
b78bf03
fix pug lint errors
margaretmeehan Nov 5, 2019
1167982
pug lint vue linter fixes
margaretmeehan Nov 5, 2019
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
30 changes: 29 additions & 1 deletion app/server/static/components/label.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,31 @@
span Edit

p.control
a.button.is-text(v-on:click="removeLabel(label)")
a.button.is-text(v-on:click="confirmDeleteModal(label)")
span.icon.is-small
i.fas.fa-trash
span Delete

div.modal(
v-if="isDeleteModalOpen"
v-bind:class="{ 'is-active': isDeleteModalOpen }"
v-bind:data="deleteModalData"
)
div.modal-background
div.modal-card
header.modal-card-head
p.modal-card-title Delete Label
button.delete(
v-on:click="isDeleteModalOpen = !isDeleteModalOpen"
aria-label="close"
)
section.modal-card-body
p Are you sure you want to delete the label <b>{{ deleteModalData.text }}</b>?
footer.modal-card-foot.pt20.pb20.pr20.pl20.has-background-white-ter
a.button.is-primary(v-on:click="removeLabel(deleteModalData)")
span Delete
button.button(v-on:click="isDeleteModalOpen = !isDeleteModalOpen") Cancel

div.columns(v-show="label === editedLabel")
div.column
div.field
Expand Down Expand Up @@ -205,6 +225,8 @@ export default {
editedLabel: null,
messages: [],
shortKeys: 'abcdefghijklmnopqrstuvwxyz',
isDeleteModalOpen: false,
deleteModalData: null,
}),

created() {
Expand Down Expand Up @@ -268,8 +290,14 @@ export default {
});
},

confirmDeleteModal(label) {
this.deleteModalData = label;
this.isDeleteModalOpen = !this.isDeleteModalOpen;
},

removeLabel(label) {
const labelId = label.id;
this.isDeleteModalOpen = !this.isDeleteModalOpen;
HTTP.delete(`labels/${labelId}`).then(() => {
const index = this.labels.indexOf(label);
this.labels.splice(index, 1);
Expand Down
30 changes: 29 additions & 1 deletion app/server/static/components/users.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,30 @@
)
| {{ otherRole.name }}
b-table-column(label="Action")
a.button.is-text(v-on:click="removeRoleMapping(props.row.id)")
a.button.is-text(v-on:click="confirmDeleteModal(props.row)")
span.icon.is-small
i.fas.fa-trash
span Delete

div.modal(
v-if="isDeleteModalOpen"
v-bind:class="{ 'is-active': isDeleteModalOpen }"
v-bind:data="deleteModalData"
)
div.modal-background
div.modal-card
header.modal-card-head
p.modal-card-title Delete User Role
button.delete(
v-on:click="isDeleteModalOpen = !isDeleteModalOpen"
aria-label="close"
)
section.modal-card-body
p Are you sure you want to delete the role for user <b>{{ deleteModalData.username }}</b>?
footer.modal-card-foot.pt20.pb20.pr20.pl20.has-background-white-ter
a.button.is-primary(v-on:click="removeRoleMapping(deleteModalData.id)")
span Delete
button.button(v-on:click="isDeleteModalOpen = !isDeleteModalOpen") Cancel
</template>

<style>
Expand Down Expand Up @@ -99,6 +119,8 @@ export default {
allUsers: [],
otherUsers: [],
roles: [],
isDeleteModalOpen: false,
deleteModalData: null,
}),

computed: {
Expand Down Expand Up @@ -158,7 +180,13 @@ export default {
this.newRoleMapping = null;
},

confirmDeleteModal(userData) {
this.deleteModalData = userData;
this.isDeleteModalOpen = !this.isDeleteModalOpen;
},

removeRoleMapping(roleMappingId) {
this.isDeleteModalOpen = !this.isDeleteModalOpen;
HTTP.delete(`roles/${roleMappingId}`).then(() => {
this.roleMappings = this.roleMappings.filter(
roleMapping => roleMapping.id !== roleMappingId,
Expand Down