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

package/lib/esm/widget/hooks/useValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"useValidator.js","sourceRoot":"","sources":["../../../../src/widget/hooks/useValidator.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAC/F,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,CAAC,MAAM,iBAAiB,GAC5B,uHAAuH,CAAC;AAE1H,MAAM,YAAY,GAAG,GAGnB,EAAE;IACF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG;QACtB,qBAAqB,EAAE;YACrB,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAC1D,sDAAsD,CACvD;YACD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;SACF;QACD,gCAAgC,EAAE;YAChC,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAC1D,iEAAiE,CAClE;YACD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC;SACF;QACD,2CAA2C,EAAE;YAC3C,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAC1D,4EAA4E,CAC7E;YACD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACzC,CAAC;SACF;QACD,SAAS,EAAE;YACT,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAC1D,0CAA0C,CAC3C;YACD,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC;YAC3B,CAAC;SACF;KACF,CAAC;IAEF,MAAM,cAAc,GAAG;QACrB,QAAQ,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAC3D,oDAAoD,CACrD;KACF,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC;QACzC,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE;QACR,SAAS,CAAC,YAAY,EAAE,CAAC;KAC1B;IAED,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { useState } from \"react\";\nimport SimpleReactValidator from \"simple-react-validator\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\n\nexport const NAME_REQUIREMENTS =\n  \"required|NoDuplicateUnderscore|OnlyBeginsWithLetterOrUnderscore|FollowedByLettersUnderscoresSpacesAndDigits|CharLimit\";\n\nconst useValidator = (): [\n  SimpleReactValidator,\n  React.Dispatch<React.SetStateAction<boolean>>\n] => {\n  const [show, setShow] = useState(false);\n  const customValidator = {\n    NoDuplicateUnderscore: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\n        \"ReportsConfigWidget:Validators.NoDuplicateUnderscore\"\n      ),\n      rule: (val: string) => {\n        return !val.match(/__+/i);\n      },\n    },\n    OnlyBeginsWithLetterOrUnderscore: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\n        \"ReportsConfigWidget:Validators.OnlyBeginsWithLetterOrUnderscore\"\n      ),\n      rule: (val: string) => {\n        return !val.match(/^[\\W\\d]+/i);\n      },\n    },\n    FollowedByLettersUnderscoresSpacesAndDigits: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\n        \"ReportsConfigWidget:Validators.FollowedByLettersUnderscoresSpacesAndDigits\"\n      ),\n      rule: (val: string) => {\n        return !val.match(/[^a-zA-Z0-9_\\s]+/i);\n      },\n    },\n    CharLimit: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\n        \"ReportsConfigWidget:Validators.CharLimit\"\n      ),\n      rule: (val: string) => {\n        return val.length <= 128;\n      },\n    },\n  };\n\n  const customMessages = {\n    required: ReportsConfigWidget.localization.getLocalizedString(\n      \"ReportsConfigWidget:Validators.ThisFieldIsRequired\"\n    ),\n  };\n\n  const validator = new SimpleReactValidator({\n    messages: customMessages,\n    validators: customValidator,\n  });\n\n  if (show) {\n    validator.showMessages();\n  }\n\n  return [validator, setShow];\n};\n\nexport default useValidator;\n"]}
+{"version":3,"file":"useValidator.js","sourceRoot":"","sources":["../../../../src/widget/hooks/useValidator.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjC,OAAO,oBAAoB,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,MAAM,CAAC,MAAM,iBAAiB,GAAG,uHAAuH,CAAC;AAEzJ,MAAM,YAAY,GAAG,GAA0E,EAAE;IAC/F,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,eAAe,GAAG;QACtB,qBAAqB,EAAE;YACrB,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,sDAAsD,CAAC;YACpH,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5B,CAAC;SACF;QACD,gCAAgC,EAAE;YAChC,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,iEAAiE,CAAC;YAC/H,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACjC,CAAC;SACF;QACD,2CAA2C,EAAE;YAC3C,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,4EAA4E,CAAC;YAC1I,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;YACzC,CAAC;SACF;QACD,SAAS,EAAE;YACT,OAAO,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,0CAA0C,CAAC;YACxG,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;gBACpB,OAAO,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC;YAC3B,CAAC;SACF;KACF,CAAC;IAEF,MAAM,cAAc,GAAG;QACrB,QAAQ,EAAE,mBAAmB,CAAC,YAAY,CAAC,kBAAkB,CAAC,oDAAoD,CAAC;KACpH,CAAC;IAEF,MAAM,SAAS,GAAG,IAAI,oBAAoB,CAAC;QACzC,QAAQ,EAAE,cAAc;QACxB,UAAU,EAAE,eAAe;KAC5B,CAAC,CAAC;IAEH,IAAI,IAAI,EAAE;QACR,SAAS,CAAC,YAAY,EAAE,CAAC;KAC1B;IAED,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AAC9B,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC","sourcesContent":["/*---------------------------------------------------------------------------------------------\n * Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n * See LICENSE.md in the project root for license terms and full copyright notice.\n *--------------------------------------------------------------------------------------------*/\nimport { useState } from \"react\";\nimport SimpleReactValidator from \"simple-react-validator\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\n\nexport const NAME_REQUIREMENTS = \"required|NoDuplicateUnderscore|OnlyBeginsWithLetterOrUnderscore|FollowedByLettersUnderscoresSpacesAndDigits|CharLimit\";\n\nconst useValidator = (): [SimpleReactValidator, React.Dispatch<React.SetStateAction<boolean>>] => {\n  const [show, setShow] = useState(false);\n  const customValidator = {\n    NoDuplicateUnderscore: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Validators.NoDuplicateUnderscore\"),\n      rule: (val: string) => {\n        return !val.match(/__+/i);\n      },\n    },\n    OnlyBeginsWithLetterOrUnderscore: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Validators.OnlyBeginsWithLetterOrUnderscore\"),\n      rule: (val: string) => {\n        return !val.match(/^[\\W\\d]+/i);\n      },\n    },\n    FollowedByLettersUnderscoresSpacesAndDigits: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Validators.FollowedByLettersUnderscoresSpacesAndDigits\"),\n      rule: (val: string) => {\n        return !val.match(/[^a-zA-Z0-9_\\s]+/i);\n      },\n    },\n    CharLimit: {\n      message: ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Validators.CharLimit\"),\n      rule: (val: string) => {\n        return val.length <= 128;\n      },\n    },\n  };\n\n  const customMessages = {\n    required: ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Validators.ThisFieldIsRequired\"),\n  };\n\n  const validator = new SimpleReactValidator({\n    messages: customMessages,\n    validators: customValidator,\n  });\n\n  if (show) {\n    validator.showMessages();\n  }\n\n  return [validator, setShow];\n};\n\nexport default useValidator;\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/reports-config-widget-react",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "An iTwin.js 3D Viewer Widget that interfaces with the iTwin Reporting Platform.",
   "keywords": [
     "Bentley",
@@ -22,11 +22,33 @@
   "main": "lib/cjs/reports-config-widget-react.js",
   "module": "lib/esm/reports-config-widget-react.js",
   "typings": "lib/cjs/reports-config-widget-react",
+  "scripts": {
+    "build": "npm run -s dual-build && npm run -s copy:assets",
+    "build:cjs": "tsc 1>&2 --outDir lib/cjs",
+    "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm",
+    "clean": "rimraf lib",
+    "copy:assets": "npm run -s copy:public && npm run -s copy:cjs && npm run -s copy:esm",
+    "copy:cjs": "cpx \"./src/**/*.scss\" ./lib/cjs",
+    "copy:esm": "cpx \"./src/**/*.scss\" ./lib/esm",
+    "copy:public": "cpx \"./public/**/*\" ./lib/public",
+    "cover": "npm test -- --coverage",
+    "dual-build": "npm run -s build:cjs && npm run -s build:esm",
+    "extract-api": "betools extract-api --entry=reports-config-widget-react --apiReportFolder=./api --apiReportTempFolder=./api/temp --apiSummaryFolder=./api",
+    "lint": "eslint -f visualstudio \"./src/**/*.{ts,tsx}\" 1>&2",
+    "lint:fix": "npm run lint -- --fix",
+    "pseudolocalize": "betools pseudolocalize --englishDir ./public/locales/en --out ./public/locales/en-PSEUDO",
+    "rebuild": "npm run clean && npm run build",
+    "test": "jest",
+    "test:watch": "jest --watch "
+  },
   "eslintConfig": {
     "plugins": [
       "@itwin"
     ],
-    "extends": "plugin:@itwin/ui",
+    "extends": [
+      "plugin:@itwin/ui",
+      "prettier"
+    ],
     "rules": {
       "no-duplicate-imports": "off",
       "@typescript-eslint/consistent-type-imports": "error",
@@ -37,9 +59,10 @@
     }
   },
   "dependencies": {
-    "@itwin/imodels-access-frontend": "^4.0.0",
-    "@itwin/imodels-client-management": "^1.0.1",
-    "@itwin/insights-client": "^0.4.0",
+    "@itwin/imodels-access-common": "^4.1.4",
+    "@itwin/imodels-access-frontend": "^4.1.4",
+    "@itwin/imodels-client-management": "^4.2.3",
+    "@itwin/insights-client": "^0.10.1",
     "@itwin/itwinui-icons-color-react": "^2.1.0",
     "@itwin/itwinui-icons-react": "^2.4.0",
     "@itwin/itwinui-react": "^2.11.0",
@@ -61,6 +84,8 @@
     "@itwin/core-orbitgt": "^4.0.0",
     "@itwin/core-quantity": "^4.0.0",
     "@itwin/core-react": "^4.0.0",
+    "@itwin/core-telemetry": "^4.0.0",
+    "@itwin/ecschema-metadata": "^4.0.0",
     "@itwin/eslint-plugin": "^3.7.8",
     "@itwin/imodel-components-react": "^4.0.0",
     "@itwin/presentation-common": "^4.0.0",
@@ -83,21 +108,21 @@
     "chai": "^4.2.0",
     "cpx2": "^3.0.0",
     "eslint": "^7.32.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-react": "^7.25.1",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.2.0",
     "jest": "^27.5.1",
     "jest-cli": "^27.5.1",
     "jest-transform-stub": "^2.0.0",
-    "msw": "^0.39.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
-    "react-redux": "^7.2.0",
-    "redux": "^4.0.4",
+    "react-redux": "^7.2.2",
+    "redux": "^4.1.0",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.3",
     "typemoq": "^2.1.0",
-    "typescript": "~4.5.0",
+    "typescript": "~4.6.0",
     "xmlhttprequest": "^1.8.0"
   },
   "peerDependencies": {
@@ -108,24 +133,5 @@
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-redux": "^7.2.0"
-  },
-  "scripts": {
-    "build": "npm run -s dual-build && npm run -s copy:assets",
-    "build:cjs": "tsc 1>&2 --outDir lib/cjs",
-    "build:esm": "tsc 1>&2 --module ES2020 --outDir lib/esm",
-    "clean": "rimraf lib",
-    "copy:assets": "npm run -s copy:public && npm run -s copy:cjs && npm run -s copy:esm",
-    "copy:cjs": "cpx \"./src/**/*.scss\" ./lib/cjs",
-    "copy:esm": "cpx \"./src/**/*.scss\" ./lib/esm",
-    "copy:public": "cpx \"./public/**/*\" ./lib/public",
-    "cover": "npm test -- --coverage",
-    "dual-build": "npm run -s build:cjs && npm run -s build:esm",
-    "lint": "eslint -f visualstudio \"./src/**/*.{ts,tsx}\" 1>&2",
-    "lint:fix": "npm run lint -- --fix",
-    "pseudolocalize": "betools pseudolocalize --englishDir ./public/locales/en --out ./public/locales/en-PSEUDO",
-    "rebuild": "npm run clean && npm run build",
-    "test": "jest",
-    "test:watch": "jest --watch "
-  },
-  "readme": "# @itwin/reports-config-widget-react\r\n\r\nCopyright © Bentley Systems, Incorporated. All rights reserved.\r\nThe Reports Config widget is a UI component for iTwin Viewer applications that simplifies how users (and developers) interface with the [Reporting Platform APIs](https://developer.bentley.com/apis/insights/overview/). This widget is one piece of the Reporting story that focuses on the configuration of Reports and the extraction thereof. It complements the [Grouping & Mapping Widget](https://www.npmjs.com/package/@itwin/grouping-mapping-widget).\r\nThe reports-config-widget-react package provides a UiProvider class - `ReportsConfigProvider` - which can be passed into the `uiProviders` prop of the iTwin Viewer's `<Viewer />` component.\r\n\r\n## Getting Started\r\n\r\nThis is not a standalone UI and requires a parent iTwin Viewer application to work as intended.\r\nA guide on how to create a basic iTwin Viewer application can be found here: <https://www.itwinjs.org/learning/tutorials/develop-web-viewer/>.\r\nThis package provides a viewer 'widget'. Documentation on how to add a widget to your application can be found here: <https://developer.bentley.com/tutorials/itwin-viewer-hello-world/#2-your-first-ui-widget>.\r\n\r\n## Permissions and Scopes\r\n\r\nThe SPA client used by your iTwin viewer must have these additional scopes:\r\n\r\n- `insights:read`\r\n- `insights:modify`\r\n- `projects:read`\r\n\r\nIn addition, users must have the `imodels_read` and `imodels_write` [permissions](https://developer.bentley.com/apis/insights/operations/create-mapping/#authorization) assigned at either the Project or iModel level. Further instruction on how to create roles and assign permissions can be found in the [iTwin Platform Projects API documentation](https://developer.bentley.com/apis/projects/tutorials/).\r\n\r\n## Sample usage\r\n\r\n### Call ReportsConfigWidget.initialize() **_before_** making use of the provider\r\n\r\n```ts\r\nimport { ReportsConfigProvider, ReportsConfigWidget } from '@itwin/reports-config-widget-react'\r\n\r\n...\r\n\r\nawait ReportsConfigWidget.initialize(IModelApp.localization);\r\n\r\n<Viewer\r\n  ...\r\n  uiProviders={[new ReportsConfigProvider()]}\r\n/>\r\n```\r\n"
-}
+  }
+}

package/src/ReportsConfigWidget.ts

@@ -1,10 +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 type { Localization } from "@itwin/core-common";
 import { IModelApp } from "@itwin/core-frontend";
 
+/**
+ * ReportsConfigWidget localization
+ * @public
+ */
 export class ReportsConfigWidget {
   private static _localizationNamespace: string;
   private static _localization: Localization;
@@ -21,16 +25,12 @@ export class ReportsConfigWidget {
     ReportsConfigWidget._localization = localization ?? IModelApp.localization;
     // Setup localization
     const ReportsConfigWidgetNamespace = "ReportsConfigWidget";
-    await ReportsConfigWidget._localization.registerNamespace(
-      ReportsConfigWidgetNamespace
-    );
+    await ReportsConfigWidget._localization.registerNamespace(ReportsConfigWidgetNamespace);
 
     ReportsConfigWidget._localizationNamespace = ReportsConfigWidgetNamespace;
   }
 
   public static terminate() {
-    ReportsConfigWidget._localization.unregisterNamespace(
-      ReportsConfigWidget.localizationNamespace
-    );
+    ReportsConfigWidget._localization.unregisterNamespace(ReportsConfigWidget.localizationNamespace);
   }
 }

package/src/reports-config-widget-react.ts

@@ -1,7 +1,7 @@
 /*---------------------------------------------------------------------------------------------
-* 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.
+ *--------------------------------------------------------------------------------------------*/
 /** UI Provider for iTwin Viewer Applications */
 export * from "./widget/ReportsConfigUiProvider";
 export * from "./ReportsConfigWidget";

package/src/test/AddMappingModal.test.tsx

@@ -1,84 +1,19 @@
 /*---------------------------------------------------------------------------------------------
-* 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,
-  waitFor,
-  within,
-} from "./test-utils";
+import { mockIModelId1, mockIModelId2, mockIModelsResponse, mockITwinId, mockReportId, render, screen, waitFor, within } from "./test-utils";
 import * as moq from "typemoq";
-import type {
-  MappingsClient,
-  MappingSingle,
-  ReportMappingCollection,
-  ReportsClient,
-} from "@itwin/insights-client";
+import type { MappingContainer, MappingsClient, ReportMappingCollection, ReportsClient } from "@itwin/insights-client";
 import type { ReportMappingAndMapping } from "../widget/components/ReportMappings";
-import type { GetSingleIModelParams, IModelOperations, IModelsClient, OperationOptions } from "@itwin/imodels-client-management";
-import { IModelState } from "@itwin/imodels-client-management";
+import type { GetSingleIModelParams, IModelsClient } from "@itwin/imodels-client-management";
 import { AddMappingsModal } from "../widget/components/AddMappingsModal";
 import { EmptyLocalization } from "@itwin/core-common";
-
-const mockITwinId = faker.datatype.uuid();
-const mockIModelId1 = faker.datatype.uuid();
-const mockIModelId2 = faker.datatype.uuid();
-
-const mockReportId = faker.datatype.uuid();
-
-const mockIModelsResponse = [
-  {
-    iModel: {
-      id: mockIModelId1,
-      displayName: "rAnDoMdIsPlAynAmE1",
-      name: "rAnDomName1",
-      description: "rAnDoMDeScRiPtIoN1",
-      createdDateTime: "2021-10-04T22:13:50.397Z",
-      state: IModelState.Initialized,
-      projectId: mockITwinId,
-      extent: null,
-      _links: {
-        creator: {
-          href: "",
-        },
-        namedVersions: {
-          href: "",
-        },
-        changesets: {
-          href: "",
-        },
-      },
-    },
-  },
-  {
-    iModel: {
-      id: mockIModelId2,
-      displayName: "rAnDoMdIsPlAynAmE2",
-      name: "rAnDomName2",
-      description: "rAnDoMDeScRiPtIoN2",
-      createdDateTime: "2021-10-04T22:13:50.397Z",
-      state: IModelState.Initialized,
-      projectId: mockITwinId,
-      extent: null,
-      _links: {
-        creator: {
-          href: "",
-        },
-        namedVersions: {
-          href: "",
-        },
-        changesets: {
-          href: "",
-        },
-      },
-    },
-  },
-];
+import type { IModelOperations, OperationOptions } from "@itwin/imodels-client-management/lib/operations";
 
 const mockProjectIModels = {
   iModels: mockIModelsResponse.map((iModel) => ({
@@ -139,29 +74,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,
         },
       },
-    })
-  );
+    },
+  }));
 
   const extraMappingId = faker.datatype.uuid();
   const extraMappingName = "mOcKNaMeExTrA";
@@ -178,7 +109,7 @@ const mockMappingsFactory = (
       modifiedOn: "",
       modifiedBy: "",
       _links: {
-        imodel: {
+        iModel: {
           href: "",
         },
       },
@@ -188,19 +119,18 @@ const mockMappingsFactory = (
   return mockMappings;
 };
 
-const mockReportMappingsAndMappingsFactory = (mockMappings: MappingSingle[], reportMappings: ReportMappingCollection): 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;
-    });
+const mockReportMappingsAndMappingsFactory = (mockMappings: MappingContainer[], reportMappings: ReportMappingCollection): 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;
 };
 
@@ -222,12 +152,13 @@ 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.createReportMapping(moq.It.isAny(), moq.It.isAny(), moq.It.isAny())).returns(mockCreateReportMapping);
   mockMappingsClient.setup(async (x) => x.getMappings(moq.It.isAny(), moq.It.isAny())).returns(mockGetMappings);
 });
@@ -243,7 +174,7 @@ describe("Add Mapping Modal", () => {
     const mockMappings = mockMappingsFactory(mockReportMappings);
     const mockReportMappingsAndMappings = mockReportMappingsAndMappingsFactory(mockMappings, mockReportMappings);
 
-    mockGetMappings.mockReturnValueOnce(mockMappings.map((m: MappingSingle) => m.mapping));
+    mockGetMappings.mockReturnValueOnce({ mappings: mockMappings.map((m: MappingContainer) => m.mapping) });
 
     const { user } = render(
       <AddMappingsModal
@@ -252,7 +183,8 @@ describe("Add Mapping Modal", () => {
         existingMappings={mockReportMappingsAndMappings}
         onClose={jest.fn()}
         defaultIModelId={mockIModelId1}
-      />, { iTwinId: mockITwinId, reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object }
+      />,
+      { iTwinId: mockITwinId, reportsClient: mockReportsClient.object, mappingsClient: mockMappingsClient.object, iModelsClient: mockIModelsClient.object },
     );
 
     expect(screen.getByRole("dialog")).toBeInTheDocument();
@@ -269,10 +201,7 @@ describe("Add Mapping Modal", () => {
     // Already mapped mappings are disabled
     for (let i = 0; i < mockMappings.length - 1; i++) {
       const row = screen.getByRole("row", {
-        name: new RegExp(
-          `${mockMappings[i].mapping.mappingName} ${mockMappings[i].mapping.description}`,
-          "i"
-        ),
+        name: new RegExp(`${mockMappings[i].mapping.mappingName} ${mockMappings[i].mapping.description}`, "i"),
       });
 
       const checkbox = within(row).getByRole("checkbox");
@@ -281,11 +210,7 @@ describe("Add Mapping Modal", () => {
 
     // Click on checkbox on new mapping
     const unmappedRow = screen.getByRole("row", {
-      name: new RegExp(
-        `${mockMappings[mockMappings.length - 1].mapping.mappingName
-        } ${mockMappings[mockMappings.length - 1].mapping.description}`,
-        "i"
-      ),
+      name: new RegExp(`${mockMappings[mockMappings.length - 1].mapping.mappingName} ${mockMappings[mockMappings.length - 1].mapping.description}`, "i"),
     });
 
     const enabledCheckbox = within(unmappedRow).getByRole("checkbox");