Removing contributor tab from peer review #1650

OpenEnergyPlatform · Jun 3, 2024 · 184f048 · 184f048
1 parent a08898e
commit 184f048
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 59 deletions.
diff --git a/dataedit/static/peer_review/opr_contributor.js b/dataedit/static/peer_review/opr_contributor.js
@@ -278,7 +278,6 @@ function getCategoryToTabIdMapping() {
     'temporal': 'spatiotemporal-tab',
     'source': 'source-tab',
     'license': 'license-tab',
-    'contributor': 'contributor-tab',
   };
   return mapping;
 }
@@ -678,7 +677,7 @@ function updateSubmitButtonColor() {
 
 
 function updateTabProgressIndicatorClasses() {
-  const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor'];
+  const tabNames = ['general', 'spatiotemporal', 'source', 'license'];
 
   for (let i = 0; i < tabNames.length; i++) {
     let tabName = tabNames[i];
@@ -699,7 +698,7 @@ function updateTabProgressIndicatorClasses() {
 
 
 function updateTabClasses() {
-  const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor'];
+  const tabNames = ['general', 'spatiotemporal', 'source', 'license'];
   for (let i = 0; i < tabNames.length; i++) {
     let tabName = tabNames[i];
     let tab = document.getElementById(tabName + '-tab');
@@ -740,7 +739,6 @@ document.addEventListener('DOMContentLoaded', function() {
     document.getElementById('spatiotemporal-tab'),
     document.getElementById('source-tab'),
     document.getElementById('license-tab'),
-    document.getElementById('contributor-tab'),
   ];
   const reviewContent = document.querySelector(".review__content");
 

diff --git a/dataedit/static/peer_review/opr_reviewer.js b/dataedit/static/peer_review/opr_reviewer.js
@@ -307,7 +307,6 @@ function getCategoryToTabIdMapping() {
     'temporal': 'spatiotemporal-tab',
     'source': 'source-tab',
     'license': 'license-tab',
-    'contributor': 'contributor-tab',
   };
   return mapping;
 }
@@ -837,11 +836,10 @@ const otherTabs = [
   document.getElementById('spatiotemporal-tab'),
   document.getElementById('source-tab'),
   document.getElementById('license-tab'),
-  document.getElementById('contributor-tab'),
 ];
 const reviewContent = document.querySelector(".review__content");
 function updateTabClasses() {
-  const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor'];
+  const tabNames = ['general', 'spatiotemporal', 'source', 'license'];
   for (let i = 0; i < tabNames.length; i++) {
     let tabName = tabNames[i];
     let tab = document.getElementById(tabName + '-tab');
@@ -896,7 +894,7 @@ function updatePercentageDisplay() {
 
 
 function updateTabProgressIndicatorClasses() {
-  const tabNames = ['general', 'spatiotemporal', 'source', 'license', 'contributor'];
+  const tabNames = ['general', 'spatiotemporal', 'source', 'license'];
 
   for (let i = 0; i < tabNames.length; i++) {
     let tabName = tabNames[i];

diff --git a/dataedit/templates/dataedit/opr_contributor.html b/dataedit/templates/dataedit/opr_contributor.html
@@ -81,9 +81,7 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
         <li class="nav-item" role="presentation">
           <button class="nav-link" id="license-tab" data-bs-toggle="tab" data-bs-target="#license" type="button" role="tab" aria-controls="license" aria-selected="false">License</button>
         </li>
-        <li class="nav-item" role="presentation">
-          <button class="nav-link" id="contributor-tab" data-bs-toggle="tab" data-bs-target="#contributor" type="button" role="tab" aria-controls="contributor" aria-selected="false">Contributor</button>
-        </li>
+
         <li class="nav-item" role="presentation">
           <button class="nav-link" id="summary-tab" data-bs-toggle="tab" data-bs-target="#summary" type="button" role="tab" aria-controls="summary" aria-selected="false">Summary</button>
         </li>
@@ -209,25 +207,6 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
               {% endfor %}
               </div>
             </div>
-            <div class="tab-pane fade" id="contributor" role="tabpanel" aria-labelledby="contributor-tab">
-              <div class="review__items">
-              {% for item in meta.contributor %}
-                <div id="field_{{item.field}}" class="field review__item" data-category="contributor" onclick="click_field('{{item.field}}', '{{ item.value }}', 'contributor');">
-                  <p class="review__item-content">
-                    {% if item.field is Null %}
-                      <span class="key">{{item.field}}</span>
-                      <span class="value">{{ item.value }}</span>
-                    {% else %}
-                      <span class="key">{{item.field}}</span>
-                      <span class="value">{{ item.newValue|default:item.value }}</span>
-                      <span id="reviewerSuggestion_{{item.field}}" class="suggestion suggestion--highlight">{{ item.reviewer_suggestion }}</span>
-                      <span class="comment suggestion--comment"> {{ item.suggestion_comment }}</span>
-                    {% endif %}
-                  </p>
-                </div>
-              {% endfor %}
-              </div>
-            </div>
 
             <div class="tab-pane fade" id="summary" role="tabpanel" aria-labelledby="summary-tab">
             </div>

diff --git a/dataedit/templates/dataedit/opr_review.html b/dataedit/templates/dataedit/opr_review.html
@@ -80,9 +80,6 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
         <li class="nav-item" role="presentation">
           <button class="nav-link" id="license-tab" data-bs-toggle="tab" data-bs-target="#license" type="button" role="tab" aria-controls="license" aria-selected="false">License</button>
         </li>
-        <li class="nav-item" role="presentation">
-          <button class="nav-link" id="contributor-tab" data-bs-toggle="tab" data-bs-target="#contributor" type="button" role="tab" aria-controls="contributor" aria-selected="false">Contributor</button>
-        </li>
         <li class="nav-item" role="presentation">
           <button class="nav-link" id="summary-tab" data-bs-toggle="tab" data-bs-target="#summary" type="button" role="tab" aria-controls="summary" aria-selected="false">Summary</button>
         </li>
@@ -206,25 +203,6 @@ <h5 class="modal-title" id="exampleModalLabel">The Open Peer Review process</h5>
               {% endfor %}
               </div>
             </div>
-            <div class="tab-pane fade" id="contributor" role="tabpanel" aria-labelledby="contributor-tab">
-              <div class="review__items">
-              {% for item in meta.contributor %}
-                <div id="field_{{item.field}}" class="field review__item" data-category="contributor" onclick="click_field('{{item.field}}', '{{ item.value }}', 'contributor');">
-                  <p class="review__item-content">
-                    {% if item.field is Null %}
-                      <span class="key">{{item.field}}</span>
-                      <span class="value">{{ item.value }}</span>
-                    {% else %}
-                      <span class="key">{{item.field}}</span>
-                      <span class="value">{{ item.newValue|default:item.value }}</span>
-                      <span id="reviewerSuggestion_{{item.field}}" class="suggestion suggestion--highlight">{{ item.reviewer_suggestion }}</span>
-                      <span class="comment suggestion--comment"> {{ item.suggestion_comment }}</span>
-                    {% endif %}
-                  </p>
-                </div>
-              {% endfor %}
-              </div>
-            </div>
             <div class="tab-pane fade" id="resource" role="tabpanel" aria-labelledby="resource-tab">
               <div class="review__items">
                 {% for item in meta.resource %}

diff --git a/dataedit/views.py b/dataedit/views.py
@@ -1968,7 +1968,6 @@ def sort_in_category(self, schema, table, oemetadata):
                 "temporal": [...],
                 "source": [...],
                 "license": [...],
-                "contributor": [...],
             }
 
         """
@@ -1979,7 +1978,6 @@ def sort_in_category(self, schema, table, oemetadata):
         temporal_key_list = []
         source_key_list = []
         license_key_list = []
-        contributor_key_list = []
 
         for i in val:
             fieldKey = list(i.values())[0]
@@ -1991,8 +1989,7 @@ def sort_in_category(self, schema, table, oemetadata):
                 source_key_list.append(i)
             elif fieldKey.split(".")[0] == "licenses":
                 license_key_list.append(i)
-            elif fieldKey.split(".")[0] == "contributors":
-                contributor_key_list.append(i)
+
             elif (
                 fieldKey.split(".")[0] == "name"
                 or fieldKey.split(".")[0] == "title"
@@ -2012,7 +2009,6 @@ def sort_in_category(self, schema, table, oemetadata):
             "temporal": temporal_key_list,
             "source": source_key_list,
             "license": license_key_list,
-            "contributor": contributor_key_list,
         }
 
         return meta
@@ -2107,7 +2103,6 @@ def get(self, request, schema, table, review_id=None):
                 "temporal",
                 "source",
                 "license",
-                "contributor",
             ]
             state_dict = process_review_data(
                 review_data=existing_review, metadata=metadata, categories=categories
@@ -2302,7 +2297,6 @@ def get(self, request, schema, table, review_id):
             "temporal",
             "source",
             "license",
-            "contributor",
         ]
         state_dict = process_review_data(
             review_data=review_data, metadata=metadata, categories=categories