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

package/lib/esm/widget/components/ReportsContainer.d.ts

@@ -1,11 +1,8 @@
 /// <reference types="react" />
-import type { AccessToken } from "@itwin/core-bentley";
 import "./ReportsContainer.scss";
 import type { Report } from "@itwin/insights-client";
-interface ReportsContainerProps {
-    getAccessToken?: () => Promise<AccessToken>;
-    baseUrl: string;
-}
+import type { ReportsConfigContextProps } from "./ReportsConfigContext";
+export declare type ReportsContainerProps = Omit<ReportsConfigContextProps, "iTwinId" | "children">;
 export declare enum RouteStep {
     ReportsList = 0,
     ReportAction = 1,
@@ -19,6 +16,6 @@ export interface Route {
     title: string;
     reportsRoutingFields: ReportsRouteFields;
 }
-declare const ReportsContainer: ({ getAccessToken, baseUrl }: ReportsContainerProps) => JSX.Element;
+declare const ReportsContainer: (props: ReportsContainerProps) => JSX.Element;
 export default ReportsContainer;
 //# sourceMappingURL=ReportsContainer.d.ts.map

package/lib/esm/widget/components/ReportsContainer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportsContainer.d.ts","sourceRoot":"","sources":["../../../../src/widget/components/ReportsContainer.tsx"],"names":[],"mappings":";AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMrD,UAAU,qBAAqB;IAC7B,cAAc,CAAC,EAAE,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;IAC5C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,oBAAY,SAAS;IACnB,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,cAAc,IAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,oBAAoB,EAAE,kBAAkB,CAAC;CAC1C;AAED,QAAA,MAAM,gBAAgB,gCAAiC,qBAAqB,gBAsB3E,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ReportsContainer.d.ts","sourceRoot":"","sources":["../../../../src/widget/components/ReportsContainer.tsx"],"names":[],"mappings":";AAKA,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAGxE,oBAAY,qBAAqB,GAAG,IAAI,CAAC,yBAAyB,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;AAE5F,oBAAY,SAAS;IACnB,WAAW,IAAA;IACX,YAAY,IAAA;IACZ,cAAc,IAAA;CACf;AAED,MAAM,WAAW,kBAAkB;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,IAAI,EAAE,SAAS,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,oBAAoB,EAAE,kBAAkB,CAAC;CAC1C;AAED,QAAA,MAAM,gBAAgB,UAAW,qBAAqB,gBAsBrD,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/lib/esm/widget/components/ReportsContainer.js

@@ -1,3 +1,7 @@
+/*---------------------------------------------------------------------------------------------
+ * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+ * See LICENSE.md in the project root for license terms and full copyright notice.
+ *--------------------------------------------------------------------------------------------*/
 import React, { useCallback, useState } from "react";
 import "./ReportsContainer.scss";
 import { useActiveIModelConnection } from "@itwin/appui-react";
@@ -10,7 +14,7 @@ export var RouteStep;
     RouteStep[RouteStep["ReportAction"] = 1] = "ReportAction";
     RouteStep[RouteStep["ReportMappings"] = 2] = "ReportMappings";
 })(RouteStep || (RouteStep = {}));
