Skip to content

Support for v42 #578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eperedo wants to merge 6 commits into
base: feature/new-dashboard-logic-869cfc51u
Choose a base branch
from
Open

Support for v42 #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a70c610
update d2-api types and new sharing permission object
eperedo Mar 31, 2026
36b2179
fix lint errors
eperedo Mar 31, 2026
b36bc7f
migrate to new data entry app for target/actual datavalues
eperedo Apr 4, 2026
9133b48
generate custom form for actual/target dataSet. add old dhis2 events …
eperedo Apr 16, 2026
a095da2
fix country dashboard sharing: restrict to project users/groups inste…
Ramon-Jimenez Apr 16, 2026
641239a
Revert "fix country dashboard sharing: restrict to project users/grou…
Ramon-Jimenez Apr 16, 2026
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
7 changes: 5 additions & 2 deletions i18n/en.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2026-03-27T15:30:46.362Z\n"
"PO-Revision-Date: 2026-03-27T15:30:46.362Z\n"
"POT-Creation-Date: 2026-04-15T02:18:47.807Z\n"
"PO-Revision-Date: 2026-04-15T02:18:47.807Z\n"

msgid "Validating Project"
msgstr ""
Expand Down Expand Up @@ -1057,6 +1057,9 @@ msgstr ""
msgid "Message"
msgstr ""

msgid "Error generating custom form"
msgstr ""

msgid "Set Target Values for Project"
msgstr ""

Expand Down
2 changes: 1 addition & 1 deletion jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module.exports = {
collectCoverageFrom: ["src/**/*.js"],
testPathIgnorePatterns: ["/node_modules/", "/cypress"],
transformIgnorePatterns: ["/node_modules/(?!@eyeseetea/d2-ui-components)"],
transformIgnorePatterns: ["node_modules/(?!@eyeseetea/d2-ui-components|@eyeseetea/d2-api|axios)"],
modulePaths: ["src"],
moduleDirectories: ["node_modules"],
moduleNameMapper: {
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@dhis2/d2-ui-forms": "^6.5.3",
"@dhis2/ui": "6.12.0",
"@dhis2/ui-core": "^4.8.0",
"@eyeseetea/d2-api": "1.16.0-beta.13",
"@eyeseetea/d2-api": "1.21.0-beta.5",
"@eyeseetea/d2-ui-components": "2.7.0",
"@eyeseetea/feedback-component": "0.1.2",
"@krakenjs/post-robot": "^11.0.0",
Expand Down
10 changes: 7 additions & 3 deletions src/components/app/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,8 @@ const App: React.FC<AppProps> = props => {
return <div>Cannot load app: {loadError}</div>;
}

const shouldRenderHeaderBar = window.self === window.top;

if (error) {
return (
<h3 style={{ margin: 20 }}>
Expand Down Expand Up @@ -147,9 +149,11 @@ const App: React.FC<AppProps> = props => {
title={disableLogoNav?.title}
description={disableLogoNav?.description}
/>
<div onClick={headerClick}>
<HeaderBar appName={"Data Management"} />
</div>
{shouldRenderHeaderBar && (
<div onClick={headerClick}>
<HeaderBar appName={"Data Management"} />
</div>
)}

<div id="app" className="content">
<ApiContext.Provider value={appContext}>
Expand Down
33 changes: 7 additions & 26 deletions src/components/dashboard/Dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ const Dashboard: React.FC<DashboardProps> = props => {
const [state, setState] = React.useState<State>({ type: "loading", height: 10000 });
const iframeRef: React.RefObject<HTMLIFrameElement> = React.createRef();

const dashboardUrlBase = `${baseUrl}/dhis-web-dashboard`;
const dashboardUrl = dashboardUrlBase + `/#/${id}`;
const dashboardUrlBase = `${baseUrl}/apps/dashboard`;
const dashboardUrl = dashboardUrlBase + `#/${id}`;
const translations = getTranslations(name);
const appHistory = useAppHistory(backUrl);

Expand Down Expand Up @@ -153,30 +153,11 @@ function waitforElementToLoad(iframeDocument: HTMLDocument, selector: string) {
async function setDashboardStyling(iframe: HTMLIFrameElement) {
if (!iframe.contentWindow) return;
const iframeDocument = iframe.contentWindow.document;

await waitforElementToLoad(iframeDocument, ".app-wrapper,.dashboard-scroll-container");
const iFrameRoot = iframeDocument.querySelector<HTMLElement>("#root");
const iFrameWrapper = iframeDocument.querySelector<HTMLElement>(".app-wrapper");
const pageContainer = iframeDocument.querySelector<HTMLElement>(".page-container-top-margin");

if (iFrameWrapper?.children[0])
(iFrameWrapper.children[0] as HTMLElement).style.display = "none";
if (iFrameWrapper?.children[1])
(iFrameWrapper.children[1] as HTMLElement).style.display = "none";

// 2.36
iframeDocument.querySelectorAll("header").forEach(el => el.remove());
iframeDocument.querySelectorAll("[data-test='dashboards-bar']").forEach(el => el.remove());

// Hide top bar actions
iframeDocument
.querySelectorAll<HTMLElement>(
".dashboard-scroll-container > div > div[class*='ViewTitleBar_container']"
)
.forEach(el => (el.style.display = "none"));

if (pageContainer) pageContainer.style.marginTop = "0px";
if (iFrameRoot) iFrameRoot.style.marginTop = "0px";
await waitforElementToLoad(iframeDocument, "header");
const iFrameHeader = iframeDocument.querySelector<HTMLElement>("header");
if (iFrameHeader) {
iFrameHeader.style.display = "none";
}
}

export default React.memo(Dashboard);
Loading