Remove old submissions table related code and removed fancybox

eslint.config.mjs

@@ -26,6 +26,7 @@ export default [
                 ...globals.commonjs,
                 jQuery: true,
                 Alpine: true,
+                htmx: true,
             },
         },
 

hypha/apply/determinations/templates/determinations/batch_determination_form.html

@@ -3,7 +3,6 @@
 
 {% block extra_css %}
     {{ block.super }}
-    <link rel="stylesheet" href="{% static 'css/fancybox.css' %}">
 {% endblock %}
 
 {% block adminbar %}
@@ -30,17 +29,15 @@
 {% endblock %}
 
 {% block form_buttons %}
-    <button data-fancybox data-src="#batch-send-determination" class="button button--submit button--top-space button--primary js-batch-determine-send" type="button">{% trans "Send" %}</button>
-    {% include "determinations/includes/batch_determination_confirmation.html" with count=submissions.count %}
-    <input type="submit" value="Submit" name="submit" class="is-hidden" />
+    <button class="button button--submit button--top-space button--primary" type="submit" onclick="return confirm('{% blocktrans %}This determination message will be emailed to applicants and cannot be undone. Do you wish to contiune?{% endblocktrans %}')">
+        {% trans "Send" %}
+    </button>
 {% endblock %}
 
 {% block show_submission %}
 {% endblock %}
 
 {% block extra_js %}
     {{ block.super }}
-    <script src="{% static 'js/jquery.fancybox.min.js' %}"></script>
     <script src="{% static 'js/batch-actions.js' %}"></script>
-    <script src="{% static 'js/fancybox-global.js' %}"></script>
 {% endblock %}

hypha/apply/determinations/tests/test_views.py

@@ -8,7 +8,6 @@
 from hypha.apply.activity.models import Activity
 from hypha.apply.determinations.options import ACCEPTED, NEEDS_MORE_INFO, REJECTED
 from hypha.apply.determinations.views import BatchDeterminationCreateView
-from hypha.apply.funds.models import ApplicationSubmission
 from hypha.apply.funds.tests.factories import ApplicationSubmissionFactory
 from hypha.apply.users.tests.factories import StaffFactory, UserFactory
 from hypha.apply.utils.testing import BaseViewTestCase
@@ -469,19 +468,6 @@ def test_can_submit_batch_determination_more_info_comment(self):
 
         self.assertRedirects(response, self.url_from_pattern("apply:submissions:list"))
 
-    def test_sets_next_on_redirect(self):
-        test_path = "/a/path/?with=query&a=sting"
-        request = RequestFactory().get("", PATH_INFO=test_path)
-        redirect = BatchDeterminationCreateView.should_redirect(
-            request,
-            ApplicationSubmission.objects.none(),
-            ["rejected"],
-        )
-        url = urllib.parse.urlparse(redirect.url)
-        query = urllib.parse.parse_qs(url.query)
-        next_path = urllib.parse.unquote_plus(query["next"][0])
-        self.assertEqual(next_path, test_path)
-
     def test_success_redirects_if_exists(self):
         test_path = "/a/path/?with=query&a=sting"
         view = BatchDeterminationCreateView()

hypha/apply/determinations/views.py

@@ -1,5 +1,3 @@
-from urllib import parse
-
 from django import forms
 from django.conf import settings
 from django.contrib import messages
@@ -277,8 +275,6 @@ def should_redirect(cls, request, submissions, actions):
                 + action
                 + "&submissions="
                 + ",".join([str(submission.id) for submission in submissions])
-                + "&next="
-                + parse.quote_plus(request.get_full_path()),
             )
         elif set(actions) != non_determine_states:
             raise ValueError("Inconsistent states provided - please talk to an admin")

hypha/apply/funds/forms.py

@@ -22,7 +22,6 @@
 from .permissions import can_change_external_reviewers
 from .utils import model_form_initial, render_icon
 from .widgets import MetaTermSelect2Widget, Select2MultiCheckboxesWidget