-const ReportsContainer = ({ getAccessToken, baseUrl }) => {
+const ReportsContainer = (props) => {
     const [routingHistory, setRoutingHistory] = useState([{ step: RouteStep.ReportsList, title: "iTwin Reports", reportsRoutingFields: {} }]);
     const currentRoute = routingHistory[routingHistory.length - 1];
     const iTwinId = useActiveIModelConnection()?.iTwinId ?? "";
@@ -22,7 +26,7 @@ const ReportsContainer = ({ getAccessToken, baseUrl }) => {
         updatedRouting.pop();
         setRoutingHistory(updatedRouting);
     }, [routingHistory]);
-    return (React.createElement(ReportsConfigContext, { getAccessToken: getAccessToken, baseUrl: baseUrl, iTwinId: iTwinId },
+    return (React.createElement(ReportsConfigContext, { ...props, iTwinId: iTwinId },
         React.createElement("div", { className: "rcw-reports-container" },
             React.createElement(ReportsHeader, { goBack: goBack, currentRoute: currentRoute }),
             React.createElement(ReportsRouter, { currentRoute: currentRoute, navigateTo: navigateTo, goBack: goBack }))));

package/lib/esm/widget/components/ReportsContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReportsContainer.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportsContainer.tsx"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAO9D,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,uDAAW,CAAA;IACX,yDAAY,CAAA;IACZ,6DAAc,CAAA;AAChB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAYD,MAAM,gBAAgB,GAAG,CAAC,EAAE,cAAc,EAAE,OAAO,EAAyB,EAAE,EAAE;IAC9E,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAU,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACnJ,MAAM,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,yBAAyB,EAAE,EAAE,OAAO,IAAI,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,OAA2C,EAAE,EAAE;QAC7E,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9B,MAAM,cAAc,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;QAC3C,cAAc,CAAC,GAAG,EAAE,CAAC;QACrB,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,OAAO,CACL,oBAAC,oBAAoB,IAAC,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO;QACtF,6BAAK,SAAS,EAAC,uBAAuB;YACpC,oBAAC,aAAa,IAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAI;YAC7D,oBAAC,aAAa,IAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAI,CACjF,CACe,CACxB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,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 type { AccessToken } from \"@itwin/core-bentley\";\nimport React, { useCallback, useState } from \"react\";\nimport \"./ReportsContainer.scss\";\nimport type { Report } from \"@itwin/insights-client\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\nimport { ReportsHeader } from \"./ReportsHeader\";\nimport { ReportsRouter } from \"./ReportsRouter\";\nimport { ReportsConfigContext } from \"./ReportsConfigContext\";\n\ninterface ReportsContainerProps {\n  getAccessToken?: () => Promise<AccessToken>;\n  baseUrl: string;\n}\n\nexport enum RouteStep {\n  ReportsList,\n  ReportAction,\n  ReportMappings,\n}\n\nexport interface ReportsRouteFields {\n  report?: Report;\n}\n\nexport interface Route {\n  step: RouteStep;\n  title: string;\n  reportsRoutingFields: ReportsRouteFields;\n}\n\nconst ReportsContainer = ({ getAccessToken, baseUrl }: ReportsContainerProps) => {\n  const [routingHistory, setRoutingHistory] = useState<Route[]>([{ step: RouteStep.ReportsList, title: \"iTwin Reports\", reportsRoutingFields: {} }]);\n  const currentRoute = routingHistory[routingHistory.length - 1];\n  const iTwinId = useActiveIModelConnection()?.iTwinId ?? \"\";\n  const navigateTo = useCallback((toRoute: (prev: Route | undefined) => Route) => {\n    setRoutingHistory((r) => [...r, toRoute(r[r.length - 1])]);\n  }, []);\n\n  const goBack = useCallback(() => {\n    const updatedRouting = [...routingHistory];\n    updatedRouting.pop();\n    setRoutingHistory(updatedRouting);\n  }, [routingHistory]);\n\n  return (\n    <ReportsConfigContext getAccessToken={getAccessToken} baseUrl={baseUrl} iTwinId={iTwinId}>\n      <div className=\"rcw-reports-container\">\n        <ReportsHeader goBack={goBack} currentRoute={currentRoute} />\n        <ReportsRouter currentRoute={currentRoute} navigateTo={navigateTo} goBack={goBack} />\n      </div>\n    </ReportsConfigContext>\n  );\n};\n\nexport default ReportsContainer;\n"]}
+{"version":3,"file":"ReportsContainer.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportsContainer.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,yBAAyB,CAAC;AAEjC,OAAO,EAAE,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAA;AAI7D,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,uDAAW,CAAA;IACX,yDAAY,CAAA;IACZ,6DAAc,CAAA;AAChB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;AAYD,MAAM,gBAAgB,GAAG,CAAC,KAA4B,EAAE,EAAE;IACxD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAU,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,WAAW,EAAE,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IACnJ,MAAM,YAAY,GAAG,cAAc,CAAC,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,yBAAyB,EAAE,EAAE,OAAO,IAAI,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,OAA2C,EAAE,EAAE;QAC7E,iBAAiB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9B,MAAM,cAAc,GAAG,CAAC,GAAG,cAAc,CAAC,CAAC;QAC3C,cAAc,CAAC,GAAG,EAAE,CAAC;QACrB,iBAAiB,CAAC,cAAc,CAAC,CAAC;IACpC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,OAAO,CACL,oBAAC,oBAAoB,OAAK,KAAK,EAAE,OAAO,EAAE,OAAO;QAC/C,6BAAK,SAAS,EAAC,uBAAuB;YACpC,oBAAC,aAAa,IAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAI;YAC7D,oBAAC,aAAa,IAAC,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,GAAI,CACjF,CACe,CACxB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,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 React, { useCallback, useState } from \"react\";\nimport \"./ReportsContainer.scss\";\nimport type { Report } from \"@itwin/insights-client\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\nimport { ReportsHeader } from \"./ReportsHeader\";\nimport { ReportsRouter } from \"./ReportsRouter\";\nimport type { ReportsConfigContextProps } from \"./ReportsConfigContext\";\nimport { ReportsConfigContext } from \"./ReportsConfigContext\"\n\nexport type ReportsContainerProps = Omit<ReportsConfigContextProps, \"iTwinId\" | \"children\">;\n\nexport enum RouteStep {\n  ReportsList,\n  ReportAction,\n  ReportMappings,\n}\n\nexport interface ReportsRouteFields {\n  report?: Report;\n}\n\nexport interface Route {\n  step: RouteStep;\n  title: string;\n  reportsRoutingFields: ReportsRouteFields;\n}\n\nconst ReportsContainer = (props: ReportsContainerProps) => {\n  const [routingHistory, setRoutingHistory] = useState<Route[]>([{ step: RouteStep.ReportsList, title: \"iTwin Reports\", reportsRoutingFields: {} }]);\n  const currentRoute = routingHistory[routingHistory.length - 1];\n  const iTwinId = useActiveIModelConnection()?.iTwinId ?? \"\";\n  const navigateTo = useCallback((toRoute: (prev: Route | undefined) => Route) => {\n    setRoutingHistory((r) => [...r, toRoute(r[r.length - 1])]);\n  }, []);\n\n  const goBack = useCallback(() => {\n    const updatedRouting = [...routingHistory];\n    updatedRouting.pop();\n    setRoutingHistory(updatedRouting);\n  }, [routingHistory]);\n\n  return (\n    <ReportsConfigContext {...props} iTwinId={iTwinId}>\n      <div className=\"rcw-reports-container\">\n        <ReportsHeader goBack={goBack} currentRoute={currentRoute} />\n        <ReportsRouter currentRoute={currentRoute} navigateTo={navigateTo} goBack={goBack} />\n      </div>\n    </ReportsConfigContext>\n  );\n};\n\nexport default ReportsContainer;\n"]}

