@openmrs/esm-openconceptlab-app 4.0.3 → 4.0.4-pre.144

package/src/import/import.test.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
-import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import Import from './import.component';
-import { openmrsFetch, showNotification } from '@openmrs/esm-framework';
+import { screen, waitFor } from '@testing-library/react';
+import { type FetchResponse, openmrsFetch, showNotification } from '@openmrs/esm-framework';
+import { mockSubscription } from '../../../../__mocks__/openconceptlab.mock';
 import { renderWithSwr } from '../../../../tools/test-helpers';
 import { startImportWithSubscription } from './import.resource';
-import { mockSubscription } from '../../../../__mocks__/openconceptlab.mock';
+import Import from './import.component';
 
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
-const mockStartImportWithSubscription = startImportWithSubscription as jest.Mock;
-const mockShowNotification = showNotification as jest.Mock;
+const mockShowNotification = jest.mocked(showNotification);
+const mockStartImportWithSubscription = jest.mocked(startImportWithSubscription);
 
 jest.mock('./import.resource', () => {
   const originalModule = jest.requireActual('./import.resource');
@@ -21,27 +21,10 @@ jest.mock('./import.resource', () => {
   };
 });
 
-jest.mock('@openmrs/esm-framework', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-  return {
-    ...originalModule,
-    showNotification: jest.fn(),
-  };
-});
-
-describe(`Import component`, () => {
-  afterEach(() => {
-    mockShowNotification.mockReset();
-  });
-
-  it(`renders without dying`, () => {
-    renderImportComponent();
-  });
-
-  it(`renders the form elements`, async () => {
+describe('Import component', () => {
+  it('renders the form elements', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
-    renderImportComponent();
+    renderWithSwr(<Import />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Import Concepts')).toBeVisible();
@@ -52,30 +35,30 @@ describe(`Import component`, () => {
     expect(screen.queryByText('File Added')).not.toBeInTheDocument();
   });
 
-  it(`renders correctly when there is no subscription`, async () => {
+  it('renders correctly when there is no subscription', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
-    renderImportComponent();
+    renderWithSwr(<Import />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Import from Subscription')).toBeDisabled();
     expect(screen.getByText('Import from file')).toBeEnabled();
   });
 
-  it(`renders correctly when when a subscription exists`, async () => {
+  it('renders correctly when when a subscription exists', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
-    renderImportComponent();
+    renderWithSwr(<Import />);
     await waitForLoadingToFinish();
 
     await waitFor(() => expect(screen.getByText('Import from Subscription')).toBeEnabled(), { timeout: 2000 });
     expect(screen.getByText('Import from file')).toBeEnabled();
   });
 
-  it(`allows starting an import using the subscription`, async () => {
+  it('allows starting an import using the subscription', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
-    renderImportComponent();
+    renderWithSwr(<Import />);
     await waitForLoadingToFinish();
 
-    mockStartImportWithSubscription.mockReturnValueOnce({ status: 201 });
+    mockStartImportWithSubscription.mockResolvedValue({ status: 201 } as unknown as FetchResponse);
 
     await waitFor(() => userEvent.click(screen.getByText('Import from Subscription')));
 
@@ -92,10 +75,6 @@ describe(`Import component`, () => {
   });
 });
 
-function renderImportComponent() {
-  renderWithSwr(<Import />);
-}
-
 function waitForLoadingToFinish() {
   return waitFor(() => {
     expect(screen.getByText('Import Concepts')).toBeVisible, { timeout: 2000 };

package/src/previous-imports/import-overview/import-items.test.tsx

@@ -6,7 +6,7 @@ import { mockImportItems, mockPreviousImports } from '../../../../../__mocks__/o
 import { getImportDetails } from './import-items.resource';
 import ImportItems from './import-items.component';
 
-const testProps = {
+const defaultProps = {
   importUuid: mockPreviousImports[1].uuid,
 };
 
@@ -22,43 +22,29 @@ jest.mock('./import-items.resource', () => {
   };
 });
 
-jest.mock('@openmrs/esm-framework', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-  return {
-    ...originalModule,
-    usePagination: jest.fn(),
-  };
-});
-
-describe(`Import Items component`, () => {
-  afterEach(() => {
-    mockGetImportDetails.mockReset();
-    mockUsePagination.mockReset();
-  });
-
-  it(`renders the table`, async () => {
+describe('Import items', () => {
+  it('renders a tabular overview', async () => {
     mockGetImportDetails.mockReturnValue({ status: 200, ok: true, data: mockImportItems });
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockImportItems,
     });
-    renderImportItemsComponent();
+    renderWithSwr(<ImportItems {...defaultProps} />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Concept/Mapping')).toBeVisible();
     expect(screen.getByText('Message')).toBeVisible();
   });
 
-  it(`renders the import items correctly`, async () => {
+  it('renders the import items correctly', async () => {
     mockGetImportDetails.mockReturnValue({ status: 200, ok: true, data: mockImportItems });
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockImportItems,
     });
-    renderImportItemsComponent();
+    renderWithSwr(<ImportItems {...defaultProps} />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Concept/Mapping')).toBeVisible();
@@ -71,10 +57,6 @@ describe(`Import Items component`, () => {
   });
 });
 
-function renderImportItemsComponent() {
-  renderWithSwr(<ImportItems {...testProps} />);
-}
-
 function waitForLoadingToFinish() {
   return waitFor(() => {
     expect(screen.getByText('Concept/Mapping')).toBeVisible(), { timeout: 2000 };

package/src/previous-imports/import-overview/import-overview.test.tsx

@@ -5,12 +5,8 @@ import { renderWithSwr } from '../../../../../tools/test-helpers';
 import { mockPreviousImports } from '../../../../../__mocks__/openconceptlab.mock';
 import ImportOverview from './import-overview.component';
 
-describe(`Import Overview component`, () => {
-  it(`renders without dying`, () => {
-    renderImportOverviewComponent(mockPreviousImports[0]);
-  });
-
-  it(`renders the fields`, async () => {
+describe('Import Overview component', () => {
+  it('renders the fields', async () => {
     renderImportOverviewComponent(mockPreviousImports[0]);
     await waitForLoadingToFinish();
 
@@ -20,7 +16,7 @@ describe(`Import Overview component`, () => {
     expect(screen.getByText('Result:')).toBeVisible();
   });
 
-  it(`renders the import details when no errored items`, async () => {
+  it('renders the import details when no errored items', async () => {
     const selectedImport = mockPreviousImports[0];
 
     renderImportOverviewComponent(selectedImport);
@@ -45,7 +41,7 @@ describe(`Import Overview component`, () => {
     expect(screen.getByText(ignoredErrorsText)).toBeVisible();
   });
 
-  it(`renders the import details when there are errored items`, async () => {
+  it('renders the import details when there are errored items', async () => {
     const selectedImport = mockPreviousImports[1];
 
     renderImportOverviewComponent(selectedImport);

package/src/previous-imports/previous-imports.test.tsx

@@ -8,37 +8,15 @@ import PreviousImports from './previous-imports.component';
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
 const mockUsePagination = usePagination as jest.Mock;
 
-jest.mock('@openmrs/esm-framework', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-  return {
-    ...originalModule,
-    usePagination: jest.fn(),
-  };
-});
-
-describe(`Previous Imports component`, () => {
-  afterEach(() => {
-    mockUsePagination.mockReset();
-  });
-
-  it(`renders without dying`, () => {
-    mockUsePagination.mockReturnValue({
-      currentPage: 1,
-      goTo: () => {},
-      results: [],
-    });
-    renderPreviousImportsComponent();
-  });
-
-  it(`renders the table`, async () => {
+describe('Previous imports', () => {
+  it('renders the table', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: [],
     });
-    renderPreviousImportsComponent();
+    renderWithSwr(<PreviousImports />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Previous Imports')).toBeVisible();
@@ -47,14 +25,14 @@ describe(`Previous Imports component`, () => {
     expect(screen.getByText('Status')).toBeVisible();
   });
 
-  it(`renders the previous imports correctly`, async () => {
+  it('renders the previous imports correctly', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: mockPreviousImports } });
     mockUsePagination.mockReturnValue({
       currentPage: 1,
       goTo: () => {},
       results: mockPreviousImports,
     });
-    renderPreviousImportsComponent();
+    renderWithSwr(<PreviousImports />);
     await waitForLoadingToFinish();
 
     mockPreviousImports.forEach((item) => {
@@ -65,10 +43,6 @@ describe(`Previous Imports component`, () => {
   });
 });
 
-function renderPreviousImportsComponent() {
-  renderWithSwr(<PreviousImports />);
-}
-
 function waitForLoadingToFinish() {
   return waitFor(() => {
     expect(screen.getByText('Previous Imports')).toBeVisible(), { timeout: 2000 };

package/src/root.test.tsx

@@ -1,14 +1,9 @@
 import React from 'react';
-import { render, cleanup, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import Root from './root.component';
 
-describe(`Root component`, () => {
-  afterEach(cleanup);
-  it(`renders without dying`, () => {
-    renderOclSubscriptionModule();
-  });
-
-  it(`renders the title and tab containers`, () => {
+describe('Root component', () => {
+  it('renders the title and tab containers', () => {
     renderOclSubscriptionModule();
     expect(screen.getByText('OCL Subscription Module')).toBeInTheDocument();
     expect(screen.getByRole('tab', { name: 'Subscription' })).toBeInTheDocument();

package/src/subscription/subscription.test.tsx

@@ -1,16 +1,16 @@
 import React from 'react';
-import { screen, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
-import Subscription from './subscription.component';
-import { openmrsFetch, showNotification } from '@openmrs/esm-framework';
+import { screen, waitFor } from '@testing-library/react';
+import { type FetchResponse, openmrsFetch, showNotification } from '@openmrs/esm-framework';
 import { renderWithSwr } from '../../../../tools/test-helpers';
 import { deleteSubscription, updateSubscription } from './subscription.resource';
 import { mockSubscription } from '../../../../__mocks__/openconceptlab.mock';
+import Subscription from './subscription.component';
 
 const mockOpenmrsFetch = openmrsFetch as jest.Mock;
-const mockUpdateSubscription = updateSubscription as jest.Mock;
-const mockDeleteSubscription = deleteSubscription as jest.Mock;
-const mockShowNotification = showNotification as jest.Mock;
+const mockUpdateSubscription = jest.mocked(updateSubscription);
+const mockDeleteSubscription = jest.mocked(deleteSubscription);
+const mockShowNotification = jest.mocked(showNotification);
 
 jest.mock('./subscription.resource', () => {
   const originalModule = jest.requireActual('./subscription.resource');
@@ -22,29 +22,10 @@ jest.mock('./subscription.resource', () => {
   };
 });
 
-jest.mock('@openmrs/esm-framework', () => {
-  const originalModule = jest.requireActual('@openmrs/esm-framework');
-
-  return {
-    ...originalModule,
-    showNotification: jest.fn(),
-  };
-});
-
-describe(`Subscription component`, () => {
-  afterEach(() => {
-    mockShowNotification.mockReset();
-    mockUpdateSubscription.mockReset();
-    mockOpenmrsFetch.mockReset();
-  });
-
-  it(`renders without dying`, () => {
-    renderSubscriptionComponent();
-  });
-
-  it(`renders the empty forms`, async () => {
+describe('Subscription component', () => {
+  it('renders the empty forms', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
-    renderSubscriptionComponent();
+    renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
 
     expect(screen.getByText('Setup Subscription')).toBeVisible();
@@ -52,9 +33,9 @@ describe(`Subscription component`, () => {
     expect(screen.getByRole('button', { name: 'danger Unsubscribe' })).toBeDisabled();
   });
 
-  it(`renders the subscription if a subscription exists`, async () => {
+  it('renders the subscription if a subscription exists', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
-    renderSubscriptionComponent();
+    renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
 
@@ -67,16 +48,16 @@ describe(`Subscription component`, () => {
     expect(screen.getByRole('button', { name: 'danger Unsubscribe' })).toBeEnabled();
   });
 
-  xit(`allows adding a new subscription`, async () => {
+  xit('allows adding a new subscription', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [] } });
-    renderSubscriptionComponent();
+    renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
 
     const urlInputField = screen.getByLabelText('Subscription URL');
     const tokenInputField = screen.getByLabelText('Token');
     const saveButton = screen.getByRole('button', { name: 'Save changes' });
 
-    mockUpdateSubscription.mockReturnValueOnce({ status: 201, ok: true });
+    mockUpdateSubscription.mockResolvedValueOnce({ status: 201, ok: true } as unknown as FetchResponse);
 
     await waitFor(() => userEvent.type(urlInputField, mockSubscription.url));
     await waitFor(() => userEvent.type(tokenInputField, mockSubscription.token));
@@ -97,9 +78,9 @@ describe(`Subscription component`, () => {
     expect(mockShowNotification).toHaveBeenCalledTimes(1);
   });
 
-  xit(`allows changing the saved subscription`, async () => {
+  xit('allows changing the saved subscription', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
-    renderSubscriptionComponent();
+    renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
 
@@ -107,7 +88,7 @@ describe(`Subscription component`, () => {
     const tokenInputField = screen.getByLabelText('Token');
     const saveButton = screen.getByRole('button', { name: 'Save changes' });
 
-    mockUpdateSubscription.mockReturnValueOnce({ status: 200, ok: true });
+    mockUpdateSubscription.mockResolvedValueOnce({ status: 200, ok: true } as unknown as FetchResponse);
 
     await waitFor(() => userEvent.clear(urlInputField));
     await waitFor(() => userEvent.clear(tokenInputField));
@@ -136,15 +117,15 @@ describe(`Subscription component`, () => {
     expect(mockShowNotification).toHaveBeenCalledTimes(1);
   });
 
-  xit(`allows removing the saved subscription`, async () => {
+  xit('allows removing the saved subscription', async () => {
     mockOpenmrsFetch.mockReturnValueOnce({ data: { results: [mockSubscription] } });
-    renderSubscriptionComponent();
+    renderWithSwr(<Subscription />);
     await waitForLoadingToFinish();
     await waitForLoadingSubscription();
 
     const unsubscribeButton = screen.getByRole('button', { name: 'danger Unsubscribe' });
 
-    mockDeleteSubscription.mockReturnValueOnce({ status: 204 });
+    mockDeleteSubscription.mockResolvedValueOnce({ status: 204 } as unknown as FetchResponse);
 
     await waitFor(() => userEvent.click(unsubscribeButton));
 
@@ -164,10 +145,6 @@ describe(`Subscription component`, () => {
   });
 });
 
-function renderSubscriptionComponent() {
-  renderWithSwr(<Subscription />);
-}
-
 function waitForLoadingToFinish() {
   return waitFor(() => {
     expect(screen.getByText('Setup Subscription')).toBeVisible(), { timeout: 2000 };

package/tsconfig.json

@@ -1,5 +1,5 @@
 {
   "extends": "../../tsconfig.json",
   "include": ["src/**/*"],
-  "exclude": ["src/**/*.test.tsx", "src/**/*.outdated.tsx"]
+  "exclude": ["src/**/*.test.tsx"]
 }

package/dist/173.js

@@ -1 +0,0 @@
-(globalThis.webpackChunk_openmrs_esm_openconceptlab_app=globalThis.webpackChunk_openmrs_esm_openconceptlab_app||[]).push([[173],{6173:(e,n,o)=>{"use strict";o.r(n),o.d(n,{adminOclCardLink:()=>l,importTranslation:()=>c,root:()=>i,startupApp:()=>p});var r=o(1083),t={},a="@openmrs/esm-openconceptlab-app",s={featureName:"openconceptlab",moduleName:a},c=o(4767);function p(){(0,r.defineConfigSchema)(a,t)}var i=(0,r.getAsyncLifecycle)((function(){return Promise.all([o.e(225),o.e(553),o.e(343),o.e(46),o.e(878)]).then(o.bind(o,3985))}),s),l=(0,r.getAsyncLifecycle)((function(){return Promise.all([o.e(225),o.e(343),o.e(46),o.e(745)]).then(o.bind(o,3745))}),s)},4767:(e,n,o)=>{var r={"./ar.json":[4132,132],"./en.json":[4300,300],"./es.json":[3099,99],"./fr.json":[4055,55]};function t(e){if(!o.o(r,e))return Promise.resolve().then((()=>{var n=new Error("Cannot find module '"+e+"'");throw n.code="MODULE_NOT_FOUND",n}));var n=r[e],t=n[0];return o.e(n[1]).then((()=>o(t)))}t.keys=()=>Object.keys(r),t.id=4767,e.exports=t}}]);