Skip to content
This repository was archived by the owner on Nov 14, 2022. It is now read-only.
Open
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
Expand Up @@ -15,6 +15,7 @@ const registerInfo: RegisterNames[] = [
caregiver_data: 1,
resident_data: 0,
dg_data: 1,
description: null,
},
];
it("registry table renders correctly for a single registry", async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 3 additions & 0 deletions src/components/RegisterPage/SelectedRegister.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ export const SelectedRegister: React.FC<SelectedRegisterProps> = ({
return false;
});

const registerDescription = registerInfo[0].description;

const placeholder =
tab === "opptaksomraade" ? (
<div>
Expand All @@ -162,6 +164,7 @@ export const SelectedRegister: React.FC<SelectedRegisterProps> = ({
dataFrom={registerFullName}
tabNames={registerTabs}
activeTab={tab as string}
registerText={registerDescription ?? undefined}
/>
<div className="app-body">
<div className="selection-container" ref={selection_bar_ref}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ exports[`register page header renders correctly 1`] = `
Norsk hjerneslagregister
</h3>
</div>
<div
class="headerText"
>
<p
style="margin: 0px;"
>
<a
href="https://vg.no"
>
Det norske hjerneslagregister
</a>
er blablabla og
<strong>
blablabla
</strong>
</p>
<br />
</div>
</div>
<div
class="topHeaderRight"
Expand Down Expand Up @@ -193,6 +211,24 @@ exports[`register page header renders correctly 2`] = `
Norsk hjerneslagregister
</h3>
</div>
<div
class="headerText"
>
<p
style="margin: 0px;"
>
<a
href="https://vg.no"
>
Det norske hjerneslagregister
</a>
er blablabla og
<strong>
blablabla
</strong>
</p>
<br />
</div>
</div>
<div
class="topHeaderRight"
Expand Down
6 changes: 6 additions & 0 deletions src/components/RegisterPage/header/__test__/header.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const registerInfo: RegisterNames[] = [
caregiver_data: 1,
resident_data: 1,
dg_data: 1,
description: null,
},
{
id: 2,
Expand All @@ -22,6 +23,7 @@ const registerInfo: RegisterNames[] = [
caregiver_data: 1,
resident_data: 1,
dg_data: 1,
description: null,
},
{
id: 3,
Expand All @@ -30,6 +32,7 @@ const registerInfo: RegisterNames[] = [
caregiver_data: 1,
resident_data: 1,
dg_data: 1,
description: null,
},
];
it("register page header renders correctly", () => {
Expand All @@ -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(
<BrowserRouter>
Expand All @@ -49,6 +54,7 @@ it("register page header renders correctly", () => {
registerNames={registerNames}
tabNames={tabNames}
dataFrom={dataFrom}
registerText={registerText}
/>
</QueryParamProvider>
</BrowserRouter>
Expand Down
17 changes: 17 additions & 0 deletions src/components/RegisterPage/header/header.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -10,6 +11,7 @@ export interface HeaderProps {
tabNames?: { label: string; value: string }[];
dataFrom?: string;
activeTab: string;
registerText?: string;
}

export const Header: React.FC<HeaderProps> = (props) => {
Expand All @@ -18,6 +20,7 @@ export const Header: React.FC<HeaderProps> = (props) => {
tabNames = [],
dataFrom = "medisinske kvalitetsregistre",
activeTab,
registerText = undefined,
} = props;

return (
Expand All @@ -29,6 +32,20 @@ export const Header: React.FC<HeaderProps> = (props) => {
<div className={style.headerText}>
<h3>Resultater fra {dataFrom}</h3>
</div>
{registerText && (
<div className={style.headerText}>
<ReactMarkdown
components={{
p({ children }) {
return <p style={{ margin: 0 }}>{children}</p>;
},
}}
>
{registerText}
</ReactMarkdown>
<br />
</div>
)}
</div>
<div className={style.topHeaderRight}>
<SelectRegister
Expand Down
1 change: 1 addition & 0 deletions src/components/RegisterPage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface RegisterNames {
caregiver_data: 1 | 0 | null;
resident_data: 1 | 0 | null;
dg_data: 1 | 0 | null;
description: string | null;
}

export interface StatisticData {
Expand Down
1 change: 1 addition & 0 deletions src/components/test/data_builders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ export const buildRegisterNames = (): RegisterNames[] => {
caregiver_data: 1,
resident_data: 1,
dg_data: 1,
description: null,
};
});

Expand Down