-from .workflow import get_action_mapping
 
 
 class ApplicationSubmissionModelForm(forms.ModelForm):
@@ -76,34 +75,6 @@ def __init__(self, *args, **kwargs):
         action_field.choices = choices
 
 
-class BatchProgressSubmissionForm(forms.Form):
-    action = forms.ChoiceField(label=_("Take action"))
-    submissions = forms.CharField(
-        widget=forms.HiddenInput(attrs={"class": "js-submissions-id"})
-    )
-
-    def __init__(self, *args, round=None, **kwargs):
-        self.user = kwargs.pop("user")
-        super().__init__(*args, **kwargs)
-        workflow = round and round.workflow
-        self.action_mapping = get_action_mapping(workflow)
-        choices = [
-            (action, detail["display"])
-            for action, detail in self.action_mapping.items()
-        ]
-        self.fields["action"].choices = choices
-
-    def clean_submissions(self):
-        value = self.cleaned_data["submissions"]
-        submission_ids = [int(submission) for submission in value.split(",")]
-        return ApplicationSubmission.objects.filter(id__in=submission_ids)
-
-    def clean_action(self):
-        value = self.cleaned_data["action"]
-        action = self.action_mapping[value]["transitions"]
-        return action
-
-
 class UpdateSubmissionLeadForm(ApplicationSubmissionModelForm):
     class Meta:
         model = ApplicationSubmission
@@ -116,59 +87,6 @@ def __init__(self, *args, **kwargs):
         lead_field.queryset = lead_field.queryset.exclude(id=self.instance.lead.id)
 
 
-class BatchUpdateSubmissionLeadForm(forms.Form):
-    lead = forms.ChoiceField(label=_("Lead"))
-    submissions = forms.CharField(
-        widget=forms.HiddenInput(attrs={"class": "js-submissions-id"})
-    )
-
-    def __init__(self, *args, round=None, **kwargs):
-        self.user = kwargs.pop("user")
-        super().__init__(*args, **kwargs)
-        self.fields["lead"].choices = [
-            (staff.id, staff) for staff in User.objects.staff()
-        ]
-
-    def clean_lead(self):
-        value = self.cleaned_data["lead"]
-        return User.objects.get(id=value)
-
-    def clean_submissions(self):
-        value = self.cleaned_data["submissions"]
-        submission_ids = [int(submission) for submission in value.split(",")]
-        return ApplicationSubmission.objects.filter(id__in=submission_ids)
-
-
-class BatchDeleteSubmissionForm(forms.Form):
-    submissions = forms.CharField(
-        widget=forms.HiddenInput(attrs={"class": "js-submissions-id"})
-    )
-
-    def __init__(self, *args, round=None, **kwargs):
-        self.user = kwargs.pop("user")
-        super().__init__(*args, **kwargs)
-
-    def clean_submissions(self):
-        value = self.cleaned_data["submissions"]
-        submission_ids = [int(submission) for submission in value.split(",")]
-        return ApplicationSubmission.objects.filter(id__in=submission_ids)
-
-
-class BatchArchiveSubmissionForm(forms.Form):
-    submissions = forms.CharField(
-        widget=forms.HiddenInput(attrs={"class": "js-submissions-id"})
-    )
-
-    def __init__(self, *args, round=None, **kwargs):
-        self.user = kwargs.pop("user")
-        super().__init__(*args, **kwargs)
-
-    def clean_submissions(self):
-        value = self.cleaned_data["submissions"]
-        submission_ids = [int(submission) for submission in value.split(",")]
-        return ApplicationSubmission.objects.filter(id__in=submission_ids)
-
-
 class UpdateReviewersForm(ApplicationSubmissionModelForm):
     reviewer_reviewers = forms.ModelMultipleChoiceField(
         queryset=User.objects.reviewers().only("pk", "full_name"),

hypha/apply/funds/tables.py

@@ -207,22 +207,6 @@ def render_screening_status(self, value):
             )
 
 
