Remove old submissions table, removed old table batch actions, update invoice batch action to use htmx

Author: sandeepsajan0

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

@@ -30,9 +30,9 @@
 {% 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 %}

hypha/apply/determinations/templates/determinations/includes/batch_determination_confirmation.html

@@ -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/forms.py

@@ -9,7 +9,7 @@
 
 {% 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 %}