Merge pull request #400 from GenSpectrum/main

Update prod from main
GenSpectrum · Dec 16, 2024 · d112895 · d112895
2 parents aac14ee + f954a5e
commit d112895
Show file tree

Hide file tree

Showing 81 changed files with 2,737 additions and 2,270 deletions.
diff --git a/backend/src/main/resources/application-dashboards-dev.yaml b/backend/src/main/resources/application-dashboards-dev.yaml
@@ -34,19 +34,19 @@ dashboards:
           menuIcon: "database"
     mpox:
       lapis:
-        url: "https://gs-staging-1.int.genspectrum.org/mpox"
-        mainDateField: "sampleCollectionDate"
+        url: "https://lapis.pathoplexus.org/mpox"
+        mainDateField: "sampleCollectionDateRangeLower"
         locationFields:
-          - "country"
-          - "division"
+          - "geoLocCountry"
+          - "geoLocAdmin1"
         hostField: "hostNameScientific"
         authorAffiliationsField: "authorAffiliations"
         authorsField: "authors"
         additionalFilters:
           versionStatus: "LATEST_VERSION"
           isRevocation: "false"
       externalNavigationLinks:
-        - url: "https://loculus.staging.genspectrum.org/mpox"
+        - url: "https://pathoplexus.org/mpox"
           label: "Browse data"
           menuIcon: "database"
     westNile:

diff --git a/backend/src/main/resources/application-dashboards-prod.yaml b/backend/src/main/resources/application-dashboards-prod.yaml
@@ -34,19 +34,19 @@ dashboards:
           menuIcon: "database"
     mpox:
       lapis:
-        url: "https://api.loculus.genspectrum.org/mpox"
-        mainDateField: "sampleCollectionDate"
+        url: "https://lapis.pathoplexus.org/mpox"
+        mainDateField: "sampleCollectionDateRangeLower"
         locationFields:
-          - "country"
-          - "division"
+          - "geoLocCountry"
+          - "geoLocAdmin1"
         hostField: "hostNameScientific"
         authorAffiliationsField: "authorAffiliations"
         authorsField: "authors"
         additionalFilters:
           versionStatus: "LATEST_VERSION"
           isRevocation: "false"
       externalNavigationLinks:
-        - url: "https://loculus.genspectrum.org/mpox"
+        - url: "https://pathoplexus.org/mpox"
           label: "Browse data"
           menuIcon: "database"
     westNile:

diff --git a/backend/src/main/resources/application-dashboards-staging.yaml b/backend/src/main/resources/application-dashboards-staging.yaml
@@ -34,25 +34,25 @@ dashboards:
           menuIcon: "database"
     mpox:
       lapis:
-        url: "https://api.loculus.staging.genspectrum.org/mpox"
+        url: "https://lapis.pathoplexus.org/mpox"
         mainDateField: "sampleCollectionDateRangeLower"
         locationFields:
-          - "country"
-          - "division"
+          - "geoLocCountry"
+          - "geoLocAdmin1"
         hostField: "hostNameScientific"
         authorAffiliationsField: "authorAffiliations"
         authorsField: "authors"
         additionalFilters:
           versionStatus: "LATEST_VERSION"
           isRevocation: "false"
       externalNavigationLinks:
-        - url: "https://loculus.staging.genspectrum.org/mpox"
+        - url: "https://pathoplexus.org/mpox"
           label: "Browse data"
           menuIcon: "database"
     westNile:
       lapis:
         url: "https://lapis.pathoplexus.org/west-nile"
-        mainDateField: "sampleCollectionDate"
+        mainDateField: "sampleCollectionDateRangeLower"
         locationFields:
           - "geoLocCountry"
           - "geoLocAdmin1"

diff --git a/website/.prettierrc b/website/.prettierrc
@@ -1,18 +1,18 @@
 {
-  "printWidth": 120,
-  "tabWidth": 4,
-  "trailingComma": "all",
-  "semi": true,
-  "jsxSingleQuote": true,
-  "singleQuote": true,
-  "quoteProps": "consistent",
-  "plugins": ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
-  "overrides": [
-    {
-      "files": "*.astro",
-      "options": {
-        "parser": "astro"
-      }
-    }
-  ]
+    "printWidth": 120,
+    "tabWidth": 4,
+    "trailingComma": "all",
+    "semi": true,
+    "jsxSingleQuote": true,
+    "singleQuote": true,
+    "quoteProps": "consistent",
+    "plugins": ["prettier-plugin-astro", "prettier-plugin-tailwindcss"],
+    "overrides": [
+        {
+            "files": "*.astro",
+            "options": {
+                "parser": "astro"
+            }
+        }
+    ]
 }
diff --git a/website/eslint.config.js b/website/eslint.config.js
@@ -93,8 +93,8 @@ const disableFromReact = {
 };
 
 export default tseslint.config(
-    { ignores: ['dist', 'node_modules'], files: ['**/*.ts', '**/*.tsx'] },
     {
+        ignores: ['**/.astro/content.d.ts'],
         files: ['**/*.ts', '**/*.tsx'],
         extends: [
             eslint.configs.recommended,