diff --git a/.env.dev b/.env.dev index 1888065a..c0f2e7fb 100644 --- a/.env.dev +++ b/.env.dev @@ -1,3 +1,4 @@ VITE_API_URL=http://localhost:8002/api/v1 VITE_APP_URL=https://127.0.0.1:8081 VITE_SITE_TITLE=MaveDB (local API) +CLINICAL_FEATURES_ENABLED=false diff --git a/.env.live b/.env.live index 1949879e..9c919530 100644 --- a/.env.live +++ b/.env.live @@ -1,3 +1,4 @@ VITE_API_URL=https://api.mavedb.org/api/v1 VITE_APP_URL=https://mavedb.org VITE_SITE_TITLE=MaveDB +CLINICAL_FEATURES_ENABLED=false diff --git a/.env.preview b/.env.preview new file mode 100644 index 00000000..ad574ace --- /dev/null +++ b/.env.preview @@ -0,0 +1,4 @@ +VITE_API_URL=https://api.mavedb.org/api/v1 +VITE_APP_URL=https://preview.mavedb.org +VITE_SITE_TITLE=MaveDB (Preview Build) +CLINICAL_FEATURES_ENABLED=true diff --git a/.env.prodapi b/.env.prodapi index 9e2092ea..483f789b 100644 --- a/.env.prodapi +++ b/.env.prodapi @@ -1,3 +1,4 @@ VITE_API_URL=https://api.mavedb.org/api/v1 VITE_APP_URL=https://127.0.0.1:8081 VITE_SITE_TITLE=MaveDB (prod API) +CLINICAL_FEATURES_ENABLED=false diff --git a/.env.staging b/.env.staging index ce4a3f47..adf86040 100644 --- a/.env.staging +++ b/.env.staging @@ -1,3 +1,4 @@ VITE_API_URL=https://api.staging.mavedb.org/api/v1 VITE_APP_URL=https://staging.mavedb.org VITE_SITE_TITLE=MaveDB (Staging) +CLINICAL_FEATURES_ENABLED=false diff --git a/package-lock.json b/package-lock.json index 65e7a0e3..bc633bfe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "mavedb-ui", - "version": "2024.4.1", + "version": "2024.4.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mavedb-ui", - "version": "2024.4.1", + "version": "2024.4.2", "dependencies": { "@fontsource/raleway": "^5.0.16", "axios": "^1.6.2", "chart.js": "^4.4.1", - "d3": "^7.8.5", + "d3": "^7.9.0", "datatables.net": "1.11.5", "datatables.net-buttons": "1.7.0", "datatables.net-buttons-dt": "1.7.0", @@ -534,9 +534,9 @@ "dev": true }, "node_modules/@types/d3-selection": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.11.tgz", - "integrity": "sha512-bhAXu23DJWsrI45xafYpkQ4NtcKMwWnAC/vKrd2l+nxMFuvOT3XMYTIj2opv8vq8AO5Yh7Qac/nSeP/3zjTK0w==", + "version": "3.0.10", + "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-3.0.10.tgz", + "integrity": "sha512-cuHoUgS/V3hLdjJOLTT691+G2QoqAjCVLmr4kJXR4ha56w1Zdu8UUQ5TxLRqudgNjwXeQxKMq4j+lyf9sWuslg==", "dev": true }, "node_modules/@types/d3-shape": { @@ -567,9 +567,9 @@ "dev": true }, "node_modules/@types/d3-transition": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.9.tgz", - "integrity": "sha512-uZS5shfxzO3rGlu0cC3bjmMFKsXv+SmZZcgp0KD22ts4uGXp5EVYGzu/0YdwZeKmddhcAccYtREJKkPfXkZuCg==", + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/@types/d3-transition/-/d3-transition-3.0.8.tgz", + "integrity": "sha512-ew63aJfQ/ms7QQ4X7pk5NxQ9fZH/z+i24ZfJ6tJSfqxJMrYLiK01EAs2/Rtw/JreGUsS3pLPNV644qXFGnoZNQ==", "dev": true, "dependencies": { "@types/d3-selection": "*" @@ -1195,9 +1195,9 @@ } }, "node_modules/d3": { - "version": "7.8.5", - "resolved": "https://registry.npmjs.org/d3/-/d3-7.8.5.tgz", - "integrity": "sha512-JgoahDG51ncUfJu6wX/1vWQEqOflgXyl4MaHqlcSruTez7yhaRKR9i8VjjcQGeS2en/jnFivXuaIMnseMMt0XA==", + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/d3/-/d3-7.9.0.tgz", + "integrity": "sha512-e1U46jVP+w7Iut8Jt8ri1YsPOvFpg46k+K8TpCb0P+zjCkjkPnV7WzfDJzMHy1LnA+wj5pLT1wjO901gLXeEhA==", "dependencies": { "d3-array": "3", "d3-axis": "3", diff --git a/package.json b/package.json index ff4d8f3d..667d062b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mavedb-ui", - "version": "2024.4.1", + "version": "2024.4.2", "private": true, "scripts": { "build": "vite build --mode=${MODE=live}", @@ -11,7 +11,7 @@ "@fontsource/raleway": "^5.0.16", "axios": "^1.6.2", "chart.js": "^4.4.1", - "d3": "^7.8.5", + "d3": "^7.9.0", "datatables.net": "1.11.5", "datatables.net-buttons": "1.7.0", "datatables.net-buttons-dt": "1.7.0", diff --git a/src/components/ScoreSetHeatmap.vue b/src/components/ScoreSetHeatmap.vue index 2de0db64..7b151957 100644 --- a/src/components/ScoreSetHeatmap.vue +++ b/src/components/ScoreSetHeatmap.vue @@ -1,31 +1,29 @@ - diff --git a/src/components/ScoreSetHistogram.vue b/src/components/ScoreSetHistogram.vue index bedaf6ee..68cd3b94 100644 --- a/src/components/ScoreSetHistogram.vue +++ b/src/components/ScoreSetHistogram.vue @@ -1,21 +1,64 @@ - + + -.mave-histogram-tooltip { + diff --git a/src/components/ScoreSetTable.vue b/src/components/ScoreSetTable.vue index c7980e12..6786539e 100644 --- a/src/components/ScoreSetTable.vue +++ b/src/components/ScoreSetTable.vue @@ -15,6 +15,7 @@ import $ from "jquery"; import _ from "lodash"; +import { textForTargetGeneCategory } from "@/lib/target-genes" import useFormatters from "@/composition/formatters"; import FlexDataTable from "@/components/common/FlexDataTable"; @@ -25,6 +26,7 @@ export default { setup: () => { return { ...useFormatters(), + textForTargetGeneCategory: textForTargetGeneCategory }; }, @@ -79,7 +81,7 @@ export default { title: "Target", }, { - data: (x) => _.get(x, "targetGenes[0].category", "null category"), + data: (x) => textForTargetGeneCategory(_.get(x, "targetGenes[0].category", undefined)) || "null category", title: "Target type", }, { diff --git a/src/components/common/SelectList.vue b/src/components/common/SelectList.vue index 6be371b5..238807de 100644 --- a/src/components/common/SelectList.vue +++ b/src/components/common/SelectList.vue @@ -15,9 +15,9 @@
- diff --git a/src/components/screens/ScoreSetCreator.vue b/src/components/screens/ScoreSetCreator.vue index b03b3417..657b0ba8 100644 --- a/src/components/screens/ScoreSetCreator.vue +++ b/src/components/screens/ScoreSetCreator.vue @@ -96,14 +96,24 @@
+ style="width: 100%;" + > + + + {{ validationErrors.experiment }} @@ -322,11 +332,20 @@
-
+
+ Would you like to define any additional restrictions governing the usage of data within this score set? +
+
+ +
{{ hasCustomUsagePolicy ? 'Yes, I would like to define additional usage guidelines' : 'No, I do not need to define additional usage guidenlines' }}
+
+
+
This may assert, for example, the original author's right to publish the data first. @@ -584,7 +603,7 @@
- Use this autocomplete field to find an existing target in MaveDB and fill this target with its metadata. You'll still be able to edit any fields below. + Use this autocomplete field to find an existing target from one of your published or unpublished score sets in MaveDB and fill this target with its metadata. You'll still be able to edit any fields below.
@@ -595,7 +614,7 @@