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

package/coverage/lcov-report/src/widget/components/Reports.tsx.html

@@ -23,30 +23,30 @@
         <div class='clearfix'>
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">90.21% </span>
+                <span class="strong">84.12% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>83/92</span>
+                <span class='fraction'>53/63</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">78.84% </span>
+                <span class="strong">66.66% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>41/52</span>
+                <span class='fraction'>12/18</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">76% </span>
+                <span class="strong">77.77% </span>
                 <span class="quiet">Functions</span>
-                <span class='fraction'>19/25</span>
+                <span class='fraction'>14/18</span>
             </div>
         
             
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.18% </span>
+                <span class="strong">91.07% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>82/88</span>
+                <span class='fraction'>51/56</span>
             </div>
         
             
@@ -286,61 +286,12 @@
 <a name='L221'></a><a href='#L221'>221</a>
 <a name='L222'></a><a href='#L222'>222</a>
 <a name='L223'></a><a href='#L223'>223</a>
-<a name='L224'></a><a href='#L224'>224</a>
-<a name='L225'></a><a href='#L225'>225</a>
-<a name='L226'></a><a href='#L226'>226</a>
-<a name='L227'></a><a href='#L227'>227</a>
-<a name='L228'></a><a href='#L228'>228</a>
-<a name='L229'></a><a href='#L229'>229</a>
-<a name='L230'></a><a href='#L230'>230</a>
-<a name='L231'></a><a href='#L231'>231</a>
-<a name='L232'></a><a href='#L232'>232</a>
-<a name='L233'></a><a href='#L233'>233</a>
-<a name='L234'></a><a href='#L234'>234</a>
-<a name='L235'></a><a href='#L235'>235</a>
-<a name='L236'></a><a href='#L236'>236</a>
-<a name='L237'></a><a href='#L237'>237</a>
-<a name='L238'></a><a href='#L238'>238</a>
-<a name='L239'></a><a href='#L239'>239</a>
-<a name='L240'></a><a href='#L240'>240</a>
-<a name='L241'></a><a href='#L241'>241</a>
-<a name='L242'></a><a href='#L242'>242</a>
-<a name='L243'></a><a href='#L243'>243</a>
-<a name='L244'></a><a href='#L244'>244</a>
-<a name='L245'></a><a href='#L245'>245</a>
-<a name='L246'></a><a href='#L246'>246</a>
-<a name='L247'></a><a href='#L247'>247</a>
-<a name='L248'></a><a href='#L248'>248</a>
-<a name='L249'></a><a href='#L249'>249</a>
-<a name='L250'></a><a href='#L250'>250</a>
-<a name='L251'></a><a href='#L251'>251</a>
-<a name='L252'></a><a href='#L252'>252</a>
-<a name='L253'></a><a href='#L253'>253</a>
-<a name='L254'></a><a href='#L254'>254</a>
-<a name='L255'></a><a href='#L255'>255</a>
-<a name='L256'></a><a href='#L256'>256</a>
-<a name='L257'></a><a href='#L257'>257</a>
-<a name='L258'></a><a href='#L258'>258</a>
-<a name='L259'></a><a href='#L259'>259</a>
-<a name='L260'></a><a href='#L260'>260</a>
-<a name='L261'></a><a href='#L261'>261</a>
-<a name='L262'></a><a href='#L262'>262</a>
-<a name='L263'></a><a href='#L263'>263</a>
-<a name='L264'></a><a href='#L264'>264</a>
-<a name='L265'></a><a href='#L265'>265</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L224'></a><a href='#L224'>224</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
@@ -348,8 +299,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -357,128 +306,109 @@
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">17x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">9x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">17x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">9x</span>
-<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">9x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">70x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">16x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">49x</span>
-<span class="cline-any cline-yes">126x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">55x</span>
+<span class="cline-any cline-yes">229x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
+<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">95x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -486,11 +416,9 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">65x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -501,7 +429,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -547,27 +474,20 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">146x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">274x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">27x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">28x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -578,7 +498,6 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -590,69 +509,44 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">/*---------------------------------------------------------------------------------------------
-* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
-* See LICENSE.md in the project root for license terms and full copyright notice.
-*--------------------------------------------------------------------------------------------*/
-import {
-  SvgAdd,
-  SvgPlay,
-} from "@itwin/itwinui-icons-react";
-import {
-  Button,
-  IconButton,
-  Surface,
-  toaster,
-} from "@itwin/itwinui-react";
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
+import { SvgAdd, SvgPlay, SvgRefresh } from "@itwin/itwinui-icons-react";
+import { Button, IconButton } from "@itwin/itwinui-react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import type { CreateTypeFromInterface } from "./utils";
 import {
   EmptyMessage,
-  generateUrl,
   handleError,
   LoadingOverlay,
-  WidgetHeader,
 } from "./utils";
 import "./Reports.scss";
 import DeleteModal from "./DeleteModal";
