Skip to content
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 13 additions & 0 deletions src/webapp/components/header-bar/HeaderBar.tsx
Original file line number Diff line number Diff line change
@@ -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<HeaderBarProps> = ({ appName }) => {
const shouldRenderHeaderBar = window.self === window.top;
return shouldRenderHeaderBar ? <D2HeaderBar appName={appName} /> : null;
};
2 changes: 1 addition & 1 deletion src/webapp/pages/app/App.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand All @@ -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";
Expand Down
Loading