diff --git a/README.md b/README.md index 0e5e420..337b583 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ This project can generate two app zips. To generate the admin app: ``` -$ yarn build-webapp +$ yarn build ``` To generate the importer app: diff --git a/src/webapp/components/header-bar/HeaderBar.tsx b/src/webapp/components/header-bar/HeaderBar.tsx new file mode 100644 index 0000000..8ee5fdb --- /dev/null +++ b/src/webapp/components/header-bar/HeaderBar.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import { HeaderBar as D2HeaderBar } from "@dhis2/ui"; + +type HeaderBarProps = { + appName: string; +}; + +// avoid rendering header for versions > 2.41 +// https://developers.dhis2.org/docs/references/global-shell/#header-bars +export const HeaderBar: React.FC = ({ appName }) => { + const shouldRenderHeaderBar = window.self === window.top; + return shouldRenderHeaderBar ? : null; +}; diff --git a/src/webapp/pages/app/App.tsx b/src/webapp/pages/app/App.tsx index c4b6ffa..549adf4 100644 --- a/src/webapp/pages/app/App.tsx +++ b/src/webapp/pages/app/App.tsx @@ -1,5 +1,4 @@ import { useConfig } from "@dhis2/app-runtime"; -import { HeaderBar } from "@dhis2/ui"; import { LoadingProvider, SnackbarProvider } from "@eyeseetea/d2-ui-components"; import { MuiThemeProvider } from "@material-ui/core/styles"; import { Feedback, FeedbackOptions } from "@eyeseetea/feedback-component"; @@ -9,6 +8,7 @@ import OldMuiThemeProvider from "material-ui/styles/MuiThemeProvider"; import React, { useEffect, useState } from "react"; import CompositionRoot from "../../../CompositionRoot"; import { D2Api } from "../../../types/d2-api"; +import { HeaderBar } from "../../components/header-bar/HeaderBar"; import Share from "../../components/share/Share"; import { AppContext, AppContextState } from "../../contexts/app-context"; import { Config } from "../../models/Config";