Skip to content
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
2 changes: 1 addition & 1 deletion explorer/app/components/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export { ExportSummary } from "@clevercanary/data-explorer-ui/lib/components/Exp
export { ExportToTerraForm } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ExportToTerra/components/ExportToTerraForm/exportToTerraForm";
export { TerraSetUpForm } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ExportToTerra/components/TerraSetUpForm/terraSetUpForm";
export { ExportToTerra } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ExportToTerra/exportToTerra";
export { ManifestDownloadEntity } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ManifestDownload/components/ManifestDownloadEntity/manifestDownloadEntity";
export { ManifestDownloadForm } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ManifestDownload/components/ManifestDownloadForm/manifestDownloadForm";
export { ManifestDownload } from "@clevercanary/data-explorer-ui/lib/components/Export/components/ManifestDownload/manifestDownload";
export { AzulFileDownload } from "@clevercanary/data-explorer-ui/lib/components/Index/components/AzulFileDownload/azulFileDownload";
Expand All @@ -59,7 +60,6 @@ export { Description } from "@clevercanary/data-explorer-ui/lib/components/Proje
export { Details } from "@clevercanary/data-explorer-ui/lib/components/Project/components/Details/details";
export { Publications } from "@clevercanary/data-explorer-ui/lib/components/Project/components/Publications/publications";
export { SupplementaryLinks } from "@clevercanary/data-explorer-ui/lib/components/Project/components/SupplementaryLinks/supplementaryLinks";
export { TitledText } from "@clevercanary/data-explorer-ui/lib/components/Project/components/TitledText/titledText";
export { ExportMethodView } from "@clevercanary/data-explorer-ui/lib/views/ExportMethodView/exportMethodView";
export { Fade } from "./common/Fade/fade";
export { MdxMarkdown } from "./common/MDXMarkdown/mdxMarkdown";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,25 @@ export const buildManifestDownload = (
};
};

/*
* Build props for ManifestDownloadEntity component.
* @param projectsResponse - Response model return from the entity response API.
* @returns model to be used as props for the ManifestDownloadEntity component.
*/
export const buildManifestDownloadEntity = (
projectsResponse: ProjectsResponse
): React.ComponentProps<typeof C.ManifestDownloadEntity> => {
// Get the initial filters.
const filters = getExportEntityFilters(projectsResponse);
// Get the metadata filters.
const metadataFilters = getMetadataFilters(filters);
return {
fileManifestType: FILE_MANIFEST_TYPE.ENTITY_DOWNLOAD_MANIFEST,
filters,
metadataFilters,
};
};

/**
* Build props for the project title Link component from the given entity response.
* @param projectsResponse - Response model return from the entity response API.
Expand Down Expand Up @@ -1482,6 +1501,20 @@ export function getGeneratedMatricesMatrixCellCountColumnDef<
};
}

/**
* Returns the metadata filters.
* @param filters - Filters.
* @returns metadata filters.
*/
function getMetadataFilters(filters: Filters): Filters {
const metadataFilters = [...filters];
metadataFilters.push({
categoryKey: HCA_DCP_CATEGORY_KEY.CONTENT_DESCRIPTION,
value: ["Database entry metadata"],
});
return metadataFilters;
}

/**
* Returns props for NTagCell component from the given entity and entity key.
* @param projectMatrixTableView - Project matrix view (by species).
Expand Down
14 changes: 7 additions & 7 deletions explorer/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion explorer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts"
},
"dependencies": {
"@clevercanary/data-explorer-ui": "0.43.0",
"@clevercanary/data-explorer-ui": "0.44.0",
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mdx-js/loader": "^2.3.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import { ComponentConfig } from "@clevercanary/data-explorer-ui/lib/config/entities";
import { ProjectsResponse } from "../../../../../app/apis/azul/hca-dcp/common/responses";
import * as C from "../../../../../app/components";
import * as V from "../../../../../app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders";

export const mainColumn: ComponentConfig[] = [
{
component: C.TitledText,
viewBuilder: () => ({
text: ["To do."],
title: "Metadata Download",
}),
} as ComponentConfig<typeof C.TitledText>,
component: C.ManifestDownloadEntity,
viewBuilder: V.buildManifestDownloadEntity,
} as ComponentConfig<typeof C.ManifestDownloadEntity, ProjectsResponse>,
];
Original file line number Diff line number Diff line change
@@ -1,8 +1,22 @@
import { ComponentConfig } from "@clevercanary/data-explorer-ui/lib/config/entities";
import * as C from "../../../../../app/components";
import * as MDX from "../../../../../app/content/hca-dcp";
import * as V from "../../../../../app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders";

export const sideColumn: ComponentConfig[] = [
{
children: [
{
component: C.ExportCurrentQuery,
viewBuilder: V.buildExportCurrentQuery,
} as ComponentConfig<typeof C.ExportCurrentQuery>,
{
component: C.ExportSelectedDataSummary,
viewBuilder: V.buildExportSelectedDataSummary,
} as ComponentConfig<typeof C.ExportSelectedDataSummary>,
],
component: C.ExportSummary,
} as ComponentConfig<typeof C.ExportSummary>,
{
children: [
{
Expand Down
14 changes: 8 additions & 6 deletions explorer/site-config/hca-dcp/dev/index/projectsEntityConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { PROJECTS_LABEL } from "../constants";
import { mainColumn as exportMainColumn } from "../detail/project/exportMainColumn";
import { sideColumn as exportSideColumn } from "../detail/project/exportSideColumn";
import { mainColumn as matricesMainColumn } from "../detail/project/matricesMainColumn";
import { mainColumn as metadataMainColumn } from "../detail/project/metadataMainColumn";
import { sideColumn as metadataSideColumn } from "../detail/project/metadataSideColumn";
import { mainColumn as overviewMainColumn } from "../detail/project/overviewMainColumn";
import { sideColumn as overviewSideColumn } from "../detail/project/overviewSideColumn";
import { mainColumn as projectFilesMainColumn } from "../detail/project/projectFilesMainColumn";
Expand All @@ -34,12 +36,12 @@ export const projectsEntityConfig: EntityConfig = {
route: "",
sideColumn: overviewSideColumn,
},
// {
// label: "Metadata",
// mainColumn: metadataMainColumn,
// route: "project-metadata",
// sideColumn: metadataSideColumn,
// },
{
label: "Metadata",
mainColumn: metadataMainColumn,
route: "project-metadata",
sideColumn: metadataSideColumn,
},
{
label: "Matrices",
mainColumn: matricesMainColumn,
Expand Down