npm - @itwin/reports-config-widget-react - Versions diffs - 0.7.0 → 0.8.0 - Mend

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

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 (76) hide show

package/lib/esm/widget/components/ReportMappings.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ReportMappings.d.ts","sourceRoot":"","sources":["../../../../src/widget/components/ReportMappings.tsx"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAEvD,OAAO,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAA6D,MAAM,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;~~AAY~~/H,oBAAY,iBAAiB,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;AAEvE,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmDF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,8CAA+C,mBAAmB,~~uBAgK5F~~,CAAC"}
1	+ {"version":3,"file":"ReportMappings.d.ts","sourceRoot":"","sources":["../../../../src/widget/components/ReportMappings.tsx"],"names":[],"mappings":";AAOA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAEvD,OAAO,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAA6D,MAAM,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAW/H,oBAAY,iBAAiB,GAAG,uBAAuB,CAAC,aAAa,CAAC,CAAC;AAEvE,oBAAY,uBAAuB,GAAG,iBAAiB,GAAG;IACxD,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAmDF;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,IAAI,CAAC;IACzB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED;;;GAGG;AACH,eAAO,MAAM,cAAc,8CAA+C,mBAAmB,uBA8J5F,CAAC"}

package/lib/esm/widget/components/ReportMappings.js CHANGED Viewed

@@ -5,10 +5,9 @@
 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 { EmptyMessage, generateUrl, handleError, LoadingOverlay, LoadingSpinner } from "./utils";
+import { EmptyMessage, handleError, LoadingOverlay, LoadingSpinner } from "./utils";
 import "./ReportMappings.scss";
 import DeleteModal from "./DeleteModal";
-import { REPORTING_BASE_PATH } from "@itwin/insights-client";
 import { AddMappingsModal } from "./AddMappingsModal";
 import { AccessTokenAdapter } from "@itwin/imodels-access-frontend";
 import { SearchBar } from "./SearchBar";
@@ -63,7 +62,7 @@ const fetchReportMappings = async (setReportMappings, reportId, setIsLoading, re
  * @public
  */
 export const ReportMappings = ({ report, onClickClose, defaultIModelId }) => {
-    const { getAccessToken, reportsClient, iModelsClient, mappingsClient, baseUrl } = useReportsConfigApi();
+    const { getAccessToken, reportsClient, iModelsClient, mappingsClient } = useReportsConfigApi();
     const [showDeleteModal, setShowDeleteModal] = useState(undefined);
     const [showAddMapping, setShowAddMapping] = useState(false);
     const { bulkExtractor } = useBulkExtractor();
@@ -83,7 +82,6 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }) => {
     const refresh = useCallback(async () => {
         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);
     }, []);
