From c01b9e336c4864f761dd4fb0fae3bafad1b0cc47 Mon Sep 17 00:00:00 2001
From: mateuswetah <mateus.m.luna@gmail.com>
Date: Thu, 16 Nov 2023 19:07:50 -0300
Subject: [PATCH] Adds enumeration to item submission block. Wraps enumerations
 in classes. #827.

---
 .../admin/components/edition/item-edition-form.vue  |  3 ++-
 .../components/metadata-types/compound/Compound.vue |  5 +++--
 .../metadata-types/tainacan-form-item.vue           |  3 ++-
 .../components/metadata-types/taxonomy/Taxonomy.vue |  2 +-
 .../admin/js/store/modules/collection/actions.js    |  2 +-
 .../item-submission/item-submission-form.vue        | 13 ++++++++++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/admin/components/edition/item-edition-form.vue b/src/views/admin/components/edition/item-edition-form.vue
index 08705dfb1..e50d3ddd4 100644
--- a/src/views/admin/components/edition/item-edition-form.vue
+++ b/src/views/admin/components/edition/item-edition-form.vue
@@ -400,7 +400,8 @@
                                                     </span>
                                                     <span
                                                             v-if="metadataSections.length > 1 && collection.item_enable_metadata_enumeration === 'yes'"
-                                                            style="opacity: 0.65;">
+                                                            style="opacity: 0.65;"
+                                                            class="metadata-section-enumeration">
                                                         {{ Number(sectionIndex) + 1 }}.
                                                     </span>
                                                     {{ metadataSection.name }}&nbsp;
diff --git a/src/views/admin/components/metadata-types/compound/Compound.vue b/src/views/admin/components/metadata-types/compound/Compound.vue
index d217bb6ac..022b20545 100644
--- a/src/views/admin/components/metadata-types/compound/Compound.vue
+++ b/src/views/admin/components/metadata-types/compound/Compound.vue
@@ -32,7 +32,8 @@
                         <label class="label has-tooltip">
                             <span
                                     v-if="enumerateMetadatum"
-                                    style="opacity: 0.65;">
+                                    style="opacity: 0.65;"
+                                    class="metadatum-section-enumeration">
                                 {{ enumerateMetadatum }}.
                             </span>
                             {{ childItemMetadatum.metadatum.name }}
@@ -168,7 +169,7 @@
         },
         watch: {
             /*  This will create the input object structure for 
-             *   <tainacan-item-form :item-metadatum="childItemMetadatum" />
+             *   <tainacan-form-item :item-metadatum="childItemMetadatum" />
              *   looking at the values from the parent (this.itemMetadatum)   
              */  
             'itemMetadatum.value': {
diff --git a/src/views/admin/components/metadata-types/tainacan-form-item.vue b/src/views/admin/components/metadata-types/tainacan-form-item.vue
index ab4843664..2f688294b 100644
--- a/src/views/admin/components/metadata-types/tainacan-form-item.vue
+++ b/src/views/admin/components/metadata-types/tainacan-form-item.vue
@@ -22,7 +22,8 @@
             <label class="label">
                 <span
                         v-if="enumerateMetadatum"
-                        style="opacity: 0.65;">
+                        style="opacity: 0.65;"
+                        class="metadatum-section-enumeration">
                     {{ enumerateMetadatum }}.
                 </span>
                 {{ itemMetadatum.metadatum.name }}
diff --git a/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue b/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue
index 94a043bbe..0aa5dd174 100644
--- a/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue
+++ b/src/views/admin/components/metadata-types/taxonomy/Taxonomy.vue
@@ -167,7 +167,7 @@
             this.taxonomyId = metadata_type_options.taxonomy_id;
             this.taxonomy = metadata_type_options.taxonomy;
             
-            this.allowNewFromOptions = this.allowNew === false ? false : metadata_type_options.allow_new_terms == 'yes' && this.$userCaps.hasCapability('tnc_rep_edit_taxonomies');
+            this.allowNewFromOptions = this.allowNew === false ? false : metadata_type_options.allow_new_terms == 'yes' && (!this.$userCaps || this.$userCaps.hasCapability('tnc_rep_edit_taxonomies'));
 
             this.getTermsId();
         },
diff --git a/src/views/admin/js/store/modules/collection/actions.js b/src/views/admin/js/store/modules/collection/actions.js
index 1f09feb36..c3175d889 100644
--- a/src/views/admin/js/store/modules/collection/actions.js
+++ b/src/views/admin/js/store/modules/collection/actions.js
@@ -310,7 +310,7 @@ export const fetchCollectionForExposer = ({ commit }, collectionId) => {
 
 export const fetchCollectionForItemSubmission = ({ commit }, collectionId) => {
     return new Promise((resolve, reject) => { 
-        let endpoint = '/collections/' + collectionId + '?fetch_only=name,allows_submission,submission_use_recaptcha';
+        let endpoint = '/collections/' + collectionId + '?fetch_only=name,allows_submission,submission_use_recaptcha,item_enable_metadata_enumeration';
         axios.tainacan.get(endpoint)
         .then(res => {
             resolve( res.data );
diff --git a/src/views/gutenberg-blocks/blocks/item-submission-form/item-submission/item-submission-form.vue b/src/views/gutenberg-blocks/blocks/item-submission-form/item-submission/item-submission-form.vue
index 901675331..9b09b6420 100644
--- a/src/views/gutenberg-blocks/blocks/item-submission-form/item-submission/item-submission-form.vue
+++ b/src/views/gutenberg-blocks/blocks/item-submission-form/item-submission/item-submission-form.vue
@@ -461,7 +461,15 @@
                                             }"
                                             class="has-text-secondary tainacan-icon tainacan-icon-1-25em"/>
                                 </span>
-                                <label>{{ metadataSection.name }}</label>
+                                <label>
+                                    <span
+                                            v-if="metadataSections.length > 1 && collectionItemMetadataEnumeration === 'yes'"
+                                            style="opacity: 0.65;"
+                                            class="metadata-section-enumeration">
+                                        {{ Number(sectionIndex) + 1 }}.
+                                    </span>
+                                    {{ metadataSection.name }}
+                                </label>
                                 <help-button
                                         v-if="!hideHelpButtons &&
                                                 !helpInfoBellowLabel &&
@@ -505,6 +513,7 @@
                                                 :hide-help-buttons="hideHelpButtons"
                                                 :help-info-bellow-label="helpInfoBellowLabel"
                                                 :is-collapsed="metadataCollapses[index]"
+                                                :enumerate-metadatum="metadataSections.length > 1 && collectionItemMetadataEnumeration === 'yes' ? ( (Number(sectionIndex) + 1) + '.' + (Number(index) + 1) ) : false"
                                                 @changeCollapse="onChangeCollapse($event, index)"/>
 
                                         <!-- JS-side hook for extra content -->
@@ -782,6 +791,7 @@ export default {
     data(){
         return {
             collecionAllowsItemSubmission: true,
+            collectionItemMetadataEnumeration: 'no',
             isLoading: false,
             isLoadingMetadataSections: false,
             isSubmitting: false,
@@ -899,6 +909,7 @@ export default {
 
                 // Gets update info from the collecion in case it has been updated
                 this.collecionAllowsItemSubmission = collection.allows_submission == 'yes' ? true : false;
+                this.collectionItemMetadataEnumeration = collection.item_enable_metadata_enumeration;
                 this.useCaptcha = collection.submission_use_recaptcha;
 
                 // Initialize clear data from store