-class AdminSubmissionsTable(BaseAdminSubmissionsTable):
-    """Adds admin only columns to the submissions table"""
-
-    selected = LabeledCheckboxColumn(
-        accessor=A("pk"),
-        attrs={
-            "input": {"class": "js-batch-select"},
-            "th__input": {"class": "js-batch-select-all"},
-        },
-    )
-
-    class Meta(BaseAdminSubmissionsTable.Meta):
-        fields = ("selected", *BaseAdminSubmissionsTable.Meta.fields)
-        sequence = fields
-
-
 class SummarySubmissionsTable(BaseAdminSubmissionsTable):
     class Meta(BaseAdminSubmissionsTable.Meta):
         orderable = False

hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html

@@ -1,11 +1,6 @@
 {% extends "funds/applicationsubmission_detail.html" %}
 {% load i18n static workflow_tags review_tags determination_tags translate_tags heroicons %}
 
-{% block extra_css %}
-    <link rel="stylesheet" href="{% static 'css/fancybox.css' %}">
-{% endblock %}
-
-
 {% block sidebar_top %}
     <div class="sidebar__inner sidebar__inner--light-blue sidebar__inner--actions" data-testid="sidebar-primary-actions">
         {% include "funds/includes/admin_primary_actions.html" %}
@@ -95,8 +90,6 @@ <h5 class="m-0">{% trans "Reminders" %}</h5>
 {% block extra_js %}
     {{ comment_form.media.js }}
     {{ block.super }}
-    <script src="{% static 'js/jquery.fancybox.min.js' %}"></script>
-    <script src="{% static 'js/fancybox-global.js' %}"></script>
     <script src="{% static 'js/behaviours/collapse.js' %}"></script>
     {% if request.user|can_translate_submission %}
         <script src="{% static 'js/translate-application.js' %}"></script>

hypha/apply/funds/templates/funds/base_submissions_table.html

@@ -3,22 +3,19 @@
 {% load render_table from django_tables2 %}
 
 {% block extra_css %}
-    <link rel="stylesheet" href="{% static 'css/fancybox.css' %}">
     {{ filter.form.media.css }}
 {% endblock %}
 
 {% block content %}
     {% block table %}
-        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action use_batch_actions=True filter_classes="filters-open" can_export=can_export %}
+        {% include "funds/includes/table_filter_and_search.html" with filter_form=filter_form search_term=search_term use_search=True filter_action=filter_action filter_classes="filters-open" can_export=can_export %}
 
         {% render_table table %}
     {% endblock %}
 {% endblock %}
 
 {% block extra_js %}
     {{ filter.form.media.js }}
-    <script src="{% static 'js/jquery.fancybox.min.js' %}"></script>
-    <script src="{% static 'js/fancybox-global.js' %}"></script>
     <script src="{% static 'js/all-submissions-table.js' %}"></script>
     <script src="{% static 'js/symbol-es6.min.js' %}"></script>
     <script src="{% static 'js/url-search-params.js' %}"></script>

hypha/apply/funds/templates/funds/grouped_application_list.html

@@ -2,7 +2,6 @@
 {% load i18n static %}
 
 {% block extra_css %}
-    <link rel="stylesheet" href="{% static 'css/fancybox.css' %}">
     {{ filter.form.media.css }}
 {% endblock %}
 
@@ -17,8 +16,6 @@
 
 {% block extra_js %}
     {{ filter.form.media.js }}
-    <script src="{% static 'js/jquery.fancybox.min.js' %}"></script>
-    <script src="{% static 'js/fancybox-global.js' %}"></script>
     <script src="{% static 'js/all-submissions-table.js' %}"></script>
     <script src="{% static 'js/symbol-es6.min.js' %}"></script>
     <script src="{% static 'js/url-search-params.js' %}"></script>

hypha/apply/funds/templates/funds/includes/delegated_form_base.html

@@ -27,7 +27,6 @@
         {% if cancel %}
             <button
                 type="button"
-                data-fancybox-close=""
                 class="button button--{% if invert %}primary{% else %}white{% endif %}"
                 title="{% trans "Close" %}">
                 {% trans "Cancel" %}