@openmrs/esm-report-builder 0.1.1-pre.88 → 0.1.1-pre.90

package/dist/openmrs-esm-report-builder.js.buildmanifest.json

@@ -86,9 +86,9 @@
       "initial": false,
       "entry": false,
       "recorded": false,
-      "size": 4016454,
+      "size": 4016444,
       "sizes": {
-        "javascript": 4016454
+        "javascript": 4016444
       },
       "names": [],
       "idHints": [],
@@ -102,7 +102,7 @@
       "auxiliaryFiles": [
         "253.js.map"
       ],
-      "hash": "f8f4d54cdfbc5318",
+      "hash": "7e72b814b58ccc18",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"report-builder","online":true,"offline":false,"order":1}],"extensions":[{"name":"system-administration-report-builder-card-link","slot":"system-admin-page-card-link-slot","component":"reportBuilderAdminLink","online":true,"offline":false,"privileges":"Task: reportbuilder.report.view"},{"component":"confirmModal","name":"confirm-modal","online":true,"offline":true}],"version":"0.1.1-pre.88"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","pages":[{"component":"root","route":"report-builder","online":true,"offline":false,"order":1}],"extensions":[{"name":"system-administration-report-builder-card-link","slot":"system-admin-page-card-link-slot","component":"reportBuilderAdminLink","online":true,"offline":false,"privileges":"Task: reportbuilder.report.view"},{"component":"confirmModal","name":"confirm-modal","online":true,"offline":true}],"version":"0.1.1-pre.90"}

package/e2e/core/global-setup.ts

@@ -13,9 +13,9 @@ async function globalSetup(config: FullConfig) {
   const response = await requestContext.post(`${e2eBaseUrl}/ws/rest/v1/session`, {
     headers: {
       Authorization: authHeader,
-      'Content-Type': 'application/x-www-form-urlencoded',
+      'Content-Type': 'application/json',
     },
-    form: {
+    data: {
       sessionLocation: loginLocation,
     },
     failOnStatusCode: false,

package/e2e/pages/etl-sources.page.ts

@@ -10,7 +10,7 @@ export class ETLSourcesPage {
   }
 
   async expectLoaded() {
-    await expect(this.page.getByRole('heading', { name: 'ETL Sources' })).toBeVisible();
+    await expect(this.page.getByRole('heading', { name: 'ETL Sources', exact: true })).toBeVisible();
   }
 
   async clickNew() {
@@ -18,12 +18,12 @@ export class ETLSourcesPage {
   }
 
   async fillForm(data: { name: string; code?: string; schemaName?: string; sourceType?: string; description?: string; tablePatterns?: string }) {
-    await this.page.locator('[data-testid="etl-source-name"] input').fill(data.name);
-    if (data.code !== undefined) await this.page.locator('[data-testid="etl-source-code"] input').fill(data.code);
-    if (data.schemaName !== undefined) await this.page.locator('[data-testid="etl-source-schema"] input').fill(data.schemaName);
-    if (data.sourceType !== undefined) await this.page.locator('[data-testid="etl-source-type"] input').fill(data.sourceType);
-    if (data.description !== undefined) await this.page.locator('[data-testid="etl-source-description"] textarea').fill(data.description);
-    if (data.tablePatterns !== undefined) await this.page.locator('[data-testid="etl-source-table-patterns"] textarea').fill(data.tablePatterns);
+    await this.page.getByTestId('etl-source-name').fill(data.name);
+    if (data.code !== undefined) await this.page.getByTestId('etl-source-code').fill(data.code);
+    if (data.schemaName !== undefined) await this.page.getByTestId('etl-source-schema').fill(data.schemaName);
+    if (data.sourceType !== undefined) await this.page.getByTestId('etl-source-type').fill(data.sourceType);
+    if (data.description !== undefined) await this.page.getByTestId('etl-source-description').fill(data.description);
+    if (data.tablePatterns !== undefined) await this.page.getByTestId('etl-source-table-patterns').fill(data.tablePatterns);
   }
 
   async save() {

package/e2e/pages/report-sections.page.ts

@@ -10,12 +10,12 @@ export class ReportSectionsPage {
   }
 
   async expectLoaded() {
-    await expect(this.page.getByRole('heading', { name: 'Sections' })).toBeVisible();
+    await expect(this.page.getByRole('heading', { name: 'Sections', exact: true })).toBeVisible();
   }
 
   async openPreviewFor(sectionName: string) {
     const row = this.page.getByTestId(`section-row-${sectionName.replace(/\s+/g, '-')}`);
-    await row.getByLabel('Actions').click();
+    await row.getByRole('button').click();
     await this.page.getByText('Preview', { exact: true }).click();
   }
 }

package/e2e/pages/section-preview.modal.ts

@@ -9,10 +9,10 @@ export class SectionPreviewModal {
   }
 
   async fillPreviewRequest(data: { startDate: string; endDate: string; indicatorUuid?: string; maxRows?: number }) {
-    await this.page.locator('[data-testid="section-preview-startdate"] input').fill(data.startDate);
-    await this.page.locator('[data-testid="section-preview-enddate"] input').fill(data.endDate);
-    if (data.indicatorUuid !== undefined) await this.page.locator('[data-testid="section-preview-indicatoruuid"] input').fill(data.indicatorUuid);
-    if (data.maxRows !== undefined) await this.page.locator('[data-testid="section-preview-maxrows"] input').fill(String(data.maxRows));
+    await this.page.getByTestId('section-preview-startdate').fill(data.startDate);
+    await this.page.getByTestId('section-preview-enddate').fill(data.endDate);
+    if (data.indicatorUuid !== undefined) await this.page.getByTestId('section-preview-indicatoruuid').fill(data.indicatorUuid);
+    if (data.maxRows !== undefined) await this.page.getByTestId('section-preview-maxrows').fill(String(data.maxRows));
   }
 
   async run() {

package/e2e/specs/section-preview.spec.ts

@@ -89,6 +89,6 @@ test.describe('section preview', () => {
     });
     await sectionPreviewModal.run();
     await sectionPreviewModal.expectMatrixVisible();
-    await expect(page.getByText('HTS TST')).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'HTS TST' })).toBeVisible();
   });
 });