@@ -96,8 +94,8 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }) => {
         return null;
     return (React.createElement(React.Fragment, null,
         React.createElement("div", { className: "rcw-report-mappings-container" },
-            React.createElement(LabeledInput, { label: ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:ODataFeedURL"), className: "rcw-odata-url-input", readOnly: true, value: odataFeedUrl, svgIcon: React.createElement(IconButton, { title: ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:Copy"), onClick: async (_) => {
-                        await navigator.clipboard.writeText(odataFeedUrl);
+            React.createElement(LabeledInput, { label: ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:ODataFeedURL"), className: "rcw-odata-url-input", readOnly: true, value: report._links.odata.href, svgIcon: React.createElement(IconButton, { title: ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:Copy"), onClick: async (_) => {
+                        await navigator.clipboard.writeText(report._links.odata.href);
                         toaster.positive(ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:CopiedToClipboard"));
                     } },
                     React.createElement(SvgCopy, null)), iconDisplayStyle: "inline" }),
@@ -113,7 +111,7 @@ export const ReportMappings = ({ report, onClickClose, defaultIModelId }) => {
                     React.createElement("div", null,
                         React.createElement(Button, { onClick: addMapping, styleType: "cta" }, ReportsConfigWidget.localization.getLocalizedString("ReportsConfigWidget:LetsAddSomeMappingsCTA")))))) : (React.createElement("div", { className: "rcw-mapping-list" }, filteredReportMappings.map((mapping) => (React.createElement(ReportMappingHorizontalTile, { key: mapping.mappingId, bulkExtractor: bulkExtractor, mapping: mapping, onClickDelete: () => {
                     setShowDeleteModal(mapping);
-                }, odataFeedUrl: odataFeedUrl, jobStartEvent: jobStartEvent })))))),
+                }, odataFeedUrl: report._links.odata.href, jobStartEvent: jobStartEvent })))))),
         React.createElement(AddMappingsModal, { show: showAddMapping, reportId: report.id, existingMappings: reportMappings, onClose: onAddMappingsModalClose, defaultIModelId: defaultIModelId }),
         React.createElement(DeleteModal, { entityName: showDeleteModal?.mappingName ?? "", onDelete: async () => {
                 const accessToken = await getAccessToken();

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ReportMappings.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportMappings.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 { SvgAdd, SvgCopy, SvgRefresh } from \"@itwin/itwinui-icons-react\";\nimport { Button, IconButton, LabeledInput, Text, toaster } from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"./utils\";\nimport { EmptyMessage, generateUrl, handleError, LoadingOverlay, LoadingSpinner } from \"./utils\";\nimport \"./ReportMappings.scss\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { ExtractionRequestDetails, IMappingsClient, IReportsClient, Report, ReportMapping } from \"@itwin/insights-client\";\nimport { REPORTING_BASE_PATH } from \"@itwin/insights-client\";\nimport { AddMappingsModal } from \"./AddMappingsModal\";\nimport type { GetSingleIModelParams, IModelsClient } from \"@itwin/imodels-client-management\";\nimport { AccessTokenAdapter } from \"@itwin/imodels-access-frontend\";\nimport { SearchBar } from \"./SearchBar\";\nimport { useReportsConfigApi } from \"../context/ReportsConfigApiContext\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\nimport { ReportMappingHorizontalTile } from \"./ReportMappingHorizontalTile\";\nimport type { AccessToken } from \"@itwin/core-bentley\";\nimport { BeEvent } from \"@itwin/core-bentley\";\nimport { useBulkExtractor } from \"../context/BulkExtractorContext\";\nexport type ReportMappingType = CreateTypeFromInterface<ReportMapping>;\n\nexport type ReportMappingAndMapping = ReportMappingType & {\n mappingName: string;\n mappingDescription: string;\n iModelName: string;\n};\n\nconst fetchReportMappings = async (\n setReportMappings: (mappings: ReportMappingAndMapping[]) => void,\n reportId: string,\n setIsLoading: (isLoading: boolean) => void,\n reportsClient: IReportsClient,\n mappingsClient: IMappingsClient,\n iModelsClient: IModelsClient,\n getAccessToken: () => Promise<AccessToken>,\n) => {\n try {\n setIsLoading(true);\n const accessToken = await getAccessToken();\n const reportMappings = await reportsClient.getReportMappings(accessToken, reportId);\n const authorization = AccessTokenAdapter.toAuthorizationCallback(accessToken);\n const iModelNames = new Map<string, string>();\n\n const reportMappingsAndMappings = [];\n for (const reportMapping of reportMappings) {\n const iModelId = reportMapping.imodelId;\n let iModelName = \"\";\n const mapping = await mappingsClient.getMapping(accessToken, reportMapping.mappingId);\n if (iModelNames.has(iModelId)) {\n iModelName = iModelNames.get(iModelId) ?? \"\";\n } else {\n const getSingleParams: GetSingleIModelParams = {\n authorization,\n iModelId,\n };\n const iModel = await iModelsClient.iModels.getSingle(getSingleParams);\n iModelName = iModel.displayName;\n iModelNames.set(iModelId, iModelName);\n }\n const reportMappingAndMapping: ReportMappingAndMapping = {\n ...reportMapping,\n iModelName,\n mappingName: mapping.mappingName,\n mappingDescription: mapping.description ?? \"\",\n };\n reportMappingsAndMappings.push(reportMappingAndMapping);\n }\n\n setReportMappings(reportMappingsAndMappings);\n } catch (error: any) {\n handleError(error.status);\n } finally {\n setIsLoading(false);\n }\n};\n\n/*\n Props for the {@link ReportMappings} component.\n * @public\n /\nexport interface ReportMappingsProps {\n report: Report;\n onClickClose: () => void;\n defaultIModelId?: string;\n}\n\n/\n Component to display and manage report mappings.\n * @public\n */\nexport const ReportMappings = ({ report, onClickClose, defaultIModelId }: ReportMappingsProps) => {\n const { getAccessToken, reportsClient, iModelsClient, mappingsClient, baseUrl } = useReportsConfigApi();\n const [showDeleteModal, setShowDeleteModal] = useState<ReportMappingAndMapping \| undefined>(undefined);\n const [showAddMapping, setShowAddMapping] = useState<boolean>(false);\n const { bulkExtractor } = useBulkExtractor();\n const [isLoading, setIsLoading] = useState<boolean>(true);\n const [searchValue, setSearchValue] = useState<string>(\"\");\n const [reportMappings, setReportMappings] = useState<ReportMappingAndMapping[]>([]);\n const [jobRunning, setJobRunning] = useState<boolean>(false);\n const jobStartEvent = useMemo(() => new BeEvent<(iModelId: string) => void>(), []);\n\n useEffect(() => {\n void fetchReportMappings(setReportMappings, report.id, setIsLoading, reportsClient, mappingsClient, iModelsClient, getAccessToken);\n }, [getAccessToken, iModelsClient, mappingsClient, report.id, reportsClient, setIsLoading]);\n\n useEffect(() => {\n if (!bulkExtractor) return;\n bulkExtractor.setHook(\n setJobRunning,\n reportMappings.map((x) => x.imodelId),\n );\n }, [bulkExtractor, reportMappings]);\n\n const refresh = useCallback(async () => {\n await fetchReportMappings(setReportMappings, report.id, setIsLoading, reportsClient, mappingsClient, iModelsClient, getAccessToken);\n }, [getAccessToken, iModelsClient, mappingsClient, report.id, reportsClient]);\n\n const odataFeedUrl = `${generateUrl(REPORTING_BASE_PATH, baseUrl)}/odata/${report.id}`;\n\n const addMapping = useCallback(() => {\n setShowAddMapping(true);\n }, []);\n\n const filteredReportMappings = useMemo(\n () => reportMappings.filter((x) => [x.iModelName, x.mappingName, x.mappingDescription].join(\" \").toLowerCase().includes(searchValue.toLowerCase())),\n [reportMappings, searchValue],\n );\n\n const onAddMappingsModalClose = useCallback(async () => {\n await refresh();\n setShowAddMapping(false);\n }, [refresh]);\n\n if (!bulkExtractor) return null;\n\n return (\n <>\n <div className=\"rcw-report-mappings-container\">\n <LabeledInput\n label={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:ODataFeedURL\")}\n className=\"rcw-odata-url-input\"\n readOnly={true}\n value={odataFeedUrl}\n svgIcon={\n <IconButton\n title={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Copy\")}\n onClick={async (_) => {\n await navigator.clipboard.writeText(odataFeedUrl);\n toaster.positive(ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:CopiedToClipboard\"));\n }}\n >\n <SvgCopy />\n </IconButton>\n }\n iconDisplayStyle=\"inline\"\n />\n <div className=\"rcw-toolbar\">\n <Button startIcon={<SvgAdd />} onClick={() => addMapping()} styleType=\"high-visibility\">\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:AddMapping\")}\n </Button>\n <div className=\"rcw-search-bar-container\" data-testid=\"rcw-search-bar\">\n <IconButton\n title={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Refresh\")}\n onClick={refresh}\n disabled={isLoading}\n styleType=\"borderless\"\n >\n <SvgRefresh />\n </IconButton>\n <SearchBar searchValue={searchValue} setSearchValue={setSearchValue} disabled={isLoading} />\n </div>\n </div>\n {isLoading ? (\n <LoadingOverlay />\n ) : reportMappings.length === 0 ? (\n <EmptyMessage>\n <>\n <Text>{ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:NoReportMappings\")}</Text>\n <div>\n <Button onClick={addMapping} styleType=\"cta\">\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:LetsAddSomeMappingsCTA\")}\n </Button>\n </div>\n </>\n </EmptyMessage>\n ) : (\n <div className=\"rcw-mapping-list\">\n {filteredReportMappings.map((mapping) => (\n <ReportMappingHorizontalTile\n key={mapping.mappingId}\n bulkExtractor={bulkExtractor}\n mapping={mapping}\n onClickDelete={() => {\n setShowDeleteModal(mapping);\n }}\n odataFeedUrl={odataFeedUrl}\n jobStartEvent={jobStartEvent}\n />\n ))}\n </div>\n )}\n </div>\n <AddMappingsModal\n show={showAddMapping}\n reportId={report.id}\n existingMappings={reportMappings}\n onClose={onAddMappingsModalClose}\n defaultIModelId={defaultIModelId}\n />\n <DeleteModal\n entityName={showDeleteModal?.mappingName ?? \"\"}\n onDelete={async () => {\n const accessToken = await getAccessToken();\n await reportsClient.deleteReportMapping(accessToken, report.id, showDeleteModal?.mappingId ?? \"\");\n }}\n refresh={refresh}\n onClose={() => setShowDeleteModal(undefined)}\n />\n <div className=\"rcw-action-panel\">\n {isLoading && <LoadingSpinner />}\n <Button\n disabled={isLoading \|\| jobRunning \|\| reportMappings.length === 0}\n styleType=\"high-visibility\"\n onClick={async () => {\n setJobRunning(true);\n const uniqueIModels = Array.from(new Set(reportMappings.map((x) => x.imodelId)));\n const iModelsAndMappings: ExtractionRequestDetails[] = uniqueIModels.map((iModelId) => {\n return {\n iModelId,\n mappings: reportMappings\n .filter((reportMapping) => reportMapping.imodelId === iModelId)\n .map((reportMappingForIModel) => ({\n id: reportMappingForIModel.mappingId,\n })),\n };\n });\n await bulkExtractor.runIModelExtractions(iModelsAndMappings);\n reportMappings.forEach((reportMapping) => {\n jobStartEvent.raiseEvent(reportMapping.imodelId);\n });\n }}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:UpdateAllDatasets\")}\n </Button>\n <Button styleType=\"default\" type=\"button\" onClick={onClickClose} disabled={isLoading}>\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Close\")}\n </Button>\n </div>\n </>\n );\n};\n"]}
1	+ {"version":3,"file":"ReportMappings.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportMappings.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 { SvgAdd, SvgCopy, SvgRefresh } from \"@itwin/itwinui-icons-react\";\nimport { Button, IconButton, LabeledInput, Text, toaster } from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"./utils\";\nimport { EmptyMessage, handleError, LoadingOverlay, LoadingSpinner } from \"./utils\";\nimport \"./ReportMappings.scss\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { ExtractionRequestDetails, IMappingsClient, IReportsClient, Report, ReportMapping } from \"@itwin/insights-client\";\nimport { AddMappingsModal } from \"./AddMappingsModal\";\nimport type { GetSingleIModelParams, IModelsClient } from \"@itwin/imodels-client-management\";\nimport { AccessTokenAdapter } from \"@itwin/imodels-access-frontend\";\nimport { SearchBar } from \"./SearchBar\";\nimport { useReportsConfigApi } from \"../context/ReportsConfigApiContext\";\nimport { ReportsConfigWidget } from \"../../ReportsConfigWidget\";\nimport { ReportMappingHorizontalTile } from \"./ReportMappingHorizontalTile\";\nimport type { AccessToken } from \"@itwin/core-bentley\";\nimport { BeEvent } from \"@itwin/core-bentley\";\nimport { useBulkExtractor } from \"../context/BulkExtractorContext\";\nexport type ReportMappingType = CreateTypeFromInterface<ReportMapping>;\n\nexport type ReportMappingAndMapping = ReportMappingType & {\n mappingName: string;\n mappingDescription: string;\n iModelName: string;\n};\n\nconst fetchReportMappings = async (\n setReportMappings: (mappings: ReportMappingAndMapping[]) => void,\n reportId: string,\n setIsLoading: (isLoading: boolean) => void,\n reportsClient: IReportsClient,\n mappingsClient: IMappingsClient,\n iModelsClient: IModelsClient,\n getAccessToken: () => Promise<AccessToken>,\n) => {\n try {\n setIsLoading(true);\n const accessToken = await getAccessToken();\n const reportMappings = await reportsClient.getReportMappings(accessToken, reportId);\n const authorization = AccessTokenAdapter.toAuthorizationCallback(accessToken);\n const iModelNames = new Map<string, string>();\n\n const reportMappingsAndMappings = [];\n for (const reportMapping of reportMappings) {\n const iModelId = reportMapping.imodelId;\n let iModelName = \"\";\n const mapping = await mappingsClient.getMapping(accessToken, reportMapping.mappingId);\n if (iModelNames.has(iModelId)) {\n iModelName = iModelNames.get(iModelId) ?? \"\";\n } else {\n const getSingleParams: GetSingleIModelParams = {\n authorization,\n iModelId,\n };\n const iModel = await iModelsClient.iModels.getSingle(getSingleParams);\n iModelName = iModel.displayName;\n iModelNames.set(iModelId, iModelName);\n }\n const reportMappingAndMapping: ReportMappingAndMapping = {\n ...reportMapping,\n iModelName,\n mappingName: mapping.mappingName,\n mappingDescription: mapping.description ?? \"\",\n };\n reportMappingsAndMappings.push(reportMappingAndMapping);\n }\n\n setReportMappings(reportMappingsAndMappings);\n } catch (error: any) {\n handleError(error.status);\n } finally {\n setIsLoading(false);\n }\n};\n\n/*\n Props for the {@link ReportMappings} component.\n * @public\n /\nexport interface ReportMappingsProps {\n report: Report;\n onClickClose: () => void;\n defaultIModelId?: string;\n}\n\n/\n Component to display and manage report mappings.\n * @public\n */\nexport const ReportMappings = ({ report, onClickClose, defaultIModelId }: ReportMappingsProps) => {\n const { getAccessToken, reportsClient, iModelsClient, mappingsClient } = useReportsConfigApi();\n const [showDeleteModal, setShowDeleteModal] = useState<ReportMappingAndMapping \| undefined>(undefined);\n const [showAddMapping, setShowAddMapping] = useState<boolean>(false);\n const { bulkExtractor } = useBulkExtractor();\n const [isLoading, setIsLoading] = useState<boolean>(true);\n const [searchValue, setSearchValue] = useState<string>(\"\");\n const [reportMappings, setReportMappings] = useState<ReportMappingAndMapping[]>([]);\n const [jobRunning, setJobRunning] = useState<boolean>(false);\n const jobStartEvent = useMemo(() => new BeEvent<(iModelId: string) => void>(), []);\n\n useEffect(() => {\n void fetchReportMappings(setReportMappings, report.id, setIsLoading, reportsClient, mappingsClient, iModelsClient, getAccessToken);\n }, [getAccessToken, iModelsClient, mappingsClient, report.id, reportsClient, setIsLoading]);\n\n useEffect(() => {\n if (!bulkExtractor) return;\n bulkExtractor.setHook(\n setJobRunning,\n reportMappings.map((x) => x.imodelId),\n );\n }, [bulkExtractor, reportMappings]);\n\n const refresh = useCallback(async () => {\n await fetchReportMappings(setReportMappings, report.id, setIsLoading, reportsClient, mappingsClient, iModelsClient, getAccessToken);\n }, [getAccessToken, iModelsClient, mappingsClient, report.id, reportsClient]);\n\n const addMapping = useCallback(() => {\n setShowAddMapping(true);\n }, []);\n\n const filteredReportMappings = useMemo(\n () => reportMappings.filter((x) => [x.iModelName, x.mappingName, x.mappingDescription].join(\" \").toLowerCase().includes(searchValue.toLowerCase())),\n [reportMappings, searchValue],\n );\n\n const onAddMappingsModalClose = useCallback(async () => {\n await refresh();\n setShowAddMapping(false);\n }, [refresh]);\n\n if (!bulkExtractor) return null;\n\n return (\n <>\n <div className=\"rcw-report-mappings-container\">\n <LabeledInput\n label={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:ODataFeedURL\")}\n className=\"rcw-odata-url-input\"\n readOnly={true}\n value={report._links.odata.href}\n svgIcon={\n <IconButton\n title={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Copy\")}\n onClick={async (_) => {\n await navigator.clipboard.writeText(report._links.odata.href);\n toaster.positive(ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:CopiedToClipboard\"));\n }}\n >\n <SvgCopy />\n </IconButton>\n }\n iconDisplayStyle=\"inline\"\n />\n <div className=\"rcw-toolbar\">\n <Button startIcon={<SvgAdd />} onClick={() => addMapping()} styleType=\"high-visibility\">\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:AddMapping\")}\n </Button>\n <div className=\"rcw-search-bar-container\" data-testid=\"rcw-search-bar\">\n <IconButton\n title={ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Refresh\")}\n onClick={refresh}\n disabled={isLoading}\n styleType=\"borderless\"\n >\n <SvgRefresh />\n </IconButton>\n <SearchBar searchValue={searchValue} setSearchValue={setSearchValue} disabled={isLoading} />\n </div>\n </div>\n {isLoading ? (\n <LoadingOverlay />\n ) : reportMappings.length === 0 ? (\n <EmptyMessage>\n <>\n <Text>{ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:NoReportMappings\")}</Text>\n <div>\n <Button onClick={addMapping} styleType=\"cta\">\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:LetsAddSomeMappingsCTA\")}\n </Button>\n </div>\n </>\n </EmptyMessage>\n ) : (\n <div className=\"rcw-mapping-list\">\n {filteredReportMappings.map((mapping) => (\n <ReportMappingHorizontalTile\n key={mapping.mappingId}\n bulkExtractor={bulkExtractor}\n mapping={mapping}\n onClickDelete={() => {\n setShowDeleteModal(mapping);\n }}\n odataFeedUrl={report._links.odata.href}\n jobStartEvent={jobStartEvent}\n />\n ))}\n </div>\n )}\n </div>\n <AddMappingsModal\n show={showAddMapping}\n reportId={report.id}\n existingMappings={reportMappings}\n onClose={onAddMappingsModalClose}\n defaultIModelId={defaultIModelId}\n />\n <DeleteModal\n entityName={showDeleteModal?.mappingName ?? \"\"}\n onDelete={async () => {\n const accessToken = await getAccessToken();\n await reportsClient.deleteReportMapping(accessToken, report.id, showDeleteModal?.mappingId ?? \"\");\n }}\n refresh={refresh}\n onClose={() => setShowDeleteModal(undefined)}\n />\n <div className=\"rcw-action-panel\">\n {isLoading && <LoadingSpinner />}\n <Button\n disabled={isLoading \|\| jobRunning \|\| reportMappings.length === 0}\n styleType=\"high-visibility\"\n onClick={async () => {\n setJobRunning(true);\n const uniqueIModels = Array.from(new Set(reportMappings.map((x) => x.imodelId)));\n const iModelsAndMappings: ExtractionRequestDetails[] = uniqueIModels.map((iModelId) => {\n return {\n iModelId,\n mappings: reportMappings\n .filter((reportMapping) => reportMapping.imodelId === iModelId)\n .map((reportMappingForIModel) => ({\n id: reportMappingForIModel.mappingId,\n })),\n };\n });\n await bulkExtractor.runIModelExtractions(iModelsAndMappings);\n reportMappings.forEach((reportMapping) => {\n jobStartEvent.raiseEvent(reportMapping.imodelId);\n });\n }}\n >\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:UpdateAllDatasets\")}\n </Button>\n <Button styleType=\"default\" type=\"button\" onClick={onClickClose} disabled={isLoading}>\n {ReportsConfigWidget.localization.getLocalizedString(\"ReportsConfigWidget:Close\")}\n </Button>\n </div>\n </>\n );\n};\n"]}

