@itwin/grouping-mapping-widget 0.3.2 → 0.3.5

package/lib/cjs/widget/components/CalculatedPropertyTable.js

@@ -31,36 +31,12 @@ const itwinui_react_1 = require("@itwin/itwinui-react");
 const react_1 = __importStar(require("react"));
 const PropertyMenu_1 = require("./PropertyMenu");
 const DeleteModal_1 = __importDefault(require("./DeleteModal"));
-const utils_1 = require("./utils");
-const insights_client_1 = require("@itwin/insights-client");
 const GroupingMapping_1 = require("./GroupingMapping");
-const fetchCalculatedProperties = async (setCalculatedProperties, iModelId, mappingId, groupId, setIsLoading, apiContext) => {
-    try {
-        setIsLoading(true);
-        const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
-        const calculatedProperties = await reportingClientApi.getCalculatedProperties(apiContext.accessToken, iModelId, mappingId, groupId);
-        setCalculatedProperties(calculatedProperties);
-    }
-    catch (error) {
-        utils_1.handleError(error.status);
-    }
-    finally {
-        setIsLoading(false);
-    }
-};
-const CalculatedPropertyTable = ({ iModelId, mappingId, groupId, setSelectedCalculatedProperty, setGroupModifyView, onCalculatedPropertyModify, selectedCalculatedProperty, }) => {
+const utils_1 = require("./utils");
+const CalculatedPropertyTable = ({ iModelId, mappingId, groupId, setSelectedCalculatedProperty, setGroupModifyView, onCalculatedPropertyModify, isLoadingCalculatedProperties: isLoadingGroupProperties, calculatedProperties, refreshCalculatedProperties, selectedCalculatedProperty, }) => {
     var _a;
     const apiContext = react_1.useContext(GroupingMapping_1.ApiContext);
-    const [isLoading, setIsLoading] = react_1.useState(true);
     const [showCalculatedPropertyDeleteModal, setShowCalculatedPropertyDeleteModal,] = react_1.useState(false);
-    const [calculatedProperties, setCalculatedProperties] = react_1.useState([]);
-    react_1.useEffect(() => {
-        void fetchCalculatedProperties(setCalculatedProperties, iModelId, mappingId, groupId, setIsLoading, apiContext);
-    }, [apiContext, groupId, iModelId, mappingId, setIsLoading]);
-    const refresh = react_1.useCallback(async () => {
-        setCalculatedProperties([]);
-        await fetchCalculatedProperties(setCalculatedProperties, iModelId, mappingId, groupId, setIsLoading, apiContext);
-    }, [apiContext, groupId, iModelId, mappingId, setCalculatedProperties]);
     const calculatedPropertiesColumns = react_1.useMemo(() => [
         {
             Header: "Table",
@@ -98,12 +74,12 @@ const CalculatedPropertyTable = ({ iModelId, mappingId, groupId, setSelectedCalc
         react_1.default.createElement(itwinui_react_1.Button, { startIcon: react_1.default.createElement(itwinui_icons_react_1.SvgAdd, null), styleType: 'high-visibility', onClick: () => {
                 setGroupModifyView(PropertyMenu_1.PropertyMenuView.ADD_CALCULATED_PROPERTY);
             } }, "Add Calculated Property"),
-        react_1.default.createElement(itwinui_react_1.Table, { data: calculatedProperties, density: 'extra-condensed', columns: calculatedPropertiesColumns, emptyTableContent: 'No Calculated Properties', isSortable: true, isLoading: isLoading }),
+        react_1.default.createElement(itwinui_react_1.Table, { data: calculatedProperties, density: 'extra-condensed', columns: calculatedPropertiesColumns, emptyTableContent: 'No Calculated Properties', isSortable: true, isLoading: isLoadingGroupProperties }),
         react_1.default.createElement(DeleteModal_1.default, { entityName: (_a = selectedCalculatedProperty === null || selectedCalculatedProperty === void 0 ? void 0 : selectedCalculatedProperty.propertyName) !== null && _a !== void 0 ? _a : "", show: showCalculatedPropertyDeleteModal, setShow: setShowCalculatedPropertyDeleteModal, onDelete: async () => {
                 var _a;
-                const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
+                const reportingClientApi = utils_1.getReportingClient(apiContext.prefix);
                 await reportingClientApi.deleteCalculatedProperty(apiContext.accessToken, iModelId, mappingId, groupId, (_a = selectedCalculatedProperty === null || selectedCalculatedProperty === void 0 ? void 0 : selectedCalculatedProperty.id) !== null && _a !== void 0 ? _a : "");
-            }, refresh: refresh })));
+            }, refresh: refreshCalculatedProperties })));
 };
 exports.default = CalculatedPropertyTable;
 //# sourceMappingURL=CalculatedPropertyTable.js.map