package/e2e/support/github/Dockerfile

@@ -10,13 +10,23 @@ RUN corepack enable && yarn install --immutable
 
 COPY . .
 
-# Build the module, pack it, and assemble the SPA (shell + this app)
+# Build and pack this module
 RUN yarn build
 RUN yarn pack -o /app/_openmrs_esm_report_builder.tgz
-RUN yarn openmrs assemble --manifest --mode config --config e2e/support/github/spa-assemble-config.json --target /app/spa
-RUN yarn openmrs build --target /app/spa
+
+# Assemble the SPA from the manifest's default module set plus this module.
+# Do not run `openmrs build` afterwards: rebuilding the shell here decouples it
+# from the manifest-pinned modules and breaks module federation.
+RUN npm_config_legacy_peer_deps=true npm install -g openmrs@next
+ARG CACHE_BUST
+RUN npm_config_legacy_peer_deps=true openmrs assemble --manifest --mode config --config e2e/support/github/spa-assemble-config.json --target /app/spa
 
 FROM openmrs/openmrs-reference-application-3-frontend:nightly
 
-RUN rm -rf /usr/share/nginx/html/*
+# Keep the image's default index.html (the startup script patches it with
+# SPA_PATH/API_URL at runtime); overlay the freshly assembled import map and
+# modules after dropping the precompressed variants that would shadow them.
+RUN rm -f /usr/share/nginx/html/importmap.json.br /usr/share/nginx/html/importmap.json.gz \
+    /usr/share/nginx/html/routes.registry.json.br /usr/share/nginx/html/routes.registry.json.gz
+
 COPY --from=build /app/spa/ /usr/share/nginx/html/

package/e2e/support/github/spa-assemble-config.json

@@ -1,9 +1,6 @@
 {
   "frontendModules": {
-    "@openmrs/esm-login-app": "next",
     "@openmrs/esm-primary-navigation-app": "next",
-    "@openmrs/esm-home-app": "next",
-    "@openmrs/esm-system-admin-app": "next",
     "@openmrs/esm-report-builder": "file:/app/_openmrs_esm_report_builder.tgz"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-report-builder",
-  "version": "0.1.1-pre.88",
+  "version": "0.1.1-pre.90",
   "license": "MPL-2.0",
   "description": "OpenMRS ESM Report Builder",
   "browser": "dist/openmrs-esm-report-builder.js",

package/src/components/report-sections/report-section-preview-modal.component.tsx

@@ -236,7 +236,7 @@ export default function ReportSectionPreviewModal({ open, onClose, section }: Pr
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [selectedTabIndex, data, section]); // generateSql and sqlData are intentionally omitted to avoid infinite loops
 
-  const canRun = Boolean(section?.uuid) && Boolean(startDate) && Boolean(endDate) && !loading;
+  const canRun = Boolean(section?.uuid) && !loading;
 
   // Function to extract pre-compiled SQL from section configJson
   const generateSql = (indicatorUuid: string, section: ReportSectionDto) => {

package/src/components/shared/header/header.component.tsx

@@ -39,7 +39,7 @@ const Header: React.FC<HeaderProps> = ({ title, subtitle, status, actions, showA
 
                 <div className={styles.pageLabels}>
                     <div className={styles.appName}>{t('reportBuilder', 'Report builder')}</div>
-                    <div className={styles.pageTitle}>{title}</div>
+                    <h1 className={styles.pageTitle}>{title}</h1>
 
                     {(metaLeft || metaRight) && (
                         <div className={styles.metaLine}>

package/src/components/shared/header/header.scss

@@ -44,6 +44,7 @@
   @include type.type-style('heading-05');
   color: var(--cds-text-primary, #161616);
   line-height: 1.15;
+  margin: 0;
 }
 
 .metaLine {