npm - @itwin/reports-config-widget-react - Versions diffs - 0.0.4 → 0.0.7 - Mend

@itwin/reports-config-widget-react 0.0.4 → 0.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (77) hide show

package/lib/esm/widget/components/Reports.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Reports.js","sourceRoot":"","sources":["../../../../src/widget/components/Reports.tsx"],"names":[],"mappings":"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","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 {\n SvgAdd,\n SvgDelete,\n SvgEdit,\n SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n Button,\n DropdownMenu,\n IconButton,\n MenuItem,\n Surface,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"./utils\";\nimport {\n EmptyMessage,\n generateUrl,\n handleError,\n LoadingOverlay,\n WidgetHeader,\n} from \"./utils\";\nimport \"./Reports.scss\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { Report } from \"@itwin/insights-client\";\nimport { REPORTING_BASE_PATH, ReportingClient } from \"@itwin/insights-client\";\nimport ReportAction from \"./ReportAction\";\nimport { ReportMappings } from \"./ReportMappings\";\nimport { HorizontalTile } from \"./HorizontalTile\";\nimport { SearchBar } from \"./SearchBar\";\nimport type { ReportsApiConfig } from \"../context/ReportsApiConfigContext\";\nimport { useReportsApiConfig } from \"../context/ReportsApiConfigContext\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\n\nexport type ReportType = CreateTypeFromInterface<Report>;\n\nenum ReportsView {\n REPORTS = \"reports\",\n REPORTSMAPPING = \"reportsmapping\",\n ADDING = \"adding\",\n MODIFYING = \"modifying\",\n}\n\nconst fetchReports = async (\n setReports: React.Dispatch<React.SetStateAction<Report[]>>,\n iTwinId: string \| undefined,\n setIsLoading: React.Dispatch<React.SetStateAction<boolean>>,\n apiContext: ReportsApiConfig\n) => {\n try {\n if (!iTwinId) return;\n setIsLoading(true);\n const reportingClientApi = new ReportingClient(\n generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)\n );\n const accessToken = await apiContext.getAccessToken();\n const reports = await reportingClientApi.getReports(accessToken, iTwinId);\n setReports(reports ?? []);\n } catch (error: any) {\n handleError(error.status);\n } finally {\n setIsLoading(false);\n }\n};\n\nexport const Reports = () => {\n const iTwinId = useActiveIModelConnection()?.iTwinId ?? \"\";\n const apiConfig = useReportsApiConfig();\n const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false);\n const [reportsView, setReportsView] = useState<ReportsView>(\n ReportsView.REPORTS\n );\n const [selectedReport, setSelectedReport] = useState<Report \| undefined>(\n undefined\n );\n const [isLoading, setIsLoading] = useState<boolean>(true);\n const [searchValue, setSearchValue] = useState<string>(\"\");\n const [reports, setReports] = useState<Report[]>([]);\n\n useEffect(() => {\n void fetchReports(setReports, iTwinId, setIsLoading, apiConfig);\n }, [apiConfig, iTwinId, setIsLoading]);\n\n const refresh = useCallback(async () => {\n setReportsView(ReportsView.REPORTS);\n setSelectedReport(undefined);\n await fetchReports(setReports, iTwinId, setIsLoading, apiConfig);\n }, [apiConfig, iTwinId, setReports]);\n\n const addReport = () => {\n setReportsView(ReportsView.ADDING);\n };\n\n const filteredReports = useMemo(\n () =>\n reports.filter((x) =>\n [x.displayName, x.description]\n .join(\" \")\n .toLowerCase()\n .includes(searchValue.toLowerCase())\n ),\n [reports, searchValue]\n );\n\n switch (reportsView) {\n case ReportsView.ADDING:\n return iTwinId ? (\n <ReportAction iTwinId={iTwinId ?? \"\"} returnFn={refresh} />\n ) : null;\n case ReportsView.MODIFYING:\n return iTwinId ? (\n <ReportAction\n iTwinId={iTwinId}\n report={selectedReport}\n returnFn={refresh}\n />\n ) : null;\n case ReportsView.REPORTSMAPPING:\n return selectedReport ? (\n <ReportMappings report={selectedReport} goBack={refresh} />\n ) : null;\n default:\n return (\n <>\n <WidgetHeader\n title={ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:ITwinReports\"\n )}\n />\n <Surface className=\"reports-list-container\">\n <div className=\"toolbar\">\n <Button\n startIcon={<SvgAdd />}\n onClick={() => addReport()}\n styleType=\"high-visibility\"\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:New\"\n )}\n </Button>\n <div className=\"search-bar-container\" data-testid=\"search-bar\">\n <SearchBar\n searchValue={searchValue}\n setSearchValue={setSearchValue}\n disabled={isLoading}\n />\n </div>\n </div>\n {isLoading ? (\n <LoadingOverlay />\n ) : reports.length === 0 ? (\n <EmptyMessage>\n <>\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:NoReports\"\n )}\n <div>\n <Button onClick={() => addReport()} styleType=\"cta\">\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:CreateOneReportCTA\"\n )}\n </Button>\n </div>\n </>\n </EmptyMessage>\n ) : (\n <div className=\"reports-list\">\n {filteredReports.map((report) => (\n <HorizontalTile\n key={report.id}\n title={report.displayName ?? \"\"}\n subText={report.description ?? \"\"}\n subtextToolTip={report.description ?? \"\"}\n titleTooltip={report.displayName}\n onClickTitle={() => {\n setSelectedReport(report);\n setReportsView(ReportsView.REPORTSMAPPING);\n }}\n button={\n <DropdownMenu\n menuItems={(close: () => void) => [\n <MenuItem\n key={0}\n onClick={() => {\n setSelectedReport(report);\n setReportsView(ReportsView.MODIFYING);\n }}\n icon={<SvgEdit />}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:Modify\"\n )}\n </MenuItem>,\n <MenuItem\n key={1}\n onClick={() => {\n setSelectedReport(report);\n setShowDeleteModal(true);\n close();\n }}\n icon={<SvgDelete />}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:Remove\"\n )}\n </MenuItem>,\n ]}\n >\n <IconButton styleType=\"borderless\">\n <SvgMore\n style={{\n width: \"16px\",\n height: \"16px\",\n }}\n />\n </IconButton>\n </DropdownMenu>\n }\n />\n ))}\n </div>\n )}\n </Surface>\n <DeleteModal\n entityName={selectedReport?.displayName ?? \"\"}\n show={showDeleteModal}\n setShow={setShowDeleteModal}\n onDelete={async () => {\n const reportingClientApi = new ReportingClient(\n generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)\n );\n const accessToken = await apiConfig.getAccessToken();\n await reportingClientApi.deleteReport(\n accessToken,\n selectedReport?.id ?? \"\"\n );\n }}\n refresh={refresh}\n />\n </>\n );\n }\n};\n"]}
1	+ {"version":3,"file":"Reports.js","sourceRoot":"","sources":["../../../../src/widget/components/Reports.tsx"],"names":[],"mappings":"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","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 {\n SvgAdd,\n SvgDelete,\n SvgEdit,\n SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n Button,\n DropdownMenu,\n IconButton,\n MenuItem,\n Surface,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"./utils\";\nimport {\n EmptyMessage,\n generateUrl,\n handleError,\n LoadingOverlay,\n WidgetHeader,\n} from \"./utils\";\nimport \"./Reports.scss\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { Report } from \"@itwin/insights-client\";\nimport { REPORTING_BASE_PATH, ReportsClient } from \"@itwin/insights-client\";\nimport ReportAction from \"./ReportAction\";\nimport { ReportMappings } from \"./ReportMappings\";\nimport { HorizontalTile } from \"./HorizontalTile\";\nimport { SearchBar } from \"./SearchBar\";\nimport type { ReportsApiConfig } from \"../context/ReportsApiConfigContext\";\nimport { useReportsApiConfig } from \"../context/ReportsApiConfigContext\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\n\nexport type ReportType = CreateTypeFromInterface<Report>;\n\nenum ReportsView {\n REPORTS = \"reports\",\n REPORTSMAPPING = \"reportsmapping\",\n ADDING = \"adding\",\n MODIFYING = \"modifying\",\n}\n\nconst fetchReports = async (\n setReports: React.Dispatch<React.SetStateAction<Report[]>>,\n iTwinId: string \| undefined,\n setIsLoading: React.Dispatch<React.SetStateAction<boolean>>,\n apiContext: ReportsApiConfig\n) => {\n try {\n if (!iTwinId) return;\n setIsLoading(true);\n const reportsClientApi = new ReportsClient(\n generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)\n );\n const accessToken = await apiContext.getAccessToken();\n const reports = await reportsClientApi.getReports(accessToken, iTwinId);\n setReports(reports ?? []);\n } catch (error: any) {\n handleError(error.status);\n } finally {\n setIsLoading(false);\n }\n};\n\nexport const Reports = () => {\n const iTwinId = useActiveIModelConnection()?.iTwinId ?? \"\";\n const apiConfig = useReportsApiConfig();\n const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false);\n const [reportsView, setReportsView] = useState<ReportsView>(\n ReportsView.REPORTS\n );\n const [selectedReport, setSelectedReport] = useState<Report \| undefined>(\n undefined\n );\n const [isLoading, setIsLoading] = useState<boolean>(true);\n const [searchValue, setSearchValue] = useState<string>(\"\");\n const [reports, setReports] = useState<Report[]>([]);\n\n useEffect(() => {\n void fetchReports(setReports, iTwinId, setIsLoading, apiConfig);\n }, [apiConfig, iTwinId, setIsLoading]);\n\n const refresh = useCallback(async () => {\n setReportsView(ReportsView.REPORTS);\n setSelectedReport(undefined);\n await fetchReports(setReports, iTwinId, setIsLoading, apiConfig);\n }, [apiConfig, iTwinId, setReports]);\n\n const addReport = () => {\n setReportsView(ReportsView.ADDING);\n };\n\n const filteredReports = useMemo(\n () =>\n reports.filter((x) =>\n [x.displayName, x.description]\n .join(\" \")\n .toLowerCase()\n .includes(searchValue.toLowerCase())\n ),\n [reports, searchValue]\n );\n\n switch (reportsView) {\n case ReportsView.ADDING:\n return iTwinId ? (\n <ReportAction iTwinId={iTwinId ?? \"\"} returnFn={refresh} />\n ) : null;\n case ReportsView.MODIFYING:\n return iTwinId ? (\n <ReportAction\n iTwinId={iTwinId}\n report={selectedReport}\n returnFn={refresh}\n />\n ) : null;\n case ReportsView.REPORTSMAPPING:\n return selectedReport ? (\n <ReportMappings report={selectedReport} goBack={refresh} />\n ) : null;\n default:\n return (\n <>\n <WidgetHeader\n title={ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:ITwinReports\"\n )}\n />\n <Surface className=\"reports-list-container\">\n <div className=\"toolbar\">\n <Button\n startIcon={<SvgAdd />}\n onClick={() => addReport()}\n styleType=\"high-visibility\"\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:New\"\n )}\n </Button>\n <div className=\"search-bar-container\" data-testid=\"search-bar\">\n <SearchBar\n searchValue={searchValue}\n setSearchValue={setSearchValue}\n disabled={isLoading}\n />\n </div>\n </div>\n {isLoading ? (\n <LoadingOverlay />\n ) : reports.length === 0 ? (\n <EmptyMessage>\n <>\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:NoReports\"\n )}\n <div>\n <Button onClick={() => addReport()} styleType=\"cta\">\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:CreateOneReportCTA\"\n )}\n </Button>\n </div>\n </>\n </EmptyMessage>\n ) : (\n <div className=\"reports-list\">\n {filteredReports.map((report) => (\n <HorizontalTile\n key={report.id}\n title={report.displayName}\n subText={report.description ?? \"\"}\n subtextToolTip={report.description ?? \"\"}\n titleTooltip={report.displayName}\n onClickTitle={() => {\n setSelectedReport(report);\n setReportsView(ReportsView.REPORTSMAPPING);\n }}\n button={\n <DropdownMenu\n menuItems={(close: () => void) => [\n <MenuItem\n key={0}\n onClick={() => {\n setSelectedReport(report);\n setReportsView(ReportsView.MODIFYING);\n }}\n icon={<SvgEdit />}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:Modify\"\n )}\n </MenuItem>,\n <MenuItem\n key={1}\n onClick={() => {\n setSelectedReport(report);\n setShowDeleteModal(true);\n close();\n }}\n icon={<SvgDelete />}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\n \"ReportsConfigWidget:Remove\"\n )}\n </MenuItem>,\n ]}\n >\n <IconButton styleType=\"borderless\">\n <SvgMore\n style={{\n width: \"16px\",\n height: \"16px\",\n }}\n />\n </IconButton>\n </DropdownMenu>\n }\n />\n ))}\n </div>\n )}\n </Surface>\n <DeleteModal\n entityName={selectedReport?.displayName ?? \"\"}\n show={showDeleteModal}\n setShow={setShowDeleteModal}\n onDelete={async () => {\n const reportsClientApi = new ReportsClient(\n generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)\n );\n const accessToken = await apiConfig.getAccessToken();\n await reportsClientApi.deleteReport(\n accessToken,\n selectedReport?.id ?? \"\"\n );\n }}\n refresh={refresh}\n />\n </>\n );\n }\n};\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/reports-config-widget-react",
-  "version": "0.0.4",
+  "version": "0.0.7",
   "description": "An iTwin.js 3D Viewer Widget that interfaces with the iTwin Reporting Platform.",
   "keywords": [
     "Bentley",
@@ -36,7 +36,7 @@
   "dependencies": {
     "@itwin/imodels-access-frontend": "^1.0.1",
     "@itwin/imodels-client-management": "^1.0.1",
-    "@itwin/insights-client": "^0.2.0",
+    "@itwin/insights-client": "^0.3.0",
     "@itwin/itwinui-icons-color-react": "^1.0.1",
     "@itwin/itwinui-icons-react": "^1.7.0",
     "@itwin/itwinui-react": "~1.42.0",
@@ -59,7 +59,6 @@
     "@itwin/core-react": "^3.0.0",
     "@itwin/eslint-plugin": "^3.0.0",
     "@itwin/imodel-components-react": "^3.0.0",
-    "@itwin/itwinui-css": "^0.50.0",
     "@itwin/presentation-common": "^3.0.0",
     "@itwin/presentation-frontend": "^3.0.0",
     "@itwin/webgl-compatibility": "^3.0.0",
@@ -87,11 +86,13 @@
     "msw": "^0.39.2",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
+    "react-redux": "^7.2.0",
     "redux": "^4.0.4",
     "rimraf": "^3.0.2",
     "ts-jest": "^27.1.3",
     "typemoq": "^2.1.0",
-    "typescript": "~4.3.0"
+    "typescript": "~4.3.0",
+    "xmlhttprequest": "^1.8.0"
   },
   "peerDependencies": {
     "@itwin/appui-abstract": "^3.0.0",

package/reports-config-widget-react.build.error.log CHANGED Viewed

@@ -1,10 +1,10 @@
-PASS src/test/ReportMappings.test.tsx (33.455 s)
-PASS src/test/Reports.test.tsx (7.981 s)
+PASS src/test/ReportMappings.test.tsx (34.754 s)
+PASS src/test/Reports.test.tsx (8.298 s)
 PASS src/test/ReportAction.test.tsx
 PASS src/test/WidgetHeader.test.tsx
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        49.335 s
+Time:        51.639 s
 Ran all test suites.

package/reports-config-widget-react.build.log CHANGED Viewed

@@ -1,37 +1,37 @@
 Invoking: npm test -- --coverage
-> @itwin/reports-config-widget-react@0.0.3 test /home/vsts/work/1/s/packages/itwin/reports-config-widget
+> @itwin/reports-config-widget-react@0.0.6 test /home/vsts/work/1/s/packages/itwin/reports-config-widget
 > jest "--coverage"
-PASS src/test/ReportMappings.test.tsx (33.455 s)
-PASS src/test/Reports.test.tsx (7.981 s)
+PASS src/test/ReportMappings.test.tsx (34.754 s)
+PASS src/test/Reports.test.tsx (8.298 s)
 PASS src/test/ReportAction.test.tsx
 PASS src/test/WidgetHeader.test.tsx
 ------------------------------|---------|----------|---------|---------|-------------------------------
 File                          | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
 ------------------------------|---------|----------|---------|---------|-------------------------------
-All files                     |   87.12 |    69.64 |   84.87 |   87.17 |
+All files                     |   88.02 |    69.53 |   85.71 |   88.12 |
  src                          |     100 |       75 |     100 |     100 |
   ReportsConfigWidget.ts      |     100 |       75 |     100 |     100 | 21
  src/test                     |     100 |    66.66 |     100 |     100 |
   test-utils.tsx              |     100 |    66.66 |     100 |     100 | 56
  src/widget                   |      40 |        0 |       0 |      40 |
   ReportsConfigUiProvider.tsx |      40 |        0 |       0 |      40 | 23-65
- src/widget/components        |   87.42 |     70.8 |   85.85 |   87.58 |
+ src/widget/components        |   88.46 |    71.07 |   86.86 |   88.67 |
   ActionPanel.tsx             |     100 |    77.77 |     100 |     100 | 25-26
-  AddMappingsModal.tsx        |   91.66 |       80 |   88.88 |   93.47 | 40,120,134
+  AddMappingsModal.tsx        |   91.66 |    83.33 |   88.88 |   93.47 | 40,120,134
   DeleteModal.tsx             |      85 |      100 |      50 |   84.21 | 42,56-87
-  Extraction.tsx              |   85.41 |    73.01 |   85.71 |   85.71 | 51-53,138,200-203,226-229,295
+  Extraction.tsx              |   85.41 |    79.48 |   85.71 |   85.71 | 51-53,138,200-203,226-229,295
   HorizontalTile.tsx          |     100 |      100 |     100 |     100 |
   LocalizedTablePaginator.tsx |     100 |       50 |     100 |     100 | 25
   ReportAction.tsx            |   94.28 |    81.48 |     100 |   94.28 | 59-60
-  ReportMappings.tsx          |   96.29 |    74.41 |   94.44 |   96.25 | 97,119,268
-  Reports.tsx                 |   97.14 |    78.68 |     100 |   98.52 | 65
+  ReportMappings.tsx          |   96.34 |    73.68 |   94.44 |   96.29 | 100,122,271
+  Reports.tsx                 |   98.57 |    78.94 |     100 |     100 | 56-72,112-124,177-178,240
   ReportsContainer.tsx        |   57.14 |        0 |       0 |   61.53 | 19,25-37
   SearchBar.tsx               |   70.58 |    71.42 |      60 |   68.75 | 31-45
   SelectIModel.tsx            |   97.05 |    81.81 |   85.71 |   96.87 | 92
-  utils.tsx                   |   56.86 |    23.07 |    87.5 |   48.83 | 46-100
+  utils.tsx                   |    64.7 |    30.76 |     100 |   58.13 | 51-94
  src/widget/context           |      80 |        0 |      50 |   77.77 |
   ReportsApiConfigContext.tsx |      80 |        0 |      50 |   77.77 | 15,22
  src/widget/hooks             |     100 |      100 |     100 |     100 |
@@ -41,5 +41,5 @@ All files                     |   87.12 |    69.64 |   84.87 |   87.17 |
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        49.335 s
+Time:        51.639 s
 Ran all test suites.

package/src/test/ReportMappings.test.tsx CHANGED Viewed

@@ -25,13 +25,16 @@ import * as moq from "typemoq";
 import type { RequestHandler } from "msw";
 import { rest } from "msw";
 import type {
-  ExtractionStatus,
+  ExtractionStatusSingle,
   Mapping,
   MappingCollection,
   MappingSingle,
   Report,
   ReportMappingCollection,
 } from "@itwin/insights-client";
+import {
+  ExtractorState,
+} from "@itwin/insights-client";
 import { ReportMappings } from "../widget/components/ReportMappings";
 import { Constants, IModelState } from "@itwin/imodels-client-management";
 import { REPORTS_CONFIG_BASE_URL } from "../widget/ReportsConfigUiProvider";
@@ -179,7 +182,7 @@ const mockReportMappingsFactory = (): ReportMappingCollection => {
 const mockMappingsFactory = (
   mockReportMappings: ReportMappingCollection
 ): [MappingSingle[], RequestHandler[]] => {
-  const mockMappings: MappingSingle[] = mockReportMappings.mappings!.map(
+  const mockMappings: MappingSingle[] = mockReportMappings.mappings.map(
     (mapping, index) => ({
       mapping: {
         id: mapping.mappingId,
@@ -202,8 +205,8 @@ const mockMappingsFactory = (
   const iModelHandlers: RequestHandler[] = mockMappings.map((mapping) =>
     rest.get(
-      `${REPORTS_CONFIG_BASE_URL}/insights/reporting/datasources/imodels/${mapping.mapping?._links?.imodel?.href ?? ""
-      }/mappings/${mapping.mapping?.id}`,
+      `${REPORTS_CONFIG_BASE_URL}/insights/reporting/datasources/imodels/${mapping.mapping._links.imodel.href
+      }/mappings/${mapping.mapping.id}`,
       async (_req, res, ctx) => {
         return res(ctx.delay(), ctx.status(200), ctx.json(mapping));
       }
@@ -317,16 +320,16 @@ describe("Report Mappings View", () => {
       const reportMappingTile = within(horizontalTile);
       const mockiModel = mockIModelsResponse.find(
         (iModel) =>
-          iModel.iModel.id === mockMappings[index].mapping?._links?.imodel?.href
+          iModel.iModel.id === mockMappings[index].mapping._links.imodel.href
       );
       expect(
         reportMappingTile.getByText(
-          mockMappings[index].mapping?.mappingName ?? ""
+          mockMappings[index].mapping.mappingName
         )
       ).toBeInTheDocument();
       expect(
         reportMappingTile.getByTitle(
-          mockMappings[index].mapping?.description ?? ""
+          mockMappings[index].mapping.description ?? ""
         )
       ).toBeInTheDocument();
       expect(
@@ -389,24 +392,24 @@ describe("Report Mappings View", () => {
     });
     // Be an exact match on display name.
-    await user.type(searchInput, mockMappings[0].mapping?.mappingName ?? "");
+    await user.type(searchInput, mockMappings[0].mapping.mappingName);
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
     expect(
-      screen.getByText(mockMappings[0].mapping?.mappingName ?? "")
+      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 ?? "");
+    await user.type(searchInput, mockMappings[0].mapping.description ?? "");
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
     expect(
-      screen.getByTitle(mockMappings[0].mapping?.description ?? "")
+      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
+        mockIModel.iModel.id === mockMappings[0].mapping._links.imodel.href
     );
     await user.clear(searchInput);
     await user.type(searchInput, iModel?.iModel.displayName ?? "");
@@ -420,7 +423,7 @@ describe("Report Mappings View", () => {
     const mockReportMappings = mockReportMappingsFactory();
     const [_, iModelHandlers] = mockMappingsFactory(mockReportMappings);
-    const mockReportMappingsOriginalSize = mockReportMappings.mappings!.length;
+    const mockReportMappingsOriginalSize = mockReportMappings.mappings.length;
     server.use(
       rest.get(
@@ -455,13 +458,12 @@ describe("Report Mappings View", () => {
       ),
       ...iModelHandlers,
       rest.delete(
-        `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports/${mockReportId}/datasources/imodelMappings/${mockReportMappings.mappings![0].mappingId ?? ""
+        `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports/${mockReportId}/datasources/imodelMappings/${mockReportMappings.mappings[0].mappingId
         }`,
         async (_req, res, ctx) => {
-          mockReportMappings.mappings = mockReportMappings.mappings!.filter(
+          mockReportMappings.mappings = mockReportMappings.mappings.filter(
             (mapping) =>
-              mapping.mappingId !== mockReportMappings.mappings![0].mappingId ??
-              ""
+              mapping.mappingId !== mockReportMappings.mappings[0].mappingId
           );
           return res(ctx.delay(100), ctx.status(204));
         }
@@ -630,7 +632,7 @@ describe("Report Mappings View", () => {
     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}`,
+          `${mockMappings[i].mapping.mappingName} ${mockMappings[i].mapping.description}`,
           "i"
         ),
       });
@@ -642,8 +644,8 @@ describe("Report Mappings View", () => {
     // 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}`,
+        `${mockMappings[mockMappings.length - 1].mapping.mappingName
+        } ${mockMappings[mockMappings.length - 1].mapping.description}`,
         "i"
       ),
     });
@@ -750,10 +752,16 @@ describe("Report Mappings View", () => {
       },
     };
-    let mockStatusResponse: ExtractionStatus = {
+    let mockStatusResponse: ExtractionStatusSingle = {
       status: {
-        state: "Queued",
+        state: ExtractorState.Queued,
         reason: "",
+        containsIssues: false,
+        _links: {
+          logs: {
+            href: "",
+          },
+        },
       },
     };
@@ -852,8 +860,14 @@ describe("Report Mappings View", () => {
     mockStatusResponse = {
       status: {
-        state: "Running",
+        state: ExtractorState.Running,
         reason: "",
+        containsIssues: false,
+        _links: {
+          logs: {
+            href: "",
+          },
+        },
       },
     };
@@ -864,8 +878,14 @@ describe("Report Mappings View", () => {
     mockStatusResponse = {
       status: {
-        state: "Succeeded",
+        state: ExtractorState.Succeeded,
         reason: "",
+        containsIssues: false,
+        _links: {
+          logs: {
+            href: "",
+          },
+        },
       },
     };

package/src/test/Reports.test.tsx CHANGED Viewed

@@ -46,6 +46,12 @@ const reportsFactory = (): ReportCollection => ({
       id: `${faker.datatype.uuid()}`,
       displayName: `mOcKRePoRT${index}`,
       description: `mOcKRePoRTDeScRiPtIoN${index}`,
+      deleted: false,
+      _links: {
+        project: {
+          href: "",
+        },
+      },
     })
   ),
   _links: {
@@ -176,18 +182,18 @@ describe("Reports View", () => {
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
     const horizontalTiles = screen.getAllByTestId("horizontal-tile");
     // TODO check for all descriptions and names and imodels
-    expect(horizontalTiles).toHaveLength(mockedReports?.reports!.length);
+    expect(horizontalTiles).toHaveLength(mockedReports?.reports.length);
     for (const [index, horizontalTile] of horizontalTiles.entries()) {
       const reportMappingTile = within(horizontalTile);
       expect(
         reportMappingTile.getByText(
-          mockedReports?.reports![index].displayName ?? ""
+          mockedReports?.reports[index].displayName ?? ""
         )
       ).toBeInTheDocument();
       expect(
         reportMappingTile.getByTitle(
-          mockedReports?.reports![index].description ?? ""
+          mockedReports?.reports[index].description ?? ""
         )
       ).toBeInTheDocument();
     }
@@ -220,7 +226,7 @@ describe("Reports View", () => {
   it("remove a report", async () => {
     const mockedReports: ReportCollection = reportsFactory();
-    const mockedReportsOriginalLength = mockedReports.reports!.length;
+    const mockedReportsOriginalLength = mockedReports.reports.length;
     server.use(
       rest.get(
         `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports`,
@@ -229,12 +235,11 @@ describe("Reports View", () => {
         }
       ),
       rest.delete(
-        `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports/${
-          mockedReports.reports![0].id
+        `${REPORTS_CONFIG_BASE_URL}/insights/reporting/reports/${mockedReports.reports[0].id
         }`,
         async (_req, res, ctx) => {
-          mockedReports.reports = mockedReports.reports!.filter(
-            (report) => report.id !== mockedReports.reports![0].id
+          mockedReports.reports = mockedReports.reports.filter(
+            (report) => report.id !== mockedReports.reports[0].id
           );
           return res(ctx.delay(100), ctx.status(204));
         }
@@ -297,22 +302,22 @@ describe("Reports View", () => {
     // Be an exact match on display name.
     await userEvent.type(
       searchInput,
-      mockedReports.reports![0].displayName ?? ""
+      mockedReports.reports[0].displayName
     );
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
     expect(
-      screen.getByText(mockedReports.reports![0].displayName ?? "")
+      screen.getByText(mockedReports.reports[0].displayName)
     ).toBeInTheDocument();
     // Be an exact match on description.
     await userEvent.clear(searchInput);
     await userEvent.type(
       searchInput,
-      mockedReports.reports![0].description ?? ""
+      mockedReports.reports[0].description ?? ""
     );
     expect(screen.getAllByTestId("horizontal-tile")).toHaveLength(1);
     expect(
-      screen.getByText(mockedReports.reports![0].displayName ?? "")
+      screen.getByText(mockedReports.reports[0].displayName)
     ).toBeInTheDocument();
   });
@@ -357,7 +362,7 @@ describe("Reports View", () => {
     await waitForElementToBeRemoved(() => screen.getByText(/loading/i));
     const reportName = screen.getByText(
-      mockedReports.reports![0].displayName ?? ""
+      mockedReports.reports[0].displayName
     );
     await user.click(reportName);
     expect(screen.getByText(/MockReportMappings/i)).toBeInTheDocument();

package/src/test/test-utils.tsx CHANGED Viewed

@@ -54,7 +54,7 @@ export class TestUtils {
     return createStore(
       rootReducer,
       (window as any).__REDUX_DEVTOOLS_EXTENSION__ &&
-        (window as any).__REDUX_DEVTOOLS_EXTENSION__()
+      (window as any).__REDUX_DEVTOOLS_EXTENSION__()
     );
   }

package/src/widget/components/AddMappingsModal.tsx CHANGED Viewed

@@ -5,7 +5,7 @@
 import { Modal, Table, tableFilters } from "@itwin/itwinui-react";
 import React, { useEffect, useMemo, useState } from "react";
 import type { Mapping } from "@itwin/insights-client";
-import { REPORTING_BASE_PATH, ReportingClient } from "@itwin/insights-client";
+import { MappingsClient, REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
 import ActionPanel from "./ActionPanel";
 import "./AddMappingsModal.scss";
 import { LocalizedTablePaginator } from "./LocalizedTablePaginator";
@@ -27,11 +27,11 @@ const fetchMappings = async (
 ) => {
   try {
     setIsLoading(true);
-    const reportingClientApi = new ReportingClient(
+    const mappingsClientApi = new MappingsClient(
       generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)
     );
     const accessToken = await apiContext.getAccessToken();
-    const mappings = await reportingClientApi.getMappings(
+    const mappings = await mappingsClientApi.getMappings(
       accessToken,
       iModelId
     );
@@ -104,14 +104,14 @@ const AddMappingsModal = ({
     try {
       if (!selectedIModelId) return;
       setIsLoading(true);
-      const reportingClientApi = new ReportingClient(
+      const reportsClientApi = new ReportsClient(
         generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
       );
       const accessToken = await apiConfig.getAccessToken();
       for (const mapping of selectedMappings) {
-        await reportingClientApi.createReportMapping(accessToken, reportId, {
+        await reportsClientApi.createReportMapping(accessToken, reportId, {
           imodelId: selectedIModelId,
-          mappingId: mapping.id ?? "",
+          mappingId: mapping.id,
         });
       }

package/src/widget/components/Extraction.tsx CHANGED Viewed

@@ -11,7 +11,7 @@ import {
 } from "@itwin/itwinui-react";
 import * as React from "react";
 import { useEffect, useMemo, useRef, useState } from "react";
-import { REPORTING_BASE_PATH, ReportingClient } from "@itwin/insights-client";
+import { ExtractionClient, REPORTING_BASE_PATH } from "@itwin/insights-client";
 import { generateUrl, handleError, SkeletonBlock } from "./utils";
 import "./Extraction.scss";
 import {
@@ -185,15 +185,15 @@ export const Extraction = ({
     try {
       setExtractionState(ExtractionStates.Starting);
       setExtractingIModelId(iModelId);
-      const reportingClientApi = new ReportingClient(
+      const extractionClientApi = new ExtractionClient(
         generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
       );
       const accessToken = await apiConfig.getAccessToken();
-      const response = await reportingClientApi.runExtraction(
+      const response = await extractionClientApi.runExtraction(
         accessToken,
         iModelId
       );
-      jobId.current = response.run?.id ?? "";
+      jobId.current = response.id;
       setIsRunning(true);
       setExtractionState(ExtractionStates.FetchingUpdate);
     } catch (error: any) {
@@ -207,23 +207,23 @@ export const Extraction = ({
   useEffect(() => {
     if (!intervalId.current && isRunning) {
       const newIntervalId = window.setInterval(async () => {
-        const reportingClientApi = new ReportingClient(
+        const extractionClientApi = new ExtractionClient(
           generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
         );
         const accessToken = await apiConfig.getAccessToken();
-        const response = await reportingClientApi.getExtractionStatus(
+        const response = await extractionClientApi.getExtractionStatus(
           accessToken,
           jobId.current
         );
-        if (response.status?.state === "Queued") {
+        if (response.state === "Queued") {
           setExtractionState(ExtractionStates.Queued);
-        } else if (response.status?.state === "Running") {
+        } else if (response.state === "Running") {
           setExtractionState(ExtractionStates.Running);
-        } else if (response.status?.state === "Succeeded") {
+        } else if (response.state === "Succeeded") {
           setExtractionState(ExtractionStates.Succeeded);
           setIsRunning(false);
           setCurrentIModelId(undefined);
-        } else if (response.status?.state === "Failed") {
+        } else if (response.state === "Failed") {
           setExtractionState(ExtractionStates.Failed);
           setIsRunning(false);
           setCurrentIModelId(undefined);

package/src/widget/components/ReportAction.tsx CHANGED Viewed

@@ -14,7 +14,7 @@ import {
 } from "./utils";
 import "./ReportAction.scss";
 import type { Report } from "@itwin/insights-client";
-import { REPORTING_BASE_PATH, ReportingClient } from "@itwin/insights-client";
+import { REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
 import { useReportsApiConfig } from "../context/ReportsApiConfigContext";
 import { ReportsConfigWidget } from "../../ReportsConfigWidget";
@@ -40,16 +40,16 @@ const ReportAction = ({ iTwinId, report, returnFn }: ReportActionProps) => {
         return;
       }
       setIsLoading(true);
-      const reportingClientApi = new ReportingClient(
+      const reportsClientApi = new ReportsClient(
         generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
       );
       const accessToken = await apiConfig.getAccessToken();
       report
-        ? await reportingClientApi.updateReport(accessToken, report.id ?? "", {
+        ? await reportsClientApi.updateReport(accessToken, report.id ?? "", {
           displayName: values.name,
           description: values.description,
         })
-        : await reportingClientApi.createReport(accessToken, {
+        : await reportsClientApi.createReport(accessToken, {
           displayName: values.name,
           description: values.description,
           projectId: iTwinId,