Merge branch 'maintainance/4-remove-projects-app' into maintainance/5…

…-remove-public-forms-app * maintainance/4-remove-projects-app: Remove public "search promotions" app (#3724) docs: update fetch-depth=0 and update copyright year (#3723) Restyle the status bar (#3672) Replace black with ruff formatter (#3688)
HyphaApp · Jan 17, 2024 · eac6d24 · eac6d24
2 parents 7b95e6d + 9720309
commit eac6d24
Show file tree

Hide file tree

Showing 17 changed files with 143 additions and 176 deletions.
diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
@@ -18,6 +18,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Deploy docs
         uses: mhausenblas/mkdocs-deploy-gh-pages@master

diff --git a/.github/workflows/hypha-ci.yml b/.github/workflows/hypha-ci.yml
@@ -67,11 +67,11 @@ jobs:
         with:
           python-version-file: ".python-version"
       - name: Install python dependencies
-        run: pip install `grep -E "ruff|djhtml|black" requirements-dev.txt`
-      - name: Run ruff
+        run: pip install `grep -E "ruff|djhtml" requirements-dev.txt`
+      - name: Run linting
         run: ruff check --output-format=github .
-      - name: Run black
-        run: black . --check
+      - name: Run formating check
+        run: ruff format --check .
       - name: Run djhtml
         run: djhtml hypha/ --check
 

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -2,22 +2,18 @@ repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.1.7
     hooks:
+      # Run the linter.
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]
-  - repo: https://github.com/psf/black
-    rev: 23.11.0
-    hooks:
-      - id: black
-        # It is recommended to specify the latest version of Python
-        # supported by your project here, or alternatively use
-        # pre-commit's default_language_version, see
-        # https://pre-commit.com/#top_level-default_language_version
-        language_version: python3.11
+      # Run the formatter.
+      - id: ruff-format
+
   - repo: https://github.com/rtts/djhtml
     rev: "3.0.6"
     hooks:
       - id: djhtml
         files: .*/templates/.*\.html$
+
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.1.0
     hooks:

