Merge branch 'main' into feature-hide-field-of-science

Author: csbarnet

coldfront/config/core.py

@@ -68,6 +68,8 @@
     "GRANT_ENABLE",
     "PUBLICATION_ENABLE",
     "FIELD_OF_SCIENCE_HIDE",
+    "INVOICE_ENABLED",
+    "PROJECT_ENABLE_PROJECT_REVIEW",
 ]
 
 ADMIN_COMMENTS_SHOW_EMPTY = ENV.bool("ADMIN_COMMENTS_SHOW_EMPTY", default=True)

coldfront/core/allocation/forms.py

@@ -226,6 +226,24 @@ def clean(self):
         allocation_attribute.clean()
 
 
+class AllocationAttributeEditForm(forms.Form):
+    attribute_pk = forms.IntegerField(required=False, disabled=True)
+    name = forms.CharField(max_length=150, required=False, disabled=True)
+    orig_value = forms.CharField(max_length=150, required=False, disabled=True)
+    value = forms.CharField(max_length=150, required=False, disabled=False)
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["attribute_pk"].widget = forms.HiddenInput()
+
+    def clean(self):
+        cleaned_data = super().clean()
+        allocation_attribute = AllocationAttribute.objects.get(pk=cleaned_data.get("attribute_pk"))
+
+        allocation_attribute.value = cleaned_data.get("value")
+        allocation_attribute.clean()
+
+
 class AllocationChangeForm(forms.Form):
     EXTENSION_CHOICES = [(0, "No Extension")]
     for choice in ALLOCATION_CHANGE_REQUEST_EXTENSION_DAYS:

coldfront/core/allocation/models.py

@@ -10,8 +10,9 @@
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.utils.html import mark_safe
+from django.utils.html import escape, format_html
 from django.utils.module_loading import import_string
+from django.utils.safestring import SafeString
 from model_utils.models import TimeStampedModel
 from simple_history.models import HistoricalRecords
 
@@ -147,16 +148,17 @@ def expires_in(self):
         return (self.end_date - datetime.date.today()).days
 
     @property
-    def get_information(self):
+    def get_information(self) -> SafeString:
         """
         Returns:
-            str: the allocation's attribute type, usage out of total value, and usage out of total value as a percentage
+            SafeString: the allocation's attribute type, usage out of total value, and usage out of total value as a percentage
         """
 
-        html_string = ""
+        html_string = escape("")
         for attribute in self.allocationattribute_set.all():
             if attribute.allocation_attribute_type.name in ALLOCATION_ATTRIBUTE_VIEW_LIST:
-                html_string += "%s: %s <br>" % (attribute.allocation_attribute_type.name, attribute.value)
+                html_substring = format_html("{}: {} <br>", attribute.allocation_attribute_type.name, attribute.value)
+                html_string += html_substring
 
             if hasattr(attribute, "allocationattributeusage"):
                 try:
@@ -175,15 +177,16 @@ def get_information(self):
                         "Allocation attribute '%s' == 0 but has a usage", attribute.allocation_attribute_type.name
                     )
 
