From df4aab3fcb4404e6d4e2c59d3ea5e7d957e17bfb Mon Sep 17 00:00:00 2001 From: Fran McDade Date: Fri, 11 Aug 2023 14:44:37 +1000 Subject: [PATCH] chore: update data-explorer-ui to latest (#901) --- .../fileLocationArchivePreview.styles.ts | 4 +- explorer/app/components/index.tsx | 5 + .../content/hca-dcp/matrixQuestionnaire.mdx | 2 +- .../azul/hca-dcp/common/viewModelBuilders.ts | 1 - explorer/package-lock.json | 14 +-- explorer/package.json | 2 +- .../detail/consortium/studiesMainColumn.ts | 11 ++- .../detail/consortium/workspacesMainColumn.ts | 11 ++- .../dev/detail/study/workspacesMainColumn.ts | 11 ++- .../dev/detail/project/matricesMainColumn.ts | 99 ++++++++++--------- 10 files changed, 95 insertions(+), 65 deletions(-) diff --git a/explorer/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts b/explorer/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts index 27e7944a4..b5bc4282f 100644 --- a/explorer/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts +++ b/explorer/app/components/Detail/components/GeneratedMatricesTables/components/FileLocationArchivePreview/fileLocationArchivePreview.styles.ts @@ -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; `; diff --git a/explorer/app/components/index.tsx b/explorer/app/components/index.tsx index ba8914ad6..929a91e1d 100644 --- a/explorer/app/components/index.tsx +++ b/explorer/app/components/index.tsx @@ -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"; diff --git a/explorer/app/content/hca-dcp/matrixQuestionnaire.mdx b/explorer/app/content/hca-dcp/matrixQuestionnaire.mdx index ac5b4682b..65d97acb9 100644 --- a/explorer/app/content/hca-dcp/matrixQuestionnaire.mdx +++ b/explorer/app/content/hca-dcp/matrixQuestionnaire.mdx @@ -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? diff --git a/explorer/app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders.ts b/explorer/app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders.ts index bad92507b..f6e8a4dc8 100644 --- a/explorer/app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders.ts +++ b/explorer/app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders.ts @@ -702,7 +702,6 @@ export const buildHero = ( ): React.ComponentProps => { return { breadcrumbs: getProjectBreadcrumbs(projectsResponse), - status: undefined, // TODO status https://github.com/clevercanary/data-browser/issues/135 title: processEntityValue(projectsResponse.projects, "projectTitle"), }; }; diff --git a/explorer/package-lock.json b/explorer/package-lock.json index 96cf7c6b3..51fadb54f 100644 --- a/explorer/package-lock.json +++ b/explorer/package-lock.json @@ -8,7 +8,7 @@ "name": "explorer", "version": "0.1.0", "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", @@ -2119,9 +2119,9 @@ "dev": true }, "node_modules/@clevercanary/data-explorer-ui": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.33.0.tgz", - "integrity": "sha512-FSvOebbeOcOqpgaaRxbcw0wYAfCcfAxlZFGn/JECATRGe/ktYFK64wD5eAob0nl2rZGNpWZfMy4ao7OMJfFO0g==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.34.0.tgz", + "integrity": "sha512-sXIFqiuGIePMu7o9rMQSq6t19zgzBMF08XVS+VEeHZw5eR8vG0UgeDmFZU2VhFgp0MI+I3pRrbNhPuK557lwpw==", "peerDependencies": { "@emotion/react": "11.11.1", "@emotion/styled": "11.11.0", @@ -25187,9 +25187,9 @@ "dev": true }, "@clevercanary/data-explorer-ui": { - "version": "0.33.0", - "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.33.0.tgz", - "integrity": "sha512-FSvOebbeOcOqpgaaRxbcw0wYAfCcfAxlZFGn/JECATRGe/ktYFK64wD5eAob0nl2rZGNpWZfMy4ao7OMJfFO0g==", + "version": "0.34.0", + "resolved": "https://registry.npmjs.org/@clevercanary/data-explorer-ui/-/data-explorer-ui-0.34.0.tgz", + "integrity": "sha512-sXIFqiuGIePMu7o9rMQSq6t19zgzBMF08XVS+VEeHZw5eR8vG0UgeDmFZU2VhFgp0MI+I3pRrbNhPuK557lwpw==", "requires": {} }, "@colors/colors": { diff --git a/explorer/package.json b/explorer/package.json index c50de7c00..1457980b3 100644 --- a/explorer/package.json +++ b/explorer/package.json @@ -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", diff --git a/explorer/site-config/anvil-catalog/dev/detail/consortium/studiesMainColumn.ts b/explorer/site-config/anvil-catalog/dev/detail/consortium/studiesMainColumn.ts index 905c12141..b19d276a9 100644 --- a/explorer/site-config/anvil-catalog/dev/detail/consortium/studiesMainColumn.ts +++ b/explorer/site-config/anvil-catalog/dev/detail/consortium/studiesMainColumn.ts @@ -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, + children: [ + { + component: C.DetailViewTable, + viewBuilder: T.buildConsortiumDetailViewStudiesTable, + } as ComponentConfig, + ], + component: C.BackPageContentSingleColumn, + } as ComponentConfig, ]; diff --git a/explorer/site-config/anvil-catalog/dev/detail/consortium/workspacesMainColumn.ts b/explorer/site-config/anvil-catalog/dev/detail/consortium/workspacesMainColumn.ts index bcdf4c470..fc4af220b 100644 --- a/explorer/site-config/anvil-catalog/dev/detail/consortium/workspacesMainColumn.ts +++ b/explorer/site-config/anvil-catalog/dev/detail/consortium/workspacesMainColumn.ts @@ -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, + children: [ + { + component: C.DetailViewTable, + viewBuilder: T.buildConsortiumDetailViewWorkspacesTable, + } as ComponentConfig, + ], + component: C.BackPageContentSingleColumn, + } as ComponentConfig, ]; diff --git a/explorer/site-config/anvil-catalog/dev/detail/study/workspacesMainColumn.ts b/explorer/site-config/anvil-catalog/dev/detail/study/workspacesMainColumn.ts index c769fba46..630c6d79a 100644 --- a/explorer/site-config/anvil-catalog/dev/detail/study/workspacesMainColumn.ts +++ b/explorer/site-config/anvil-catalog/dev/detail/study/workspacesMainColumn.ts @@ -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, + children: [ + { + component: C.DetailViewTable, + viewBuilder: T.buildStudyDetailViewWorkspacesTable, + } as ComponentConfig, + ], + component: C.BackPageContentSingleColumn, + } as ComponentConfig, ]; diff --git a/explorer/site-config/hca-dcp/dev/detail/project/matricesMainColumn.ts b/explorer/site-config/hca-dcp/dev/detail/project/matricesMainColumn.ts index 507dd6c7d..15abf5daa 100644 --- a/explorer/site-config/hca-dcp/dev/detail/project/matricesMainColumn.ts +++ b/explorer/site-config/hca-dcp/dev/detail/project/matricesMainColumn.ts @@ -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, { children: [ { - children: [ - { - component: MDX.DCPGeneratedMatrices, - } as ComponentConfig, - ], - component: MDX.Section, - } as ComponentConfig, - { - component: C.GeneratedMatricesTables, - viewBuilder: V.buildDCPGeneratedMatricesTable, - } as ComponentConfig, - ], - component: C.FluidPaper, - } as ComponentConfig, - { - children: [ - { - children: [ - { - component: MDX.ContributorGeneratedMatrices, - } as ComponentConfig, - ], - component: MDX.Section, - } as ComponentConfig, - { - component: C.GeneratedMatricesTables, - viewBuilder: V.buildContributorGeneratedMatricesTable, - } as ComponentConfig, - ], - component: C.FluidPaper, - } as ComponentConfig, - { - children: [ + component: C.FluidAlert, + viewBuilder: V.buildBatchCorrectionWarning, + } as ComponentConfig, { children: [ { children: [ { - component: MDX.MatrixQuestionnaire, - } as ComponentConfig, + component: MDX.DCPGeneratedMatrices, + } as ComponentConfig, ], component: MDX.Section, } as ComponentConfig, + { + component: C.GeneratedMatricesTables, + viewBuilder: V.buildDCPGeneratedMatricesTable, + } as ComponentConfig< + typeof C.GeneratedMatricesTables, + ProjectsResponse + >, ], component: C.FluidPaper, } as ComponentConfig, @@ -63,16 +36,54 @@ export const mainColumn: ComponentConfig[] = [ { children: [ { - component: MDX.DataReleasePolicy, - } as ComponentConfig, + component: MDX.ContributorGeneratedMatrices, + } as ComponentConfig, ], component: MDX.Section, } as ComponentConfig, + { + component: C.GeneratedMatricesTables, + viewBuilder: V.buildContributorGeneratedMatricesTable, + } as ComponentConfig< + typeof C.GeneratedMatricesTables, + ProjectsResponse + >, ], component: C.FluidPaper, } as ComponentConfig, + { + children: [ + { + children: [ + { + children: [ + { + component: MDX.MatrixQuestionnaire, + } as ComponentConfig, + ], + component: MDX.Section, + } as ComponentConfig, + ], + component: C.FluidPaper, + } as ComponentConfig, + { + children: [ + { + children: [ + { + component: MDX.DataReleasePolicy, + } as ComponentConfig, + ], + component: MDX.Section, + } as ComponentConfig, + ], + component: C.FluidPaper, + } as ComponentConfig, + ], + component: C.Grid, + viewBuilder: V.buildTripleColumnGrid, + } as ComponentConfig, ], - component: C.Grid, - viewBuilder: V.buildTripleColumnGrid, - } as ComponentConfig, + component: C.BackPageContentSingleColumn, + } as ComponentConfig, ];