Merge pull request #4312 from dfe-analytical-services/dev

Merge Dev into Master

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "7.0.10",
+      "commands": [
+        "dotnet-ef"
+      ]
+    }
+  }
+}

.dockerignore

@@ -0,0 +1,3 @@
+bin/
+obj/
+node_modules/

.eslintrc.json

@@ -130,6 +130,18 @@
         "no-console": "off"
       }
     },
+    {
+      "files": ["useful-scripts/*.ts", "useful-scripts/*/**.ts"],
+      "rules": {
+        "no-console": "off",
+        "no-underscore-dangle": [
+          "error",
+          {
+            "allow": ["__dirname", "__filename"]
+          }
+        ]
+      }
+    },
     {
       "files": ["src/explore-education-statistics-frontend/**/*.{tsx,ts}"],
       "settings": {

.github/workflows/codeql.yml

@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

.github/workflows/dependency-review.yml

@@ -10,6 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@v3

.github/workflows/validate-snapshots.yml

@@ -27,7 +27,7 @@ jobs:
         run: sudo ethtool -K eth0 tx off rx off
 
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup python
         uses: actions/setup-python@v4

.gitignore

@@ -46,8 +46,6 @@ src/explore-education-statistics-frontend/*.xml
 **/*/chromedriver
 **/*/jwt
 **/coverage
-/useful-scripts/get_data_block_responses/*.csv
-/useful-scripts/get_data_block_responses/results*
 /tests/robot-tests/scripts/permalink_snapshots/invalid-permalinks.csv
 /tests/robot-tests/scripts/permalink_snapshots/prod-permalinks.csv
 /tests/robot-tests/scripts/permalink_snapshots/checked-permalinks.csv
@@ -60,6 +58,12 @@ src/explore-education-statistics-frontend/*.xml
 /tests/performance-tests/big-files
 /tests/performance-tests/*.html
 
+## Scripts
+
+useful-scripts/*.lock
+useful-scripts/get_data_block_responses/*.csv
+useful-scripts/get_data_block_responses/results*
+
 ## Data API Seed CSV data
 
 src/GovUk.Education.ExploreEducationStatistics.Data.Seed/Files/
@@ -77,7 +81,9 @@ remote-profile
 
 .DS_Store
 
+src/GovUk.Education.ExploreEducationStatistics.*/appsettings.Local.json
 src/GovUk.Education.ExploreEducationStatistics.Admin/appsettings.Idp.json
+src/GovUk.Education.ExploreEducationStatistics.Admin/appsettings.IdpBootstrapUsers.json
 
 ## IdentityServer Developer Signing key
 **/*/tempkey.rsa