diff --git a/.prettierignore b/.prettierignore
@@ -11,10 +11,12 @@
 # Ignore all files in the static & media directory.
 static_compiled/**
 media/**
+/static/**
 
 # Ignore all files in the virtualenv directory.
 .venv/**
 venv/**
+.ruff_cache/**
 
 # Ignore node files
 node_modules/**

diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ build:
 fmt:
 	@echo "run code formatters on all code."
 	python -m ruff --fix .
-	python -m black .
+	python -m ruff format .
 	npx prettier . --write
 	djhtml hypha/
 
@@ -52,7 +52,7 @@ endif
 lint:
 	@echo "Checking python code style with ruff"
 	ruff check .
-	black . --check
+	ruff format --check .
 	@echo "Checking html file indendation."
 	djhtml hypha/ --check
 	@echo "Checking js and css code style."

diff --git a/hypha/apply/activity/messaging.py b/hypha/apply/activity/messaging.py
@@ -35,7 +35,7 @@ def send(
                     user=user,
                     source=source,
                     related=related,
-                    **kwargs
+                    **kwargs,
                 )
 
         elif sources:
@@ -51,7 +51,7 @@ def send(
                     user=user,
                     sources=sources,
                     related=related,
-                    **kwargs
+                    **kwargs,
                 )
 
 

diff --git a/hypha/apply/activity/options.py b/hypha/apply/activity/options.py
@@ -14,17 +14,19 @@ class MESSAGES(TextChoices):
     TRANSITION = "TRANSITION", _("transitioned")
     BATCH_TRANSITION = "BATCH_TRANSITION", _("batch transitioned")
     DETERMINATION_OUTCOME = "DETERMINATION_OUTCOME", _("sent determination outcome")
-    BATCH_DETERMINATION_OUTCOME = "BATCH_DETERMINATION_OUTCOME", _(
-        "sent batch determination outcome"
+    BATCH_DETERMINATION_OUTCOME = (
+        "BATCH_DETERMINATION_OUTCOME",
+        _("sent batch determination outcome"),
     )
     INVITED_TO_PROPOSAL = "INVITED_TO_PROPOSAL", _("invited to proposal")
     REVIEWERS_UPDATED = "REVIEWERS_UPDATED", _("updated reviewers")
     BATCH_REVIEWERS_UPDATED = "BATCH_REVIEWERS_UPDATED", _("batch updated reviewers")
     PARTNERS_UPDATED = "PARTNERS_UPDATED", _("updated partners")
     PARTNERS_UPDATED_PARTNER = "PARTNERS_UPDATED_PARTNER", _("partners updated partner")
     READY_FOR_REVIEW = "READY_FOR_REVIEW", _("marked ready for review")
-    BATCH_READY_FOR_REVIEW = "BATCH_READY_FOR_REVIEW", _(
-        "marked batch ready for review"
+    BATCH_READY_FOR_REVIEW = (
+        "BATCH_READY_FOR_REVIEW",
+        _("marked batch ready for review"),
     )
     NEW_REVIEW = "NEW_REVIEW", _("added new review")
     COMMENT = "COMMENT", _("added comment")
@@ -44,8 +46,9 @@ class MESSAGES(TextChoices):
     APPROVE_PAF = "APPROVE_PAF", _("approved paf")
     PROJECT_TRANSITION = "PROJECT_TRANSITION", _("transitioned project")
     REQUEST_PROJECT_CHANGE = "REQUEST_PROJECT_CHANGE", _("requested project change")
-    SUBMIT_CONTRACT_DOCUMENTS = "SUBMIT_CONTRACT_DOCUMENTS", _(
-        "submitted contract documents"
+    SUBMIT_CONTRACT_DOCUMENTS = (
+        "SUBMIT_CONTRACT_DOCUMENTS",
+        _("submitted contract documents"),
     )
     UPLOAD_DOCUMENT = "UPLOAD_DOCUMENT", _("uploaded document to project")
     REMOVE_DOCUMENT = "REMOVE_DOCUMENT", _("removed document from project")
@@ -66,8 +69,9 @@ class MESSAGES(TextChoices):
     DELETE_REMINDER = "DELETE_REMINDER", _("deleted reminder")
     REVIEW_REMINDER = "REVIEW_REMINDER", _("reminder to review")
     BATCH_DELETE_SUBMISSION = "BATCH_DELETE_SUBMISSION", _("batch deleted submissions")
-    BATCH_ARCHIVE_SUBMISSION = "BATCH_ARCHIVE_SUBMISSION", _(
-        "batch archive submissions"
+    BATCH_ARCHIVE_SUBMISSION = (
+        "BATCH_ARCHIVE_SUBMISSION",
+        _("batch archive submissions"),
     )
     STAFF_ACCOUNT_CREATED = "STAFF_ACCOUNT_CREATED", _("created new account")
     STAFF_ACCOUNT_EDITED = "STAFF_ACCOUNT_EDITED", _("edited account")

diff --git a/hypha/apply/categories/admin_helpers.py b/hypha/apply/categories/admin_helpers.py
@@ -46,7 +46,7 @@ def get_buttons_for_obj(self, obj, exclude=None, *args, **kwargs):
         add_child_button = self.add_child_button(
             pk=getattr(obj, self.opts.pk.attname),
             child_verbose_name=obj.node_child_verbose_name,
-            **kwargs
+            **kwargs,
         )
         buttons.append(add_child_button)
 

diff --git a/hypha/apply/funds/tables.py b/hypha/apply/funds/tables.py
@@ -176,7 +176,19 @@ class BaseAdminSubmissionsTable(SubmissionsTable):
     organization_name = tables.Column()
 
     class Meta(SubmissionsTable.Meta):
-        fields = ("title", "phase", "stage", "fund", "round", "lead", "submit_time", "last_update", "screening_status", "reviews_stats", "organization_name")  # type: ignore
+        fields = (
+            "title",
+            "phase",
+            "stage",
+            "fund",
+            "round",
+            "lead",
+            "submit_time",
+            "last_update",
+            "screening_status",
+            "reviews_stats",
+            "organization_name",
+        )
         sequence = fields + ("comments",)
 
     def render_lead(self, value):

diff --git a/hypha/apply/funds/templates/funds/includes/status_bar.html b/hypha/apply/funds/templates/funds/includes/status_bar.html
@@ -1,5 +1,5 @@
 {% load statusbar_tags %}
-<div class="status-bar {{ class }}">
+<div class="status-bar my-6 {{ class }}">
     {% for phase in phases %}
         {% ifchanged phase.step %}
             {% status_display current_phase phase public as display_text %}
@@ -14,12 +14,12 @@
         {% endifchanged %}
     {% endfor %}
 </div>
-<div class="status-bar--mobile">
-    <h6 class="status-bar__subheading">
+<div class="status-bar--mobile my-2">
+    <div class="status-bar__subheading status-bar__text">
         {% if public %}
             {{ current_phase.public_name }}
         {% else %}
             {{ current_phase }}
         {% endif %}
-    </h6>
+    </div>
 </div>
diff --git a/hypha/apply/funds/templates/funds/includes/status_bar_item.html b/hypha/apply/funds/templates/funds/includes/status_bar_item.html
@@ -4,9 +4,5 @@
             {% elif is_complete %}
                 status-bar__item--is-complete
             {% endif %}">
-    <span class="status-bar__tooltip"
-          data-title="{{ label }}" aria-label="{{ label }}"></span>
-    <svg class="status-bar__icon">
-        <use xlink:href="#tick-alt"></use>
-    </svg>
+    <div class="status-bar__tooltip status-bar__text" style="--tooltip-chars:{{ label|length }}ch;">{{ label }}</div>
 </div>
diff --git a/hypha/apply/funds/tests/test_models.py b/hypha/apply/funds/tests/test_models.py
@@ -314,9 +314,10 @@ def test_associated_if_another_user_exists(self):
         # Lead + 2 x applicant
         self.assertEqual(self.User.objects.count(), 3)
 
-        first_user, second_user = self.User.objects.get(
-            email=self.email
-        ), self.User.objects.get(email=email)
+        first_user, second_user = (
+            self.User.objects.get(email=self.email),
+            self.User.objects.get(email=email),
+        )
         self.assertEqual(ApplicationSubmission.objects.count(), 2)
         self.assertEqual(ApplicationSubmission.objects.first().user, first_user)
         self.assertEqual(ApplicationSubmission.objects.last().user, second_user)

diff --git a/hypha/apply/funds/views_beta.py b/hypha/apply/funds/views_beta.py
@@ -309,7 +309,9 @@ def bulk_update_submissions_status(request: HttpRequest) -> HttpResponse:
 
     submissions = ApplicationSubmission.objects.filter(id__in=submission_ids)
 
-    redirect: HttpResponse = BatchDeterminationCreateView.should_redirect(request, submissions, transitions)  # type: ignore
+    redirect: HttpResponse = BatchDeterminationCreateView.should_redirect(
+        request, submissions, transitions
+    )
     if redirect:
         return HttpResponseClientRedirect(redirect.url)
 

diff --git a/hypha/settings/django.py b/hypha/settings/django.py
@@ -37,7 +37,6 @@
     "django_web_components",
     "wagtail.contrib.modeladmin",
     "wagtail.contrib.settings",
-    "wagtail.contrib.search_promotions",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     "wagtail.embeds",