From 1573b07cdd9fa61539c9457fdecd8e9c176e6a15 Mon Sep 17 00:00:00 2001 From: arnfinn Date: Fri, 24 Jun 2022 10:08:43 +0200 Subject: [PATCH] =?UTF-8?q?Registerbeskrivelse=20inn=20under=20tittel=20p?= =?UTF-8?q?=C3=A5=20register?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes #596 --- .../RegisterPage/SelectedRegister.tsx | 3 ++ .../__snapshots__/header.test.tsx.snap | 36 +++++++++++++++++++ .../header/__test__/header.test.tsx | 6 ++++ src/components/RegisterPage/header/header.tsx | 17 +++++++++ src/components/RegisterPage/index.tsx | 1 + .../__test__/indicatortable.test.tsx | 1 + .../tableblock/__test__/tableblock.test.tsx | 1 + src/components/test/data_builders.ts | 1 + 8 files changed, 66 insertions(+) diff --git a/src/components/RegisterPage/SelectedRegister.tsx b/src/components/RegisterPage/SelectedRegister.tsx index a8447dc8f..1989ce69c 100644 --- a/src/components/RegisterPage/SelectedRegister.tsx +++ b/src/components/RegisterPage/SelectedRegister.tsx @@ -149,6 +149,8 @@ export const SelectedRegister: React.FC = ({ return false; }); + const registerDescription = registerInfo[0].description; + const placeholder = tab === "opptaksomraade" ? (
@@ -163,6 +165,7 @@ export const SelectedRegister: React.FC = ({ dataFrom={registerFullName} tabNames={registerTabs} activeTab={tab as string} + registerText={registerDescription ?? undefined} />
diff --git a/src/components/RegisterPage/header/__test__/__snapshots__/header.test.tsx.snap b/src/components/RegisterPage/header/__test__/__snapshots__/header.test.tsx.snap index 8327be188..8c27dce7e 100644 --- a/src/components/RegisterPage/header/__test__/__snapshots__/header.test.tsx.snap +++ b/src/components/RegisterPage/header/__test__/__snapshots__/header.test.tsx.snap @@ -35,6 +35,24 @@ exports[`register page header renders correctly 1`] = ` Norsk hjerneslagregister
+
+

+ + Det norske hjerneslagregister + + er blablabla og + + blablabla + +

+
+
+
+

+ + Det norske hjerneslagregister + + er blablabla og + + blablabla + +

+
+
{ @@ -40,6 +43,8 @@ it("register page header renders correctly", () => { { value: "datakvalitet", label: "Datakvalitit" }, ]; const dataFrom = "Norsk hjerneslagregister"; + const registerText = + "[Det norske hjerneslagregister](https://vg.no) er blablabla og **blablabla**"; const { container } = render( @@ -49,6 +54,7 @@ it("register page header renders correctly", () => { registerNames={registerNames} tabNames={tabNames} dataFrom={dataFrom} + registerText={registerText} /> diff --git a/src/components/RegisterPage/header/header.tsx b/src/components/RegisterPage/header/header.tsx index 74ae461e6..aa393f17d 100644 --- a/src/components/RegisterPage/header/header.tsx +++ b/src/components/RegisterPage/header/header.tsx @@ -1,4 +1,5 @@ import React from "react"; +import ReactMarkdown from "react-markdown"; import { NSMLogo } from "./nsmlogo"; import { HeaderTabs } from "./headertabs"; import SelectRegister from "../../SelectRegister"; @@ -10,6 +11,7 @@ export interface HeaderProps { tabNames?: { label: string; value: string }[]; dataFrom?: string; activeTab: string; + registerText?: string; } export const Header: React.FC = (props) => { @@ -18,6 +20,7 @@ export const Header: React.FC = (props) => { tabNames = [], dataFrom = "medisinske kvalitetsregistre", activeTab, + registerText = undefined, } = props; return ( @@ -29,6 +32,20 @@ export const Header: React.FC = (props) => {

Resultater fra {dataFrom}

+ {registerText && ( +
+ {children}

; + }, + }} + > + {registerText} +
+
+
+ )}
{ diff --git a/src/components/RegisterPage/indicatortable/tableblock/__test__/tableblock.test.tsx b/src/components/RegisterPage/indicatortable/tableblock/__test__/tableblock.test.tsx index 4986b40c7..c2254ce33 100644 --- a/src/components/RegisterPage/indicatortable/tableblock/__test__/tableblock.test.tsx +++ b/src/components/RegisterPage/indicatortable/tableblock/__test__/tableblock.test.tsx @@ -15,6 +15,7 @@ const props: TableBlockProps = { caregiver_data: 1, resident_data: 1, dg_data: 1, + description: "Dette er litt tekst", }, blockTitle: "Nasjonalt hoftebruddregister", treatmentYear: 2019, diff --git a/src/components/test/data_builders.ts b/src/components/test/data_builders.ts index 3db7a55ff..97b56cda3 100644 --- a/src/components/test/data_builders.ts +++ b/src/components/test/data_builders.ts @@ -165,6 +165,7 @@ export const buildRegisterNames = (): RegisterNames[] => { caregiver_data: 1, resident_data: 1, dg_data: 1, + description: null, }; });