package/lib/cjs/widget/components/CalculatedPropertyTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"CalculatedPropertyTable.js","sourceRoot":"","sources":["../../../../src/widget/components/CalculatedPropertyTable.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  SvgAdd,\n  SvgDelete,\n  SvgEdit,\n  SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n  Button,\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n  Table,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback, useContext, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"../utils\";\nimport { PropertyMenuView } from \"./PropertyMenu\";\nimport type { CellProps } from \"react-table\";\nimport DeleteModal from \"./DeleteModal\";\nimport { handleError } from \"./utils\";\nimport type { CalculatedProperty } from \"@itwin/insights-client\";\nimport { ReportingClient } from \"@itwin/insights-client\";\nimport type { Api } from \"./GroupingMapping\";\nimport { ApiContext } from \"./GroupingMapping\";\n\nexport type CalculatedPropertyType =\n  CreateTypeFromInterface<CalculatedProperty>;\n\nconst fetchCalculatedProperties = async (\n  setCalculatedProperties: React.Dispatch<\n  React.SetStateAction<CalculatedPropertyType[]>\n  >,\n  iModelId: string,\n  mappingId: string,\n  groupId: string,\n  setIsLoading: React.Dispatch<React.SetStateAction<boolean>>,\n  apiContext: Api\n) => {\n  try {\n    setIsLoading(true);\n    const reportingClientApi = new ReportingClient(apiContext.prefix);\n    const calculatedProperties =\n      await reportingClientApi.getCalculatedProperties(\n        apiContext.accessToken,\n        iModelId,\n        mappingId,\n        groupId,\n      );\n    setCalculatedProperties(calculatedProperties);\n  } catch (error: any) {\n    handleError(error.status);\n  } finally {\n    setIsLoading(false);\n  }\n};\n\ninterface CalculatedPropertyTableProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n\n  setSelectedCalculatedProperty: React.Dispatch<\n  React.SetStateAction<\n  CreateTypeFromInterface<CalculatedProperty> | undefined\n  >\n  >;\n  setGroupModifyView: React.Dispatch<React.SetStateAction<PropertyMenuView>>;\n  onCalculatedPropertyModify: (value: CellProps<CalculatedPropertyType>) => void;\n  selectedCalculatedProperty?: CalculatedPropertyType;\n}\n\nconst CalculatedPropertyTable = ({\n  iModelId,\n  mappingId,\n  groupId,\n  setSelectedCalculatedProperty,\n  setGroupModifyView,\n  onCalculatedPropertyModify,\n  selectedCalculatedProperty,\n}: CalculatedPropertyTableProps) => {\n  const apiContext = useContext(ApiContext);\n  const [isLoading, setIsLoading] = useState<boolean>(true);\n  const [\n    showCalculatedPropertyDeleteModal,\n    setShowCalculatedPropertyDeleteModal,\n  ] = useState<boolean>(false);\n  const [calculatedProperties, setCalculatedProperties] = useState<\n  CalculatedPropertyType[]\n  >([]);\n\n  useEffect(() => {\n    void fetchCalculatedProperties(\n      setCalculatedProperties,\n      iModelId,\n      mappingId,\n      groupId,\n      setIsLoading,\n      apiContext\n    );\n  }, [apiContext, groupId, iModelId, mappingId, setIsLoading]);\n\n  const refresh = useCallback(async () => {\n    setCalculatedProperties([]);\n    await fetchCalculatedProperties(\n      setCalculatedProperties,\n      iModelId,\n      mappingId,\n      groupId,\n      setIsLoading,\n      apiContext\n    );\n  }, [apiContext, groupId, iModelId, mappingId, setCalculatedProperties]);\n\n  const calculatedPropertiesColumns = useMemo(\n    () => [\n      {\n        Header: \"Table\",\n        columns: [\n          {\n            id: \"propertyName\",\n            Header: \"Calculated Property\",\n            accessor: \"propertyName\",\n            Cell: (value: CellProps<CalculatedPropertyType>) => (\n              <div\n                className='iui-anchor'\n                onClick={() => onCalculatedPropertyModify(value)}\n              >\n                {value.row.original.propertyName}\n              </div>\n            ),\n          },\n          {\n            id: \"dropdown\",\n            Header: \"\",\n            width: 80,\n            Cell: (value: CellProps<CalculatedPropertyType>) => {\n              return (\n                <DropdownMenu\n                  menuItems={(close: () => void) => [\n                    <MenuItem\n                      key={0}\n                      onClick={() => onCalculatedPropertyModify(value)}\n                      icon={<SvgEdit />}\n                    >\n                      Modify\n                    </MenuItem>,\n                    <MenuItem\n                      key={1}\n                      onClick={() => {\n                        setSelectedCalculatedProperty(value.row.original);\n                        setShowCalculatedPropertyDeleteModal(true);\n                        close();\n                      }}\n                      icon={<SvgDelete />}\n                    >\n                      Remove\n                    </MenuItem>,\n                  ]}\n                >\n                  <IconButton styleType='borderless'>\n                    <SvgMore\n                      style={{\n                        width: \"16px\",\n                        height: \"16px\",\n                      }}\n                    />\n                  </IconButton>\n                </DropdownMenu>\n              );\n            },\n          },\n        ],\n      },\n    ],\n    [onCalculatedPropertyModify, setSelectedCalculatedProperty],\n  );\n\n  return (\n    <>\n      <Button\n        startIcon={<SvgAdd />}\n        styleType='high-visibility'\n        onClick={() => {\n          setGroupModifyView(PropertyMenuView.ADD_CALCULATED_PROPERTY);\n        }}\n      >\n        Add Calculated Property\n      </Button>\n      <Table<CalculatedPropertyType>\n        data={calculatedProperties}\n        density='extra-condensed'\n        columns={calculatedPropertiesColumns}\n        emptyTableContent='No Calculated Properties'\n        isSortable\n        isLoading={isLoading}\n      />\n\n      <DeleteModal\n        entityName={selectedCalculatedProperty?.propertyName ?? \"\"}\n        show={showCalculatedPropertyDeleteModal}\n        setShow={setShowCalculatedPropertyDeleteModal}\n        onDelete={async () => {\n          const reportingClientApi = new ReportingClient(apiContext.prefix);\n          await reportingClientApi.deleteCalculatedProperty(\n            apiContext.accessToken,\n            iModelId,\n            mappingId,\n            groupId,\n            selectedCalculatedProperty?.id ?? \"\",\n          );\n        }}\n        refresh={refresh}\n      />\n    </>\n  );\n};\n\nexport default CalculatedPropertyTable;\n"]}
+{"version":3,"file":"CalculatedPropertyTable.js","sourceRoot":"","sources":["../../../../src/widget/components/CalculatedPropertyTable.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  SvgAdd,\n  SvgDelete,\n  SvgEdit,\n  SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n  Button,\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n  Table,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"../utils\";\nimport { PropertyMenuView } from \"./PropertyMenu\";\nimport type { CellProps } from \"react-table\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { CalculatedProperty } from \"@itwin/insights-client\";\nimport { ApiContext } from \"./GroupingMapping\";\nimport { getReportingClient } from \"./utils\";\n\nexport type CalculatedPropertyType =\n  CreateTypeFromInterface<CalculatedProperty>;\n\ninterface CalculatedPropertyTableProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n  setSelectedCalculatedProperty: React.Dispatch<\n  React.SetStateAction<\n  CreateTypeFromInterface<CalculatedPropertyType> | undefined\n  >\n  >;\n  setGroupModifyView: React.Dispatch<React.SetStateAction<PropertyMenuView>>;\n  onCalculatedPropertyModify: (value: CellProps<CalculatedPropertyType>) => void;\n  isLoadingCalculatedProperties: boolean;\n  calculatedProperties: CalculatedPropertyType[];\n  refreshCalculatedProperties: () => Promise<void>;\n  selectedCalculatedProperty?: CalculatedPropertyType;\n}\n\nconst CalculatedPropertyTable = ({\n  iModelId,\n  mappingId,\n  groupId,\n  setSelectedCalculatedProperty,\n  setGroupModifyView,\n  onCalculatedPropertyModify,\n  isLoadingCalculatedProperties: isLoadingGroupProperties,\n  calculatedProperties,\n  refreshCalculatedProperties,\n  selectedCalculatedProperty,\n}: CalculatedPropertyTableProps) => {\n  const apiContext = useContext(ApiContext);\n  const [\n    showCalculatedPropertyDeleteModal,\n    setShowCalculatedPropertyDeleteModal,\n  ] = useState<boolean>(false);\n\n  const calculatedPropertiesColumns = useMemo(\n    () => [\n      {\n        Header: \"Table\",\n        columns: [\n          {\n            id: \"propertyName\",\n            Header: \"Calculated Property\",\n            accessor: \"propertyName\",\n            Cell: (value: CellProps<CalculatedPropertyType>) => (\n              <div\n                className='iui-anchor'\n                onClick={() => onCalculatedPropertyModify(value)}\n              >\n                {value.row.original.propertyName}\n              </div>\n            ),\n          },\n          {\n            id: \"dropdown\",\n            Header: \"\",\n            width: 80,\n            Cell: (value: CellProps<CalculatedPropertyType>) => {\n              return (\n                <DropdownMenu\n                  menuItems={(close: () => void) => [\n                    <MenuItem\n                      key={0}\n                      onClick={() => onCalculatedPropertyModify(value)}\n                      icon={<SvgEdit />}\n                    >\n                      Modify\n                    </MenuItem>,\n                    <MenuItem\n                      key={1}\n                      onClick={() => {\n                        setSelectedCalculatedProperty(value.row.original);\n                        setShowCalculatedPropertyDeleteModal(true);\n                        close();\n                      }}\n                      icon={<SvgDelete />}\n                    >\n                      Remove\n                    </MenuItem>,\n                  ]}\n                >\n                  <IconButton styleType='borderless'>\n                    <SvgMore\n                      style={{\n                        width: \"16px\",\n                        height: \"16px\",\n                      }}\n                    />\n                  </IconButton>\n                </DropdownMenu>\n              );\n            },\n          },\n        ],\n      },\n    ],\n    [onCalculatedPropertyModify, setSelectedCalculatedProperty],\n  );\n\n  return (\n    <>\n      <Button\n        startIcon={<SvgAdd />}\n        styleType='high-visibility'\n        onClick={() => {\n          setGroupModifyView(PropertyMenuView.ADD_CALCULATED_PROPERTY);\n        }}\n      >\n        Add Calculated Property\n      </Button>\n      <Table<CalculatedPropertyType>\n        data={calculatedProperties}\n        density='extra-condensed'\n        columns={calculatedPropertiesColumns}\n        emptyTableContent='No Calculated Properties'\n        isSortable\n        isLoading={isLoadingGroupProperties}\n      />\n\n      <DeleteModal\n        entityName={selectedCalculatedProperty?.propertyName ?? \"\"}\n        show={showCalculatedPropertyDeleteModal}\n        setShow={setShowCalculatedPropertyDeleteModal}\n        onDelete={async () => {\n          const reportingClientApi = getReportingClient(apiContext.prefix);\n          await reportingClientApi.deleteCalculatedProperty(\n            apiContext.accessToken,\n            iModelId,\n            mappingId,\n            groupId,\n            selectedCalculatedProperty?.id ?? \"\",\n          );\n        }}\n        refresh={refreshCalculatedProperties}\n      />\n    </>\n  );\n};\n\nexport default CalculatedPropertyTable;\n"]}

package/lib/cjs/widget/components/ConfirmMappingsImport.js

@@ -30,7 +30,6 @@ const appui_react_1 = require("@itwin/appui-react");
 const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
 const useValidator_1 = __importStar(require("../hooks/useValidator"));
 const utils_1 = require("./utils");
