From aee825e003d770af8a40afac3f05cb12b60dc12c Mon Sep 17 00:00:00 2001
From: Mateus Machado Luna <mateus.m.luna@gmail.com>
Date: Thu, 13 Dec 2018 13:05:30 -0200
Subject: [PATCH] Adds confirmation dialog to attachment deletion on item
 edition page. Makes all modal borders square instead of rounded. Adds key
 attributes part of the v-fors on activity details.

---
 .../components/edition/item-edition-form.vue  | 53 ++++++++++++-------
 .../other/activity/activity-details-modal.vue | 15 ++++--
 .../components/other/checkbox-radio-modal.vue |  1 -
 src/admin/scss/_modals.scss                   |  3 +-
 src/admin/tainacan-admin-i18n.php             |  1 +
 5 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/src/admin/components/edition/item-edition-form.vue b/src/admin/components/edition/item-edition-form.vue
index cabdd2bf0..aaf4ba043 100644
--- a/src/admin/components/edition/item-edition-form.vue
+++ b/src/admin/components/edition/item-edition-form.vue
@@ -905,24 +905,24 @@ export default {
             this.form.document_type = 'url';
             this.form.document = this.urlLink;
             this.updateItemDocument({ item_id: this.itemId, document: this.form.document, document_type: this.form.document_type })
-            .then(item => {
-                this.item.document_as_html = item.document_as_html;
-                this.isLoading = false;
+                .then(item => {
+                    this.item.document_as_html = item.document_as_html;
+                    this.isLoading = false;
 
-                let oldThumbnail = this.item.thumbnail;
-                if (item.document_type == 'url' && oldThumbnail != item.thumbnail )
-                    this.item.thumbnail = item.thumbnail;
-            })
-            .catch((errors) => {
-                for (let error of errors.errors) {
-                    for (let metadatum of Object.keys(error)){
-                       eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                    let oldThumbnail = this.item.thumbnail;
+                    if (item.document_type == 'url' && oldThumbnail != item.thumbnail )
+                        this.item.thumbnail = item.thumbnail;
+                })
+                .catch((errors) => {
+                    for (let error of errors.errors) {
+                        for (let metadatum of Object.keys(error)){
+                        eventBus.errors.push({ metadatum_id: metadatum, errors: error[metadatum]});
+                        }
                     }
-                }
-                this.formErrorMessage = errors.error_message;
+                    this.formErrorMessage = errors.error_message;
 
-                this.isLoading = false;
-            });
+                    this.isLoading = false;
+                });
         },
         cancelURLSelection() {
             this.isURLModalActive = false;
@@ -945,11 +945,24 @@ export default {
                 });
         },
         deleteAttachment(attachment) {
-            this.removeAttachmentFromItem(attachment.id)
-                .then(() => { })
-                .catch((error) => {
-                    this.$console.error(error);
-                });
+
+            this.$modal.open({
+                parent: this,
+                component: CustomDialog,
+                props: {
+                    icon: 'alert',
+                    title: this.$i18n.get('label_warning'),
+                    message: this.$i18n.get('info_warning_attachment_delete'),
+                    onConfirm: () => {
+                        this.removeAttachmentFromItem(attachment.id)
+                            .then(() => { })
+                            .catch((error) => {
+                                this.$console.error(error);
+                            });
+                    }
+                } 
+            });
+
         },
         initializeMediaFrames() {
 
diff --git a/src/admin/components/other/activity/activity-details-modal.vue b/src/admin/components/other/activity/activity-details-modal.vue
index b23850225..968478518 100644
--- a/src/admin/components/other/activity/activity-details-modal.vue
+++ b/src/admin/components/other/activity/activity-details-modal.vue
@@ -11,8 +11,10 @@
                 <p><strong>{{ $i18n.get('label_activity_author') }}:</strong> {{ activity.user_name }}</p>
             </div>
             <div>
-                <template v-for="(diff, attributeName) in activity.log_diffs">
-                    <div class="columns">
+                <template v-for="(diff, attributeName, index) in activity.log_diffs">
+                    <div 
+                            :key="index"
+                            class="columns">
 
                         <!-- OLD -->
                         <div class="column is-6">
@@ -45,8 +47,9 @@
                                 <div
                                         class="tainacan-attachments-in-modal"
                                         v-if="diff.old.length">
-                                    <template v-for="attachment in diff.old">
+                                    <template v-for="(attachment, anotherIndex ) in diff.old">
                                         <div
+                                                :key="anotherIndex"
                                                 class="box"
                                                 v-if="attachment.mime_type.includes('image')">
                                             <p class="tainacan-p-overflow">{{ `${$i18n.get('label_title')}: ${attachment.title}` }}</p>
@@ -59,6 +62,7 @@
                                             </figure>
                                         </div>
                                         <div
+                                                :key="anotherIndex"
                                                 class="box"
                                                 v-else-if="['pdf', 'audio', 'video'].includes(attachment.mime_type.split('/')[1])">
                                             <p class="tainacan-p-overflow">{{ `${$i18n.get('label_title')}: ${attachment.title}` }}</p>
@@ -165,8 +169,9 @@
                                 <div
                                         class="tainacan-attachments-in-modal"
                                         v-if="diff.new.length">
-                                    <template v-for="attachment in diff.new">
+                                    <template v-for="(attachment, index) in diff.new">
                                         <div
+                                                :key="index"
                                                 class="box"
                                                 v-if="attachment.mime_type.includes('image')">
                                             <p class="tainacan-p-overflow">{{ `${$i18n.get('label_title')}: ${attachment.title}` }}</p>
@@ -179,6 +184,7 @@
                                             </figure>
                                         </div>
                                         <div
+                                                :key="index"
                                                 class="box"
                                                 v-else-if="['pdf', 'audio', 'video'].includes(attachment.mime_type.split('/')[1])">
                                             <p class="tainacan-p-overflow">{{ `${$i18n.get('label_title')}: ${attachment.title}` }}</p>
@@ -373,7 +379,6 @@
     .tainacan-modal-content {
         width: auto;
         min-height: 600px;
-        border-radius: 10px;
     }
 
     .modal-card-body {
diff --git a/src/admin/components/other/checkbox-radio-modal.vue b/src/admin/components/other/checkbox-radio-modal.vue
index ad98d181a..3481703f7 100644
--- a/src/admin/components/other/checkbox-radio-modal.vue
+++ b/src/admin/components/other/checkbox-radio-modal.vue
@@ -698,7 +698,6 @@
     .tainacan-modal-content {
         width: auto;
         min-height: 600px;
-        border-radius: 10px;
     }
 
     .tainacan-modal-title {
diff --git a/src/admin/scss/_modals.scss b/src/admin/scss/_modals.scss
index 29ad0e86b..6b128bee2 100644
--- a/src/admin/scss/_modals.scss
+++ b/src/admin/scss/_modals.scss
@@ -6,7 +6,7 @@
 .tainacan-modal-title {
     display: flex;
     flex-wrap: wrap;
-    margin-bottom: 40px;
+    margin-bottom: 30px;
     justify-content: space-between;
     align-items: flex-end;
 
@@ -32,6 +32,7 @@
     }
 }
 .tainacan-modal-content {
+    border-radius: 0px;
     background-color: white;
     padding: 40px 50px;
     position: relative;
diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php
index 660cfa930..b17dfcf2d 100644
--- a/src/admin/tainacan-admin-i18n.php
+++ b/src/admin/tainacan-admin-i18n.php
@@ -417,6 +417,7 @@ return apply_filters( 'tainacan-admin-i18n', [
 	'info_collection_deleted'                        => __( 'Collection deleted.', 'tainacan' ),
 	'info_item_deleted'                              => __( 'Item deleted.', 'tainacan' ),
 	'info_taxonomy_deleted'                          => __( 'Taxonomy deleted', 'tainacan' ),
+	'info_warning_attachment_delete'                 => __( 'Do you really want to delete this attachment?', 'tainacan' ),
 	'info_warning_collection_delete'                 => __( 'Do you really want to permanently delete this collection?', 'tainacan' ),
 	'info_warning_collection_trash'                  => __( 'Do you really want to trash this collection?', 'tainacan' ),
 	'info_warning_item_delete'                       => __( 'Do you really want to permanently delete this item?', 'tainacan' ),