Mw/dqt 2024

.eslintrc

@@ -0,0 +1,23 @@
+{
+  "root": true,
+  "env": {
+    "browser": true,
+    "es2021": true,
+    "jquery": true
+  },
+  "plugins": [
+    "html"
+  ],
+  "parserOptions": {
+    "ecmaVersion": "latest"
+  },
+  "extends": [
+    "eslint-config-semistandard"
+  ],
+  "globals": {
+    "URI": "readonly"
+  },
+  "rules": {
+    "comma-dangle": "error",
+  }
+}

.github/workflows/lint.yml

@@ -3,19 +3,17 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v2
     - name: Setup python
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
         architecture: x64
-    - uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
     - run: pip install -r requirements_dev.txt
     - run: flake8
+
+    - run: npm install
+    - run: ./node_modules/eslint/bin/eslint.js --ext .js --ext .html cove/cove_360/templates/**
+    - run: ./node_modules/eslint/bin/eslint.js --ext .js --ext .html cove/cove_360/static/dataexplore/js/**

.github/workflows/test.yml

@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       DATA_SUBMISSION_ENABLED: "true"
       REGISTRY_PUBLISHERS_URL: ${{secrets.REGISTRY_PUBLISHERS_URL}}
@@ -20,13 +20,6 @@ jobs:
       with:
         python-version: ${{ matrix.python-version }}
         architecture: x64
-    - uses: actions/cache@v1
-      with:
-        path: ~/.cache/pip
-        key: ${{ runner.os }}-pip-${{ hashFiles('**/requirements_dev.txt') }}-${{ matrix.python-version }}
-        restore-keys: |
-          ${{ runner.os }}-pip-
-
     - name: Install requirements_cove_dev.txt
       run: pip install -r requirements_cove_dev.txt
     - name: Install Ubuntu Translation Libraries

.gitignore

@@ -20,3 +20,5 @@ cove/lib/org-ids.json
 cove/lib/org-ids.json.lock
 chromedriver/
 src/
+node_modules/
+untracked/

cove/cove_360/context_processors.py

@@ -5,4 +5,5 @@ def additional_context(request):
     return {
         "DATA_SUBMISSION_ENABLED": settings.DATA_SUBMISSION_ENABLED,
         "DEBUG": settings.DEBUG,
+        "DISABLE_COOKIE_POPUP": settings.DISABLE_COOKIE_POPUP,
     }

cove/cove_360/fixtures/additional_fields.json

@@ -0,0 +1,27 @@
+{
+    "grants": [
+        {
+            "id": "360G-sampletrust-105177/Z/14/Z",
+            "awardDate": "2024-12-30",
+            "amountAwarded": 10,
+            "url": "http://example.com",
+            "title": "test",
+            "currency": "GBP",
+            "description": "test",
+            "AdditionalField": "2",
+            "CheckMicOne": "two",
+            "recipientOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ],
+            "fundingOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ]
+        }
+    ]
+}

cove/cove_360/fixtures/duration_usefulness.json

@@ -0,0 +1,25 @@
+{
+    "grants": [
+        {
+            "id": "360G-sampletrust-105177/Z/14/Z",
+            "awardDate": "2024-12-30",
+            "amountAwarded": 10,
+            "url": "http://example.com",
+            "title": "test",
+            "currency": "GBP",
+            "description": "test",
+            "recipientOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ],
+            "fundingOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ]
+        }
+    ]
+}

cove/cove_360/fixtures/multiple_funder_names_org_ids.json

@@ -0,0 +1,57 @@
+{
+    "grants": [
+        {
+            "id": "360G-sampletrust-105177/Z/14/Z",
+            "awardDate": "2024-12-30",
+            "amountAwarded": 10,
+            "url": "http://example.com",
+            "title": "test",
+            "currency": "GBP",
+            "description": "test",
+	    "plannedDates": [
+                {
+                    "duration": 30
+                }
+            ],
+            "recipientOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ],
+            "fundingOrganization": [
+                {
+                    "id": "GB-12345-test",
+                    "name": "Example Funder Limited"
+                }
+            ]
+        },
+	{
+            "id": "360G-sampletrust-123452",
+            "awardDate": "2024-12-30",
+            "amountAwarded": 10,
+            "url": "http://example.com",
+            "title": "test two",
+            "currency": "GBP",
+            "description": "test two",
+	    "plannedDates": [
+                {
+                    "duration": 30
+                }
+            ],
+            "recipientOrganization": [
+                {
+                    "id": "GB-323242-test",
+                    "name": "Example Project Limited"
+                }
+            ],
+            "fundingOrganization": [
+                {
+                    "id": "GB-54321-test",
+                    "name": "Example Funder Limited"
+                }
+            ]
+        }
+
+    ]
+}

cove/cove_360/fixtures/publishers.json

@@ -9,7 +9,8 @@
     "self_publish": {
       "enabled": true,
       "authorised_domains": [
-        "test-data.360dev1.vs.mythic-beasts.com"
+        "test-data.360dev1.vs.mythic-beasts.com",
+        "www.threesixtygiving.org"
       ]
     }
   }