package/lib/esm/widget/context/ReportsConfigApiContext.d.ts

@@ -1,14 +1,14 @@
 import type { AccessToken } from "@itwin/core-bentley";
 import { IModelsClient } from "@itwin/imodels-client-management";
-import { MappingsClient, ReportsClient } from "@itwin/insights-client";
+import type { IMappingsClient, IReportsClient } from "@itwin/insights-client";
 import * as React from "react";
 export declare type GetAccessTokenFn = () => Promise<AccessToken>;
 export interface ReportsConfigApiProps {
     getAccessToken: GetAccessTokenFn;
     iTwinId: string;
     baseUrl: string;
-    reportsClient: ReportsClient;
-    mappingsClient: MappingsClient;
+    reportsClient: IReportsClient;
+    mappingsClient: IMappingsClient;
     iModelsClient: IModelsClient;
 }
 export declare const ReportsConfigApiContext: React.Context<ReportsConfigApiProps>;

package/lib/esm/widget/context/ReportsConfigApiContext.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportsConfigApiContext.d.ts","sourceRoot":"","sources":["../../../../src/widget/context/ReportsConfigApiContext.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,oBAAY,gBAAgB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;AAE1D,MAAM,WAAW,qBAAqB;IACpC,cAAc,EAAE,gBAAgB,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,eAAO,MAAM,uBAAuB,sCAOlC,CAAC;AAEH,eAAO,MAAM,mBAAmB,6BAM/B,CAAC"}
+{"version":3,"file":"ReportsConfigApiContext.d.ts","sourceRoot":"","sources":["../../../../src/widget/context/ReportsConfigApiContext.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE9E,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,oBAAY,gBAAgB,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC,CAAC;AAE1D,MAAM,WAAW,qBAAqB;IACpC,cAAc,EAAE,gBAAgB,CAAC;IACjC,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,aAAa,EAAE,cAAc,CAAC;IAC9B,cAAc,EAAE,eAAe,CAAC;IAChC,aAAa,EAAE,aAAa,CAAC;CAC9B;AAED,eAAO,MAAM,uBAAuB,sCAOlC,CAAC;AAEH,eAAO,MAAM,mBAAmB,6BAM/B,CAAC"}

package/lib/esm/widget/context/ReportsConfigApiContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReportsConfigApiContext.js","sourceRoot":"","sources":["../../../../src/widget/context/ReportsConfigApiContext.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAatC,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAwB;IAC1E,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IAC9B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,aAAa,EAAE,IAAI,aAAa,EAAE;IAClC,cAAc,EAAE,IAAI,cAAc,EAAE;IACpC,aAAa,EAAE,IAAI,aAAa,EAAE;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;KACjG;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,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 type { AccessToken } from \"@itwin/core-bentley\";\nimport { IModelsClient } from \"@itwin/imodels-client-management\";\nimport { MappingsClient, ReportsClient } from \"@itwin/insights-client\";\nimport * as React from \"react\";\nimport { createContext } from \"react\";\n\nexport type GetAccessTokenFn = () => Promise<AccessToken>;\n\nexport interface ReportsConfigApiProps {\n  getAccessToken: GetAccessTokenFn;\n  iTwinId: string;\n  baseUrl: string;\n  reportsClient: ReportsClient;\n  mappingsClient: MappingsClient;\n  iModelsClient: IModelsClient;\n}\n\nexport const ReportsConfigApiContext = createContext<ReportsConfigApiProps>({\n  getAccessToken: async () => \"\",\n  iTwinId: \"\",\n  baseUrl: \"\",\n  reportsClient: new ReportsClient(),\n  mappingsClient: new MappingsClient(),\n  iModelsClient: new IModelsClient(),\n});\n\nexport const useReportsConfigApi = () => {\n  const context = React.useContext(ReportsConfigApiContext);\n  if (!context) {\n    throw new Error(\"useReportsConfigApi should be used within a ReportsConfigApiContext provider\");\n  }\n  return context;\n};\n"]}
+{"version":3,"file":"ReportsConfigApiContext.js","sourceRoot":"","sources":["../../../../src/widget/context/ReportsConfigApiContext.tsx"],"names":[],"mappings":"AAKA,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAatC,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAwB;IAC1E,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,EAAE;IAC9B,OAAO,EAAE,EAAE;IACX,OAAO,EAAE,EAAE;IACX,aAAa,EAAE,IAAI,aAAa,EAAE;IAClC,cAAc,EAAE,IAAI,cAAc,EAAE;IACpC,aAAa,EAAE,IAAI,aAAa,EAAE;CACnC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;IAC1D,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;KACjG;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,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 type { AccessToken } from \"@itwin/core-bentley\";\nimport { IModelsClient } from \"@itwin/imodels-client-management\";\nimport type { IMappingsClient, IReportsClient } from \"@itwin/insights-client\";\nimport { MappingsClient, ReportsClient } from \"@itwin/insights-client\";\nimport * as React from \"react\";\nimport { createContext } from \"react\";\n\nexport type GetAccessTokenFn = () => Promise<AccessToken>;\n\nexport interface ReportsConfigApiProps {\n  getAccessToken: GetAccessTokenFn;\n  iTwinId: string;\n  baseUrl: string;\n  reportsClient: IReportsClient;\n  mappingsClient: IMappingsClient;\n  iModelsClient: IModelsClient;\n}\n\nexport const ReportsConfigApiContext = createContext<ReportsConfigApiProps>({\n  getAccessToken: async () => \"\",\n  iTwinId: \"\",\n  baseUrl: \"\",\n  reportsClient: new ReportsClient(),\n  mappingsClient: new MappingsClient(),\n  iModelsClient: new IModelsClient(),\n});\n\nexport const useReportsConfigApi = () => {\n  const context = React.useContext(ReportsConfigApiContext);\n  if (!context) {\n    throw new Error(\"useReportsConfigApi should be used within a ReportsConfigApiContext provider\");\n  }\n  return context;\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/reports-config-widget-react",
-  "version": "0.6.0",
+  "version": "0.7.1",
   "description": "An iTwin.js 3D Viewer Widget that interfaces with the iTwin Reporting Platform.",
   "keywords": [
     "Bentley",
@@ -62,7 +62,7 @@
     "@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/insights-client": "^0.13.0",
     "@itwin/itwinui-icons-color-react": "^2.1.0",
     "@itwin/itwinui-icons-react": "^2.4.0",
     "@itwin/itwinui-react": "^2.11.0",

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

@@ -5,6 +5,7 @@
 /** UI Provider for iTwin Viewer Applications */
 export * from "./widget/ReportsConfigUiProvider";
 export * from "./ReportsConfigWidget";
+export * from "@itwin/insights-client";
 
 export { Reports, ReportsProps } from "./widget/components/Reports";
 export { ReportMappings, ReportMappingsProps } from "./widget/components/ReportMappings";

package/src/test/ReportAction.test.tsx

@@ -46,6 +46,9 @@ describe("Reports Action", () => {
         project: {
           href: "",
         },
+        odata: {
+          href: "",
+        },
       },
     };
 

package/src/test/ReportMappings.test.tsx

@@ -53,6 +53,9 @@ const mockReport: Report = {
     project: {
       href: "",
     },
+    odata: {
+      href: "mock-odata-feed-url",
+    },
   },
 };
 
@@ -297,7 +300,7 @@ describe("Report Mappings View", () => {
       name: /odatafeedurl/i,
     });
     expect(urlTextbox).toBeInTheDocument();
-    expect(screen.getByDisplayValue(`https://api.bentley.com/insights/reporting/odata/${mockReport.id}`)).toBeInTheDocument();
+    expect(screen.getByDisplayValue(`mock-odata-feed-url`)).toBeInTheDocument();
 
     const copyButton = screen.getByRole("button", {
       name: /copy/i,

package/src/test/Reports.test.tsx

@@ -23,6 +23,9 @@ const reportsFactory = (): ReportCollection => ({
       project: {
         href: "",
       },
+      odata: {
+        href: "",
+      },
     },
   })),
   _links: {

package/src/widget/ReportsConfigUiProvider.tsx

@@ -4,10 +4,10 @@
  *--------------------------------------------------------------------------------------------*/
 import type { UiItemsProvider, Widget } from "@itwin/appui-react";
 import { StagePanelLocation, StagePanelSection, StageUsage } from "@itwin/appui-react";
-import type { AccessToken } from "@itwin/core-bentley";
 
 import * as React from "react";
 import { ReportsConfigWidget } from "../ReportsConfigWidget";
+import type { ReportsContainerProps } from "./components/ReportsContainer";
 import ReportsContainer from "./components/ReportsContainer";
 
 /**
@@ -21,13 +21,8 @@ export const REPORTS_CONFIG_BASE_URL = "https://api.bentley.com";
  */
 export class ReportsConfigProvider implements UiItemsProvider {
   public readonly id = "ReportsConfigProvider";
-  private readonly _getAccessToken?: () => Promise<AccessToken>;
-  private readonly _baseUrl: string;
 
-  constructor(getAccessToken?: () => Promise<AccessToken>, baseUrl: string = REPORTS_CONFIG_BASE_URL) {
-    this._getAccessToken = getAccessToken;
-    this._baseUrl = baseUrl;
-  }
+  constructor(private _props?: ReportsContainerProps) { }
 
   public provideWidgets(_stageId: string, stageUsage: string, location: StagePanelLocation, section?: StagePanelSection): ReadonlyArray<Widget> {
     const widgets: Widget[] = [];
@@ -35,7 +30,7 @@ export class ReportsConfigProvider implements UiItemsProvider {
       const ReportsWidget: Widget = {
         id: "reports-config-widget",
         label: ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:ReportsConfig"),
-        content: <ReportsContainer getAccessToken={this._getAccessToken} baseUrl={this._baseUrl} />,
+        content: <ReportsContainer {...this._props} />,
       };
 
       widgets.push(ReportsWidget);

package/src/widget/components/AddMappingsModal.tsx

@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import { Modal, Table, tableFilters } from "@itwin/itwinui-react";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { Mapping, MappingsClient } from "@itwin/insights-client";
+import type { IMappingsClient, Mapping } from "@itwin/insights-client";
 import ActionPanel from "./ActionPanel";
 import "./AddMappingsModal.scss";
 import { LocalizedTablePaginator } from "./LocalizedTablePaginator";
@@ -23,7 +23,7 @@ const fetchMappings = async (
   setMappings: (mappings: Mapping[]) => void,
   iModelId: string,
   setIsLoading: (isLoading: boolean) => void,
-  mappingsClient: MappingsClient,
+  mappingsClient: IMappingsClient,
   getAccessToken: () => Promise<AccessToken>,
 ) => {
   try {

package/src/widget/components/BulkExtractor.ts

@@ -6,7 +6,7 @@ import { ExtractionState } from "@itwin/insights-client";
 import { handleError } from "./utils";
 import { ExtractionStates } from "./ExtractionStatus";
 import { STATUS_CHECK_INTERVAL } from "./Constants";
-import type { ExtractionClient, ExtractionMapping, ExtractionRequestDetails, ReportMapping, ReportsClient } from "@itwin/insights-client";
+import type { ExtractionMapping, ExtractionRequestDetails, IExtractionClient, IReportsClient, ReportMapping } from "@itwin/insights-client";
 import type { AccessToken } from "@itwin/core-bentley";
 
 export type ReportMappingAndMapping = ReportMapping & {
@@ -19,10 +19,9 @@ export type ReportMappingAndMapping = ReportMapping & {
  * @public
  */
 export class BulkExtractor {
-  private _reportsClientApi: ReportsClient;
-  private _extractionClientApi: ExtractionClient;
+  private _reportsClientApi: IReportsClient;
+  private _extractionClientApi: IExtractionClient;
   private _accessToken: () => Promise<string>;
-
   private _reportIModels = new Map<string, string[]>(); // key: reportId, value: iModels
   private _iModelStates = new Map<string, ExtractionState>(); // key: iModelId, value: state
   private _timeFetched = new Date();
@@ -34,8 +33,8 @@ export class BulkExtractor {
   private _iModels: string[] = [];
 
   constructor(
-    reportsClient: ReportsClient,
-    extractionClient: ExtractionClient,
+    reportsClient: IReportsClient,
+    extractionClient: IExtractionClient,
     getAccessToken: () => Promise<AccessToken>,
     successfulExtractionToast: (iModelName: string, odataFeedUrl: string) => void,
     failedExtractionToast: (iModelName: string) => void,

package/src/widget/components/ReportMappings.tsx

@@ -6,11 +6,10 @@ import { SvgAdd, SvgCopy, SvgRefresh } from "@itwin/itwinui-icons-react";
 import { Button, IconButton, LabeledInput, Text, toaster } from "@itwin/itwinui-react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
 import type { CreateTypeFromInterface } from "./utils";
-import { EmptyMessage, generateUrl, handleError, LoadingOverlay, LoadingSpinner } from "./utils";
+import { EmptyMessage, handleError, LoadingOverlay, LoadingSpinner } from "./utils";
 import "./ReportMappings.scss";
 import DeleteModal from "./DeleteModal";
-import type { ExtractionRequestDetails, MappingsClient, Report, ReportMapping, ReportsClient } from "@itwin/insights-client";
-import { REPORTING_BASE_PATH } from "@itwin/insights-client";
+import type { ExtractionRequestDetails, IMappingsClient, IReportsClient, Report, ReportMapping } from "@itwin/insights-client";
 import { AddMappingsModal } from "./AddMappingsModal";
 import type { GetSingleIModelParams, IModelsClient } from "@itwin/imodels-client-management";
 import { AccessTokenAdapter } from "@itwin/imodels-access-frontend";
@@ -33,8 +32,8 @@ const fetchReportMappings = async (
   setReportMappings: (mappings: ReportMappingAndMapping[]) => void,
   reportId: string,
   setIsLoading: (isLoading: boolean) => void,
-  reportsClient: ReportsClient,
-  mappingsClient: MappingsClient,
+  reportsClient: IReportsClient,
+  mappingsClient: IMappingsClient,
   iModelsClient: IModelsClient,
   getAccessToken: () => Promise<AccessToken>,
 ) => {
@@ -93,7 +92,7 @@ export interface ReportMappingsProps {
  * @public
  */
 export const ReportMappings = ({ report, onClickClose, defaultIModelId }: ReportMappingsProps) => {
-  const { getAccessToken, reportsClient, iModelsClient, mappingsClient, baseUrl } = useReportsConfigApi();
+  const { getAccessToken, reportsClient, iModelsClient, mappingsClient } = useReportsConfigApi();
   const [showDeleteModal, setShowDeleteModal] = useState<ReportMappingAndMapping | undefined>(undefined);
   const [showAddMapping, setShowAddMapping] = useState<boolean>(false);
   const { bulkExtractor } = useBulkExtractor();
@@ -119,8 +118,6 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }: Report
     await fetchReportMappings(setReportMappings, report.id, setIsLoading, reportsClient, mappingsClient, iModelsClient, getAccessToken);
   }, [getAccessToken, iModelsClient, mappingsClient, report.id, reportsClient]);
 
-  const odataFeedUrl = `${generateUrl(REPORTING_BASE_PATH, baseUrl)}/odata/${report.id}`;
-
   const addMapping = useCallback(() => {
     setShowAddMapping(true);
   }, []);
@@ -144,12 +141,12 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }: Report
           label={ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:ODataFeedURL")}
           className="rcw-odata-url-input"
           readOnly={true}
-          value={odataFeedUrl}
+          value={report._links.odata.href}
           svgIcon={
             <IconButton
               title={ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:Copy")}
               onClick={async (_) => {
-                await navigator.clipboard.writeText(odataFeedUrl);
+                await navigator.clipboard.writeText(report._links.odata.href);
                 toaster.positive(ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:CopiedToClipboard"));
               }}
             >
@@ -197,7 +194,7 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }: Report
                 onClickDelete={() => {
                   setShowDeleteModal(mapping);
                 }}
-                odataFeedUrl={odataFeedUrl}
+                odataFeedUrl={report._links.odata.href}
                 jobStartEvent={jobStartEvent}
               />
             ))}

package/src/widget/components/Reports.tsx

@@ -9,7 +9,7 @@ import type { CreateTypeFromInterface } from "./utils";
 import { EmptyMessage, handleError, LoadingOverlay } from "./utils";
 import "./Reports.scss";
 import DeleteModal from "./DeleteModal";
-import type { Report, ReportsClient } from "@itwin/insights-client";
+import type { IReportsClient, Report } from "@itwin/insights-client";
 import { ReportHorizontalTile } from "./ReportHorizontalTile";
 import { SearchBar } from "./SearchBar";
 import { useReportsConfigApi } from "../context/ReportsConfigApiContext";
@@ -24,7 +24,7 @@ const fetchReports = async (
   setReports: (reports: Report[]) => void,
   iTwinId: string | undefined,
   setIsLoading: (isLoading: boolean) => void,
-  reportsClient: ReportsClient,
+  reportsClient: IReportsClient,
   getAccessToken: () => Promise<AccessToken>,
 ) => {
   try {

package/src/widget/components/ReportsConfigContext.tsx

@@ -5,6 +5,7 @@
 import { IModelApp } from "@itwin/core-frontend";
 import type { IModelsClientOptions } from "@itwin/imodels-client-management";
 import { IModelsClient } from "@itwin/imodels-client-management";
+import type { IExtractionClient, IMappingsClient, IReportsClient } from "@itwin/insights-client";
 import { ExtractionClient, GROUPING_AND_MAPPING_BASE_PATH, MappingsClient, REPORTING_BASE_PATH, ReportsClient } from "@itwin/insights-client";
 import { toaster } from "@itwin/itwinui-react";
 import React, { useCallback, useEffect, useMemo, useState } from "react";
@@ -22,13 +23,35 @@ import { generateUrl } from "./utils";
  * @public
  */
 export interface ReportsConfigContextProps {
+  /**
+   * A callback function that returns an access token for authenticating API requests.
+   * If not specified, it defaults to the authorizationClient of the IModelApp.
+   */
   getAccessToken?: GetAccessTokenFn;
+  /**
+   * The base URL for the API requests. Defaults to https://api.bentley.com.
+   */
   baseUrl?: string;
   iTwinId: string;
+  /**
+   * The bulk extractor instance to use for extracting data. Internal use only.
+   */
   bulkExtractor?: BulkExtractor;
-  reportsClient?: ReportsClient;
-  mappingsClient?: MappingsClient;
-  extractionClient?: ExtractionClient;
+  /**
+   * A custom implementation of ReportsClient. If provided, baseUrl is ignored.
+   */
+  reportsClient?: IReportsClient;
+  /**
+   * A custom implementation of MappingsClient. If provided, baseUrl is ignored.
+   */
+  mappingsClient?: IMappingsClient;
+  /**
+   * A custom implementation of ExtractionClient. If provided, baseUrl is ignored.
+   */
+  extractionClient?: IExtractionClient;
+  /**
+   * A custom implementation of IModelsClient. If provided, baseUrl is ignored.
+   */
   iModelsClient?: IModelsClient;
   children?: React.ReactNode;
 }
@@ -48,7 +71,7 @@ export const ReportsConfigContext = (props: ReportsConfigContextProps) => {
     }),
     [props.baseUrl],
   );
-  const [extractionClient, setExtractionClient] = useState<ExtractionClient>(props.extractionClient ?? new ExtractionClient(reportsBaseUrl()));
+  const [extractionClient, setExtractionClient] = useState<IExtractionClient>(props.extractionClient ?? new ExtractionClient(reportsBaseUrl()));
 
   const [apiConfig, setApiConfig] = useState<ReportsConfigApiProps>({
     getAccessToken: props.getAccessToken ?? authorizationClientGetAccessToken,
@@ -61,9 +84,9 @@ export const ReportsConfigContext = (props: ReportsConfigContextProps) => {
 
   useEffect(() => {
     if (!props.extractionClient) {
-      setExtractionClient(props.extractionClient ?? new ExtractionClient(reportsBaseUrl()));
+      setExtractionClient(props.extractionClient ?? new ExtractionClient(groupingMappingBaseUrl()));
     }
-  }, [props.extractionClient, reportsBaseUrl]);
+  }, [groupingMappingBaseUrl, props.extractionClient]);
 
   const successfulExtractionToast = (iModelName: string, odataFeedUrl: string) => {
     toaster.positive(<SuccessfulExtractionToast iModelName={iModelName} odataFeedUrl={odataFeedUrl} />);
@@ -88,10 +111,20 @@ export const ReportsConfigContext = (props: ReportsConfigContextProps) => {
       baseUrl: props.baseUrl || REPORTS_CONFIG_BASE_URL,
       iTwinId: props.iTwinId,
       reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),
-      mappingsClient: props.mappingsClient ?? new MappingsClient(reportsBaseUrl()),
+      mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),
       iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),
     }));
-  }, [props.getAccessToken, props.baseUrl, props.iTwinId, props.reportsClient, props.mappingsClient, props.iModelsClient, reportsBaseUrl, iModelClientOptions]);
+  }, [
+    props.getAccessToken,
+    props.baseUrl,
+    props.iTwinId,
+    props.reportsClient,
+    props.mappingsClient,
+    props.iModelsClient,
+    reportsBaseUrl,
+    iModelClientOptions,
+    groupingMappingBaseUrl,
+  ]);
 
   return (
     <ReportsConfigApiContext.Provider value={apiConfig}>

package/src/widget/components/ReportsContainer.tsx

@@ -2,19 +2,16 @@
  * Copyright (c) Bentley Systems, Incorporated. All rights reserved.
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
-import type { AccessToken } from "@itwin/core-bentley";
 import React, { useCallback, useState } from "react";
 import "./ReportsContainer.scss";
 import type { Report } from "@itwin/insights-client";
 import { useActiveIModelConnection } from "@itwin/appui-react";
 import { ReportsHeader } from "./ReportsHeader";
 import { ReportsRouter } from "./ReportsRouter";
-import { ReportsConfigContext } from "./ReportsConfigContext";
+import type { ReportsConfigContextProps } from "./ReportsConfigContext";
+import { ReportsConfigContext } from "./ReportsConfigContext"
 
-interface ReportsContainerProps {
-  getAccessToken?: () => Promise<AccessToken>;
-  baseUrl: string;
-}
+export type ReportsContainerProps = Omit<ReportsConfigContextProps, "iTwinId" | "children">;
 
 export enum RouteStep {
   ReportsList,
@@ -32,7 +29,7 @@ export interface Route {
   reportsRoutingFields: ReportsRouteFields;
 }
 
-const ReportsContainer = ({ getAccessToken, baseUrl }: ReportsContainerProps) => {
+const ReportsContainer = (props: ReportsContainerProps) => {
   const [routingHistory, setRoutingHistory] = useState<Route[]>([{ step: RouteStep.ReportsList, title: "iTwin Reports", reportsRoutingFields: {} }]);
   const currentRoute = routingHistory[routingHistory.length - 1];
   const iTwinId = useActiveIModelConnection()?.iTwinId ?? "";
@@ -47,7 +44,7 @@ const ReportsContainer = ({ getAccessToken, baseUrl }: ReportsContainerProps) =>
   }, [routingHistory]);
 
   return (
-    <ReportsConfigContext getAccessToken={getAccessToken} baseUrl={baseUrl} iTwinId={iTwinId}>
+    <ReportsConfigContext {...props} iTwinId={iTwinId}>
       <div className="rcw-reports-container">
         <ReportsHeader goBack={goBack} currentRoute={currentRoute} />
         <ReportsRouter currentRoute={currentRoute} navigateTo={navigateTo} goBack={goBack} />

package/src/widget/context/ReportsConfigApiContext.tsx

@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 import type { AccessToken } from "@itwin/core-bentley";
 import { IModelsClient } from "@itwin/imodels-client-management";
+import type { IMappingsClient, IReportsClient } from "@itwin/insights-client";
 import { MappingsClient, ReportsClient } from "@itwin/insights-client";
 import * as React from "react";
 import { createContext } from "react";
@@ -14,8 +15,8 @@ export interface ReportsConfigApiProps {
   getAccessToken: GetAccessTokenFn;
   iTwinId: string;
   baseUrl: string;
-  reportsClient: ReportsClient;
-  mappingsClient: MappingsClient;
+  reportsClient: IReportsClient;
+  mappingsClient: IMappingsClient;
   iModelsClient: IModelsClient;
 }