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

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);

package/src/test/ReportMappings.test.tsx

@@ -1,12 +1,13 @@
 /*---------------------------------------------------------------------------------------------
-* 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 "@testing-library/jest-dom";
 import { ReportsConfigWidget } from "../ReportsConfigWidget";
 import {
   act,
+  mockExtractionRequestDetails,
   mockIModelId1,
   mockIModelId2,
   mockIModelsResponse,
@@ -18,16 +19,8 @@ import {
   within,
 } from "./test-utils";
 import * as moq from "typemoq";
-import type {
-  MappingsClient,
-  MappingSingle,
-  Report,
-  ReportMappingCollection,
-} from "@itwin/insights-client";
-import {
-  ExtractionClient,
-  ReportsClient,
-} from "@itwin/insights-client";
+import type { MappingContainer, MappingsClient, Report, ReportMappingCollection } from "@itwin/insights-client";
+import { ExtractionClient, ReportsClient } from "@itwin/insights-client";
 import { ReportMappings } from "../widget/components/ReportMappings";
 import type { GetSingleIModelParams, IModelsClient } from "@itwin/imodels-client-management";
 import { BulkExtractor } from "../widget/components/BulkExtractor";
@@ -108,29 +101,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;
 };
@@ -142,10 +131,12 @@ jest.mock("../widget/components/Constants.ts", () => ({
 
 jest.mock("../widget/components/ReportMappingHorizontalTile", () => ({
   ReportMappingHorizontalTile: (props: ReportMappingHorizontalTileProps) => {
-    return (<div data-testid="horizontal-tile">
-      <Text>{props.mapping.mappingName}</Text>
-      <Text title={props.mapping.mappingDescription}>{props.mapping.iModelName}</Text>
-    </div>);
+    return (
+      <div data-testid="horizontal-tile">
+        <Text>{props.mapping.mappingName}</Text>
+        <Text title={props.mapping.mappingDescription}>{props.mapping.iModelName}</Text>
+      </div>
+    );
   },
 }));
 
@@ -178,15 +169,16 @@ const mockMappingsClient = moq.Mock.ofType<MappingsClient>();
 beforeAll(async () => {
   const localization = new EmptyLocalization();
   await ReportsConfigWidget.initialize(localization);
-  mockIModelsClientOperations.setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId1 })))
+  mockIModelsClientOperations
+    .setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId1 })))
     .returns(async () => mockIModelsResponse[0].iModel);
-  mockIModelsClientOperations.setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId2 })))
+  mockIModelsClientOperations
+    .setup(async (x) => x.getSingle(moq.It.isObjectWith<GetSingleIModelParams>({ iModelId: mockIModelId2 })))
     .returns(async () => mockIModelsResponse[1].iModel);
-  mockIModelsClient.setup((x) => x.iModels)
-    .returns(() => mockIModelsClientOperations.object);
+  mockIModelsClient.setup((x) => x.iModels).returns(() => mockIModelsClientOperations.object);
   mockReportsClient.setup(async (x) => x.getReportMappings(moq.It.isAny(), moq.It.isAny())).returns(mockGetReportMappings);
   mockMappingsClient.setup(async (x) => x.getMappings(moq.It.isAny(), moq.It.isAny())).returns(mockGetMappings);
-  mockMappingsClient.setup(async (x) => x.getMapping(moq.It.isAny(), moq.It.isAny(), moq.It.isAny())).returns(mockGetMapping);
+  mockMappingsClient.setup(async (x) => x.getMapping(moq.It.isAny(), moq.It.isAny())).returns(mockGetMapping);
 });
 
 afterEach(() => {
@@ -203,7 +195,11 @@ describe("Report Mappings View", () => {
     mockGetMapping.mockReturnValueOnce(mockMappings[0].mapping).mockReturnValueOnce(mockMappings[1].mapping);
     mockGetReportMappings.mockReturnValueOnce(mockReportMappings.mappings);
 
-    render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, { reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object });
+    render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, {
+      reportsClient: mockReportsClient.object,
+      mappingsClient: mockMappingsClient.object,
+      iModelsClient: mockIModelsClient.object,
+    });
 
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
 
@@ -218,7 +214,11 @@ describe("Report Mappings View", () => {
     mockGetMapping.mockReturnValueOnce(mockMappings[0].mapping).mockReturnValueOnce(mockMappings[1].mapping);
     mockGetReportMappings.mockReturnValueOnce(mockReportMappings.mappings);
 
-    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, { reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object });
+    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, {
+      reportsClient: mockReportsClient.object,
+      mappingsClient: mockMappingsClient.object,
+      iModelsClient: mockIModelsClient.object,
+    });
 
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
 
@@ -232,29 +232,20 @@ describe("Report Mappings View", () => {
     // Be an exact match on display name.
     await user.type(searchInput, mockMappings[0].mapping.mappingName);
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
-    expect(
-      screen.getByText(mockMappings[0].mapping.mappingName)
-    ).toBeInTheDocument();
+    expect(screen.getByText(mockMappings[0].mapping.mappingName)).toBeInTheDocument();
 
     // Be an exact match on description.
     await user.clear(searchInput);
     await user.type(searchInput, mockMappings[0].mapping.description ?? "");
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
-    expect(
-      screen.getByTitle(mockMappings[0].mapping.description ?? "")
-    ).toBeInTheDocument();
+    expect(screen.getByTitle(mockMappings[0].mapping.description ?? "")).toBeInTheDocument();
 
     // Be an exact match on iModel Name.
-    const iModel = mockIModelsResponse.find(
-      (mockIModel) =>
-        mockIModel.iModel.id === mockMappings[0].mapping._links.imodel.href
-    );
+    const iModel = mockIModelsResponse.find((mockIModel) => mockIModel.iModel.id === mockMappings[0].mapping._links.iModel.href);
     await user.clear(searchInput);
     await user.type(searchInput, iModel?.iModel.displayName ?? "");
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
-    expect(
-      screen.getByText(iModel?.iModel.displayName ?? "")
-    ).toBeInTheDocument();
+    expect(screen.getByText(iModel?.iModel.displayName ?? "")).toBeInTheDocument();
   });
 
   it("add mapping", async () => {
@@ -264,11 +255,15 @@ describe("Report Mappings View", () => {
     mockGetMapping.mockReturnValueOnce(mockMappings[0].mapping).mockReturnValueOnce(mockMappings[1].mapping);
     mockGetReportMappings.mockReturnValueOnce(mockReportMappings.mappings);
 
-    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, { reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object });
+    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, {
+      reportsClient: mockReportsClient.object,
+      mappingsClient: mockMappingsClient.object,
+      iModelsClient: mockIModelsClient.object,
+    });
 
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
 
-    mockGetMappings.mockReturnValueOnce(mockMappings.map((m: MappingSingle) => m.mapping));
+    mockGetMappings.mockReturnValueOnce(mockMappings.map((m: MappingContainer) => m.mapping));
 
     const addMappingButton = screen.getByRole("button", {
       name: /addmapping/i,
@@ -290,7 +285,11 @@ describe("Report Mappings View", () => {
   });
 
   it("odata feed url", async () => {
-    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, { reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object });
+    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, {
+      reportsClient: mockReportsClient.object,
+      mappingsClient: mockMappingsClient.object,
+      iModelsClient: mockIModelsClient.object,
+    });
 
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
 
@@ -298,11 +297,7 @@ describe("Report Mappings View", () => {
       name: /odatafeedurl/i,
     });
     expect(urlTextbox).toBeInTheDocument();
-    expect(
-      screen.getByDisplayValue(
-        `https://api.bentley.com/insights/reporting/odata/${mockReport.id}`
-      )
-    ).toBeInTheDocument();
+    expect(screen.getByDisplayValue(`https://api.bentley.com/insights/reporting/odata/${mockReport.id}`)).toBeInTheDocument();
 
     const copyButton = screen.getByRole("button", {
       name: /copy/i,
@@ -319,13 +314,16 @@ describe("Report Mappings View", () => {
     mockGetMapping.mockReturnValueOnce(mockMappings[0].mapping).mockReturnValueOnce(mockMappings[1].mapping);
     mockGetReportMappings.mockReturnValueOnce(mockReportMappings.mappings);
 
-    const iModels = mockIModelsResponse.map((iModel) => iModel.iModel.id);
-
     const bulkExtractor = new BulkExtractor(new ReportsClient(), new ExtractionClient(), jest.fn().mockResolvedValue("mockAccessToken"), jest.fn, jest.fn);
 
     const runIModelExtractionsMock = jest.spyOn(bulkExtractor, "runIModelExtractions").mockImplementation(async () => Promise.resolve());
 
-    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, { reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object, bulkExtractor });
+    const { user } = render(<ReportMappings report={mockReport} onClickClose={jest.fn()} />, {
+      reportsClient: mockReportsClient.object,
+      mappingsClient: mockMappingsClient.object,
+      iModelsClient: mockIModelsClient.object,
+      bulkExtractor,
+    });
 
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
 
@@ -336,31 +334,18 @@ describe("Report Mappings View", () => {
     await waitFor(() => expect(extractAllButton).toBeEnabled());
 
     // Check that the mocked method was called with the expected arguments
-    expect(runIModelExtractionsMock).toHaveBeenCalledWith(iModels);
+    expect(runIModelExtractionsMock).toHaveBeenCalledWith(mockExtractionRequestDetails);
   });
 
-  const assertHorizontalTiles = (horizontalTiles: HTMLElement[], mockMappings: MappingSingle[]) => {
+  const assertHorizontalTiles = (horizontalTiles: HTMLElement[], mockMappings: MappingContainer[]) => {
     expect(horizontalTiles).toHaveLength(mockMappings.length);
 
     for (const [index, horizontalTile] of horizontalTiles.entries()) {
       const reportMappingTile = within(horizontalTile);
-      const mockiModel = mockIModelsResponse.find(
-        (iModel) =>
-          iModel.iModel.id === mockMappings[index].mapping._links.imodel.href
-      );
-      expect(
-        reportMappingTile.getByText(
-          mockMappings[index].mapping.mappingName
-        )
-      ).toBeInTheDocument();
-      expect(
-        reportMappingTile.getByTitle(
-          mockMappings[index].mapping.description ?? ""
-        )
-      ).toBeInTheDocument();
-      expect(
-        reportMappingTile.getByText(mockiModel?.iModel.displayName ?? "")
-      ).toBeInTheDocument();
+      const mockiModel = mockIModelsResponse.find((iModel) => iModel.iModel.id === mockMappings[index].mapping._links.iModel.href);
+      expect(reportMappingTile.getByText(mockMappings[index].mapping.mappingName)).toBeInTheDocument();
+      expect(reportMappingTile.getByTitle(mockMappings[index].mapping.description ?? "")).toBeInTheDocument();
+      expect(reportMappingTile.getByText(mockiModel?.iModel.displayName ?? "")).toBeInTheDocument();
     }
   };
 });