-import type { Report } from "@itwin/insights-client";
-import { REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
-import ReportAction from "./ReportAction";
-import { ReportMappings } from "./ReportMappings";
+import type { Report, ReportsClient } from "@itwin/insights-client";
 import { ReportHorizontalTile } from "./ReportHorizontalTile";
 import { SearchBar } from "./SearchBar";
-import type { ReportsApiConfig } from "../context/ReportsApiConfigContext";
-import { useReportsApiConfig } from "../context/ReportsApiConfigContext";
+import { useReportsConfigApi } from "../context/ReportsConfigApiContext";
 import { ReportsConfigWidget } from "../../ReportsConfigWidget";
-import { useActiveIModelConnection } from "@itwin/appui-react";
-import BulkExtractor from "./BulkExtractor";
+import type { AccessToken } from "@itwin/core-bentley";
 import { BeEvent } from "@itwin/core-bentley";
-import { FailedExtractionToast, SuccessfulExtractionToast } from "./ExtractionToast";
+import { useBulkExtractor } from "../context/BulkExtractorContext";
 &nbsp;
 export type ReportType = CreateTypeFromInterface&lt;Report&gt;;
 &nbsp;
-enum ReportsView {
-  REPORTS = "reports",
-  REPORTSMAPPING = "reportsmapping",
-  ADDING = "adding",
-  MODIFYING = "modifying",
-}
-&nbsp;
 const fetchReports = async (
-  setReports: React.Dispatch&lt;React.SetStateAction&lt;Report[]&gt;&gt;,
+  setReports: (reports: Report[]) =&gt; void,
   iTwinId: string | undefined,
-  setIsLoading: React.Dispatch&lt;React.SetStateAction&lt;boolean&gt;&gt;,
-  apiContext: ReportsApiConfig
+  setIsLoading: (isLoading: boolean) =&gt; void,
+  reportsClient: ReportsClient,
+  getAccessToken: () =&gt; Promise&lt;AccessToken&gt;
 ) =&gt; {
   try {
     <span class="missing-if-branch" title="if path not taken" >I</span>if (!iTwinId) <span class="cstat-no" title="statement not covered" >return;</span>
     setIsLoading(true);
-    const reportsClientApi = new ReportsClient(
-      generateUrl(REPORTING_BASE_PATH, apiContext.baseUrl)
-    );
-    const accessToken = await apiContext.getAccessToken();
-    const reports = await reportsClientApi.getReports(accessToken, iTwinId);
+    const accessToken = await getAccessToken();
+    const reports = await reportsClient.getReports(accessToken, iTwinId);
     setReports(reports ?? <span class="branch-1 cbranch-no" title="branch not covered" >[])</span>;
   } catch (error: any) {
     handleError(error.status);
@@ -661,50 +555,50 @@ const fetchReports = async (
   }
 };
 &nbsp;
-export const Reports = () =&gt; {
-  const successfulExtractionToast = <span class="fstat-no" title="function not covered" >(i</span>ModelName: string, odataFeedUrl: string) =&gt; {
-<span class="cstat-no" title="statement not covered" >    toaster.positive(&lt;SuccessfulExtractionToast iModelName={iModelName} odataFeedUrl={odataFeedUrl} /&gt;);</span>
-  };
-&nbsp;
-  const failedExtractionToast = <span class="fstat-no" title="function not covered" >(i</span>ModelName: string) =&gt; {
-<span class="cstat-no" title="statement not covered" >    toaster.negative(&lt;FailedExtractionToast iModelName={iModelName} /&gt;);</span>
-  };
+export interface ReportsProps {
+  onClickAddReport?: () =&gt; void;
+  onClickReportTitle?: (report: Report) =&gt; void;
+  onClickReportModify?: (report: Report) =&gt; void;
+}
 &nbsp;
-  const iTwinId = useActiveIModelConnection()<span class="branch-0 cbranch-no" title="branch not covered" >?.i</span>TwinId ?? <span class="branch-1 cbranch-no" title="branch not covered" >"";</span>
-  const apiConfig = useReportsApiConfig();
-  const [selectedReportIds, setSelectedReportIds] = useState&lt;string[]&gt;([]);
-  const [showDeleteModal, setShowDeleteModal] = useState&lt;boolean&gt;(false);
-  const [reportsView, setReportsView] = useState&lt;ReportsView&gt;(
-    ReportsView.REPORTS
-  );
-  const [selectedReport, setSelectedReport] = useState&lt;Report | undefined&gt;(
+export const Reports = ({
+  onClickAddReport,
+  onClickReportModify,
+  onClickReportTitle,
+}: ReportsProps) =&gt; {
+  const { iTwinId, getAccessToken, reportsClient } = useReportsConfigApi();
+  const { bulkExtractor } = useBulkExtractor();
+  const [showDeleteModal, setShowDeleteModal] = useState&lt;Report | undefined&gt;(
     undefined
   );
+  const [selectedReportIds, setSelectedReportIds] = useState&lt;string[]&gt;([]);
   const [isLoading, setIsLoading] = useState&lt;boolean&gt;(true);
   const [searchValue, setSearchValue] = useState&lt;string&gt;("");
   const [reports, setReports] = useState&lt;Report[]&gt;([]);
-  const bulkExtractor = useMemo(
-    () =&gt; new BulkExtractor(apiConfig, successfulExtractionToast, failedExtractionToast),
-    [apiConfig]
-  );
   const jobStartEvent = useMemo(
     () =&gt; new BeEvent&lt;(reportId: string) =&gt; void&gt;(),
     []
   );
 &nbsp;
   useEffect(() =&gt; {
-    void fetchReports(setReports, iTwinId, setIsLoading, apiConfig);
-  }, [apiConfig, iTwinId, setIsLoading]);
+    void fetchReports(
+      setReports,
+      iTwinId,
+      setIsLoading,
+      reportsClient,
+      getAccessToken
+    );
+  }, [getAccessToken, iTwinId, reportsClient, setIsLoading]);
 &nbsp;
   const refresh = useCallback(async () =&gt; {
-    setReportsView(ReportsView.REPORTS);
-    setSelectedReport(undefined);
-    await fetchReports(setReports, iTwinId, setIsLoading, apiConfig);
-  }, [apiConfig, iTwinId, setReports]);
-&nbsp;
-  const addReport = () =&gt; {
-    setReportsView(ReportsView.ADDING);
-  };
+    await fetchReports(
+      setReports,
+      iTwinId,
+      setIsLoading,
+      reportsClient,
+      getAccessToken
+    );
+  }, [getAccessToken, iTwinId, reportsClient]);
 &nbsp;
   const filteredReports = useMemo(
     () =&gt;
@@ -718,142 +612,125 @@ export const Reports = () =&gt; {
   );
 &nbsp;
   const onSelectionChange = (reportId: string, control: boolean) =&gt; {
-    if (!control)
-      setSelectedReportIds([]);
+    if (!control) setSelectedReportIds([]);
 &nbsp;
     setSelectedReportIds((sr) =&gt;
       sr.some(<span class="fstat-no" title="function not covered" >(r</span>) =&gt; <span class="cstat-no" title="statement not covered" >reportId === r)</span>
-        ? <span class="branch-0 cbranch-no" title="branch not covered" >sr.filter(</span>
-<span class="fstat-no" title="function not covered" >          (r</span>) =&gt; <span class="cstat-no" title="statement not covered" >reportId !== r</span>
-        )
+        ? <span class="branch-0 cbranch-no" title="branch not covered" >sr.filter(<span class="fstat-no" title="function not covered" >(r</span>) =&gt; <span class="cstat-no" title="statement not covered" >reportId !== r)</span></span>
         : [...sr, reportId]
     );
   };
 &nbsp;
   const updateDatasets = useCallback(<span class="fstat-no" title="function not covered" >async </span>() =&gt; {
+<span class="cstat-no" title="statement not covered" >    <span class="missing-if-branch" title="if path not taken" >I</span>if (!bulkExtractor) <span class="cstat-no" title="statement not covered" >return;</span></span>
 <span class="cstat-no" title="statement not covered" >    await bulkExtractor.runReportExtractions(selectedReportIds);</span>
 <span class="cstat-no" title="statement not covered" >    selectedReportIds.map(<span class="fstat-no" title="function not covered" >(r</span>eportId) =&gt; <span class="cstat-no" title="statement not covered" >jobStartEvent.raiseEvent(reportId))</span>;</span>
 <span class="cstat-no" title="statement not covered" >    setSelectedReportIds([]);</span>
   }, [selectedReportIds, jobStartEvent, bulkExtractor]);
 &nbsp;
-  switch (reportsView) {
-    case ReportsView.ADDING:
-      return iTwinId ? (
-        &lt;ReportAction iTwinId={iTwinId ?? <span class="branch-1 cbranch-no" title="branch not covered" >""}</span> returnFn={refresh} /&gt;
-      ) : <span class="branch-1 cbranch-no" title="branch not covered" >null;</span>
-    case ReportsView.MODIFYING:
-      return iTwinId ? (
-        &lt;ReportAction
-          iTwinId={iTwinId}
-          report={selectedReport}
-          returnFn={refresh}
-        /&gt;
-      ) : <span class="branch-1 cbranch-no" title="branch not covered" >null;</span>
-    case ReportsView.REPORTSMAPPING:
-      return selectedReport ? (
-        &lt;ReportMappings report={selectedReport} bulkExtractor={bulkExtractor} goBack={refresh} /&gt;
-      ) : <span class="branch-1 cbranch-no" title="branch not covered" >null;</span>
-    default:
-      return (
-        &lt;&gt;
-          &lt;WidgetHeader
-            title={ReportsConfigWidget.localization.getLocalizedString(
-              "ReportsConfigWidget:ITwinReports"
-            )}
-          /&gt;
-          &lt;Surface className="rcw-reports-list-container"&gt;
-            &lt;div className="rcw-toolbar"&gt;
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (!bulkExtractor) <span class="cstat-no" title="statement not covered" >return null;</span>
+&nbsp;
+  return (
+    &lt;&gt;
+      &lt;div className="rcw-reports-list-container"&gt;
+        &lt;div className="rcw-toolbar"&gt;
+          &lt;div className="rcw-button-spacing"&gt;
+            {onClickAddReport &amp;&amp; (
               &lt;Button
                 startIcon={&lt;SvgAdd /&gt;}
-                onClick={() =&gt; addReport()}
+                onClick={onClickAddReport}
                 styleType="high-visibility"
+                title="New Report"
               &gt;
                 {ReportsConfigWidget.localization.getLocalizedString(
                   "ReportsConfigWidget:New"
                 )}
               &lt;/Button&gt;
-              &lt;IconButton
-                title={ReportsConfigWidget.localization.getLocalizedString(
-                  "ReportsConfigWidget:UpdateDatasets"
-                )}
-                onClick={updateDatasets}
-                disabled={selectedReportIds.length === 0}
-              &gt;
-                &lt;SvgPlay /&gt;
-              &lt;/IconButton&gt;
-              &lt;div className="rcw-search-bar-container" data-testid="rcw-search-bar"&gt;
-                &lt;div className="rcw-search-button"&gt;
-                  &lt;SearchBar
-                    searchValue={searchValue}
-                    setSearchValue={setSearchValue}
-                    disabled={isLoading}
-                  /&gt;
-                &lt;/div&gt;
-              &lt;/div&gt;
-            &lt;/div&gt;
-            {isLoading ? (
-              &lt;LoadingOverlay /&gt;
-            ) : reports.length === 0 ? (
-              &lt;EmptyMessage&gt;
-                &lt;&gt;
+            )}
+            &lt;IconButton
+              title={ReportsConfigWidget.localization.getLocalizedString(
+                "ReportsConfigWidget:UpdateDatasets"
+              )}
+              onClick={updateDatasets}
+              disabled={selectedReportIds.length === 0}
+            &gt;
+              &lt;SvgPlay /&gt;
+            &lt;/IconButton&gt;
+          &lt;/div&gt;
+          &lt;div
+            className="rcw-search-bar-container"
+            data-testid="rcw-search-bar"
+          &gt;
+            &lt;IconButton
+              title={ReportsConfigWidget.localization.getLocalizedString(
+                "ReportsConfigWidget:Refresh"
+              )}
+              onClick={refresh}
+              disabled={isLoading}
+              styleType="borderless"
+            &gt;
+              &lt;SvgRefresh /&gt;
+            &lt;/IconButton&gt;
+            &lt;SearchBar
+              searchValue={searchValue}
+              setSearchValue={setSearchValue}
+              disabled={isLoading}
+            /&gt;
+          &lt;/div&gt;
+        &lt;/div&gt;
+        {isLoading ? (
+          &lt;LoadingOverlay /&gt;
+        ) : reports.length === 0 &amp;&amp; onClickAddReport ? (
+          &lt;EmptyMessage&gt;
+            &lt;&gt;
+              {ReportsConfigWidget.localization.getLocalizedString(
+                "ReportsConfigWidget:NoReports"
+              )}
+              &lt;div&gt;
+                &lt;Button onClick={onClickAddReport} styleType="cta"&gt;
                   {ReportsConfigWidget.localization.getLocalizedString(
-                    "ReportsConfigWidget:NoReports"
+                    "ReportsConfigWidget:CreateOneReportCTA"
                   )}
-                  &lt;div&gt;
-                    &lt;Button onClick={addReport} styleType="cta"&gt;
-                      {ReportsConfigWidget.localization.getLocalizedString(
-                        "ReportsConfigWidget:CreateOneReportCTA"
-                      )}
-                    &lt;/Button&gt;
-                  &lt;/div&gt;
-                &lt;/&gt;
-              &lt;/EmptyMessage&gt;
-            ) : (
-              &lt;div className="rcw-reports-list"&gt;
-                {filteredReports.map((report) =&gt; (
-                  &lt;ReportHorizontalTile
-                    key={report.id}
-                    report={report}
-                    onClickTitle={() =&gt; {
-                      setSelectedReport(report);
-                      setReportsView(ReportsView.REPORTSMAPPING);
-                    }}
-                    jobStartEvent={jobStartEvent}
-                    bulkExtractor={bulkExtractor}
-                    onClickDelete={() =&gt; {
-                      setSelectedReport(report);
-                      setShowDeleteModal(true);
-                    }}
-                    onClickModify={() =&gt; {
-                      setSelectedReport(report);
-                      setReportsView(ReportsView.MODIFYING);
-                    }}
-                    onSelectionChange={onSelectionChange}
-                    selected={selectedReportIds.some((reportId) =&gt; report.id === reportId)}
-                  /&gt;
-                ))}
+                &lt;/Button&gt;
               &lt;/div&gt;
-            )}
-          &lt;/Surface&gt;
-          &lt;DeleteModal
-            entityName={selectedReport?.displayName ?? ""}
-            show={showDeleteModal}
-            setShow={setShowDeleteModal}
-            onDelete={async () =&gt; {
-              const reportsClientApi = new ReportsClient(
-                generateUrl(REPORTING_BASE_PATH, apiConfig.baseUrl)
-              );
-              const accessToken = await apiConfig.getAccessToken();
-              await reportsClientApi.deleteReport(
-                accessToken,
-                selectedReport<span class="branch-0 cbranch-no" title="branch not covered" >?.i</span>d ?? <span class="branch-1 cbranch-no" title="branch not covered" >""</span>
-              );
-            }}
-            refresh={refresh}
-          /&gt;
-        &lt;/&gt;
-      );
-  }
+            &lt;/&gt;
+          &lt;/EmptyMessage&gt;
+        ) : (
+          &lt;div className="rcw-reports-list"&gt;
+            {filteredReports.map((report) =&gt; (
+              &lt;ReportHorizontalTile
+                key={report.id}
+                report={report}
+                onClickTitle={onClickReportTitle}
+                jobStartEvent={jobStartEvent}
+                bulkExtractor={bulkExtractor}
+                onClickDelete={() =&gt; {
+                  setShowDeleteModal(report);
+                }}
+                onClickModify={onClickReportModify}
+                onSelectionChange={onSelectionChange}
+                selected={selectedReportIds.some(
+                  (reportId) =&gt; report.id === reportId
+                )}
+              /&gt;
+            ))}
+          &lt;/div&gt;
+        )}
+      &lt;/div&gt;
+      &lt;DeleteModal
+        entityName={showDeleteModal?.displayName}
+        onClose={() =&gt; setShowDeleteModal(undefined)}
+        onDelete={async () =&gt; {
+          const accessToken = await getAccessToken();
+          await reportsClient.deleteReport(
+            accessToken,
+            showDeleteModal?.id ?? <span class="branch-1 cbranch-no" title="branch not covered" >""</span>
+          );
+        }}
+        refresh={refresh}
+      /&gt;
+    &lt;/&gt;
+  );
 };
 &nbsp;</pre></td></tr></table></pre>
 
@@ -862,7 +739,7 @@ export const Reports = () =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Tue Mar 07 2023 15:47:40 GMT+0000 (Coordinated Universal Time)
+                at Thu Aug 17 2023 14:40:52 GMT+0000 (Coordinated Universal Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>