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

chore: update data-explorer-ui to 34 (#901) #3607

Merged
merged 1 commit into from
Aug 11, 2023
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
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TextButtonPrimary } from "@clevercanary/data-explorer-ui/lib/components/common/Button/button.styles";
import { ButtonTextPrimary } from "@clevercanary/data-explorer-ui/lib/components/common/Button/components/ButtonTextPrimary/buttonTextPrimary";
import styled from "@emotion/styled";

export const FileLocationArchivePreviewButton = styled(TextButtonPrimary)`
export const FileLocationArchivePreviewButton = styled(ButtonTextPrimary)`
font-weight: 400;
justify-self: flex-start;
`;
5 changes: 5 additions & 0 deletions explorer/app/components/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@ export { Cell } from "@clevercanary/data-explorer-ui/lib/components/Index/compon
export { Summaries } from "@clevercanary/data-explorer-ui/lib/components/Index/components/Hero/components/Summaries/summaries";
export { NTagCell } from "@clevercanary/data-explorer-ui/lib/components/Index/components/NTagCell/nTagCell";
export { Tooltip } from "@clevercanary/data-explorer-ui/lib/components/Index/components/Tooltip/tooltip";
export {
BackPageContentMainColumn,
BackPageContentSideColumn,
BackPageContentSingleColumn,
} from "@clevercanary/data-explorer-ui/lib/components/Layout/components/BackPage/backPageView.styles";
export { BackPageHero } from "@clevercanary/data-explorer-ui/lib/components/Layout/components/BackPage/components/BackPageHero/backPageHero";
export { Link } from "@clevercanary/data-explorer-ui/lib/components/Links/components/Link/link";
export { Links } from "@clevercanary/data-explorer-ui/lib/components/Links/links";
Expand Down
2 changes: 1 addition & 1 deletion explorer/app/content/hca-dcp/matrixQuestionnaire.mdx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ButtonSecondary } from "@clevercanary/data-explorer-ui/lib/components/common/Button/button.styles";
import { SectionActions } from "../../components/common/MDXMarkdown/components/Section/mdxSection.styles";
import { ANCHOR_TARGET } from "@clevercanary/data-explorer-ui/lib/components/Links/common/entities";
import { ButtonSecondary } from "@clevercanary/data-explorer-ui/lib/components/common/Button/components/ButtonSecondary/buttonSecondary";

### Have matrix questions?

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -702,7 +702,6 @@ export const buildHero = (
): React.ComponentProps<typeof C.BackPageHero> => {
return {
breadcrumbs: getProjectBreadcrumbs(projectsResponse),
status: undefined, // TODO status https://github.com/clevercanary/data-browser/issues/135
title: processEntityValue(projectsResponse.projects, "projectTitle"),
};
};
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.33.0",
"@clevercanary/data-explorer-ui": "0.34.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
Expand Up @@ -5,7 +5,12 @@ import * as T from "../../../../../app/viewModelBuilders/catalog/anvil-catalog/c

export const studiesMainColumn = [
{
component: C.DetailViewTable,
viewBuilder: T.buildConsortiumDetailViewStudiesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogConsortium>,
children: [
{
component: C.DetailViewTable,
viewBuilder: T.buildConsortiumDetailViewStudiesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogConsortium>,
],
component: C.BackPageContentSingleColumn,
} as ComponentConfig<typeof C.BackPageContentSingleColumn>,
];
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import * as T from "../../../../../app/viewModelBuilders/catalog/anvil-catalog/c

export const workspacesMainColumn = [
{
component: C.DetailViewTable,
viewBuilder: T.buildConsortiumDetailViewWorkspacesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogConsortium>,
children: [
{
component: C.DetailViewTable,
viewBuilder: T.buildConsortiumDetailViewWorkspacesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogConsortium>,
],
component: C.BackPageContentSingleColumn,
} as ComponentConfig<typeof C.BackPageContentSingleColumn>,
];
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@ import * as T from "../../../../../app/viewModelBuilders/catalog/anvil-catalog/c

export const workspacesMainColumn = [
{
component: C.DetailViewTable,
viewBuilder: T.buildStudyDetailViewWorkspacesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogStudy>,
children: [
{
component: C.DetailViewTable,
viewBuilder: T.buildStudyDetailViewWorkspacesTable,
} as ComponentConfig<typeof C.DetailViewTable, AnVILCatalogStudy>,
],
component: C.BackPageContentSingleColumn,
} as ComponentConfig<typeof C.BackPageContentSingleColumn>,
];
Original file line number Diff line number Diff line change
Expand Up @@ -5,56 +5,29 @@ import * as MDX from "../../../../../app/content/hca-dcp";
import * as V from "../../../../../app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders";

export const mainColumn: ComponentConfig[] = [
{
component: C.FluidAlert,
viewBuilder: V.buildBatchCorrectionWarning,
} as ComponentConfig<typeof C.FluidAlert>,
{
children: [
{
children: [
{
component: MDX.DCPGeneratedMatrices,
} as ComponentConfig<typeof MDX.DCPGeneratedMatrices>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
{
component: C.GeneratedMatricesTables,
viewBuilder: V.buildDCPGeneratedMatricesTable,
} as ComponentConfig<typeof C.GeneratedMatricesTables, ProjectsResponse>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
{
children: [
{
children: [
{
component: MDX.ContributorGeneratedMatrices,
} as ComponentConfig<typeof MDX.ContributorGeneratedMatrices>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
{
component: C.GeneratedMatricesTables,
viewBuilder: V.buildContributorGeneratedMatricesTable,
} as ComponentConfig<typeof C.GeneratedMatricesTables, ProjectsResponse>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
{
children: [
component: C.FluidAlert,
viewBuilder: V.buildBatchCorrectionWarning,
} as ComponentConfig<typeof C.FluidAlert>,
{
children: [
{
children: [
{
component: MDX.MatrixQuestionnaire,
} as ComponentConfig<typeof MDX.MatrixQuestionnaire>,
component: MDX.DCPGeneratedMatrices,
} as ComponentConfig<typeof MDX.DCPGeneratedMatrices>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
{
component: C.GeneratedMatricesTables,
viewBuilder: V.buildDCPGeneratedMatricesTable,
} as ComponentConfig<
typeof C.GeneratedMatricesTables,
ProjectsResponse
>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
Expand All @@ -63,16 +36,54 @@ export const mainColumn: ComponentConfig[] = [
{
children: [
{
component: MDX.DataReleasePolicy,
} as ComponentConfig<typeof MDX.DataReleasePolicy>,
component: MDX.ContributorGeneratedMatrices,
} as ComponentConfig<typeof MDX.ContributorGeneratedMatrices>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
{
component: C.GeneratedMatricesTables,
viewBuilder: V.buildContributorGeneratedMatricesTable,
} as ComponentConfig<
typeof C.GeneratedMatricesTables,
ProjectsResponse
>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
{
children: [
{
children: [
{
children: [
{
component: MDX.MatrixQuestionnaire,
} as ComponentConfig<typeof MDX.MatrixQuestionnaire>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
{
children: [
{
children: [
{
component: MDX.DataReleasePolicy,
} as ComponentConfig<typeof MDX.DataReleasePolicy>,
],
component: MDX.Section,
} as ComponentConfig<typeof MDX.Section>,
],
component: C.FluidPaper,
} as ComponentConfig<typeof C.FluidPaper>,
],
component: C.Grid,
viewBuilder: V.buildTripleColumnGrid,
} as ComponentConfig<typeof C.Grid>,
],
component: C.Grid,
viewBuilder: V.buildTripleColumnGrid,
} as ComponentConfig<typeof C.Grid>,
component: C.BackPageContentSingleColumn,
} as ComponentConfig<typeof C.BackPageContentSingleColumn>,
];