@itwin/reports-config-widget-react 0.2.1 → 0.4.0

package/src/test/BulkExtractor.test.ts

@@ -2,11 +2,11 @@
 * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
-import BulkExtractor from "../widget/components/BulkExtractor";
+import { BulkExtractor } from "../widget/components/BulkExtractor";
 import { ExtractionStates } from "../widget/components/ExtractionStatus";
 import { assert } from "chai";
 import * as moq from "typemoq";
-import { ExtractorState } from "@itwin/insights-client";
+import { ExtractionClient, ExtractorState, ReportsClient } from "@itwin/insights-client";
 import type { AccessToken } from "@itwin/core-bentley";
 
 jest.mock("../widget/components/Constants.ts", () => ({
@@ -40,6 +40,8 @@ afterEach(() => {
 
 const mockToastCallback = jest.fn();
 
+const mockGetAccessToken = async () => "mockAccessToken";
+
 const mockIModelId = "mockIModelId";
 const mockIModelId1 = "mockIModelId1";
 const mockReportId = "mockReportId";
@@ -47,13 +49,9 @@ const mockRunId = "mockRunId";
 const mockRunId1 = "mockRunId1";
 
 describe("BulkExtractor", () => {
-  const mockApiConfig = {
-    getAccessToken: async () => "mockAccessToken",
-    baseUrl: "",
-  };
 
   it("should return status none for unknown iModel", async () => {
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     const result = await sut.getIModelState(mockIModelId, "", "");
     assert.strictEqual(result, ExtractionStates.None);
   });
@@ -67,7 +65,7 @@ describe("BulkExtractor", () => {
       async () => ({ state: ExtractorState.Running })
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     await sut.runIModelExtraction(mockIModelId);
     const result = await sut.getIModelState(mockIModelId, "", "");
     assert.strictEqual(result, ExtractionStates.Running);
@@ -82,7 +80,7 @@ describe("BulkExtractor", () => {
       async () => ({ state: ExtractorState.Failed })
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     await sut.runIModelExtraction(mockIModelId);
     const result = await sut.getIModelState(mockIModelId, "", "");
     assert.strictEqual(result, ExtractionStates.Failed);
@@ -105,7 +103,7 @@ describe("BulkExtractor", () => {
       async () => ({ state: ExtractorState.Succeeded })
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     await sut.runIModelExtraction(mockIModelId);
 
     let result = await sut.getIModelState(mockIModelId, "", "");
@@ -137,7 +135,7 @@ describe("BulkExtractor", () => {
       async () => ({ state: ExtractorState.Queued })
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
 
     await sut.runIModelExtractions(mockIModelIds);
 
@@ -149,7 +147,7 @@ describe("BulkExtractor", () => {
   });
 
   it("should return status none for unknown report", async () => {
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     const result = await sut.getReportState(mockReportId);
     assert.strictEqual(result, ExtractionStates.None);
   });
@@ -167,7 +165,7 @@ describe("BulkExtractor", () => {
       async () => ([{ imodelId: mockIModelId }])
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
 
     await sut.runReportExtractions([mockReportId]);
 
@@ -196,7 +194,7 @@ describe("BulkExtractor", () => {
       async () => ([{ imodelId: mockIModelId }, { imodelId: mockIModelId1 }])
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
 
     await sut.runReportExtractions([mockReportId]);
 
@@ -228,7 +226,7 @@ describe("BulkExtractor", () => {
       async () => ([{ imodelId: mockIModelId }, { imodelId: mockIModelId1 }])
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
 
     await sut.runReportExtractions([mockReportId]);
 
@@ -257,7 +255,7 @@ describe("BulkExtractor", () => {
       async () => ([{ imodelId: mockIModelId1 }, { imodelId: mockIModelId1 }])
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
 
     await sut.runReportExtractions([mockReportId]);
 
@@ -286,7 +284,7 @@ describe("BulkExtractor", () => {
       async () => ([{ imodelId: mockIModelId }])
     );
 
-    const sut = new BulkExtractor(mockApiConfig, mockToastCallback, mockToastCallback);
+    const sut = new BulkExtractor(new ReportsClient(), new ExtractionClient(), mockGetAccessToken, mockToastCallback, mockToastCallback);
     await sut.runReportExtractions([mockReportId]);
 
     let result = await sut.getReportState(mockReportId);

package/src/test/DeleteModal.test.tsx

@@ -3,67 +3,18 @@
 * See LICENSE.md in the project root for license terms and full copyright notice.
 *--------------------------------------------------------------------------------------------*/
 import React from "react";
-import faker from "@faker-js/faker";
 import "@testing-library/jest-dom";
-import type {
-  IModelConnection,
-  SelectionSet,
-  SelectionSetEvent,
-} from "@itwin/core-frontend";
-import { NoRenderApp } from "@itwin/core-frontend";
 import {
   render,
   screen,
-  TestUtils,
 } from "./test-utils";
-import * as moq from "typemoq";
-import type {
-  SelectionManager,
-  SelectionScopesManager,
-} from "@itwin/presentation-frontend";
-import {
-  Presentation,
-  SelectionChangeEvent,
-} from "@itwin/presentation-frontend";
-import type { BeEvent } from "@itwin/core-bentley";
 import DeleteModal from "../widget/components/DeleteModal";
 import { ReportsConfigWidget } from "../ReportsConfigWidget";
 import { EmptyLocalization } from "@itwin/core-common";
 
-const mockITwinId = faker.datatype.uuid();
-const mockIModelId1 = faker.datatype.uuid();
-
-const connectionMock = moq.Mock.ofType<IModelConnection>();
-const selectionManagerMock = moq.Mock.ofType<SelectionManager>();
-const selectionScopesManagerMock = moq.Mock.ofType<SelectionScopesManager>();
-
 beforeAll(async () => {
-  await NoRenderApp.startup({localization: new EmptyLocalization()});
-  await Presentation.initialize();
-  const selectionSet = moq.Mock.ofType<SelectionSet>();
-  const onChanged = moq.Mock.ofType<BeEvent<(ev: SelectionSetEvent) => void>>();
-  selectionSet.setup((x) => x.elements).returns(() => new Set([]));
-  selectionSet.setup((x) => x.onChanged).returns(() => onChanged.object);
-  connectionMock
-    .setup((x) => x.selectionSet)
-    .returns(() => selectionSet.object);
-  connectionMock.setup((x) => x.iModelId).returns(() => mockIModelId1);
-  connectionMock.setup((x) => x.iTwinId).returns(() => mockITwinId);
-
-  selectionManagerMock
-    .setup((x) => x.selectionChange)
-    .returns(() => new SelectionChangeEvent());
-
-  selectionScopesManagerMock
-    .setup(async (x) => x.getSelectionScopes(connectionMock.object))
-    .returns(async () => []);
-  selectionManagerMock
-    .setup((x) => x.scopes)
-    .returns(() => selectionScopesManagerMock.object);
-
-  Presentation.setSelectionManager(selectionManagerMock.object);
-  await TestUtils.initializeUiFramework(connectionMock.object);
-  await ReportsConfigWidget.initialize();
+  const localization = new EmptyLocalization();
+  await ReportsConfigWidget.initialize(localization);
 });
 
 describe("Delete modal", () => {
@@ -71,10 +22,9 @@ describe("Delete modal", () => {
     const { container } = render(
       <DeleteModal
         entityName="test"
-        show={true}
-        setShow={jest.fn()}
         onDelete={jest.fn()}
         refresh={jest.fn()}
+        onClose={jest.fn()}
       />
     );
     expect(container).toBeTruthy();
@@ -85,10 +35,9 @@ describe("Delete modal", () => {
     const { user } = render(
       <DeleteModal
         entityName="test"
-        show={true}
-        setShow={jest.fn()}
         onDelete={onDelete}
         refresh={jest.fn()}
+        onClose={jest.fn()}
       />
     );
     const deleteButton = screen.getByRole("button", {
@@ -97,22 +46,4 @@ describe("Delete modal", () => {
     await user.click(deleteButton);
     expect(onDelete).toHaveBeenCalled();
   });
-
-  it("should call setShow when cancel button is clicked", async () => {
-    const setShow = jest.fn();
-    const { user } = render(
-      <DeleteModal
-        entityName="test"
-        show={true}
-        setShow={setShow}
-        onDelete={jest.fn()}
-        refresh={jest.fn()}
-      />
-    );
-    const cancelButton = screen.getByRole("button", {
-      name: /cancel/i,
-    });
-    await user.click(cancelButton);
-    expect(setShow).toHaveBeenCalled();
-  });
 });

package/src/test/ReportAction.test.tsx

@@ -5,97 +5,28 @@
 import React from "react";
 import faker from "@faker-js/faker";
 import "@testing-library/jest-dom";
-import type {
-  IModelConnection,
-  SelectionSet,
-  SelectionSetEvent,
-} from "@itwin/core-frontend";
-import { NoRenderApp } from "@itwin/core-frontend";
 import { ReportsConfigWidget } from "../ReportsConfigWidget";
-import { setupServer } from "msw/node";
 import {
   render,
   screen,
-  TestUtils,
   waitForElementToBeRemoved,
 } from "./test-utils";
-import ReportAction from "../widget/components/ReportAction";
+import { ReportAction } from "../widget/components/ReportAction";
 import userEvent from "@testing-library/user-event";
-import { rest } from "msw";
-import type { Report } from "@itwin/insights-client";
-import * as moq from "typemoq";
-import { REPORTS_CONFIG_BASE_URL } from "../widget/ReportsConfigUiProvider";
-import type {
-  SelectionManager,
-  SelectionScopesManager,
-} from "@itwin/presentation-frontend";
-import {
-  Presentation,
-  SelectionChangeEvent,
-} from "@itwin/presentation-frontend";
-import type { BeEvent } from "@itwin/core-bentley";
 import { EmptyLocalization } from "@itwin/core-common";
-
-const mockITwinId = faker.datatype.uuid();
-const mockIModelId = faker.datatype.uuid();
-
-const connectionMock = moq.Mock.ofType<IModelConnection>();
-const selectionManagerMock = moq.Mock.ofType<SelectionManager>();
-const selectionScopesManagerMock = moq.Mock.ofType<SelectionScopesManager>();
-
-jest.mock("../widget/components/ReportMappings", () => ({
-  ReportMappings: () => "MockReportMappings",
-}));
-
-jest.mock("@itwin/appui-react", () => ({
-  ...jest.requireActual("@itwin/appui-react"),
-  useActiveIModelConnection: () => connectionMock.object,
-}));
-
-const server = setupServer();
+import type { Report } from "@itwin/insights-client";
+import { ReportsClient } from "@itwin/insights-client";
 
 beforeAll(async () => {
-  await NoRenderApp.startup({localization: new EmptyLocalization()});
-  await Presentation.initialize();
-  const selectionSet = moq.Mock.ofType<SelectionSet>();
-  const onChanged = moq.Mock.ofType<BeEvent<(ev: SelectionSetEvent) => void>>();
-  selectionSet.setup((x) => x.elements).returns(() => new Set([]));
-  selectionSet.setup((x) => x.onChanged).returns(() => onChanged.object);
-  connectionMock
-    .setup((x) => x.selectionSet)
-    .returns(() => selectionSet.object);
-  connectionMock.setup((x) => x.iModelId).returns(() => mockIModelId);
-  connectionMock.setup((x) => x.iTwinId).returns(() => mockITwinId);
-
-  selectionManagerMock
-    .setup((x) => x.selectionChange)
-    .returns(() => new SelectionChangeEvent());
-
-  selectionScopesManagerMock
-    .setup(async (x) => x.getSelectionScopes(connectionMock.object))
-    .returns(async () => []);
-  selectionManagerMock
-    .setup((x) => x.scopes)
-    .returns(() => selectionScopesManagerMock.object);
-
-  Presentation.setSelectionManager(selectionManagerMock.object);
-  await TestUtils.initializeUiFramework(connectionMock.object);
-  await ReportsConfigWidget.initialize();
-  server.listen();
-});
-
-afterAll(() => {
-  TestUtils.terminateUiFramework();
-  server.close();
+  const localization = new EmptyLocalization();
+  await ReportsConfigWidget.initialize(localization);
 });
 
-afterEach(() => server.resetHandlers());
-
 describe("Reports Action", () => {
   it("required fields should be filled out", async () => {
     const mockReturnFn = jest.fn();
 
-    render(<ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />);
+    render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />);
 
     const addButton = screen.getByRole("button", {
       name: /add/i,
@@ -109,6 +40,7 @@ describe("Reports Action", () => {
   });
 
   it("should be able to add report", async () => {
+    const mockReturnFn = jest.fn();
     const mockReport: Report = {
       id: faker.datatype.uuid(),
       displayName: "mOcKRePoRt1",
@@ -120,21 +52,16 @@ describe("Reports Action", () => {
         },
       },
     };
-    server.use(
-      rest.post(
-        `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports`,
-        async (_req, res, ctx) => {
-          return res(ctx.delay(400), ctx.status(200), ctx.json(mockReport));
-        }
-      )
-    );
 
-    const mockReturnFn = jest.fn();
+    const reportsClient = new ReportsClient();
 
-    const { user } = render(
-      <ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />
+    jest.spyOn(reportsClient, "createReport").mockImplementation(async () =>
+      new Promise((resolve) => setTimeout(() => { resolve(mockReport); }, 100))
     );
 
+    const { user } = render(
+      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />, { reportsClient });
+
     const addButton = screen.getByRole("button", {
       name: /add/i,
     });
@@ -170,7 +97,7 @@ describe("Reports Action", () => {
     const mockReturnFn = jest.fn();
 
     const { user } = render(
-      <ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />
+      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
     );
 
     const addButton = screen.getByRole("button", {
@@ -192,7 +119,7 @@ describe("Reports Action", () => {
     const mockReturnFn = jest.fn();
 
     const { user } = render(
-      <ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />
+      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
     );
 
     const addButton = screen.getByRole("button", {
@@ -214,7 +141,7 @@ describe("Reports Action", () => {
     const mockReturnFn = jest.fn();
 
     const { user } = render(
-      <ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />
+      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
     );
 
     const addButton = screen.getByRole("button", {
@@ -238,7 +165,7 @@ describe("Reports Action", () => {
     const mockReturnFn = jest.fn();
 
     const { user } = render(
-      <ReportAction iTwinId={mockITwinId} returnFn={mockReturnFn} />
+      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
     );
 
     const addButton = screen.getByRole("button", {

package/src/test/ReportMappingHorizontalTile.test.tsx

@@ -5,18 +5,11 @@
 import React from "react";
 import faker from "@faker-js/faker";
 import "@testing-library/jest-dom";
-import type {
-  IModelConnection,
-  SelectionSet,
-  SelectionSetEvent,
-} from "@itwin/core-frontend";
-import { NoRenderApp } from "@itwin/core-frontend";
 import { ReportsConfigWidget } from "../ReportsConfigWidget";
 import {
   fireEvent,
   render,
   screen,
-  TestUtils,
   waitFor,
   within,
 } from "./test-utils";
@@ -28,19 +21,11 @@ import type {
 import type { ReportMappingAndMapping } from "../widget/components/ReportMappings";
 import type { GetSingleIModelParams, IModelOperations, OperationOptions } from "@itwin/imodels-client-management";
 import { IModelState } from "@itwin/imodels-client-management";
-import type {
-  SelectionManager,
-  SelectionScopesManager,
-} from "@itwin/presentation-frontend";
-import {
-  Presentation,
-  SelectionChangeEvent,
-} from "@itwin/presentation-frontend";
 import { BeEvent } from "@itwin/core-bentley";
-import type BulkExtractor from "../widget/components/BulkExtractor";
 import { ExtractionStates } from "../widget/components/ExtractionStatus";
 import { ReportMappingHorizontalTile } from "../widget/components/ReportMappingHorizontalTile";
 import { EmptyLocalization } from "@itwin/core-common";
+import type { BulkExtractor } from "../widget/components/BulkExtractor";
 
 const mockITwinId = faker.datatype.uuid();
 // Lets work with two iModels for now.
@@ -202,54 +187,18 @@ const mockReportMappingsAndMappingsFactory = (): ReportMappingAndMapping[] => {
   return reportMappingsAndMapping;
 };
 
-const connectionMock = moq.Mock.ofType<IModelConnection>();
 const mockBulkExtractor = moq.Mock.ofType<BulkExtractor>();
-const selectionManagerMock = moq.Mock.ofType<SelectionManager>();
-const selectionScopesManagerMock = moq.Mock.ofType<SelectionScopesManager>();
 const mockIModelsClient = moq.Mock.ofType<IModelOperations<OperationOptions>>();
 
 jest.mock("../widget/components/Constants.ts", () => ({
   STATUS_CHECK_INTERVAL: 10,
 }));
 
-jest.mock("@itwin/appui-react", () => ({
-  ...jest.requireActual("@itwin/appui-react"),
-  useActiveIModelConnection: () => connectionMock.object,
-}));
-
 const mockOdataFeedUrl = "mockOdataFeedUrl";
 
 beforeAll(async () => {
-  await NoRenderApp.startup({localization: new EmptyLocalization()});
-  await Presentation.initialize();
-  const selectionSet = moq.Mock.ofType<SelectionSet>();
-  const onChanged = moq.Mock.ofType<BeEvent<(ev: SelectionSetEvent) => void>>();
-  selectionSet.setup((x) => x.elements).returns(() => new Set([]));
-  selectionSet.setup((x) => x.onChanged).returns(() => onChanged.object);
-  connectionMock
-    .setup((x) => x.selectionSet)
-    .returns(() => selectionSet.object);
-  connectionMock.setup((x) => x.iModelId).returns(() => mockIModelId1);
-  connectionMock.setup((x) => x.iTwinId).returns(() => mockITwinId);
-
-  selectionManagerMock
-    .setup((x) => x.selectionChange)
-    .returns(() => new SelectionChangeEvent());
-
-  selectionScopesManagerMock
-    .setup(async (x) => x.getSelectionScopes(connectionMock.object))
-    .returns(async () => []);
-  selectionManagerMock
-    .setup((x) => x.scopes)
-    .returns(() => selectionScopesManagerMock.object);
-
-  Presentation.setSelectionManager(selectionManagerMock.object);
-  await TestUtils.initializeUiFramework(connectionMock.object);
-  await ReportsConfigWidget.initialize();
-});
-
-afterAll(() => {
-  TestUtils.terminateUiFramework();
+  const localization = new EmptyLocalization();
+  await ReportsConfigWidget.initialize(localization);
 });
 
 afterEach(() => {