-                string = "{}: {}/{} ({} %) <br>".format(
+                html_substring = format_html(
+                    "{}: {}/{} ({} %) <br>",
                     attribute.allocation_attribute_type.name,
                     attribute.allocationattributeusage.value,
                     attribute.value,
                     percent,
                 )
-                html_string += string
+                html_string += html_substring
 
-        return mark_safe(html_string)
+        return html_string
 
     @property
     def get_resources_as_string(self):

coldfront/core/allocation/signals.py

@@ -21,3 +21,6 @@
 
 allocation_change_created = django.dispatch.Signal()
 # providing_args=["allocation_pk", "allocation_change_pk"]
+
+allocation_attribute_changed = django.dispatch.Signal()
+# providing_args=["attribute_pk", "allocation_pk"]

coldfront/core/allocation/templates/allocation/allocation_allocationattribute_delete.html

@@ -54,7 +54,7 @@ <h2>Delete allocation attributes from allocation for project: {{allocation.proje
   <a class="btn btn-secondary mb-3" href="{% url 'allocation-detail' allocation.pk %}" role="button"><i
       class="fas fa-long-arrow-left" aria-hidden="true"></i> Back to Allocation</a>
   <div class="alert alert-info">
-    No users to remove!
+    No attributes to remove!
   </div>
 {% endif %}
 

coldfront/core/allocation/templates/allocation/allocation_attribute_edit.html

@@ -0,0 +1,81 @@
+{% extends "common/base.html" %} {% load crispy_forms_tags %} {% load static %}
+{% block title %} Allocation Change Detail {% endblock %} {% block content %}
+
+<h2>
+  Edit attributes for {{ allocation.get_parent_resource }} for project: {{ allocation.project.title }}
+</h2>
+<hr />
+<form method="post">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h3 class="d-inline">
+        <i class="fas fa-info-circle" aria-hidden="true"></i> Allocation
+        Attributes
+      </h3>
+    </div>
+    <div class="card-body">
+      {% if attributes %} {% csrf_token %}
+      <div class="table-responsive">
+        <table class="table table-bordered table-sm">
+          <thead>
+            <tr class="d-flex">
+              <th class="col-6" scope="col">Attribute</th>
+              <th class="col-6" scope="col">Set New Value</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for form in formset %}
+            <tr class="d-flex">
+              <td class="col-6">{{form.name.value}}</td>
+              <td class="col-6">
+                {{form.value}}
+                <span
+                  class="d-none"
+                  id="change-indicator-{{form.attribute_pk.value}}"
+                >
+                  <i class="fas fa-info-circle" aria-hidden="true"></i>
+                  Value changed
+                </span>
+              </td>
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      {% else %}
+      <div class="alert alert-info" role="alert">
+        <i class="fas fa-info-circle" aria-hidden="true"></i>
+        This allocation has no attributes.
+      </div>
+      {% endif %}
+
+      {% if attributes %}
+        <input class="btn btn-success" type="submit" value="Confirm" />
+      {% endif %}
+      <a
+        class="btn btn-secondary"
+        href="{% url 'allocation-detail' allocation.pk %}"
+        role="button"
+        >Cancel</a
+      >
+      {{ formset.management_form }}
+    </div>
+  </div>
+</form>
+
+<script>
+  $(document).ready(function() {
+    {% for form in formset %}
+    $("#{{form.value.auto_id}}").on("input", function(){
+      let change_indicator = $("#change-indicator-{{form.attribute_pk.value}}");
+      if ($(this).val() != "{{form.orig_value.value|escapejs}}") {
+        change_indicator.removeClass("d-none");
+      } else {
+        change_indicator.addClass("d-none");
+      }
+    });
+    $("#{{form.value.auto_id}}").trigger("input");
+    {% endfor %}
+  })
+</script>
+{% endblock %}

coldfront/core/allocation/templates/allocation/allocation_detail.html

@@ -214,6 +214,11 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> EULA
       <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Allocation Attributes</h3>
       <div class="float-right">
         {% if request.user.is_superuser %}
+          {% if attributes %}
+            <a class="btn btn-info" href="{% url 'allocation-attribute-edit' allocation.pk %}" role="button">
+              <i class="fas fa-edit" aria-hidden="true"></i> Edit Allocation Attributes
+            </a>
+          {% endif %}
           <a class="btn btn-success" href="{% url 'allocation-attribute-add' allocation.pk %}" role="button">
             <i class="fas fa-plus" aria-hidden="true"></i> Add Allocation Attribute
           </a>
@@ -299,7 +304,6 @@ <h3 class="d-inline"><i class="fas fa-info-circle" aria-hidden="true"></i> Alloc
                   {% else %}
                     <td class="text-info">{{ change_request.status.name }}</td>
                   {% endif %}
-                  </td>
                   {% if change_request.notes %}
                     <td>{{change_request.notes}}</td>
                   {% else %}

coldfront/core/allocation/tests/test_views.py

@@ -3,6 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-or-later
 
 import logging
+from http import HTTPStatus
 
 from django.test import TestCase
 from django.urls import reverse
@@ -193,6 +194,51 @@ def test_allocationchangeview_post_no_change(self):
         self.assertEqual(len(AllocationChangeRequest.objects.all()), 0)
 
 
+class AllocationAttributeEditViewTest(AllocationViewBaseTest):
+    """Tests for AllocationAttributeEditView"""
+
+    def setUp(self):
+        self.client.force_login(self.admin_user, backend=BACKEND)
+        self.url = f"/allocation/{self.allocation.pk}/allocationattribute/edit"
+        self.post_data = {
+            "attributeform-0-value": self.allocation.get_attribute("Storage Quota (TB)"),
+            "attributeform-INITIAL_FORMS": "1",
+            "attributeform-MAX_NUM_FORMS": "1",
+            "attributeform-MIN_NUM_FORMS": "0",
+            "attributeform-TOTAL_FORMS": "1",
+        }
+
+    def test_allocationattributeeditview_access(self):
+        """Test get request"""
+        self.allocation_access_tstbase(self.url)
+        utils.test_user_cannot_access(self, self.pi_user, self.url)
+        utils.test_user_cannot_access(self, self.allocation_user, self.url)
+
+    def test_allocationattributeeditview_post_change_attr(self):
+        """Test post request to change attribute"""
+        quota_orig = 100
+        quota_new = 200
+
+        self.assertEqual(self.allocation.get_attribute("Storage Quota (TB)"), quota_orig)
+
+        self.post_data["attributeform-0-value"] = quota_new
+        response = self.client.post(self.url, data=self.post_data, follow=True)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+
+        self.assertEqual(self.allocation.get_attribute("Storage Quota (TB)"), quota_new)
+
+    def test_allocationattributeeditview_post_no_change(self):
+        """Test post request with no change"""
+        quota_orig = 100
+
+        self.assertEqual(self.allocation.get_attribute("Storage Quota (TB)"), quota_orig)
+
+        response = self.client.post(self.url, data=self.post_data, follow=True)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
+
+        self.assertEqual(self.allocation.get_attribute("Storage Quota (TB)"), quota_orig)
+
+
 class AllocationDetailViewTest(AllocationViewBaseTest):
     """Tests for AllocationDetailView"""
 
@@ -214,12 +260,15 @@ def test_allocationdetail_requestchange_button(self):
     def test_allocationattribute_button_visibility(self):
         """Test visibility of "Add Attribute" button for different user types"""
         # admin
+        utils.page_contains_for_user(self, self.admin_user, self.url, "Edit Allocation Attribute")
         utils.page_contains_for_user(self, self.admin_user, self.url, "Add Allocation Attribute")
         utils.page_contains_for_user(self, self.admin_user, self.url, "Delete Allocation Attribute")
         # pi
+        utils.page_does_not_contain_for_user(self, self.pi_user, self.url, "Edit Allocation Attribute")
         utils.page_does_not_contain_for_user(self, self.pi_user, self.url, "Add Allocation Attribute")
         utils.page_does_not_contain_for_user(self, self.pi_user, self.url, "Delete Allocation Attribute")
         # allocation user
+        utils.page_does_not_contain_for_user(self, self.allocation_user, self.url, "Edit Allocation Attribute")
         utils.page_does_not_contain_for_user(self, self.allocation_user, self.url, "Add Allocation Attribute")
         utils.page_does_not_contain_for_user(self, self.allocation_user, self.url, "Delete Allocation Attribute")
 

coldfront/core/allocation/urls.py

@@ -32,6 +32,11 @@
         name="allocation-attribute-add",
     ),
     path("<int:pk>/change-request", allocation_views.AllocationChangeView.as_view(), name="allocation-change"),
+    path(
+        "<int:pk>/allocationattribute/edit",
+        allocation_views.AllocationAttributeEditView.as_view(),
+        name="allocation-attribute-edit",
+    ),
     path(
         "<int:pk>/allocationattribute/delete",
         allocation_views.AllocationAttributeDeleteView.as_view(),