package/lib/esm/widget/components/ReportsConfigContext.js CHANGED Viewed

@@ -31,12 +31,12 @@ export const ReportsConfigContext = (props) => {
         baseUrl: reportsBaseUrl(),
         iTwinId: props.iTwinId,
         reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),
-        mappingsClient: props.mappingsClient ?? new MappingsClient(undefined, groupingMappingBaseUrl()),
+        mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),
         iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),
     });
     useEffect(() => {
         if (!props.extractionClient) {
-            setExtractionClient(props.extractionClient ?? new ExtractionClient(undefined, groupingMappingBaseUrl()));
+            setExtractionClient(props.extractionClient ?? new ExtractionClient(groupingMappingBaseUrl()));
         }
     }, [groupingMappingBaseUrl, props.extractionClient]);
     const successfulExtractionToast = (iModelName, odataFeedUrl) => {
@@ -55,7 +55,7 @@ export const ReportsConfigContext = (props) => {
             baseUrl: props.baseUrl || REPORTS_CONFIG_BASE_URL,
             iTwinId: props.iTwinId,
             reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),
-            mappingsClient: props.mappingsClient ?? new MappingsClient(undefined, groupingMappingBaseUrl()),
+            mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),
             iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),
         }));
     }, [

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ReportsConfigContext.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportsConfigContext.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAChG,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,8BAA8B,EAAE,cAAc,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC9I,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AAEvE,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAwCtC,MAAM,iCAAiC,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,SAAS,CAAC,mBAAmB,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,CAAC;AAEpH;;;GAGG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAgC,EAAE,EAAE;IACvE,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,mBAAmB,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACtI,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,8BAA8B,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IACzJ,MAAM,mBAAmB,GAAyB,OAAO,CACvD,GAAG,EAAE,CAAC,CAAC;QACL,GAAG,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB,CAAC,EAAE;KAC1F,CAAC,EACF,CAAC,KAAK,CAAC,OAAO,CAAC,CAChB,CAAC;IACF,MAAM,CAAC,gBAAgB,EAAE,mBAAmB,CAAC,GAAG,QAAQ,CAAoB,KAAK,CAAC,gBAAgB,IAAI,IAAI,gBAAgB,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC;IAE9I,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAwB;QAChE,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,iCAAiC;QACzE,OAAO,EAAE,cAAc,EAAE;QACzB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,aAAa,CAAC,cAAc,EAAE,CAAC;QACzE,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,cAAc,CAAC,~~SAAS,EAAE,~~sBAAsB,EAAE,CAAC;~~QAC/F~~,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,aAAa,CAAC,mBAAmB,CAAC;KAC7E,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE;YAC3B,mBAAmB,CAAC,KAAK,CAAC,gBAAgB,IAAI,IAAI,gBAAgB,CAAC,~~SAAS,EAAE,~~sBAAsB,EAAE,CAAC,CAAC,CAAC;~~SAC1G~~;IACH,CAAC,EAAE,CAAC,sBAAsB,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAErD,MAAM,yBAAyB,GAAG,CAAC,UAAkB,EAAE,YAAoB,EAAE,EAAE;QAC7E,OAAO,CAAC,QAAQ,CAAC,oBAAC,yBAAyB,IAAC,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,YAAY,GAAI,CAAC,CAAC;IACtG,CAAC,CAAC;IAEF,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,EAAE;QACnD,OAAO,CAAC,QAAQ,CAAC,oBAAC,qBAAqB,IAAC,UAAU,EAAE,UAAU,GAAI,CAAC,CAAC;IACtE,CAAC,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,CAAC;QACL,aAAa,EACX,KAAK,CAAC,aAAa;YACnB,IAAI,aAAa,CAAC,SAAS,CAAC,aAAa,EAAE,gBAAgB,EAAE,SAAS,CAAC,cAAc,EAAE,yBAAyB,EAAE,qBAAqB,CAAC;KAC3I,CAAC,EACF,CAAC,SAAS,CAAC,cAAc,EAAE,SAAS,CAAC,aAAa,EAAE,gBAAgB,EAAE,KAAK,CAAC,aAAa,CAAC,CAC3F,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,GAAG,EAAE,CAAC,CAAC;YAClB,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,iCAAiC;YACzE,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,uBAAuB;YACjD,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,aAAa,CAAC,cAAc,EAAE,CAAC;YACzE,cAAc,EAAE,KAAK,CAAC,cAAc,IAAI,IAAI,cAAc,CAAC,~~SAAS,EAAE,~~sBAAsB,EAAE,CAAC;~~YAC/F~~,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI,IAAI,aAAa,CAAC,mBAAmB,CAAC;SAC7E,CAAC,CAAC,CAAC;IACN,CAAC,EAAE;QACD,KAAK,CAAC,cAAc;QACpB,KAAK,CAAC,OAAO;QACb,KAAK,CAAC,OAAO;QACb,KAAK,CAAC,aAAa;QACnB,KAAK,CAAC,cAAc;QACpB,KAAK,CAAC,aAAa;QACnB,cAAc;QACd,mBAAmB;QACnB,sBAAsB;KACvB,CAAC,CAAC;IAEH,OAAO,CACL,oBAAC,uBAAuB,CAAC,QAAQ,IAAC,KAAK,EAAE,SAAS;QAChD,oBAAC,oBAAoB,CAAC,QAAQ,IAAC,KAAK,EAAE,aAAa,IAAG,KAAK,CAAC,QAAQ,CAAiC,CACpE,CACpC,CAAC;AACJ,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 { IModelApp } from \"@itwin/core-frontend\";\nimport type { IModelsClientOptions } from \"@itwin/imodels-client-management\";\nimport { IModelsClient } from \"@itwin/imodels-client-management\";\nimport type { IExtractionClient, IMappingsClient, IReportsClient } from \"@itwin/insights-client\";\nimport { ExtractionClient, GROUPING_AND_MAPPING_BASE_PATH, MappingsClient, REPORTING_BASE_PATH, ReportsClient } from \"@itwin/insights-client\";\nimport { toaster } from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport { BulkExtractorContext } from \"../context/BulkExtractorContext\";\nimport type { GetAccessTokenFn, ReportsConfigApiProps } from \"../context/ReportsConfigApiContext\";\nimport { ReportsConfigApiContext } from \"../context/ReportsConfigApiContext\";\nimport { REPORTS_CONFIG_BASE_URL } from \"../ReportsConfigUiProvider\";\nimport { BulkExtractor } from \"./BulkExtractor\";\nimport { IMODELS_BASE_URL } from \"./Constants\";\nimport { FailedExtractionToast, SuccessfulExtractionToast } from \"./ExtractionToast\";\nimport { generateUrl } from \"./utils\";\n\n/*\n Props for the {@link ReportsConfigContext} component.\n * @public\n /\nexport interface ReportsConfigContextProps {\n /\n A callback function that returns an access token for authenticating API requests.\n * If not specified, it defaults to the authorizationClient of the IModelApp.\n /\n getAccessToken?: GetAccessTokenFn;\n /\n The base URL for the API requests. Defaults to https://api.bentley.com.\n /\n baseUrl?: string;\n iTwinId: string;\n /\n The bulk extractor instance to use for extracting data. Internal use only.\n /\n bulkExtractor?: BulkExtractor;\n /\n A custom implementation of ReportsClient. If provided, baseUrl is ignored.\n /\n reportsClient?: IReportsClient;\n /\n A custom implementation of MappingsClient. If provided, baseUrl is ignored.\n /\n mappingsClient?: IMappingsClient;\n /\n A custom implementation of ExtractionClient. If provided, baseUrl is ignored.\n /\n extractionClient?: IExtractionClient;\n /\n A custom implementation of IModelsClient. If provided, baseUrl is ignored.\n /\n iModelsClient?: IModelsClient;\n children?: React.ReactNode;\n}\n\nconst authorizationClientGetAccessToken = async () => (await IModelApp.authorizationClient?.getAccessToken()) ?? \"\";\n\n/\n Reports Config context providers required for all components.\n * @public\n */\nexport const ReportsConfigContext = (props: ReportsConfigContextProps) => {\n const reportsBaseUrl = useCallback(() => generateUrl(REPORTING_BASE_PATH, props.baseUrl \|\| REPORTS_CONFIG_BASE_URL), [props.baseUrl]);\n const groupingMappingBaseUrl = useCallback(() => generateUrl(GROUPING_AND_MAPPING_BASE_PATH, props.baseUrl \|\| REPORTS_CONFIG_BASE_URL), [props.baseUrl]);\n const iModelClientOptions: IModelsClientOptions = useMemo(\n () => ({\n api: { baseUrl: generateUrl(IMODELS_BASE_URL, props.baseUrl ?? REPORTS_CONFIG_BASE_URL) },\n }),\n [props.baseUrl],\n );\n const [extractionClient, setExtractionClient] = useState<IExtractionClient>(props.extractionClient ?? new ExtractionClient(reportsBaseUrl()));\n\n const [apiConfig, setApiConfig] = useState<ReportsConfigApiProps>({\n getAccessToken: props.getAccessToken ?? authorizationClientGetAccessToken,\n baseUrl: reportsBaseUrl(),\n iTwinId: props.iTwinId,\n reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),\n mappingsClient: props.mappingsClient ?? new MappingsClient(~~undefined,~~ groupingMappingBaseUrl()),\n iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),\n });\n\n useEffect(() => {\n if (!props.extractionClient) {\n setExtractionClient(props.extractionClient ?? new ExtractionClient(~~undefined,~~ groupingMappingBaseUrl()));\n }\n }, [groupingMappingBaseUrl, props.extractionClient]);\n\n const successfulExtractionToast = (iModelName: string, odataFeedUrl: string) => {\n toaster.positive(<SuccessfulExtractionToast iModelName={iModelName} odataFeedUrl={odataFeedUrl} />);\n };\n\n const failedExtractionToast = (iModelName: string) => {\n toaster.negative(<FailedExtractionToast iModelName={iModelName} />);\n };\n\n const bulkExtractor = useMemo(\n () => ({\n bulkExtractor:\n props.bulkExtractor ??\n new BulkExtractor(apiConfig.reportsClient, extractionClient, apiConfig.getAccessToken, successfulExtractionToast, failedExtractionToast),\n }),\n [apiConfig.getAccessToken, apiConfig.reportsClient, extractionClient, props.bulkExtractor],\n );\n\n useEffect(() => {\n setApiConfig(() => ({\n getAccessToken: props.getAccessToken ?? authorizationClientGetAccessToken,\n baseUrl: props.baseUrl \|\| REPORTS_CONFIG_BASE_URL,\n iTwinId: props.iTwinId,\n reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),\n mappingsClient: props.mappingsClient ?? new MappingsClient(~~undefined,~~ groupingMappingBaseUrl()),\n iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),\n }));\n }, [\n props.getAccessToken,\n props.baseUrl,\n props.iTwinId,\n props.reportsClient,\n props.mappingsClient,\n props.iModelsClient,\n reportsBaseUrl,\n iModelClientOptions,\n groupingMappingBaseUrl,\n ]);\n\n return (\n <ReportsConfigApiContext.Provider value={apiConfig}>\n <BulkExtractorContext.Provider value={bulkExtractor}>{props.children}</BulkExtractorContext.Provider>\n </ReportsConfigApiContext.Provider>\n );\n};\n"]}
1	+ {"version":3,"file":"ReportsConfigContext.js","sourceRoot":"","sources":["../../../../src/widget/components/ReportsConfigContext.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 { IModelApp } from \"@itwin/core-frontend\";\nimport type { IModelsClientOptions } from \"@itwin/imodels-client-management\";\nimport { IModelsClient } from \"@itwin/imodels-client-management\";\nimport type { IExtractionClient, IMappingsClient, IReportsClient } from \"@itwin/insights-client\";\nimport { ExtractionClient, GROUPING_AND_MAPPING_BASE_PATH, MappingsClient, REPORTING_BASE_PATH, ReportsClient } from \"@itwin/insights-client\";\nimport { toaster } from \"@itwin/itwinui-react\";\nimport React, { useCallback, useEffect, useMemo, useState } from \"react\";\nimport { BulkExtractorContext } from \"../context/BulkExtractorContext\";\nimport type { GetAccessTokenFn, ReportsConfigApiProps } from \"../context/ReportsConfigApiContext\";\nimport { ReportsConfigApiContext } from \"../context/ReportsConfigApiContext\";\nimport { REPORTS_CONFIG_BASE_URL } from \"../ReportsConfigUiProvider\";\nimport { BulkExtractor } from \"./BulkExtractor\";\nimport { IMODELS_BASE_URL } from \"./Constants\";\nimport { FailedExtractionToast, SuccessfulExtractionToast } from \"./ExtractionToast\";\nimport { generateUrl } from \"./utils\";\n\n/*\n Props for the {@link ReportsConfigContext} component.\n * @public\n /\nexport interface ReportsConfigContextProps {\n /\n A callback function that returns an access token for authenticating API requests.\n * If not specified, it defaults to the authorizationClient of the IModelApp.\n /\n getAccessToken?: GetAccessTokenFn;\n /\n The base URL for the API requests. Defaults to https://api.bentley.com.\n /\n baseUrl?: string;\n iTwinId: string;\n /\n The bulk extractor instance to use for extracting data. Internal use only.\n /\n bulkExtractor?: BulkExtractor;\n /\n A custom implementation of ReportsClient. If provided, baseUrl is ignored.\n /\n reportsClient?: IReportsClient;\n /\n A custom implementation of MappingsClient. If provided, baseUrl is ignored.\n /\n mappingsClient?: IMappingsClient;\n /\n A custom implementation of ExtractionClient. If provided, baseUrl is ignored.\n /\n extractionClient?: IExtractionClient;\n /\n A custom implementation of IModelsClient. If provided, baseUrl is ignored.\n /\n iModelsClient?: IModelsClient;\n children?: React.ReactNode;\n}\n\nconst authorizationClientGetAccessToken = async () => (await IModelApp.authorizationClient?.getAccessToken()) ?? \"\";\n\n/\n Reports Config context providers required for all components.\n * @public\n */\nexport const ReportsConfigContext = (props: ReportsConfigContextProps) => {\n const reportsBaseUrl = useCallback(() => generateUrl(REPORTING_BASE_PATH, props.baseUrl \|\| REPORTS_CONFIG_BASE_URL), [props.baseUrl]);\n const groupingMappingBaseUrl = useCallback(() => generateUrl(GROUPING_AND_MAPPING_BASE_PATH, props.baseUrl \|\| REPORTS_CONFIG_BASE_URL), [props.baseUrl]);\n const iModelClientOptions: IModelsClientOptions = useMemo(\n () => ({\n api: { baseUrl: generateUrl(IMODELS_BASE_URL, props.baseUrl ?? REPORTS_CONFIG_BASE_URL) },\n }),\n [props.baseUrl],\n );\n const [extractionClient, setExtractionClient] = useState<IExtractionClient>(props.extractionClient ?? new ExtractionClient(reportsBaseUrl()));\n\n const [apiConfig, setApiConfig] = useState<ReportsConfigApiProps>({\n getAccessToken: props.getAccessToken ?? authorizationClientGetAccessToken,\n baseUrl: reportsBaseUrl(),\n iTwinId: props.iTwinId,\n reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),\n mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),\n iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),\n });\n\n useEffect(() => {\n if (!props.extractionClient) {\n setExtractionClient(props.extractionClient ?? new ExtractionClient(groupingMappingBaseUrl()));\n }\n }, [groupingMappingBaseUrl, props.extractionClient]);\n\n const successfulExtractionToast = (iModelName: string, odataFeedUrl: string) => {\n toaster.positive(<SuccessfulExtractionToast iModelName={iModelName} odataFeedUrl={odataFeedUrl} />);\n };\n\n const failedExtractionToast = (iModelName: string) => {\n toaster.negative(<FailedExtractionToast iModelName={iModelName} />);\n };\n\n const bulkExtractor = useMemo(\n () => ({\n bulkExtractor:\n props.bulkExtractor ??\n new BulkExtractor(apiConfig.reportsClient, extractionClient, apiConfig.getAccessToken, successfulExtractionToast, failedExtractionToast),\n }),\n [apiConfig.getAccessToken, apiConfig.reportsClient, extractionClient, props.bulkExtractor],\n );\n\n useEffect(() => {\n setApiConfig(() => ({\n getAccessToken: props.getAccessToken ?? authorizationClientGetAccessToken,\n baseUrl: props.baseUrl \|\| REPORTS_CONFIG_BASE_URL,\n iTwinId: props.iTwinId,\n reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),\n mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),\n iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),\n }));\n }, [\n props.getAccessToken,\n props.baseUrl,\n props.iTwinId,\n props.reportsClient,\n props.mappingsClient,\n props.iModelsClient,\n reportsBaseUrl,\n iModelClientOptions,\n groupingMappingBaseUrl,\n ]);\n\n return (\n <ReportsConfigApiContext.Provider value={apiConfig}>\n <BulkExtractorContext.Provider value={bulkExtractor}>{props.children}</BulkExtractorContext.Provider>\n </ReportsConfigApiContext.Provider>\n );\n};\n"]}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@itwin/reports-config-widget-react",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "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.15.1",
     "@itwin/itwinui-icons-color-react": "^2.1.0",
     "@itwin/itwinui-icons-react": "^2.4.0",
     "@itwin/itwinui-react": "^2.11.0",