-const insights_client_1 = require("@itwin/insights-client");
 const GroupingMapping_1 = require("./GroupingMapping");
 const ConfirmMappingImport = ({ sourceiModelId, selectedMappings, importing, setImporting, setSelectedMappings, backFn, onCancel, onFinish, }) => {
     var _a;
@@ -62,7 +61,7 @@ const ConfirmMappingImport = ({ sourceiModelId, selectedMappings, importing, set
         }
         setImporting(true);
         try {
-            const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
+            const reportingClientApi = utils_1.getReportingClient(apiContext.prefix);
             for (const selectedMapping of selectedMappings) {
                 setCurrentlyImporting((_a = selectedMapping.mappingName) !== null && _a !== void 0 ? _a : "");
                 await reportingClientApi.copyMapping(apiContext.accessToken, sourceiModelId, (_b = selectedMapping.id) !== null && _b !== void 0 ? _b : "", {

package/lib/cjs/widget/components/ConfirmMappingsImport.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfirmMappingsImport.js","sourceRoot":"","sources":["../../../../src/widget/components/ConfirmMappingsImport.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  Button,\n  LabeledInput,\n  MiddleTextTruncation,\n  ProgressLinear,\n  Text,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useEffect, useState } from \"react\";\nimport type { MappingType } from \"./Mapping\";\nimport \"./ConfirmMappingsImport.scss\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\nimport { SvgStatusSuccessHollow } from \"@itwin/itwinui-icons-react\";\nimport useValidator, { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport { handleError } from \"./utils\";\nimport { ReportingClient } from \"@itwin/insights-client\";\nimport { ApiContext } from \"./GroupingMapping\";\n\ninterface ConfirmMappingImportProps {\n  sourceiModelId: string;\n  selectedMappings: MappingType[];\n  importing: boolean;\n  setImporting: React.Dispatch<React.SetStateAction<boolean>>;\n  setSelectedMappings: React.Dispatch<React.SetStateAction<MappingType[]>>;\n  backFn: () => void;\n  onCancel: () => void;\n  onFinish: () => void;\n}\n\nconst ConfirmMappingImport = ({\n  sourceiModelId,\n  selectedMappings,\n  importing,\n  setImporting,\n  setSelectedMappings,\n  backFn,\n  onCancel,\n  onFinish,\n}: ConfirmMappingImportProps) => {\n  const iModelId = useActiveIModelConnection()?.iModelId;\n  const apiContext = useContext(ApiContext);\n\n  const [importCount, setImportCount] = useState<number>(0);\n  const [currentlyImporting, setCurrentlyImporting] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n  const [errored, setErrored] = useState<boolean>(false);\n\n  useEffect(() => {\n    setSelectedMappings((selectedMappings) =>\n      selectedMappings.map((mapping) => ({\n        ...mapping,\n        mappingName: `${mapping.mappingName}_Copy`,\n      })),\n    );\n  }, [setSelectedMappings]);\n\n  const handleChange = (\n    e: React.ChangeEvent<HTMLInputElement>,\n    index: number,\n  ) => {\n    const newState = [...selectedMappings];\n    newState[index] = {\n      ...newState[index],\n      mappingName: e.target.value,\n    };\n    setSelectedMappings(newState);\n  };\n\n  const onImport = async () => {\n    if (!validator.allValid()) {\n      showValidationMessage(true);\n      return;\n    }\n    setImporting(true);\n    try {\n      const reportingClientApi = new ReportingClient(apiContext.prefix);\n      for (const selectedMapping of selectedMappings) {\n        setCurrentlyImporting(selectedMapping.mappingName ?? \"\");\n        await reportingClientApi.copyMapping(\n          apiContext.accessToken,\n          sourceiModelId,\n          selectedMapping.id ?? \"\",\n          {\n            targetIModelId: iModelId ?? \"\",\n            mappingName: selectedMapping.mappingName ?? \"\",\n          },\n        );\n        setImportCount((importCount) => importCount + 1);\n      }\n    } catch (error: any) {\n      handleError(error);\n      setErrored(true);\n    }\n  };\n\n  return (\n    <>\n      {importing ? (\n        <div className='import-progress-container'>\n          <div className='import-progress-bar'>\n            <div className='import-progress-bar-description'>\n              {\n                !errored ? importCount !== selectedMappings.length ? (\n                  <>\n                    <Text variant='title'>Importing</Text>\n                    <Text>We are currently importing the mappings.</Text>\n                  </>\n                ) : (\n                  <>\n                    <Text variant='title'>Done!</Text>\n                    <Text>Your mapping(s) are ready.</Text>\n                  </>\n                ) :\n                  <>\n                    <Text variant='title'>Error!</Text>\n                    <Text>Sorry, there was an error importing some or all mappings.</Text>\n                  </>}\n            </div>\n            <ProgressLinear\n              value={(importCount / selectedMappings.length) * 100}\n              labels={\n                importCount === selectedMappings.length\n                  ? [\"Import done!\", <SvgStatusSuccessHollow key='0' />]\n                  : [\n                    <>\n                      <Text>Copying</Text>\n                      <MiddleTextTruncation text={currentlyImporting} />\n                    </>,\n                    `${importCount}/${selectedMappings.length}`,\n                  ]\n              }\n              status={\n                !errored ?\n                  importCount === selectedMappings.length ? \"positive\" : undefined : \"negative\"\n              }\n            />\n          </div>\n          <div className='import-action-panel'>\n            <Button\n              disabled={!errored && importCount !== selectedMappings.length}\n              onClick={() => {\n                setImporting(false);\n                setImportCount(0);\n                setCurrentlyImporting(\"\");\n                setErrored(false);\n              }}\n            >\n              Back\n            </Button>\n            <Button\n              styleType='high-visibility'\n              disabled={!errored && importCount !== selectedMappings.length}\n              onClick={() => onFinish()}\n            >\n              Close\n            </Button>\n          </div>\n        </div>\n      ) : (\n        <div className='rename-confirm-container '>\n          <div className='mapping-rename-container'>\n            <div className='mapping-row-header-container'>\n              <div className='mapping-row'>\n                <Text variant='leading'>Mapping </Text>\n                <Text variant='leading'>Description</Text>\n              </div>\n            </div>\n            <div className='mapping-row-body'>\n              {selectedMappings.map((mapping, index) => (\n                <div className='mapping-row-container' key={mapping.id}>\n                  <div className='mapping-row'>\n                    <LabeledInput\n                      value={mapping.mappingName}\n                      name={`mapping_${mapping.id}`}\n                      required\n                      onChange={(event) => {\n                        handleChange(event, index);\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                      message={validator.message(\n                        `mapping_${mapping.id}`,\n                        mapping.mappingName,\n                        NAME_REQUIREMENTS,\n                      )}\n                      status={\n                        validator.message(\n                          `mapping_${mapping.id}`,\n                          mapping.mappingName,\n                          NAME_REQUIREMENTS,\n                        )\n                          ? \"negative\"\n                          : undefined\n                      }\n                      onBlur={() => {\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                      onBlurCapture={(event) => {\n                        handleChange(event, index);\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                    />\n                    <div>{mapping.description}</div>\n                  </div>\n                  <div className='border-div' />\n                </div>\n              ))}\n            </div>\n          </div>\n          <div className='import-action-panel'>\n            <Button onClick={backFn}>Back</Button>\n            <Button styleType='high-visibility' onClick={async () => onImport()}>\n              Import\n            </Button>\n            <Button onClick={onCancel}>Cancel</Button>\n          </div>\n        </div>\n      )}\n    </>\n  );\n};\n\nexport default ConfirmMappingImport;\n"]}
+{"version":3,"file":"ConfirmMappingsImport.js","sourceRoot":"","sources":["../../../../src/widget/components/ConfirmMappingsImport.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  Button,\n  LabeledInput,\n  MiddleTextTruncation,\n  ProgressLinear,\n  Text,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useEffect, useState } from \"react\";\nimport type { MappingType } from \"./Mapping\";\nimport \"./ConfirmMappingsImport.scss\";\nimport { useActiveIModelConnection } from \"@itwin/appui-react\";\nimport { SvgStatusSuccessHollow } from \"@itwin/itwinui-icons-react\";\nimport useValidator, { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport { getReportingClient, handleError } from \"./utils\";\nimport { ApiContext } from \"./GroupingMapping\";\n\ninterface ConfirmMappingImportProps {\n  sourceiModelId: string;\n  selectedMappings: MappingType[];\n  importing: boolean;\n  setImporting: React.Dispatch<React.SetStateAction<boolean>>;\n  setSelectedMappings: React.Dispatch<React.SetStateAction<MappingType[]>>;\n  backFn: () => void;\n  onCancel: () => void;\n  onFinish: () => void;\n}\n\nconst ConfirmMappingImport = ({\n  sourceiModelId,\n  selectedMappings,\n  importing,\n  setImporting,\n  setSelectedMappings,\n  backFn,\n  onCancel,\n  onFinish,\n}: ConfirmMappingImportProps) => {\n  const iModelId = useActiveIModelConnection()?.iModelId;\n  const apiContext = useContext(ApiContext);\n\n  const [importCount, setImportCount] = useState<number>(0);\n  const [currentlyImporting, setCurrentlyImporting] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n  const [errored, setErrored] = useState<boolean>(false);\n\n  useEffect(() => {\n    setSelectedMappings((selectedMappings) =>\n      selectedMappings.map((mapping) => ({\n        ...mapping,\n        mappingName: `${mapping.mappingName}_Copy`,\n      })),\n    );\n  }, [setSelectedMappings]);\n\n  const handleChange = (\n    e: React.ChangeEvent<HTMLInputElement>,\n    index: number,\n  ) => {\n    const newState = [...selectedMappings];\n    newState[index] = {\n      ...newState[index],\n      mappingName: e.target.value,\n    };\n    setSelectedMappings(newState);\n  };\n\n  const onImport = async () => {\n    if (!validator.allValid()) {\n      showValidationMessage(true);\n      return;\n    }\n    setImporting(true);\n    try {\n      const reportingClientApi = getReportingClient(apiContext.prefix);\n      for (const selectedMapping of selectedMappings) {\n        setCurrentlyImporting(selectedMapping.mappingName ?? \"\");\n        await reportingClientApi.copyMapping(\n          apiContext.accessToken,\n          sourceiModelId,\n          selectedMapping.id ?? \"\",\n          {\n            targetIModelId: iModelId ?? \"\",\n            mappingName: selectedMapping.mappingName ?? \"\",\n          },\n        );\n        setImportCount((importCount) => importCount + 1);\n      }\n    } catch (error: any) {\n      handleError(error);\n      setErrored(true);\n    }\n  };\n\n  return (\n    <>\n      {importing ? (\n        <div className='import-progress-container'>\n          <div className='import-progress-bar'>\n            <div className='import-progress-bar-description'>\n              {\n                !errored ? importCount !== selectedMappings.length ? (\n                  <>\n                    <Text variant='title'>Importing</Text>\n                    <Text>We are currently importing the mappings.</Text>\n                  </>\n                ) : (\n                  <>\n                    <Text variant='title'>Done!</Text>\n                    <Text>Your mapping(s) are ready.</Text>\n                  </>\n                ) :\n                  <>\n                    <Text variant='title'>Error!</Text>\n                    <Text>Sorry, there was an error importing some or all mappings.</Text>\n                  </>}\n            </div>\n            <ProgressLinear\n              value={(importCount / selectedMappings.length) * 100}\n              labels={\n                importCount === selectedMappings.length\n                  ? [\"Import done!\", <SvgStatusSuccessHollow key='0' />]\n                  : [\n                    <>\n                      <Text>Copying</Text>\n                      <MiddleTextTruncation text={currentlyImporting} />\n                    </>,\n                    `${importCount}/${selectedMappings.length}`,\n                  ]\n              }\n              status={\n                !errored ?\n                  importCount === selectedMappings.length ? \"positive\" : undefined : \"negative\"\n              }\n            />\n          </div>\n          <div className='import-action-panel'>\n            <Button\n              disabled={!errored && importCount !== selectedMappings.length}\n              onClick={() => {\n                setImporting(false);\n                setImportCount(0);\n                setCurrentlyImporting(\"\");\n                setErrored(false);\n              }}\n            >\n              Back\n            </Button>\n            <Button\n              styleType='high-visibility'\n              disabled={!errored && importCount !== selectedMappings.length}\n              onClick={() => onFinish()}\n            >\n              Close\n            </Button>\n          </div>\n        </div>\n      ) : (\n        <div className='rename-confirm-container '>\n          <div className='mapping-rename-container'>\n            <div className='mapping-row-header-container'>\n              <div className='mapping-row'>\n                <Text variant='leading'>Mapping </Text>\n                <Text variant='leading'>Description</Text>\n              </div>\n            </div>\n            <div className='mapping-row-body'>\n              {selectedMappings.map((mapping, index) => (\n                <div className='mapping-row-container' key={mapping.id}>\n                  <div className='mapping-row'>\n                    <LabeledInput\n                      value={mapping.mappingName}\n                      name={`mapping_${mapping.id}`}\n                      required\n                      onChange={(event) => {\n                        handleChange(event, index);\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                      message={validator.message(\n                        `mapping_${mapping.id}`,\n                        mapping.mappingName,\n                        NAME_REQUIREMENTS,\n                      )}\n                      status={\n                        validator.message(\n                          `mapping_${mapping.id}`,\n                          mapping.mappingName,\n                          NAME_REQUIREMENTS,\n                        )\n                          ? \"negative\"\n                          : undefined\n                      }\n                      onBlur={() => {\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                      onBlurCapture={(event) => {\n                        handleChange(event, index);\n                        validator.showMessageFor(`mapping_${mapping.id}`);\n                      }}\n                    />\n                    <div>{mapping.description}</div>\n                  </div>\n                  <div className='border-div' />\n                </div>\n              ))}\n            </div>\n          </div>\n          <div className='import-action-panel'>\n            <Button onClick={backFn}>Back</Button>\n            <Button styleType='high-visibility' onClick={async () => onImport()}>\n              Import\n            </Button>\n            <Button onClick={onCancel}>Cancel</Button>\n          </div>\n        </div>\n      )}\n    </>\n  );\n};\n\nexport default ConfirmMappingImport;\n"]}

package/lib/cjs/widget/components/ConfirmMappingsImport.scss

@@ -20,7 +20,8 @@
 .import-progress-container {
   display: flex;
   flex-direction: column;
-  height: 66vh;
+  flex-grow: 1;
+  min-height: 0;
   justify-content: center;
 
   .import-progress-bar {
@@ -52,7 +53,8 @@
 .rename-confirm-container {
   display: flex;
   flex-direction: column;
-  height: 66vh;
+  flex-grow: 1;
+  min-height: 0;
 
   .mapping-rename-container {
     display: flex;

package/lib/cjs/widget/components/CustomCalculationAction.d.ts

@@ -2,13 +2,15 @@
 import "./CalculatedPropertyAction.scss";
 import type { CustomCalculationType } from "./CustomCalculationTable";
 import "./CustomCalculationAction.scss";
+import type { PropertyMap } from "../../formula/Types";
 interface CalculatedPropertyActionProps {
     iModelId: string;
     mappingId: string;
     groupId: string;
+    properties: PropertyMap;
     customCalculation?: CustomCalculationType;
-    returnFn: () => Promise<void>;
+    returnFn: (modified: boolean) => Promise<void>;
 }
-declare const CustomCalculationAction: ({ iModelId, mappingId, groupId, customCalculation, returnFn, }: CalculatedPropertyActionProps) => JSX.Element;
+declare const CustomCalculationAction: ({ iModelId, mappingId, groupId, properties, customCalculation, returnFn, }: CalculatedPropertyActionProps) => JSX.Element;
 export default CustomCalculationAction;
 //# sourceMappingURL=CustomCalculationAction.d.ts.map

package/lib/cjs/widget/components/CustomCalculationAction.js

@@ -34,9 +34,9 @@ const utils_1 = require("./utils");
 require("./CalculatedPropertyAction.scss");
 require("./CustomCalculationAction.scss");
 const GroupPropertyAction_1 = require("./GroupPropertyAction");
-const insights_client_1 = require("@itwin/insights-client");
+const useFormulaValidation_1 = require("../hooks/useFormulaValidation");
 const GroupingMapping_1 = require("./GroupingMapping");
-const CustomCalculationAction = ({ iModelId, mappingId, groupId, customCalculation, returnFn, }) => {
+const CustomCalculationAction = ({ iModelId, mappingId, groupId, properties, customCalculation, returnFn, }) => {
     var _a, _b, _c, _d;
     const apiContext = react_1.useContext(GroupingMapping_1.ApiContext);
     const [propertyName, setPropertyName] = react_1.useState((_a = customCalculation === null || customCalculation === void 0 ? void 0 : customCalculation.propertyName) !== null && _a !== void 0 ? _a : "");
@@ -45,15 +45,19 @@ const CustomCalculationAction = ({ iModelId, mappingId, groupId, customCalculati
     const [isLoading, setIsLoading] = react_1.useState(false);
     const [formulaErrorMessage, setFormulaErrorMessage] = react_1.useState("");
     const [validator, showValidationMessage] = useValidator_1.default();
+    const { isValid, forceValidation } = useFormulaValidation_1.useFormulaValidation(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);
     const onSave = async () => {
         var _a;
         if (!validator.allValid()) {
             showValidationMessage(true);
             return;
         }
+        if (!forceValidation()) {
+            return;
+        }
         try {
             setIsLoading(true);
-            const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
+            const reportingClientApi = utils_1.getReportingClient(apiContext.prefix);
             customCalculation
                 ? await reportingClientApi.updateCustomCalculation(apiContext.accessToken, iModelId, mappingId, groupId, (_a = customCalculation.id) !== null && _a !== void 0 ? _a : "", {
                     propertyName,
@@ -65,7 +69,7 @@ const CustomCalculationAction = ({ iModelId, mappingId, groupId, customCalculati
                     formula,
                     quantityType,
                 });
-            await returnFn();
+            await returnFn(true);
         }
         catch (error) {
             // error instanceof Response refuses to be true when it should be.
@@ -86,7 +90,7 @@ const CustomCalculationAction = ({ iModelId, mappingId, groupId, customCalculati
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(utils_1.WidgetHeader, { title: customCalculation
                 ? `${(_d = customCalculation === null || customCalculation === void 0 ? void 0 : customCalculation.propertyName) !== null && _d !== void 0 ? _d : ""}`
-                : "Create Custom Calculation", returnFn: returnFn }),
+                : "Create Custom Calculation", returnFn: async () => returnFn(false) }),
         react_1.default.createElement("div", { className: 'custom-calculation-action-container' },
             react_1.default.createElement(itwinui_react_1.Fieldset, { legend: 'Custom Calculation Details', className: 'details-form' },
                 react_1.default.createElement(itwinui_react_1.Small, { className: 'field-legend' }, "Asterisk * indicates mandatory fields."),
@@ -105,7 +109,7 @@ const CustomCalculationAction = ({ iModelId, mappingId, groupId, customCalculati
                         setFormula(event.target.value);
                     }, message: formulaErrorMessage, status: formulaErrorMessage ? "negative" : undefined }),
                 react_1.default.createElement(itwinui_react_1.LabeledSelect, { label: 'Quantity Type', disabled: isLoading, options: GroupPropertyAction_1.quantityTypesSelectionOptions, value: quantityType, onChange: setQuantityType, onShow: () => { }, onHide: () => { } }))),
-        react_1.default.createElement(ActionPanel_1.default, { onSave: onSave, onCancel: returnFn, isSavingDisabled: !(formula && propertyName), isLoading: isLoading })));
+        react_1.default.createElement(ActionPanel_1.default, { onSave: onSave, onCancel: async () => returnFn(false), isSavingDisabled: !(formula && propertyName && isValid), isLoading: isLoading })));
 };
 exports.default = CustomCalculationAction;
 //# sourceMappingURL=CustomCalculationAction.js.map

package/lib/cjs/widget/components/CustomCalculationAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomCalculationAction.js","sourceRoot":"","sources":["../../../../src/widget/components/CustomCalculationAction.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,wDAM8B;AAC9B,+CAAoD;AACpD,gEAAwC;AACxC,sEAAwE;AACxE,mCAAoD;AACpD,2CAAyC;AAEzC,0CAAwC;AACxC,+DAAsE;AACtE,4DAAyD;AACzD,uDAA+C;AAU/C,MAAM,uBAAuB,GAAG,CAAC,EAC/B,QAAQ,EACR,SAAS,EACT,OAAO,EACP,iBAAiB,EACjB,QAAQ,GACsB,EAAE,EAAE;;IAClC,MAAM,UAAU,GAAG,kBAAU,CAAC,4BAAU,CAAC,CAAC;IAC1C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,gBAAQ,CAC9C,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,mCAAI,EAAE,CACtC,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,gBAAQ,CACpC,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,OAAO,mCAAI,EAAE,CACjC,CAAC;IACF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,gBAAQ,CAAS,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,mCAAI,WAAW,CAAC,CAAC;IACzG,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,gBAAQ,CAAU,KAAK,CAAC,CAAC;IAC3D,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,gBAAQ,CAAS,EAAE,CAAC,CAAC;IAC3E,MAAM,CAAC,SAAS,EAAE,qBAAqB,CAAC,GAAG,sBAAY,EAAE,CAAC;IAE1D,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;;QACxB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YACzB,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,IAAI;YACF,YAAY,CAAC,IAAI,CAAC,CAAC;YACnB,MAAM,kBAAkB,GAAG,IAAI,iCAAe,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YAElE,iBAAiB;gBACf,CAAC,CAAC,MAAM,kBAAkB,CAAC,uBAAuB,CAChD,UAAU,CAAC,WAAW,EACtB,QAAQ,EACR,SAAS,EACT,OAAO,EACP,MAAA,iBAAiB,CAAC,EAAE,mCAAI,EAAE,EAC1B;oBACE,YAAY;oBACZ,OAAO;oBACP,YAAY;iBACb,CACF;gBACD,CAAC,CAAC,MAAM,kBAAkB,CAAC,uBAAuB,CAChD,UAAU,CAAC,WAAW,EACtB,QAAQ,EACR,SAAS,EACT,OAAO,EACP;oBACE,YAAY;oBACZ,OAAO;oBACP,YAAY;iBACb,CACF,CAAC;YACJ,MAAM,QAAQ,EAAE,CAAC;SAClB;QAAC,OAAO,KAAU,EAAE;YACnB,kEAAkE;YAClE,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;gBACxB,KAAK,GAAG,KAAiB,CAAC;gBAC1B,MAAM,eAAe,GAAG,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC3C,IACE,eAAe,CAAC,KAAK,CAAC,IAAI,KAAK,wBAAwB;oBACvD,eAAe,CAAC,KAAK,CAAC,MAAM,KAAK,SAAS,EAC1C;oBACA,sBAAsB,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;iBACvD;aACF;iBAAM;gBACL,mBAAW,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC3B;YACD,YAAY,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC,CAAC;IAEF,OAAO,CACL;QACE,8BAAC,oBAAY,IACX,KAAK,EACH,iBAAiB;gBACf,CAAC,CAAC,GAAG,MAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,YAAY,mCAAI,EAAE,EAAE;gBAC5C,CAAC,CAAC,2BAA2B,EAEjC,QAAQ,EAAE,QAAQ,GAClB;QACF,uCAAK,SAAS,EAAC,qCAAqC;YAClD,8BAAC,wBAAQ,IAAC,MAAM,EAAC,4BAA4B,EAAC,SAAS,EAAC,cAAc;gBACpE,8BAAC,qBAAK,IAAC,SAAS,EAAC,cAAc,6CAEvB;gBACR,8BAAC,4BAAY,IACX,KAAK,EAAE,YAAY,EACnB,QAAQ,QACR,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,MAAM,EACZ,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;wBAClB,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACpC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACnC,CAAC,EACD,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,gCAAiB,CAAC,EACnE,MAAM,EACJ,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,gCAAiB,CAAC;wBACxD,CAAC,CAAC,UAAU;wBACZ,CAAC,CAAC,SAAS,EAEf,MAAM,EAAE,GAAG,EAAE;wBACX,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACnC,CAAC,EACD,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;wBACvB,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACpC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBACnC,CAAC,GACD;gBACF,8BAAC,+BAAe,IACd,KAAK,EAAE,OAAO,EACd,QAAQ,QACR,IAAI,EAAC,SAAS,EACd,KAAK,EAAC,SAAS,EACf,QAAQ,EAAE,SAAS,EACnB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;wBAClB,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACjC,CAAC,EACD,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,GACpD;gBACF,8BAAC,6BAAa,IACZ,KAAK,EAAC,eAAe,EACrB,QAAQ,EAAE,SAAS,EACnB,OAAO,EAAE,mDAA6B,EACtC,KAAK,EAAE,YAAY,EACnB,QAAQ,EAAE,eAAe,EACzB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EACjB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GACjB,CACO,CACP;QACN,8BAAC,qBAAW,IACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,gBAAgB,EAAE,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,EAC5C,SAAS,EAAE,SAAS,GACpB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,kBAAe,uBAAuB,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 {\n  Fieldset,\n  LabeledInput,\n  LabeledSelect,\n  LabeledTextarea,\n  Small,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useState } from \"react\";\nimport ActionPanel from \"./ActionPanel\";\nimport useValidator, { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport { handleError, WidgetHeader } from \"./utils\";\nimport \"./CalculatedPropertyAction.scss\";\nimport type { CustomCalculationType } from \"./CustomCalculationTable\";\nimport \"./CustomCalculationAction.scss\";\nimport { quantityTypesSelectionOptions } from \"./GroupPropertyAction\";\nimport { ReportingClient } from \"@itwin/insights-client\";\nimport { ApiContext } from \"./GroupingMapping\";\n\ninterface CalculatedPropertyActionProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n  customCalculation?: CustomCalculationType;\n  returnFn: () => Promise<void>;\n}\n\nconst CustomCalculationAction = ({\n  iModelId,\n  mappingId,\n  groupId,\n  customCalculation,\n  returnFn,\n}: CalculatedPropertyActionProps) => {\n  const apiContext = useContext(ApiContext);\n  const [propertyName, setPropertyName] = useState<string>(\n    customCalculation?.propertyName ?? \"\",\n  );\n  const [formula, setFormula] = useState<string>(\n    customCalculation?.formula ?? \"\",\n  );\n  const [quantityType, setQuantityType] = useState<string>(customCalculation?.quantityType ?? \"Undefined\");\n  const [isLoading, setIsLoading] = useState<boolean>(false);\n  const [formulaErrorMessage, setFormulaErrorMessage] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n\n  const onSave = async () => {\n    if (!validator.allValid()) {\n      showValidationMessage(true);\n      return;\n    }\n    try {\n      setIsLoading(true);\n      const reportingClientApi = new ReportingClient(apiContext.prefix);\n\n      customCalculation\n        ? await reportingClientApi.updateCustomCalculation(\n          apiContext.accessToken,\n          iModelId,\n          mappingId,\n          groupId,\n          customCalculation.id ?? \"\",\n          {\n            propertyName,\n            formula,\n            quantityType,\n          }\n        )\n        : await reportingClientApi.createCustomCalculation(\n          apiContext.accessToken,\n          iModelId,\n          mappingId,\n          groupId,\n          {\n            propertyName,\n            formula,\n            quantityType,\n          }\n        );\n      await returnFn();\n    } catch (error: any) {\n      // error instanceof Response refuses to be true when it should be.\n      if (error.status === 422) {\n        error = error as Response;\n        const erroredResponse = await error.json();\n        if (\n          erroredResponse.error.code === \"InvalidInsightsRequest\" &&\n          erroredResponse.error.target === \"formula\"\n        ) {\n          setFormulaErrorMessage(erroredResponse.error.message);\n        }\n      } else {\n        handleError(error.status);\n      }\n      setIsLoading(false);\n    }\n  };\n\n  return (\n    <>\n      <WidgetHeader\n        title={\n          customCalculation\n            ? `${customCalculation?.propertyName ?? \"\"}`\n            : \"Create Custom Calculation\"\n        }\n        returnFn={returnFn}\n      />\n      <div className='custom-calculation-action-container'>\n        <Fieldset legend='Custom Calculation Details' className='details-form'>\n          <Small className='field-legend'>\n            Asterisk * indicates mandatory fields.\n          </Small>\n          <LabeledInput\n            value={propertyName}\n            required\n            name='name'\n            label='Name'\n            disabled={isLoading}\n            onChange={(event) => {\n              setPropertyName(event.target.value);\n              validator.showMessageFor(\"name\");\n            }}\n            message={validator.message(\"name\", propertyName, NAME_REQUIREMENTS)}\n            status={\n              validator.message(\"name\", propertyName, NAME_REQUIREMENTS)\n                ? \"negative\"\n                : undefined\n            }\n            onBlur={() => {\n              validator.showMessageFor(\"name\");\n            }}\n            onBlurCapture={(event) => {\n              setPropertyName(event.target.value);\n              validator.showMessageFor(\"name\");\n            }}\n          />\n          <LabeledTextarea\n            value={formula}\n            required\n            name='formula'\n            label='Formula'\n            disabled={isLoading}\n            onChange={(event) => {\n              setFormula(event.target.value);\n            }}\n            message={formulaErrorMessage}\n            status={formulaErrorMessage ? \"negative\" : undefined}\n          />\n          <LabeledSelect<string>\n            label='Quantity Type'\n            disabled={isLoading}\n            options={quantityTypesSelectionOptions}\n            value={quantityType}\n            onChange={setQuantityType}\n            onShow={() => { }}\n            onHide={() => { }}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={returnFn}\n        isSavingDisabled={!(formula && propertyName)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n\nexport default CustomCalculationAction;\n"]}
+{"version":3,"file":"CustomCalculationAction.js","sourceRoot":"","sources":["../../../../src/widget/components/CustomCalculationAction.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  Fieldset,\n  LabeledInput,\n  LabeledSelect,\n  LabeledTextarea,\n  Small,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useState } from \"react\";\nimport ActionPanel from \"./ActionPanel\";\nimport useValidator, { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport { getReportingClient, handleError, WidgetHeader } from \"./utils\";\nimport \"./CalculatedPropertyAction.scss\";\nimport type { CustomCalculationType } from \"./CustomCalculationTable\";\nimport \"./CustomCalculationAction.scss\";\nimport { quantityTypesSelectionOptions } from \"./GroupPropertyAction\";\nimport { useFormulaValidation } from \"../hooks/useFormulaValidation\";\nimport type { PropertyMap } from \"../../formula/Types\";\nimport { ApiContext } from \"./GroupingMapping\";\n\ninterface CalculatedPropertyActionProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n  properties: PropertyMap;\n  customCalculation?: CustomCalculationType;\n  returnFn: (modified: boolean) => Promise<void>;\n}\n\nconst CustomCalculationAction = ({\n  iModelId,\n  mappingId,\n  groupId,\n  properties,\n  customCalculation,\n  returnFn,\n}: CalculatedPropertyActionProps) => {\n  const apiContext = useContext(ApiContext);\n  const [propertyName, setPropertyName] = useState<string>(\n    customCalculation?.propertyName ?? \"\",\n  );\n  const [formula, setFormula] = useState<string>(\n    customCalculation?.formula ?? \"\",\n  );\n  const [quantityType, setQuantityType] = useState<string>(customCalculation?.quantityType ?? \"Undefined\");\n  const [isLoading, setIsLoading] = useState<boolean>(false);\n  const [formulaErrorMessage, setFormulaErrorMessage] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n  const { isValid, forceValidation } = useFormulaValidation(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);\n\n  const onSave = async () => {\n    if (!validator.allValid()) {\n      showValidationMessage(true);\n      return;\n    }\n    if (!forceValidation()) {\n      return;\n    }\n    try {\n      setIsLoading(true);\n      const reportingClientApi = getReportingClient(apiContext.prefix);\n\n      customCalculation\n        ? await reportingClientApi.updateCustomCalculation(\n          apiContext.accessToken,\n          iModelId,\n          mappingId,\n          groupId,\n          customCalculation.id ?? \"\",\n          {\n            propertyName,\n            formula,\n            quantityType,\n          }\n        )\n        : await reportingClientApi.createCustomCalculation(\n          apiContext.accessToken,\n          iModelId,\n          mappingId,\n          groupId,\n          {\n            propertyName,\n            formula,\n            quantityType,\n          }\n        );\n      await returnFn(true);\n    } catch (error: any) {\n      // error instanceof Response refuses to be true when it should be.\n      if (error.status === 422) {\n        error = error as Response;\n        const erroredResponse = await error.json();\n        if (\n          erroredResponse.error.code === \"InvalidInsightsRequest\" &&\n          erroredResponse.error.target === \"formula\"\n        ) {\n          setFormulaErrorMessage(erroredResponse.error.message);\n        }\n      } else {\n        handleError(error.status);\n      }\n      setIsLoading(false);\n    }\n  };\n\n  return (\n    <>\n      <WidgetHeader\n        title={\n          customCalculation\n            ? `${customCalculation?.propertyName ?? \"\"}`\n            : \"Create Custom Calculation\"\n        }\n        returnFn={async () => returnFn(false)}\n      />\n      <div className='custom-calculation-action-container'>\n        <Fieldset legend='Custom Calculation Details' className='details-form'>\n          <Small className='field-legend'>\n            Asterisk * indicates mandatory fields.\n          </Small>\n          <LabeledInput\n            value={propertyName}\n            required\n            name='name'\n            label='Name'\n            disabled={isLoading}\n            onChange={(event) => {\n              setPropertyName(event.target.value);\n              validator.showMessageFor(\"name\");\n            }}\n            message={validator.message(\"name\", propertyName, NAME_REQUIREMENTS)}\n            status={\n              validator.message(\"name\", propertyName, NAME_REQUIREMENTS)\n                ? \"negative\"\n                : undefined\n            }\n            onBlur={() => {\n              validator.showMessageFor(\"name\");\n            }}\n            onBlurCapture={(event) => {\n              setPropertyName(event.target.value);\n              validator.showMessageFor(\"name\");\n            }}\n          />\n          <LabeledTextarea\n            value={formula}\n            required\n            name='formula'\n            label='Formula'\n            disabled={isLoading}\n            onChange={(event) => {\n              setFormula(event.target.value);\n            }}\n            message={formulaErrorMessage}\n            status={formulaErrorMessage ? \"negative\" : undefined}\n          />\n          <LabeledSelect<string>\n            label='Quantity Type'\n            disabled={isLoading}\n            options={quantityTypesSelectionOptions}\n            value={quantityType}\n            onChange={setQuantityType}\n            onShow={() => { }}\n            onHide={() => { }}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={async () => returnFn(false)}\n        isSavingDisabled={!(formula && propertyName && isValid)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n\nexport default CustomCalculationAction;\n"]}

package/lib/cjs/widget/components/CustomCalculationTable.d.ts

@@ -8,11 +8,14 @@ interface CustomCalculationTableProps {
     iModelId: string;
     mappingId: string;
     groupId: string;
-    setSelectedCustomCalculation: React.Dispatch<React.SetStateAction<CreateTypeFromInterface<CustomCalculation> | undefined>>;
+    setSelectedCustomCalculation: React.Dispatch<React.SetStateAction<CreateTypeFromInterface<CustomCalculationType> | undefined>>;
     setGroupModifyView: React.Dispatch<React.SetStateAction<PropertyMenuView>>;
     onCustomCalculationModify: (value: CellProps<CustomCalculationType>) => void;
+    isLoadingCustomCalculations: boolean;
+    customCalculations: CustomCalculationType[];
+    refreshCustomCalculations: () => Promise<void>;
     selectedCustomCalculation?: CustomCalculationType;
 }
-declare const CustomCalculationTable: ({ iModelId, mappingId, groupId, setSelectedCustomCalculation, setGroupModifyView, onCustomCalculationModify, selectedCustomCalculation, }: CustomCalculationTableProps) => JSX.Element;
+declare const CustomCalculationTable: ({ iModelId, mappingId, groupId, setSelectedCustomCalculation, setGroupModifyView, onCustomCalculationModify, isLoadingCustomCalculations, customCalculations, refreshCustomCalculations, selectedCustomCalculation, }: CustomCalculationTableProps) => JSX.Element;
 export default CustomCalculationTable;
 //# sourceMappingURL=CustomCalculationTable.d.ts.map

package/lib/cjs/widget/components/CustomCalculationTable.js

@@ -31,36 +31,12 @@ const itwinui_react_1 = require("@itwin/itwinui-react");
 const react_1 = __importStar(require("react"));
 const PropertyMenu_1 = require("./PropertyMenu");
 const DeleteModal_1 = __importDefault(require("./DeleteModal"));
-const utils_1 = require("./utils");
-const insights_client_1 = require("@itwin/insights-client");
 const GroupingMapping_1 = require("./GroupingMapping");
-const fetchCustomCalculations = async (setCustomCalculations, iModelId, mappingId, groupId, setIsLoading, apiContext) => {
-    try {
-        setIsLoading(true);
-        const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
-        const customCalculations = await reportingClientApi.getCustomCalculations(apiContext.accessToken, iModelId, mappingId, groupId);
-        setCustomCalculations(customCalculations);
-    }
-    catch (error) {
-        utils_1.handleError(error.status);
-    }
-    finally {
-        setIsLoading(false);
-    }
-};
-const CustomCalculationTable = ({ iModelId, mappingId, groupId, setSelectedCustomCalculation, setGroupModifyView, onCustomCalculationModify, selectedCustomCalculation, }) => {
+const utils_1 = require("./utils");
+const CustomCalculationTable = ({ iModelId, mappingId, groupId, setSelectedCustomCalculation, setGroupModifyView, onCustomCalculationModify, isLoadingCustomCalculations, customCalculations, refreshCustomCalculations, selectedCustomCalculation, }) => {
     var _a;
     const apiContext = react_1.useContext(GroupingMapping_1.ApiContext);
-    const [isLoading, setIsLoading] = react_1.useState(true);
     const [showCustomCalculationDeleteModal, setShowCustomCalculationDeleteModal,] = react_1.useState(false);
-    const [customCalculations, setCustomCalculations] = react_1.useState([]);
-    react_1.useEffect(() => {
-        void fetchCustomCalculations(setCustomCalculations, iModelId, mappingId, groupId, setIsLoading, apiContext);
-    }, [apiContext, groupId, iModelId, mappingId, setIsLoading]);
-    const refresh = react_1.useCallback(async () => {
-        setCustomCalculations([]);
-        await fetchCustomCalculations(setCustomCalculations, iModelId, mappingId, groupId, setIsLoading, apiContext);
-    }, [apiContext, groupId, iModelId, mappingId, setCustomCalculations]);
     const CustomCalculationsColumns = react_1.useMemo(() => [
         {
             Header: "Table",
@@ -103,12 +79,12 @@ const CustomCalculationTable = ({ iModelId, mappingId, groupId, setSelectedCusto
         react_1.default.createElement(itwinui_react_1.Button, { startIcon: react_1.default.createElement(itwinui_icons_react_1.SvgAdd, null), styleType: 'high-visibility', onClick: () => {
                 setGroupModifyView(PropertyMenu_1.PropertyMenuView.ADD_CUSTOM_CALCULATION);
             } }, "Add Custom Calculation"),
-        react_1.default.createElement(itwinui_react_1.Table, { data: customCalculations, density: 'extra-condensed', columns: CustomCalculationsColumns, emptyTableContent: 'No Custom Calculations', isSortable: true, isLoading: isLoading }),
+        react_1.default.createElement(itwinui_react_1.Table, { data: customCalculations, density: 'extra-condensed', columns: CustomCalculationsColumns, emptyTableContent: 'No Custom Calculations', isSortable: true, isLoading: isLoadingCustomCalculations }),
         react_1.default.createElement(DeleteModal_1.default, { entityName: (_a = selectedCustomCalculation === null || selectedCustomCalculation === void 0 ? void 0 : selectedCustomCalculation.propertyName) !== null && _a !== void 0 ? _a : "", show: showCustomCalculationDeleteModal, setShow: setShowCustomCalculationDeleteModal, onDelete: async () => {
                 var _a;
-                const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
+                const reportingClientApi = utils_1.getReportingClient(apiContext.prefix);
                 await reportingClientApi.deleteCustomCalculation(apiContext.accessToken, iModelId, mappingId, groupId, (_a = selectedCustomCalculation === null || selectedCustomCalculation === void 0 ? void 0 : selectedCustomCalculation.id) !== null && _a !== void 0 ? _a : "");
-            }, refresh: refresh })));
+            }, refresh: refreshCustomCalculations })));
 };
 exports.default = CustomCalculationTable;
 //# sourceMappingURL=CustomCalculationTable.js.map

package/lib/cjs/widget/components/CustomCalculationTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomCalculationTable.js","sourceRoot":"","sources":["../../../../src/widget/components/CustomCalculationTable.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  SvgAdd,\n  SvgDelete,\n  SvgEdit,\n  SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n  Button,\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n  Table,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback, useContext, useEffect, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"../utils\";\nimport { PropertyMenuView } from \"./PropertyMenu\";\nimport type { CellProps } from \"react-table\";\nimport DeleteModal from \"./DeleteModal\";\nimport { handleError } from \"./utils\";\nimport type { CustomCalculation } from \"@itwin/insights-client\";\nimport { ReportingClient } from \"@itwin/insights-client\";\nimport type { Api } from \"./GroupingMapping\";\nimport { ApiContext } from \"./GroupingMapping\";\n\nexport type CustomCalculationType =\n  CreateTypeFromInterface<CustomCalculation>;\n\nconst fetchCustomCalculations = async (\n  setCustomCalculations: React.Dispatch<\n  React.SetStateAction<CustomCalculationType[]>\n  >,\n  iModelId: string,\n  mappingId: string,\n  groupId: string,\n  setIsLoading: React.Dispatch<React.SetStateAction<boolean>>,\n  apiContext: Api\n) => {\n  try {\n    setIsLoading(true);\n    const reportingClientApi = new ReportingClient(apiContext.prefix);\n    const customCalculations = await reportingClientApi.getCustomCalculations(\n      apiContext.accessToken,\n      iModelId,\n      mappingId,\n      groupId,\n    );\n    setCustomCalculations(customCalculations);\n  } catch (error: any) {\n    handleError(error.status);\n  } finally {\n    setIsLoading(false);\n  }\n};\n\ninterface CustomCalculationTableProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n\n  setSelectedCustomCalculation: React.Dispatch<\n  React.SetStateAction<\n  CreateTypeFromInterface<CustomCalculation> | undefined\n  >\n  >;\n  setGroupModifyView: React.Dispatch<React.SetStateAction<PropertyMenuView>>;\n  onCustomCalculationModify: (value: CellProps<CustomCalculationType>) => void;\n  selectedCustomCalculation?: CustomCalculationType;\n}\n\nconst CustomCalculationTable = ({\n  iModelId,\n  mappingId,\n  groupId,\n  setSelectedCustomCalculation,\n  setGroupModifyView,\n  onCustomCalculationModify,\n  selectedCustomCalculation,\n}: CustomCalculationTableProps) => {\n  const apiContext = useContext(ApiContext);\n  const [isLoading, setIsLoading] = useState<boolean>(true);\n  const [\n    showCustomCalculationDeleteModal,\n    setShowCustomCalculationDeleteModal,\n  ] = useState<boolean>(false);\n  const [customCalculations, setCustomCalculations] = useState<\n  CustomCalculationType[]\n  >([]);\n\n  useEffect(() => {\n    void fetchCustomCalculations(\n      setCustomCalculations,\n      iModelId,\n      mappingId,\n      groupId,\n      setIsLoading,\n      apiContext\n    );\n  }, [apiContext, groupId, iModelId, mappingId, setIsLoading]);\n\n  const refresh = useCallback(async () => {\n    setCustomCalculations([]);\n    await fetchCustomCalculations(\n      setCustomCalculations,\n      iModelId,\n      mappingId,\n      groupId,\n      setIsLoading,\n      apiContext\n    );\n  }, [apiContext, groupId, iModelId, mappingId, setCustomCalculations]);\n\n  const CustomCalculationsColumns = useMemo(\n    () => [\n      {\n        Header: \"Table\",\n        columns: [\n          {\n            id: \"propertyName\",\n            Header: \"Custom Calculation\",\n            accessor: \"propertyName\",\n            Cell: (value: CellProps<CustomCalculationType>) => (\n              <div\n                className='iui-anchor'\n                onClick={() => onCustomCalculationModify(value)}\n              >\n                {value.row.original.propertyName}\n              </div>\n            ),\n          },\n          {\n            id: \"formula\",\n            Header: \"Formula\",\n            accessor: \"formula\",\n          },\n          {\n            id: \"dropdown\",\n            Header: \"\",\n            width: 80,\n            Cell: (value: CellProps<CustomCalculationType>) => {\n              return (\n                <DropdownMenu\n                  menuItems={(close: () => void) => [\n                    <MenuItem\n                      key={0}\n                      onClick={() => onCustomCalculationModify(value)}\n                      icon={<SvgEdit />}\n                    >\n                      Modify\n                    </MenuItem>,\n                    <MenuItem\n                      key={1}\n                      onClick={() => {\n                        setSelectedCustomCalculation(value.row.original);\n                        setShowCustomCalculationDeleteModal(true);\n                        close();\n                      }}\n                      icon={<SvgDelete />}\n                    >\n                      Remove\n                    </MenuItem>,\n                  ]}\n                >\n                  <IconButton styleType='borderless'>\n                    <SvgMore\n                      style={{\n                        width: \"16px\",\n                        height: \"16px\",\n                      }}\n                    />\n                  </IconButton>\n                </DropdownMenu>\n              );\n            },\n          },\n        ],\n      },\n    ],\n    [onCustomCalculationModify, setSelectedCustomCalculation],\n  );\n\n  return (\n    <>\n      <Button\n        startIcon={<SvgAdd />}\n        styleType='high-visibility'\n        onClick={() => {\n          setGroupModifyView(PropertyMenuView.ADD_CUSTOM_CALCULATION);\n        }}\n      >\n        Add Custom Calculation\n      </Button>\n      <Table<CustomCalculationType>\n        data={customCalculations}\n        density='extra-condensed'\n        columns={CustomCalculationsColumns}\n        emptyTableContent='No Custom Calculations'\n        isSortable\n        isLoading={isLoading}\n      />\n\n      <DeleteModal\n        entityName={selectedCustomCalculation?.propertyName ?? \"\"}\n        show={showCustomCalculationDeleteModal}\n        setShow={setShowCustomCalculationDeleteModal}\n        onDelete={async () => {\n          const reportingClientApi = new ReportingClient(apiContext.prefix);\n          await reportingClientApi.deleteCustomCalculation(\n            apiContext.accessToken,\n            iModelId,\n            mappingId,\n            groupId,\n            selectedCustomCalculation?.id ?? \"\",\n          );\n        }}\n        refresh={refresh}\n      />\n    </>\n  );\n};\n\nexport default CustomCalculationTable;\n"]}
+{"version":3,"file":"CustomCalculationTable.js","sourceRoot":"","sources":["../../../../src/widget/components/CustomCalculationTable.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport {\n  SvgAdd,\n  SvgDelete,\n  SvgEdit,\n  SvgMore,\n} from \"@itwin/itwinui-icons-react\";\nimport {\n  Button,\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n  Table,\n} from \"@itwin/itwinui-react\";\nimport React, { useContext, useMemo, useState } from \"react\";\nimport type { CreateTypeFromInterface } from \"../utils\";\nimport { PropertyMenuView } from \"./PropertyMenu\";\nimport type { CellProps } from \"react-table\";\nimport DeleteModal from \"./DeleteModal\";\nimport type { CustomCalculation } from \"@itwin/insights-client\";\nimport { ApiContext } from \"./GroupingMapping\";\nimport { getReportingClient } from \"./utils\";\n\nexport type CustomCalculationType =\n  CreateTypeFromInterface<CustomCalculation>;\n\ninterface CustomCalculationTableProps {\n  iModelId: string;\n  mappingId: string;\n  groupId: string;\n  setSelectedCustomCalculation: React.Dispatch<\n  React.SetStateAction<\n  CreateTypeFromInterface<CustomCalculationType> | undefined\n  >\n  >;\n  setGroupModifyView: React.Dispatch<React.SetStateAction<PropertyMenuView>>;\n  onCustomCalculationModify: (value: CellProps<CustomCalculationType>) => void;\n  isLoadingCustomCalculations: boolean;\n  customCalculations: CustomCalculationType[];\n  refreshCustomCalculations: () => Promise<void>;\n  selectedCustomCalculation?: CustomCalculationType;\n}\n\nconst CustomCalculationTable = ({\n  iModelId,\n  mappingId,\n  groupId,\n  setSelectedCustomCalculation,\n  setGroupModifyView,\n  onCustomCalculationModify,\n  isLoadingCustomCalculations,\n  customCalculations,\n  refreshCustomCalculations,\n  selectedCustomCalculation,\n}: CustomCalculationTableProps) => {\n  const apiContext = useContext(ApiContext);\n  const [\n    showCustomCalculationDeleteModal,\n    setShowCustomCalculationDeleteModal,\n  ] = useState<boolean>(false);\n\n  const CustomCalculationsColumns = useMemo(\n    () => [\n      {\n        Header: \"Table\",\n        columns: [\n          {\n            id: \"propertyName\",\n            Header: \"Custom Calculation\",\n            accessor: \"propertyName\",\n            Cell: (value: CellProps<CustomCalculationType>) => (\n              <div\n                className='iui-anchor'\n                onClick={() => onCustomCalculationModify(value)}\n              >\n                {value.row.original.propertyName}\n              </div>\n            ),\n          },\n          {\n            id: \"formula\",\n            Header: \"Formula\",\n            accessor: \"formula\",\n          },\n          {\n            id: \"dropdown\",\n            Header: \"\",\n            width: 80,\n            Cell: (value: CellProps<CustomCalculationType>) => {\n              return (\n                <DropdownMenu\n                  menuItems={(close: () => void) => [\n                    <MenuItem\n                      key={0}\n                      onClick={() => onCustomCalculationModify(value)}\n                      icon={<SvgEdit />}\n                    >\n                      Modify\n                    </MenuItem>,\n                    <MenuItem\n                      key={1}\n                      onClick={() => {\n                        setSelectedCustomCalculation(value.row.original);\n                        setShowCustomCalculationDeleteModal(true);\n                        close();\n                      }}\n                      icon={<SvgDelete />}\n                    >\n                      Remove\n                    </MenuItem>,\n                  ]}\n                >\n                  <IconButton styleType='borderless'>\n                    <SvgMore\n                      style={{\n                        width: \"16px\",\n                        height: \"16px\",\n                      }}\n                    />\n                  </IconButton>\n                </DropdownMenu>\n              );\n            },\n          },\n        ],\n      },\n    ],\n    [onCustomCalculationModify, setSelectedCustomCalculation],\n  );\n\n  return (\n    <>\n      <Button\n        startIcon={<SvgAdd />}\n        styleType='high-visibility'\n        onClick={() => {\n          setGroupModifyView(PropertyMenuView.ADD_CUSTOM_CALCULATION);\n        }}\n      >\n        Add Custom Calculation\n      </Button>\n      <Table<CustomCalculationType>\n        data={customCalculations}\n        density='extra-condensed'\n        columns={CustomCalculationsColumns}\n        emptyTableContent='No Custom Calculations'\n        isSortable\n        isLoading={isLoadingCustomCalculations}\n      />\n\n      <DeleteModal\n        entityName={selectedCustomCalculation?.propertyName ?? \"\"}\n        show={showCustomCalculationDeleteModal}\n        setShow={setShowCustomCalculationDeleteModal}\n        onDelete={async () => {\n          const reportingClientApi = getReportingClient(apiContext.prefix);\n          await reportingClientApi.deleteCustomCalculation(\n            apiContext.accessToken,\n            iModelId,\n            mappingId,\n            groupId,\n            selectedCustomCalculation?.id ?? \"\",\n          );\n        }}\n        refresh={refreshCustomCalculations}\n      />\n    </>\n  );\n};\n\nexport default CustomCalculationTable;\n"]}

package/lib/cjs/widget/components/GroupAction.js

@@ -35,7 +35,6 @@ const GroupQueryBuilderContext_1 = require("./GroupQueryBuilderContext");
 const QueryBuilder_1 = require("./QueryBuilder");
 const viewerUtils_1 = require("./viewerUtils");
 const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
-const insights_client_1 = require("@itwin/insights-client");
 const GroupingMapping_1 = require("./GroupingMapping");
 const GroupAction = ({ iModelId, mappingId, group, goBack, }) => {
     var _a, _b, _c;
@@ -122,7 +121,7 @@ const GroupAction = ({ iModelId, mappingId, group, goBack, }) => {
         try {
             setIsLoading(true);
             const currentQuery = query || simpleQuery;
-            const reportingClientApi = new insights_client_1.ReportingClient(apiContext.prefix);
+            const reportingClientApi = utils_1.getReportingClient(apiContext.prefix);
             group
                 ? await reportingClientApi.updateGroup(apiContext.accessToken, iModelId, mappingId, (_a = group.id) !== null && _a !== void 0 ? _a : "", { ...details, query: currentQuery })
                 : await reportingClientApi.createGroup(apiContext.accessToken, iModelId, mappingId, {
@@ -150,7 +149,7 @@ const GroupAction = ({ iModelId, mappingId, group, goBack, }) => {
         apiContext.accessToken,
         apiContext.prefix,
     ]);
-    const isBlockingActions = !(details.groupName && details.description && (query || simpleQuery) && !isRendering && !isLoading);
+    const isBlockingActions = !(details.groupName && (query || simpleQuery) && !isRendering && !isLoading);
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement(utils_1.WidgetHeader, { title: group ? (_c = group.groupName) !== null && _c !== void 0 ? _c : "" : "Add Group", returnFn: async () => {
                 presentation_frontend_1.Presentation.selection.clearSelection("GroupingMappingWidget", iModelConnection);
@@ -170,16 +169,8 @@ const GroupAction = ({ iModelId, mappingId, group, goBack, }) => {
                         utils_1.handleInputChange(event, details, setDetails);
                         validator.showMessageFor("groupName");
                     } }),
-                react_1.default.createElement(itwinui_react_1.LabeledInput, { id: 'description', required: true, name: 'description', label: 'Description', value: details.description, onChange: (event) => {
+                react_1.default.createElement(itwinui_react_1.LabeledInput, { id: 'description', name: 'description', label: 'Description', value: details.description, onChange: (event) => {
                         utils_1.handleInputChange(event, details, setDetails);
-                        validator.showMessageFor("description");
-                    }, message: validator.message("description", details.description, "required"), status: validator.message("description", details.description, "required")
-                        ? "negative"
-                        : undefined, onBlur: () => {
-                        validator.showMessageFor("description");
-                    }, onBlurCapture: (event) => {
-                        utils_1.handleInputChange(event, details, setDetails);
-                        validator.showMessageFor("description");
                     } })),
             react_1.default.createElement(itwinui_react_1.Fieldset, { legend: 'Group By', className: 'query-builder-container' },
                 react_1.default.createElement(itwinui_react_1.RadioTileGroup, { className: "radio-group-tile", required: true },