Merge pull request #1997 from sanger/develop

Merging develop to master
sanger · Oct 9, 2024 · 546aa6d · 546aa6d
2 parents 3d7ce9c + 30ef2d3
commit 546aa6d
Show file tree

Hide file tree

Showing 41 changed files with 2,279 additions and 2,784 deletions.
diff --git a/.env b/.env
@@ -3,6 +3,7 @@ VITE_TRACTION_GRAPHQL_URL=http://traction/graphql
 VITE_PRINTMYBARCODE_BASE_URL=http://printmybarcode
 VITE_SAMPLEEXTRACTION_BASE_URL=http://sampleextraction
 VITE_SEQUENCESCAPE_BASE_URL=http://sequencescape
+VITE_LABWHERE_BASE_URL=http://labwhere
 VITE_SEQUENCESCAPE_API_KEY=development
 VITE_LOG=false
 VITE_ENVIRONMENT=development
diff --git a/.env.development b/.env.development
@@ -2,6 +2,7 @@ VITE_TRACTION_BASE_URL=http://traction
 VITE_TRACTION_GRAPHQL_URL=http://traction/graphql
 VITE_PRINTMYBARCODE_BASE_URL=http://printmybarcode
 VITE_SAMPLEEXTRACTION_BASE_URL=http://sampleextraction
+VITE_LABWHERE_BASE_URL=http://labwhere
 VITE_SEQUENCESCAPE_API_KEY=development
 VITE_LOG=true
 VITE_ENVIRONMENT=development
diff --git a/.env.production b/.env.production
@@ -3,5 +3,6 @@ VITE_TRACTION_GRAPHQL_URL=REPLACE_VITE_TRACTION_GRAPHQL_URL
 VITE_PRINTMYBARCODE_BASE_URL=REPLACE_VITE_PRINTMYBARCODE_BASE_URL
 VITE_SAMPLEEXTRACTION_BASE_URL=REPLACE_VITE_SAMPLEEXTRACTION_BASE_URL
 VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
+VITE_LABWHERE_BASE_URL=REPLACE_VITE_LABWHERE_BASE_URL
 VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
 VITE_ENVIRONMENT=REPLACE_VITE_ENVIRONMENT
diff --git a/.env.uat b/.env.uat
@@ -3,5 +3,6 @@ VITE_TRACTION_GRAPHQL_URL=REPLACE_VITE_TRACTION_GRAPHQL_URL
 VITE_PRINTMYBARCODE_BASE_URL=REPLACE_VITE_PRINTMYBARCODE_BASE_URL
 VITE_SAMPLEEXTRACTION_BASE_URL=REPLACE_VITE_SAMPLEEXTRACTION_BASE_URL
 VITE_SEQUENCESCAPE_BASE_URL=REPLACE_VITE_SEQUENCESCAPE_BASE_URL
+VITE_LABWHERE_BASE_URL=REPLACE_VITE_LABWHERE_BASE_URL
 VITE_SEQUENCESCAPE_API_KEY=REPLACE_VITE_SEQUENCESCAPE_API_KEY
 VITE_ENVIRONMENT=REPLACE_VITE_ENVIRONMENT
diff --git a/.release-version b/.release-version
@@ -1 +1 @@
-10.7.6
+10.7.7
diff --git a/jsdoc.json b/jsdoc.json
@@ -1,12 +1,11 @@
 {
   "source": {
     "include": ["src", "public", "style_guide.md"],
-    "plugins": ["plugins/markdown", "node_modules/better-docs/component"],
+    "plugins": ["plugins/markdown"],
     "includePattern": ".+\\.(js|svg)$"
   },
   "opts": {
-    "readme": "./README.md",
-    "template": "node_modules/better-docs"
+    "readme": "./README.md"
   },
   "templates": {
     "better-docs": {