@@ -130,8 +130,8 @@
     "@itwin/appui-react": "^4.0.0",
     "@itwin/core-bentley": "^4.0.0",
     "@itwin/core-frontend": "^4.0.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^17.0.2 || ^18.0.0",
+    "react-dom": "^17.0.2 || ^18.0.0",
     "react-redux": "^7.2.0"
   }
 }

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

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

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

@@ -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 CHANGED Viewed

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

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

@@ -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, IMappingsClient, IReportsClient, Report, ReportMapping } from "@itwin/insights-client";
-import { REPORTING_BASE_PATH } from "@itwin/insights-client";
 import { AddMappingsModal } from "./AddMappingsModal";
 import type { GetSingleIModelParams, IModelsClient } from "@itwin/imodels-client-management";
 import { AccessTokenAdapter } from "@itwin/imodels-access-frontend";
@@ -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/ReportsConfigContext.tsx CHANGED Viewed

@@ -78,13 +78,13 @@ export const ReportsConfigContext = (props: ReportsConfigContextProps) => {
     baseUrl: reportsBaseUrl(),
     iTwinId: props.iTwinId,
     reportsClient: props.reportsClient ?? new ReportsClient(reportsBaseUrl()),
-    mappingsClient: props.mappingsClient ?? new MappingsClient(undefined, groupingMappingBaseUrl()),
+    mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),
     iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),
   });
   useEffect(() => {
     if (!props.extractionClient) {
-      setExtractionClient(props.extractionClient ?? new ExtractionClient(undefined, groupingMappingBaseUrl()));
+      setExtractionClient(props.extractionClient ?? new ExtractionClient(groupingMappingBaseUrl()));
     }
   }, [groupingMappingBaseUrl, props.extractionClient]);
@@ -111,7 +111,7 @@ 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(undefined, groupingMappingBaseUrl()),
+      mappingsClient: props.mappingsClient ?? new MappingsClient(groupingMappingBaseUrl()),
       iModelsClient: props.iModelsClient ?? new IModelsClient(iModelClientOptions),
     }));
   }, [