@itwin/reports-config-widget-react 0.5.0 → 0.6.0

package/src/test/ReportAction.test.tsx

@@ -1,16 +1,12 @@
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * 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 { ReportsConfigWidget } from "../ReportsConfigWidget";
-import {
-  render,
-  screen,
-  waitForElementToBeRemoved,
-} from "./test-utils";
+import { render, screen, waitForElementToBeRemoved } from "./test-utils";
 import { ReportAction } from "../widget/components/ReportAction";
 import userEvent from "@testing-library/user-event";
 import { EmptyLocalization } from "@itwin/core-common";
@@ -55,12 +51,16 @@ describe("Reports Action", () => {
 
     const reportsClient = new ReportsClient();
 
-    jest.spyOn(reportsClient, "createReport").mockImplementation(async () =>
-      new Promise((resolve) => setTimeout(() => { resolve(mockReport); }, 100))
+    jest.spyOn(reportsClient, "createReport").mockImplementation(
+      async () =>
+        new Promise((resolve) =>
+          setTimeout(() => {
+            resolve(mockReport);
+          }, 100),
+        ),
     );
 
-    const { user } = render(
-      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />, { reportsClient });
+    const { user } = render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />, { reportsClient });
 
     const addButton = screen.getByRole("button", {
       name: /add/i,
@@ -86,9 +86,7 @@ describe("Reports Action", () => {
     expect(cancelButton).toBeDisabled();
     expect(nameInput).toBeDisabled();
 
-    await waitForElementToBeRemoved(() =>
-      screen.getByTestId(/loading\-spinner/i)
-    );
+    await waitForElementToBeRemoved(() => screen.getByTestId(/loading\-spinner/i));
 
     expect(mockReturnFn).toHaveBeenCalledTimes(1);
   });
@@ -96,9 +94,7 @@ describe("Reports Action", () => {
   it("No duplicate underscores in the beginning of name", async () => {
     const mockReturnFn = jest.fn();
 
-    const { user } = render(
-      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
-    );
+    const { user } = render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />);
 
     const addButton = screen.getByRole("button", {
       name: /add/i,
@@ -110,17 +106,13 @@ describe("Reports Action", () => {
 
     await userEvent.type(nameInput, "__testName");
     await user.click(addButton);
-    expect(
-      screen.getByText(/validators\.noduplicateunderscore/i)
-    ).toBeInTheDocument();
+    expect(screen.getByText(/validators\.noduplicateunderscore/i)).toBeInTheDocument();
   });
 
   it("Only begin with letters or underscores of name", async () => {
     const mockReturnFn = jest.fn();
 
-    const { user } = render(
-      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
-    );
+    const { user } = render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />);
 
     const addButton = screen.getByRole("button", {
       name: /add/i,
@@ -132,17 +124,13 @@ describe("Reports Action", () => {
 
     await userEvent.type(nameInput, "$testName");
     await user.click(addButton);
-    expect(
-      screen.getByText(/validators\.onlybeginswithletterorunderscore/i)
-    ).toBeInTheDocument();
+    expect(screen.getByText(/validators\.onlybeginswithletterorunderscore/i)).toBeInTheDocument();
   });
 
   it("Only letters underscores and digits of name", async () => {
     const mockReturnFn = jest.fn();
 
-    const { user } = render(
-      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
-    );
+    const { user } = render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />);
 
     const addButton = screen.getByRole("button", {
       name: /add/i,
@@ -154,19 +142,13 @@ describe("Reports Action", () => {
 
     await userEvent.type(nameInput, "_# ");
     await user.click(addButton);
-    expect(
-      screen.getByText(
-        /validators\.FollowedByLettersUnderscoresSpacesAndDigits/i
-      )
-    ).toBeInTheDocument();
+    expect(screen.getByText(/validators\.FollowedByLettersUnderscoresSpacesAndDigits/i)).toBeInTheDocument();
   });
 
   it("check for character limits of name", async () => {
     const mockReturnFn = jest.fn();
 
-    const { user } = render(
-      <ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />
-    );
+    const { user } = render(<ReportAction onClickCancel={jest.fn()} onSaveSuccess={mockReturnFn} />);
 
     const addButton = screen.getByRole("button", {
       name: /add/i,

package/src/test/ReportMappingHorizontalTile.test.tsx

@@ -1,26 +1,14 @@
 /*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * 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 { ReportsConfigWidget } from "../ReportsConfigWidget";
-import {
-  fireEvent,
-  mockIModelId1,
-  mockIModelsResponse,
-  mockReportId,
-  render,
-  screen,
-  waitFor,
-  within,
-} from "./test-utils";
+import { fireEvent, mockIModelId1, mockIModelsResponse, mockReportId, render, screen, waitFor, within } from "./test-utils";
 import * as moq from "typemoq";
-import type {
-  MappingSingle,
-  ReportMappingCollection,
-} from "@itwin/insights-client";
+import type { MappingContainer, ReportMappingCollection } from "@itwin/insights-client";
 import type { ReportMappingAndMapping } from "../widget/components/ReportMappings";
 import type { GetSingleIModelParams } from "@itwin/imodels-client-management";
 import { BeEvent } from "@itwin/core-bentley";
@@ -89,29 +77,25 @@ const mockReportMappingsFactory = (): ReportMappingCollection => {
   };
 };
 
-const mockMappingsFactory = (
-  mockReportMappings: ReportMappingCollection
-): MappingSingle[] => {
-  const mockMappings: MappingSingle[] = mockReportMappings.mappings.map(
-    (mapping, index) => ({
-      mapping: {
-        id: mapping.mappingId,
-        mappingName: `mOcKMaPpIngNaMe${index}`,
-        description: `mOcKmApPInGDeScRiPtIoN${index}`,
-        extractionEnabled: false,
-        createdOn: "",
-        createdBy: "",
-        modifiedOn: "",
-        modifiedBy: "",
-        _links: {
-          imodel: {
-            // Tie the mapping to to the iModel Id
-            href: mapping.imodelId,
-          },
+const mockMappingsFactory = (mockReportMappings: ReportMappingCollection): MappingContainer[] => {
+  const mockMappings: MappingContainer[] = mockReportMappings.mappings.map((mapping, index) => ({
+    mapping: {
+      id: mapping.mappingId,
+      mappingName: `mOcKMaPpIngNaMe${index}`,
+      description: `mOcKmApPInGDeScRiPtIoN${index}`,
+      extractionEnabled: false,
+      createdOn: "",
+      createdBy: "",
+      modifiedOn: "",
+      modifiedBy: "",
+      _links: {
+        iModel: {
+          // Tie the mapping to to the iModel Id
+          href: mapping.imodelId,
         },
       },
-    })
-  );
+    },
+  }));
 
   return mockMappings;
 };
@@ -119,18 +103,17 @@ const mockMappingsFactory = (
 const mockReportMappingsAndMappingsFactory = (): ReportMappingAndMapping[] => {
   const reportMappings = mockReportMappingsFactory();
   const mockMappings = mockMappingsFactory(reportMappings);
-  const reportMappingsAndMapping =
-    reportMappings.mappings.map((reportMapping) => {
-      const mapping = mockMappings.find((x) => x.mapping.id === reportMapping.mappingId)!.mapping;
-      const iModelName = mockProjectIModels.iModels.find((x) => x.id === reportMapping.imodelId)!.displayName;
-      const reportMappingAndMapping: ReportMappingAndMapping = {
-        ...reportMapping,
-        iModelName,
-        mappingName: mapping.mappingName,
-        mappingDescription: mapping.description ?? "",
-      };
-      return reportMappingAndMapping;
-    });
+  const reportMappingsAndMapping = reportMappings.mappings.map((reportMapping) => {
+    const mapping = mockMappings.find((x) => x.mapping.id === reportMapping.mappingId)!.mapping;
+    const iModelName = mockProjectIModels.iModels.find((x) => x.id === reportMapping.imodelId)!.displayName;
+    const reportMappingAndMapping: ReportMappingAndMapping = {
+      ...reportMapping,
+      iModelName,
+      mappingName: mapping.mappingName,
+      mappingDescription: mapping.description ?? "",
+    };
+    return reportMappingAndMapping;
+  });
   return reportMappingsAndMapping;
 };
 
@@ -158,16 +141,19 @@ describe("Report Mapping Horizontal Tile", () => {
   it("tile renders correctly", async () => {
     const firstMockMapping = mockReportMappingsAndMappingsFactory()[0];
 
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.None);
 
-    render(<ReportMappingHorizontalTile
-      jobStartEvent={new BeEvent()}
-      mapping={firstMockMapping}
-      onClickDelete={() => { }}
-      bulkExtractor={mockBulkExtractor.object}
-      odataFeedUrl={mockOdataFeedUrl}
-    />);
+    render(
+      <ReportMappingHorizontalTile
+        jobStartEvent={new BeEvent()}
+        mapping={firstMockMapping}
+        onClickDelete={() => {}}
+        bulkExtractor={mockBulkExtractor.object}
+        odataFeedUrl={mockOdataFeedUrl}
+      />,
+    );
 
     mockBulkExtractor.verify(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl), moq.Times.once());
     await waitFor(() => expect(screen.getByRole("button", { name: /UpdateDataset/i })).not.toBeDisabled(), { timeout: 1000 });
@@ -181,22 +167,32 @@ describe("Report Mapping Horizontal Tile", () => {
 
   it("starting extraction sends request", async () => {
     const firstMockMapping = mockReportMappingsAndMappingsFactory()[0];
-
-    mockBulkExtractor.setup(async (x) => x.runIModelExtraction(firstMockMapping.imodelId))
-      .returns(async () => { return Promise.resolve(); });
-
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    const firstMockExtractionRequest = {
+      mappings: [{ id: firstMockMapping.mappingId }],
+      iModelId: firstMockMapping.imodelId,
+    };
+
+    mockBulkExtractor
+      .setup(async (x) => x.runIModelExtraction(firstMockExtractionRequest))
+      .returns(async () => {
+        return Promise.resolve();
+      });
+
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.None);
 
     const jobStartEvent = new BeEvent<(iModelId: string) => void>();
 
-    const { user } = render(<ReportMappingHorizontalTile
-      jobStartEvent={jobStartEvent}
-      mapping={firstMockMapping}
-      onClickDelete={() => { }}
-      bulkExtractor={mockBulkExtractor.object}
-      odataFeedUrl={mockOdataFeedUrl}
-    />);
+    const { user } = render(
+      <ReportMappingHorizontalTile
+        jobStartEvent={jobStartEvent}
+        mapping={firstMockMapping}
+        onClickDelete={() => {}}
+        bulkExtractor={mockBulkExtractor.object}
+        odataFeedUrl={mockOdataFeedUrl}
+      />,
+    );
 
     mockBulkExtractor.verify(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl), moq.Times.once());
     await waitFor(() => expect(screen.getByRole("button", { name: /UpdateDataset/i })).not.toBeDisabled(), { timeout: 1000 });
@@ -204,29 +200,39 @@ describe("Report Mapping Horizontal Tile", () => {
     const startExtractionButton = screen.getByRole("button", { name: /UpdateDataset/i });
     await user.click(startExtractionButton);
 
-    mockBulkExtractor.verify(async (x) => x.runIModelExtraction(firstMockMapping.imodelId), moq.Times.once());
+    mockBulkExtractor.verify(async (x) => x.runIModelExtraction(firstMockExtractionRequest), moq.Times.once());
   });
 
   it("on delete is called when remove is pressed", async () => {
     const firstMockMapping = mockReportMappingsAndMappingsFactory()[0];
-
-    mockBulkExtractor.setup(async (x) => x.runIModelExtraction(firstMockMapping.imodelId))
-      .returns(async () => { return Promise.resolve(); });
-
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    const firstMockExtractionRequest = {
+      mappings: [{ id: firstMockMapping.mappingId }],
+      iModelId: firstMockMapping.imodelId,
+    };
+
+    mockBulkExtractor
+      .setup(async (x) => x.runIModelExtraction(firstMockExtractionRequest))
+      .returns(async () => {
+        return Promise.resolve();
+      });
+
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.None);
 
     const mockOnClickDelete = jest.fn();
 
     const jobStartEvent = new BeEvent<(iModelId: string) => void>();
 
-    const { user } = render(<ReportMappingHorizontalTile
-      jobStartEvent={jobStartEvent}
-      mapping={firstMockMapping}
-      onClickDelete={mockOnClickDelete}
-      bulkExtractor={mockBulkExtractor.object}
-      odataFeedUrl={mockOdataFeedUrl}
-    />);
+    const { user } = render(
+      <ReportMappingHorizontalTile
+        jobStartEvent={jobStartEvent}
+        mapping={firstMockMapping}
+        onClickDelete={mockOnClickDelete}
+        bulkExtractor={mockBulkExtractor.object}
+        odataFeedUrl={mockOdataFeedUrl}
+      />,
+    );
 
     await waitFor(() => expect(screen.getByRole("button", { name: /Remove/i })).not.toBeDisabled(), { timeout: 1000 });
 
@@ -238,53 +244,68 @@ describe("Report Mapping Horizontal Tile", () => {
 
   it("full extraction status cycle", async () => {
     const firstMockMapping = mockReportMappingsAndMappingsFactory()[0];
+    const firstMockExtractionRequest = {
+      mappings: [{ id: firstMockMapping.mappingId }],
+      iModelId: firstMockMapping.imodelId,
+    };
 
-    mockIModelsClient.setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId1 })))
+    mockIModelsClient
+      .setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId1 })))
       .returns(async () => mockIModelsResponse[0].iModel);
 
-    mockBulkExtractor.setup(async (x) => x.runIModelExtraction(firstMockMapping.imodelId))
-      .returns(async () => { return Promise.resolve(); });
+    mockBulkExtractor
+      .setup(async (x) => x.runIModelExtraction(firstMockExtractionRequest))
+      .returns(async () => {
+        return Promise.resolve();
+      });
 
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.None);
 
     const mockOnClickDelete = jest.fn();
 
     const jobStartEvent = new BeEvent<(iModelId: string) => void>();
 
-    const { user } = render(<ReportMappingHorizontalTile
-      jobStartEvent={jobStartEvent}
-      mapping={firstMockMapping}
-      onClickDelete={mockOnClickDelete}
-      bulkExtractor={mockBulkExtractor.object}
-      odataFeedUrl={mockOdataFeedUrl}
-    />);
+    const { user } = render(
+      <ReportMappingHorizontalTile
+        jobStartEvent={jobStartEvent}
+        mapping={firstMockMapping}
+        onClickDelete={mockOnClickDelete}
+        bulkExtractor={mockBulkExtractor.object}
+        odataFeedUrl={mockOdataFeedUrl}
+      />,
+    );
 
     await waitFor(() => expect(screen.getByRole("button", { name: /UpdateDataset/i })).not.toBeDisabled(), { timeout: 1000 });
 
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.Starting);
 
     const startExtractionButton = screen.getByRole("button", { name: /UpdateDataset/i });
     await user.click(startExtractionButton);
 
-    mockBulkExtractor.verify(async (x) => x.runIModelExtraction(firstMockMapping.imodelId), moq.Times.once());
+    mockBulkExtractor.verify(async (x) => x.runIModelExtraction(firstMockExtractionRequest), moq.Times.once());
 
     expect(screen.getByTitle(/Starting/i)).toBeInTheDocument();
 
     mockBulkExtractor.reset();
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.Queued);
 
     await waitFor(() => expect(screen.getByTitle(/Queued/i)).toBeInTheDocument(), { timeout: 1000 });
 
     mockBulkExtractor.reset();
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.Running);
     await waitFor(() => expect(screen.getByTitle(/Running/i)).toBeInTheDocument(), { timeout: 1000 });
 
     mockBulkExtractor.reset();
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.Succeeded);
     await waitFor(() => expect(screen.getByTitle(/Success/i)).toBeInTheDocument(), { timeout: 1000 });
 
@@ -297,8 +318,13 @@ describe("Report Mapping Horizontal Tile", () => {
     const mockReportMappingsAndMappings = mockReportMappingsAndMappingsFactory();
     const firstMockMapping = mockReportMappingsAndMappings[0];
     const secondMockMapping = mockReportMappingsAndMappings[1];
+    const firstMockExtractionRequest = {
+      mappings: [{ id: firstMockMapping.mappingId }],
+      iModelId: firstMockMapping.imodelId,
+    };
 
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.None);
 
     const jobStartEvent = new BeEvent<(iModelId: string) => void>();
@@ -308,18 +334,19 @@ describe("Report Mapping Horizontal Tile", () => {
         <ReportMappingHorizontalTile
           jobStartEvent={jobStartEvent}
           mapping={firstMockMapping}
-          onClickDelete={() => { }}
+          onClickDelete={() => {}}
           bulkExtractor={mockBulkExtractor.object}
           odataFeedUrl={mockOdataFeedUrl}
         />
         <ReportMappingHorizontalTile
           jobStartEvent={jobStartEvent}
           mapping={secondMockMapping}
-          onClickDelete={() => { }}
+          onClickDelete={() => {}}
           bulkExtractor={mockBulkExtractor.object}
           odataFeedUrl={mockOdataFeedUrl}
         />
-      </div>);
+      </div>,
+    );
 
     const tiles = screen.getAllByTestId("horizontal-tile");
 
@@ -329,11 +356,15 @@ describe("Report Mapping Horizontal Tile", () => {
     }
 
     mockBulkExtractor.reset();
-    mockBulkExtractor.setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
+    mockBulkExtractor
+      .setup(async (x) => x.getIModelState(firstMockMapping.imodelId, firstMockMapping.iModelName, mockOdataFeedUrl))
       .returns(async () => ExtractionStates.Queued);
 
-    mockBulkExtractor.setup(async (x) => x.runIModelExtraction(firstMockMapping.imodelId))
-      .returns(async () => { return Promise.resolve(); });
+    mockBulkExtractor
+      .setup(async (x) => x.runIModelExtraction(firstMockExtractionRequest))
+      .returns(async () => {
+        return Promise.resolve();
+      });
 
     const startExtractionButton = screen.getAllByRole("button", { name: /UpdateDataset/i })[0];
     await user.click(startExtractionButton);