Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User datasets verbiage and config #1271

Merged
merged 3 commits into from
Nov 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/libs/web-common/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ export const {
datasetImportUrl = '',
showUnreleasedData = false,
vdiServiceUrl = '',
userDatasetsUploadTypes = '',
} = window.__SITE_CONFIG__;

export const edaExampleAnalysesAuthors = !window.__SITE_CONFIG__
Expand Down
31 changes: 13 additions & 18 deletions packages/libs/web-common/src/user-dataset-upload-config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,18 @@ export const uploadTypeConfig: DatasetUploadTypeConfig<ImplementedUploadTypes> =
},
renderInfo: () => (
<p className="formInfo">
Please upload a zip file with your RNASeq results: your bigWig and
fpkm fastq files containing your processed reads.
<br />
Each file in the collection of FPKM or TPM files should be a two
column tab-delimited file where the first column contains gene ids,
and the second column contains normalized counts for each gene,
either FPKM or TPM. The first line must have column headings
'gene_id' and either 'FPKM' or 'TMP'.
<br />
<br />
The files must be mapped to the reference genome that you select
above.
<br />
Only letters, numbers, spaces and dashes are allowed in the file
name.
<br />
Please restrict the name to 100 characters or less.
Complete the Upload My Normalized RNA-Seq form. Name, Summary and
Upload File/URL are required. Three types of files – bigWig, counts
and index – are supported in the uploaded zip file. BigWig files are
not required but will allow visualization in the genome browser if
included. The counts (FPKM/TPM) files should be tab-delimited and
contain two columns with column headers: 'gene_id', and either
'FPKM' or 'TMP'. The index file should be named manifest.txt and
consist of a tab delimited txt file with three columns (no column
headers): sample name, filename, and strandedness
(unstranded/stranded). Upload Data Set initiates the transfer and
will create a record page for your data set that contains links to
the fold change search, and bigWig files if included.
</p>
),
uploadMethodConfig: {
Expand All @@ -82,7 +77,7 @@ export const uploadTypeConfig: DatasetUploadTypeConfig<ImplementedUploadTypes> =
bigwigfiles: {
type: 'bigwigfiles',
displayName: 'bigWig',
description: `Integrate your BigWig data in ${projectId}.`,
description: `Integrate your bigWig data in ${projectId}.`,
uploadTitle: 'Upload My bigWig Data Set',
formConfig: {
summary: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ import { useLocation } from 'react-router-dom';
import { Loading } from '@veupathdb/wdk-client/lib/Components';
import { RouteEntry } from '@veupathdb/wdk-client/lib/Core/RouteEntry';

import { communitySite } from '@veupathdb/web-common/lib/config';
import {
communitySite,
userDatasetsUploadTypes,
} from '@veupathdb/web-common/lib/config';
import ExternalContentController from '@veupathdb/web-common/lib/controllers/ExternalContentController';

import { uploadTypeConfig } from '@veupathdb/web-common/lib/user-dataset-upload-config';
Expand All @@ -14,7 +17,9 @@ const UserDatasetRouter = React.lazy(
() => import('./controllers/UserDatasetRouter')
);

const availableUploadTypes = ['genelist', 'bigwigfiles', 'rnaseq'];
const availableUploadTypes = userDatasetsUploadTypes.trim()
? userDatasetsUploadTypes.split(/,\s*/g)
: ['genelist', 'bigwigfiles', 'rnaseq'];

const USER_DATASETS_HELP_PAGE = 'user_datasets_help.html';

Expand Down
1 change: 1 addition & 0 deletions packages/sites/genomics-site/webpack.config.local.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default configure({
siteSearchServiceUrl: process.env.SITE_SEARCH_SERVICE_ENDPOINT,
useUserDatasetsWorkspace: process.env.USER_DATASETS_WORKSPACE_ENABLED === 'true',
datasetImportUrl: process.env.USER_DATASETS_WORKSPACE_IMPORT_SERVICE_ENDPOINT,
userDatasetsUploadTypes: process.env.USER_DATASETS_UPLOAD_TYPES,
useEda: process.env.EDA_ENABLED === "true",
edaExampleAnalysesAuthor: process.env.EDA_EXAMPLE_ANALYSES_AUTHOR,
edaServiceUrl: process.env.EDA_SERVICE_ENDPOINT,
Expand Down
Loading