@itwin/grouping-mapping-widget 0.26.1 → 0.28.0

package/lib/cjs/components/Properties/CalculatedProperties/SharedCalculatedPropertyForms.d.ts

@@ -1,16 +1,12 @@
 /// <reference types="react" />
 import { CalculatedPropertyType } from "@itwin/insights-client";
 import type { SelectOption } from "@itwin/itwinui-react";
-import type SimpleReactValidator from "simple-react-validator";
 interface SharedCalculatedPropertyFormsProps {
-    propertyName: string;
-    setPropertyName: (value: string) => void;
-    type: CalculatedPropertyType | undefined;
-    setType: (value: CalculatedPropertyType | undefined) => void;
-    validator: SimpleReactValidator;
-    itemRenderer?: (option: SelectOption<string>) => JSX.Element;
-    selectedItemRenderer?: (option: SelectOption<string>) => JSX.Element;
+    calculatedPropertyType: CalculatedPropertyType | undefined;
+    setCalculatedPropertyType: (value: CalculatedPropertyType | undefined) => void;
+    itemRenderer?: (option: SelectOption<string | undefined>) => JSX.Element;
+    selectedItemRenderer?: (option: SelectOption<string | undefined>) => JSX.Element;
 }
-export declare const SharedCalculatedPropertyForms: ({ propertyName, setPropertyName, type, setType, validator, itemRenderer, selectedItemRenderer, }: SharedCalculatedPropertyFormsProps) => JSX.Element;
+export declare const SharedCalculatedPropertyForms: ({ calculatedPropertyType, setCalculatedPropertyType, itemRenderer, selectedItemRenderer, }: SharedCalculatedPropertyFormsProps) => JSX.Element;
 export {};
 //# sourceMappingURL=SharedCalculatedPropertyForms.d.ts.map

package/lib/cjs/components/Properties/CalculatedProperties/SharedCalculatedPropertyForms.js

@@ -30,12 +30,12 @@ exports.SharedCalculatedPropertyForms = void 0;
  *--------------------------------------------------------------------------------------------*/
 const insights_client_1 = require("@itwin/insights-client");
 const react_1 = __importStar(require("react"));
-const useValidator_1 = require("../hooks/useValidator");
 const itwinui_react_1 = require("@itwin/itwinui-react");
-const SharedCalculatedPropertyForms = ({ propertyName, setPropertyName, type, setType, validator, itemRenderer, selectedItemRenderer, }) => {
+const SharedCalculatedPropertyForms = ({ calculatedPropertyType, setCalculatedPropertyType, itemRenderer, selectedItemRenderer, }) => {
     const generateOptionsFromCalculatedPropertyType = (0, react_1.useCallback)(() => {
         const options = [];
         const indexableEnum = insights_client_1.CalculatedPropertyType;
+        options.push({ value: undefined, label: "No Calculated Property Type" });
         for (const key in indexableEnum) {
             if (typeof indexableEnum[key] === "string" && key !== "Undefined") {
                 // Generate labels by adding space between capitals
@@ -49,16 +49,7 @@ const SharedCalculatedPropertyForms = ({ propertyName, setPropertyName, type, se
         return options;
     }, []);
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement(itwinui_react_1.LabeledInput, { value: propertyName, required: true, name: "name", label: "Name", onChange: (event) => {
-                setPropertyName(event.target.value);
-                validator.showMessageFor("name");
-            }, message: validator.message("name", propertyName, useValidator_1.NAME_REQUIREMENTS), status: validator.message("name", propertyName, useValidator_1.NAME_REQUIREMENTS) ? "negative" : undefined, onBlur: () => {
-                validator.showMessageFor("name");
-            }, onBlurCapture: (event) => {
-                setPropertyName(event.target.value);
-                validator.showMessageFor("name");
-            } }),
-        react_1.default.createElement(itwinui_react_1.LabeledSelect, { label: "Quantity Type", required: true, options: generateOptionsFromCalculatedPropertyType(), value: type, onChange: setType, itemRenderer: itemRenderer, selectedItemRenderer: selectedItemRenderer, onShow: () => { }, onHide: () => { } })));
+        react_1.default.createElement(itwinui_react_1.LabeledSelect, { label: "Calculated Property Type", options: generateOptionsFromCalculatedPropertyType(), value: calculatedPropertyType, onChange: setCalculatedPropertyType, itemRenderer: itemRenderer, selectedItemRenderer: selectedItemRenderer, placeholder: 'No Calculated Property Type', onShow: () => { }, onHide: () => { } })));
 };
 exports.SharedCalculatedPropertyForms = SharedCalculatedPropertyForms;
 //# sourceMappingURL=SharedCalculatedPropertyForms.js.map

package/lib/cjs/components/Properties/CalculatedProperties/SharedCalculatedPropertyForms.js.map

@@ -1 +1 @@
-{"version":3,"file":"SharedCalculatedPropertyForms.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/SharedCalculatedPropertyForms.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;gGAGgG;AAChG,4DAAgE;AAChE,+CAA2C;AAC3C,wDAA0D;AAE1D,wDAAmE;AAa5D,MAAM,6BAA6B,GAAG,CAAC,EAC5C,YAAY,EACZ,eAAe,EACf,IAAI,EACJ,OAAO,EACP,SAAS,EACT,YAAY,EACZ,oBAAoB,GACe,EAAE,EAAE;IACvC,MAAM,yCAAyC,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACjE,MAAM,OAAO,GAA2C,EAAE,CAAC;QAE3D,MAAM,aAAa,GAAG,wCAA8D,CAAC;QAErF,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;YAC/B,IAAI,OAAO,aAAa,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,GAAG,KAAK,WAAW,EAAE;gBACjE,mDAAmD;gBACnD,MAAM,KAAK,GAAG,GAAG;qBACd,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;qBAC1B,IAAI,EAAE;qBACN,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC1C,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,CAA2B,EAAE,KAAK,EAAE,CAAC,CAAC;aAC9E;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL;QACE,8BAAC,4BAAY,IACX,KAAK,EAAE,YAAY,EACnB,QAAQ,QACR,IAAI,EAAC,MAAM,EACX,KAAK,EAAC,MAAM,EACZ,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClB,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC,EACD,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,gCAAiB,CAAC,EACnE,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,EAAE,gCAAiB,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EAC3F,MAAM,EAAE,GAAG,EAAE;gBACX,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC,EACD,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE;gBACvB,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACpC,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACnC,CAAC,GACD;QACF,8BAAC,6BAAa,IACZ,KAAK,EAAC,eAAe,EACrB,QAAQ,QACR,OAAO,EAAE,yCAAyC,EAAE,EACpD,KAAK,EAAE,IAAI,EACX,QAAQ,EAAE,OAAO,EACjB,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,EAChB,MAAM,EAAE,GAAG,EAAE,GAAE,CAAC,GAChB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AA7DW,QAAA,6BAA6B,iCA6DxC","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 { CalculatedPropertyType } from \"@itwin/insights-client\";\nimport React, { useCallback } from \"react\";\nimport { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport type { SelectOption } from \"@itwin/itwinui-react\";\nimport { LabeledInput, LabeledSelect } from \"@itwin/itwinui-react\";\nimport type SimpleReactValidator from \"simple-react-validator\";\n\ninterface SharedCalculatedPropertyFormsProps {\n  propertyName: string;\n  setPropertyName: (value: string) => void;\n  type: CalculatedPropertyType | undefined;\n  setType: (value: CalculatedPropertyType | undefined) => void;\n  validator: SimpleReactValidator;\n  itemRenderer?: (option: SelectOption<string>) => JSX.Element;\n  selectedItemRenderer?: (option: SelectOption<string>) => JSX.Element;\n}\n\nexport const SharedCalculatedPropertyForms = ({\n  propertyName,\n  setPropertyName,\n  type,\n  setType,\n  validator,\n  itemRenderer,\n  selectedItemRenderer,\n}: SharedCalculatedPropertyFormsProps) => {\n  const generateOptionsFromCalculatedPropertyType = useCallback(() => {\n    const options: SelectOption<CalculatedPropertyType>[] = [];\n\n    const indexableEnum = CalculatedPropertyType as unknown as { [key: string]: string };\n\n    for (const key in indexableEnum) {\n      if (typeof indexableEnum[key] === \"string\" && key !== \"Undefined\") {\n        // Generate labels by adding space between capitals\n        const label = key\n          .replace(/([A-Z])/g, \" $1\")\n          .trim()\n          .replace(/^\\w/, (c) => c.toUpperCase());\n        options.push({ value: indexableEnum[key] as CalculatedPropertyType, label });\n      }\n    }\n    return options;\n  }, []);\n\n  return (\n    <>\n      <LabeledInput\n        value={propertyName}\n        required\n        name=\"name\"\n        label=\"Name\"\n        onChange={(event) => {\n          setPropertyName(event.target.value);\n          validator.showMessageFor(\"name\");\n        }}\n        message={validator.message(\"name\", propertyName, NAME_REQUIREMENTS)}\n        status={validator.message(\"name\", propertyName, NAME_REQUIREMENTS) ? \"negative\" : undefined}\n        onBlur={() => {\n          validator.showMessageFor(\"name\");\n        }}\n        onBlurCapture={(event) => {\n          setPropertyName(event.target.value);\n          validator.showMessageFor(\"name\");\n        }}\n      />\n      <LabeledSelect<CalculatedPropertyType>\n        label=\"Quantity Type\"\n        required\n        options={generateOptionsFromCalculatedPropertyType()}\n        value={type}\n        onChange={setType}\n        itemRenderer={itemRenderer}\n        selectedItemRenderer={selectedItemRenderer}\n        onShow={() => {}}\n        onHide={() => {}}\n      />\n    </>\n  );\n};\n"]}
+{"version":3,"file":"SharedCalculatedPropertyForms.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/SharedCalculatedPropertyForms.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;gGAGgG;AAChG,4DAAgE;AAChE,+CAA2C;AAE3C,wDAAqD;AAS9C,MAAM,6BAA6B,GAAG,CAAC,EAC5C,sBAAsB,EACtB,yBAAyB,EACzB,YAAY,EACZ,oBAAoB,GACe,EAAE,EAAE;IACvC,MAAM,yCAAyC,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QACjE,MAAM,OAAO,GAAuD,EAAE,CAAC;QACvE,MAAM,aAAa,GAAG,wCAA8D,CAAC;QAErF,OAAO,CAAC,IAAI,CAAC,EAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,6BAA6B,EAAC,CAAC,CAAC;QACvE,KAAK,MAAM,GAAG,IAAI,aAAa,EAAE;YAC/B,IAAI,OAAO,aAAa,CAAC,GAAG,CAAC,KAAK,QAAQ,IAAI,GAAG,KAAK,WAAW,EAAE;gBACjE,mDAAmD;gBACnD,MAAM,KAAK,GAAG,GAAG;qBACd,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC;qBAC1B,IAAI,EAAE;qBACN,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC1C,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,GAAG,CAA2B,EAAE,KAAK,EAAE,CAAC,CAAC;aAC9E;SACF;QACD,OAAO,OAAO,CAAC;IACjB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO,CACL;QACE,8BAAC,6BAAa,IACZ,KAAK,EAAC,0BAA0B,EAChC,OAAO,EAAE,yCAAyC,EAAE,EACpD,KAAK,EAAE,sBAAsB,EAC7B,QAAQ,EAAE,yBAAyB,EACnC,YAAY,EAAE,YAAY,EAC1B,oBAAoB,EAAE,oBAAoB,EAC1C,WAAW,EAAG,6BAA6B,EAC3C,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,EACjB,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GACjB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAvCW,QAAA,6BAA6B,iCAuCxC","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 { CalculatedPropertyType } from \"@itwin/insights-client\";\nimport React, { useCallback } from \"react\";\nimport type { SelectOption } from \"@itwin/itwinui-react\";\nimport { LabeledSelect } from \"@itwin/itwinui-react\";\n\ninterface SharedCalculatedPropertyFormsProps {\n  calculatedPropertyType: CalculatedPropertyType | undefined;\n  setCalculatedPropertyType: (value: CalculatedPropertyType | undefined) => void;\n  itemRenderer?: (option: SelectOption<string | undefined>) => JSX.Element;\n  selectedItemRenderer?: (option: SelectOption<string | undefined>) => JSX.Element;\n}\n\nexport const SharedCalculatedPropertyForms = ({\n  calculatedPropertyType,\n  setCalculatedPropertyType,\n  itemRenderer,\n  selectedItemRenderer,\n}: SharedCalculatedPropertyFormsProps) => {\n  const generateOptionsFromCalculatedPropertyType = useCallback(() => {\n    const options: SelectOption<CalculatedPropertyType | undefined>[] = [];\n    const indexableEnum = CalculatedPropertyType as unknown as { [key: string]: string };\n    \n    options.push({value: undefined, label: \"No Calculated Property Type\"});\n    for (const key in indexableEnum) {\n      if (typeof indexableEnum[key] === \"string\" && key !== \"Undefined\") {\n        // Generate labels by adding space between capitals\n        const label = key\n          .replace(/([A-Z])/g, \" $1\")\n          .trim()\n          .replace(/^\\w/, (c) => c.toUpperCase());\n        options.push({ value: indexableEnum[key] as CalculatedPropertyType, label });\n      }\n    }\n    return options;\n  }, []);\n\n  return (\n    <>\n      <LabeledSelect<CalculatedPropertyType | undefined>\n        label=\"Calculated Property Type\"\n        options={generateOptionsFromCalculatedPropertyType()}\n        value={calculatedPropertyType}\n        onChange={setCalculatedPropertyType}\n        itemRenderer={itemRenderer}\n        selectedItemRenderer={selectedItemRenderer}\n        placeholder = 'No Calculated Property Type'\n        onShow={() => { }}\n        onHide={() => { }}\n      />\n    </>\n  );\n};\n"]}

package/lib/cjs/components/Properties/CustomCalculations/CustomCalculationAction.d.ts

@@ -1,20 +1,19 @@
 /// <reference types="react" />
 import "./CustomCalculationAction.scss";
-import type { Property } from "@itwin/insights-client";
 /**
  * Props for the {@link CustomCalculationAction} component.
- * @public
+ * @internal
  */
 export interface CustomCalculationActionProps {
-    mappingId: string;
-    groupId: string;
-    customCalculation?: Property;
-    onSaveSuccess: () => void;
-    onClickCancel?: () => void;
+    formula?: string;
+    setFormula: (formula: string | undefined) => void;
+    formulaErrorMessage?: string;
+    forceValidation: () => void;
+    disabled?: boolean;
 }
 /**
  * Component to create or update a custom calculation property.
- * @public
+ * @internal
  */
-export declare const CustomCalculationAction: ({ mappingId, groupId, customCalculation, onSaveSuccess, onClickCancel }: CustomCalculationActionProps) => JSX.Element;
+export declare const CustomCalculationAction: ({ formula, setFormula, formulaErrorMessage, forceValidation, disabled }: CustomCalculationActionProps) => JSX.Element;
 //# sourceMappingURL=CustomCalculationAction.d.ts.map

package/lib/cjs/components/Properties/CustomCalculations/CustomCalculationAction.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -32,151 +9,27 @@ exports.CustomCalculationAction = void 0;
  * See LICENSE.md in the project root for license terms and full copyright notice.
  *--------------------------------------------------------------------------------------------*/
 const itwinui_react_1 = require("@itwin/itwinui-react");
-const react_1 = __importStar(require("react"));
-const ActionPanel_1 = __importDefault(require("../../SharedComponents/ActionPanel"));
-const useValidator_1 = __importStar(require("../hooks/useValidator"));
-const utils_1 = require("../../../common/utils");
+const react_1 = __importDefault(require("react"));
 require("./CustomCalculationAction.scss");
-const GroupPropertyAction_1 = require("../GroupProperties/GroupPropertyAction");
-const useFormulaValidation_1 = require("../hooks/useFormulaValidation");
-const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
-const insights_client_1 = require("@itwin/insights-client");
-const usePropertiesQuery_1 = require("../hooks/usePropertiesQuery");
-const react_query_1 = require("@tanstack/react-query");
-const PropertiesClientContext_1 = require("../../context/PropertiesClientContext");
-const stringToPossibleDataType = (str) => {
-    switch (str?.toLowerCase()) {
-        case "double":
-            return "Double";
-        case "integer":
-            return "Integer";
-        case "string":
-            return "String";
-        case "boolean":
-            return "Boolean";
-        default:
-            return "Undefined";
-    }
-};
-const convertToPropertyMap = (properties, selectedPropertyName) => {
-    const map = {};
-    const selectedLowerName = selectedPropertyName?.toLowerCase();
-    properties.forEach((p) => {
-        const lowerName = p.propertyName?.toLowerCase();
-        if (lowerName && lowerName !== selectedLowerName)
-            map[lowerName] = stringToPossibleDataType(p.dataType);
-    });
-    return map;
-};
-const inferToPropertyDataType = (value) => {
-    switch (value) {
-        case "Double":
-            return insights_client_1.DataType.Double;
-        case "Integer":
-            return insights_client_1.DataType.Integer;
-        case "String":
-            return insights_client_1.DataType.String;
-        case "Boolean":
-            return insights_client_1.DataType.Boolean;
-        default:
-            return insights_client_1.DataType.String;
-    }
-};
 /**
  * Component to create or update a custom calculation property.
- * @public
+ * @internal
  */
-const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSaveSuccess, onClickCancel }) => {
-    const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
-    const propertiesClient = (0, PropertiesClientContext_1.usePropertiesClient)();
-    const [propertyName, setPropertyName] = (0, react_1.useState)(customCalculation?.propertyName ?? "");
-    const [formula, setFormula] = (0, react_1.useState)(customCalculation?.formula ?? "");
-    const [quantityType, setQuantityType] = (0, react_1.useState)(customCalculation?.quantityType ?? undefined);
-    const [formulaErrorMessage, setFormulaErrorMessage] = (0, react_1.useState)("");
-    const [validator, showValidationMessage] = (0, useValidator_1.default)();
-    const [properties, setProperties] = (0, react_1.useState)({});
-    const { isValid, forceValidation, inferredDataType } = (0, useFormulaValidation_1.useFormulaValidation)(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);
-    const queryClient = (0, react_query_1.useQueryClient)();
-    const { data: groupProperties, isFetching: isLoadingGroupProperties } = (0, usePropertiesQuery_1.usePropertiesQuery)(iModelId, mappingId, groupId, getAccessToken, propertiesClient);
-    (0, react_1.useEffect)(() => {
-        const propertiesMap = convertToPropertyMap(groupProperties?.properties ?? []);
-        setProperties(propertiesMap);
-    }, [groupProperties]);
-    const { mutate: saveMutation, isLoading: isSaving } = (0, react_query_1.useMutation)(async () => {
-        const accessToken = await getAccessToken();
-        if (customCalculation) {
-            return propertiesClient.updateProperty(accessToken, mappingId, groupId, customCalculation.id, {
-                propertyName,
-                dataType: customCalculation.dataType,
-                formula,
-                quantityType,
-            });
-        }
-        if (inferredDataType) {
-            return propertiesClient.createProperty(accessToken, mappingId, groupId, {
-                propertyName,
-                dataType: inferToPropertyDataType(inferredDataType),
-                formula,
-                quantityType,
-            });
-        }
-        return;
-    }, {
-        onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: ["properties", iModelId, mappingId, groupId] });
-            onSaveSuccess();
-            setPropertyName("");
-            setFormula("");
-            setQuantityType(undefined);
-        },
-        onError: async (error) => {
-            if (error.status === 422) {
-                const erroredResponse = await error.json();
-                if (erroredResponse.error.code === "InvalidInsightsRequest" && erroredResponse.error.target === "formula") {
-                    setFormulaErrorMessage(erroredResponse.error.message);
-                }
-            }
-            else {
-                (0, utils_1.handleError)(error.status);
-            }
-        },
-    });
-    const onSave = () => {
-        if (!validator.allValid()) {
-            showValidationMessage(true);
-            return;
-        }
-        if (!forceValidation()) {
-            return;
-        }
-        saveMutation();
-    };
-    const isLoading = isSaving || isLoadingGroupProperties;
-    return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement("div", { className: "gmw-custom-calculation-action-container" },
-            react_1.default.createElement(itwinui_react_1.Fieldset, { legend: "Custom Calculation Details", className: "gmw-details-form" },
-                react_1.default.createElement(itwinui_react_1.Text, { variant: "small", as: "small", className: "gmw-field-legend" }, "Asterisk * indicates mandatory fields."),
-                react_1.default.createElement(itwinui_react_1.LabeledInput, { value: propertyName, required: true, name: "name", label: "Name", disabled: isLoading, onChange: (event) => {
-                        setPropertyName(event.target.value);
-                        validator.showMessageFor("name");
-                    }, message: validator.message("name", propertyName, useValidator_1.NAME_REQUIREMENTS), status: validator.message("name", propertyName, useValidator_1.NAME_REQUIREMENTS) ? "negative" : undefined, onBlur: () => {
-                        validator.showMessageFor("name");
-                    }, onBlurCapture: (event) => {
-                        setPropertyName(event.target.value);
-                        validator.showMessageFor("name");
-                    } }),
-                react_1.default.createElement(itwinui_react_1.Alert, { type: "informational", clickableText: "Click here.", clickableTextProps: {
-                        href: "https://developer.bentley.com/apis/grouping-and-mapping/operations/create-property/#customcalculations",
-                        target: "_blank",
-                        rel: "noreferrer",
-                    } }, "To learn more about creating custom calculation formulas, view the documentation."),
-                react_1.default.createElement(itwinui_react_1.LabeledTextarea, { value: formula, required: true, name: "formula", label: "Formula", disabled: isLoading, onChange: (event) => {
-                        setFormula(event.target.value);
-                    }, message: formulaErrorMessage, status: formulaErrorMessage ? "negative" : undefined, onBlurCapture: () => {
-                        forceValidation();
-                    } }),
-                react_1.default.createElement(itwinui_react_1.LabeledSelect, { label: "Quantity Type", disabled: isLoading, options: GroupPropertyAction_1.quantityTypesSelectionOptions, value: quantityType, onChange: setQuantityType, onShow: () => { }, onHide: () => { }, placeholder: "No Quantity Type" }))),
-        react_1.default.createElement(ActionPanel_1.default, { onSave: onSave, onCancel: onClickCancel, isSavingDisabled: !(formula && propertyName && isValid), isLoading: isLoading })));
+const CustomCalculationAction = ({ formula, setFormula, formulaErrorMessage, forceValidation, disabled }) => {
+    return (react_1.default.createElement(itwinui_react_1.InputGroup, { className: "gmw-custom-calculation-action-container" },
+        react_1.default.createElement(itwinui_react_1.Alert, { type: "informational", clickableText: "Click here.", clickableTextProps: {
+                href: "https://developer.bentley.com/apis/grouping-and-mapping/operations/create-property/#customcalculations",
+                target: "_blank",
+                rel: "noreferrer",
+            } }, "To learn more about creating custom calculation formulas, view the documentation."),
+        react_1.default.createElement(itwinui_react_1.LabeledTextarea, { className: "gmw-details-form", value: formula, name: "formula", label: "Formula", disabled: disabled, onChange: (event) => {
+                setFormula(event.target.value);
+            }, message: formulaErrorMessage, status: formulaErrorMessage ? "negative" : undefined, onBlur: (event) => {
+                if (event.target.textLength === 0)
+                    setFormula(undefined);
+            }, onBlurCapture: () => {
+                forceValidation();
+            } })));
 };
 exports.CustomCalculationAction = CustomCalculationAction;
 //# sourceMappingURL=CustomCalculationAction.js.map

package/lib/cjs/components/Properties/CustomCalculations/CustomCalculationAction.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomCalculationAction.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CustomCalculations/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 { Alert, Fieldset, LabeledInput, LabeledSelect, LabeledTextarea, Text } from \"@itwin/itwinui-react\";\nimport React, { useEffect, useState } from \"react\";\nimport ActionPanel from \"../../SharedComponents/ActionPanel\";\nimport useValidator, { NAME_REQUIREMENTS } from \"../hooks/useValidator\";\nimport { handleError } from \"../../../common/utils\";\nimport \"./CustomCalculationAction.scss\";\nimport { quantityTypesSelectionOptions } from \"../GroupProperties/GroupPropertyAction\";\nimport { useFormulaValidation } from \"../hooks/useFormulaValidation\";\nimport type { PossibleDataType, PropertyMap } from \"../../../formula/Types\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport type { Property, QuantityType } from \"@itwin/insights-client\";\nimport { DataType } from \"@itwin/insights-client\";\nimport type { DataType as FormulaDataType } from \"../../../formula/Types\";\nimport { usePropertiesQuery } from \"../hooks/usePropertiesQuery\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { usePropertiesClient } from \"../../context/PropertiesClientContext\";\n\n/**\n * Props for the {@link CustomCalculationAction} component.\n * @public\n */\nexport interface CustomCalculationActionProps {\n  mappingId: string;\n  groupId: string;\n  customCalculation?: Property;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\nconst stringToPossibleDataType = (str?: string): PossibleDataType => {\n  switch (str?.toLowerCase()) {\n    case \"double\":\n      return \"Double\";\n    case \"integer\":\n      return \"Integer\";\n    case \"string\":\n      return \"String\";\n    case \"boolean\":\n      return \"Boolean\";\n    default:\n      return \"Undefined\";\n  }\n};\n\nconst convertToPropertyMap = (properties: Property[], selectedPropertyName?: string): PropertyMap => {\n  const map: PropertyMap = {};\n  const selectedLowerName = selectedPropertyName?.toLowerCase();\n\n  properties.forEach((p) => {\n    const lowerName = p.propertyName?.toLowerCase();\n    if (lowerName && lowerName !== selectedLowerName) map[lowerName] = stringToPossibleDataType(p.dataType);\n  });\n\n  return map;\n};\n\nconst inferToPropertyDataType = (value: FormulaDataType): DataType => {\n  switch (value) {\n    case \"Double\":\n      return DataType.Double;\n    case \"Integer\":\n      return DataType.Integer;\n    case \"String\":\n      return DataType.String;\n    case \"Boolean\":\n      return DataType.Boolean;\n    default:\n      return DataType.String;\n  }\n};\n\n/**\n * Component to create or update a custom calculation property.\n * @public\n */\nexport const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSaveSuccess, onClickCancel }: CustomCalculationActionProps) => {\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const propertiesClient = usePropertiesClient();\n  const [propertyName, setPropertyName] = useState<string>(customCalculation?.propertyName ?? \"\");\n  const [formula, setFormula] = useState<string>(customCalculation?.formula ?? \"\");\n  const [quantityType, setQuantityType] = useState<QuantityType | undefined>(customCalculation?.quantityType ?? undefined);\n  const [formulaErrorMessage, setFormulaErrorMessage] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n  const [properties, setProperties] = useState<PropertyMap>({});\n  const { isValid, forceValidation, inferredDataType } = useFormulaValidation(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);\n  const queryClient = useQueryClient();\n\n  const { data: groupProperties, isFetching: isLoadingGroupProperties } = usePropertiesQuery(iModelId, mappingId, groupId, getAccessToken, propertiesClient);\n\n  useEffect(() => {\n    const propertiesMap = convertToPropertyMap(groupProperties?.properties ?? []);\n    setProperties(propertiesMap);\n  }, [groupProperties]);\n\n  const { mutate: saveMutation, isLoading: isSaving } = useMutation(\n    async () => {\n      const accessToken = await getAccessToken();\n\n      if (customCalculation) {\n        return propertiesClient.updateProperty(accessToken, mappingId, groupId, customCalculation.id, {\n          propertyName,\n          dataType: customCalculation.dataType,\n          formula,\n          quantityType,\n        });\n      }\n\n      if (inferredDataType) {\n        return propertiesClient.createProperty(accessToken, mappingId, groupId, {\n          propertyName,\n          dataType: inferToPropertyDataType(inferredDataType),\n          formula,\n          quantityType,\n        });\n      }\n      return;\n    },\n    {\n      onSuccess: async () => {\n        await queryClient.invalidateQueries({ queryKey: [\"properties\", iModelId, mappingId, groupId] });\n        onSaveSuccess();\n        setPropertyName(\"\");\n        setFormula(\"\");\n        setQuantityType(undefined);\n      },\n      onError: async (error: any) => {\n        if (error.status === 422) {\n          const erroredResponse = await error.json();\n          if (erroredResponse.error.code === \"InvalidInsightsRequest\" && erroredResponse.error.target === \"formula\") {\n            setFormulaErrorMessage(erroredResponse.error.message);\n          }\n        } else {\n          handleError(error.status);\n        }\n      },\n    },\n  );\n\n  const onSave = () => {\n    if (!validator.allValid()) {\n      showValidationMessage(true);\n      return;\n    }\n    if (!forceValidation()) {\n      return;\n    }\n    saveMutation();\n  };\n\n  const isLoading = isSaving || isLoadingGroupProperties;\n\n  return (\n    <>\n      <div className=\"gmw-custom-calculation-action-container\">\n        <Fieldset legend=\"Custom Calculation Details\" className=\"gmw-details-form\">\n          <Text variant=\"small\" as=\"small\" className=\"gmw-field-legend\">\n            Asterisk * indicates mandatory fields.\n          </Text>\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={validator.message(\"name\", propertyName, NAME_REQUIREMENTS) ? \"negative\" : undefined}\n            onBlur={() => {\n              validator.showMessageFor(\"name\");\n            }}\n            onBlurCapture={(event) => {\n              setPropertyName(event.target.value);\n              validator.showMessageFor(\"name\");\n            }}\n          />\n          <Alert\n            type=\"informational\"\n            clickableText=\"Click here.\"\n            clickableTextProps={{\n              href: \"https://developer.bentley.com/apis/grouping-and-mapping/operations/create-property/#customcalculations\",\n              target: \"_blank\",\n              rel: \"noreferrer\",\n            }}\n          >\n            To learn more about creating custom calculation formulas, view the documentation.\n          </Alert>\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            onBlurCapture={() => {\n              forceValidation();\n            }}\n          />\n          <LabeledSelect<QuantityType | undefined>\n            label=\"Quantity Type\"\n            disabled={isLoading}\n            options={quantityTypesSelectionOptions}\n            value={quantityType}\n            onChange={setQuantityType}\n            onShow={() => {}}\n            onHide={() => {}}\n            placeholder=\"No Quantity Type\"\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel onSave={onSave} onCancel={onClickCancel} isSavingDisabled={!(formula && propertyName && isValid)} isLoading={isLoading} />\n    </>\n  );\n};\n"]}
+{"version":3,"file":"CustomCalculationAction.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CustomCalculations/CustomCalculationAction.tsx"],"names":[],"mappings":";;;;;;AAAA;;;gGAGgG;AAChG,wDAA0E;AAC1E,kDAA0B;AAC1B,0CAAwC;AAcxC;;;GAGG;AACI,MAAM,uBAAuB,GAAG,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,eAAe,EAAE,QAAQ,EAAgC,EAAE,EAAE;IAC/I,OAAO,CACL,8BAAC,0BAAU,IAAC,SAAS,EAAC,yCAAyC;QAC7D,8BAAC,qBAAK,IACJ,IAAI,EAAC,eAAe,EACpB,aAAa,EAAC,aAAa,EAC3B,kBAAkB,EAAE;gBAClB,IAAI,EAAE,wGAAwG;gBAC9G,MAAM,EAAE,QAAQ;gBAChB,GAAG,EAAE,YAAY;aAClB,wFAGK;QACR,8BAAC,+BAAe,IACd,SAAS,EAAC,kBAAkB,EAC5B,KAAK,EAAE,OAAO,EACd,IAAI,EAAC,SAAS,EACd,KAAK,EAAC,SAAS,EACf,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAClB,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACjC,CAAC,EACD,OAAO,EAAE,mBAAmB,EAC5B,MAAM,EAAE,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,EACpD,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChB,IAAI,KAAK,CAAC,MAAM,CAAC,UAAU,KAAK,CAAC;oBAAE,UAAU,CAAC,SAAS,CAAC,CAAC;YAC3D,CAAC,EACD,aAAa,EAAE,GAAG,EAAE;gBAClB,eAAe,EAAE,CAAC;YACpB,CAAC,GACD,CACS,CACd,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,uBAAuB,2BAkClC","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 { Alert, InputGroup, LabeledTextarea } from \"@itwin/itwinui-react\";\nimport React from \"react\";\nimport \"./CustomCalculationAction.scss\";\n\n/**\n * Props for the {@link CustomCalculationAction} component.\n * @internal\n */\nexport interface CustomCalculationActionProps {\n  formula?: string;\n  setFormula: (formula: string | undefined) => void;\n  formulaErrorMessage?: string;\n  forceValidation: () => void;\n  disabled?: boolean;\n}\n\n/**\n * Component to create or update a custom calculation property.\n * @internal\n */\nexport const CustomCalculationAction = ({ formula, setFormula, formulaErrorMessage, forceValidation, disabled }: CustomCalculationActionProps) => {\n  return (\n    <InputGroup className=\"gmw-custom-calculation-action-container\">\n      <Alert\n        type=\"informational\"\n        clickableText=\"Click here.\"\n        clickableTextProps={{\n          href: \"https://developer.bentley.com/apis/grouping-and-mapping/operations/create-property/#customcalculations\",\n          target: \"_blank\",\n          rel: \"noreferrer\",\n        }}\n      >\n        To learn more about creating custom calculation formulas, view the documentation.\n      </Alert>\n      <LabeledTextarea\n        className=\"gmw-details-form\"\n        value={formula}\n        name=\"formula\"\n        label=\"Formula\"\n        disabled={disabled}\n        onChange={(event) => {\n          setFormula(event.target.value);\n        }}\n        message={formulaErrorMessage}\n        status={formulaErrorMessage ? \"negative\" : undefined}\n        onBlur={(event) => {\n          if (event.target.textLength === 0) setFormula(undefined);\n        }}\n        onBlurCapture={() => {\n          forceValidation();\n        }}\n      />\n    </InputGroup>\n  );\n};\n"]}

package/lib/cjs/components/Properties/CustomCalculations/CustomCalculationAction.scss

@@ -4,12 +4,13 @@
 *--------------------------------------------------------------------------------------------*/
 
 .gmw-custom-calculation-action-container {
+  display: flex;
+  flex-direction: column;
   overflow-x: auto;
   height: 100%;
+  gap: var(--iui-size-s);
 
   .gmw-details-form {
-    display: flex;
-    flex-direction: column;
-    gap: var(--iui-size-s);
+    padding-top: var(--iui-size-s);
   }
 }

package/lib/cjs/components/Properties/GroupProperties/GroupPropertyAction.js

@@ -46,6 +46,13 @@ const GroupsPropertiesSelectionModal_1 = require("./GroupsPropertiesSelectionMod
 const react_query_1 = require("@tanstack/react-query");
 const GroupPropertyListItem_1 = require("./GroupPropertyListItem");
 const PropertiesClientContext_1 = require("../../context/PropertiesClientContext");
+const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
+const CalculatedPropertyActionWithVisuals_1 = require("../CalculatedProperties/CalculatedPropertyActionWithVisuals");
+const utils_1 = require("../../../common/utils");
+const CustomCalculationAction_1 = require("../CustomCalculations/CustomCalculationAction");
+const usePropertiesQuery_1 = require("../hooks/usePropertiesQuery");
+const useFormulaValidation_1 = require("../hooks/useFormulaValidation");
+const ScrollableExpandableBlock_1 = require("../ScrollableExpandableBlock");
 exports.quantityTypesSelectionOptions = [
     { value: insights_client_1.QuantityType.Area, label: "Area" },
     { value: insights_client_1.QuantityType.Distance, label: "Distance" },
@@ -61,23 +68,35 @@ exports.quantityTypesSelectionOptions = [
  * @public
  */
 const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, onClickCancel }) => {
-    const { getAccessToken, iModelId, iModelConnection } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
+    const actionContainerRef = (0, react_1.useRef)(null);
+    const calculatedPropertyActionRef = (0, react_1.useRef)(null);
+    const customCalculationActionRef = (0, react_1.useRef)(null);
     const propertiesClient = (0, PropertiesClientContext_1.usePropertiesClient)();
+    const queryClient = (0, react_query_1.useQueryClient)();
     const [propertyName, setPropertyName] = (0, react_1.useState)("");
     const [oldPropertyName, setOldPropertyName] = (0, react_1.useState)("");
-    const [dataType, setDataType] = (0, react_1.useState)(insights_client_1.DataType.String);
-    const [quantityType, setQuantityType] = (0, react_1.useState)();
+    const [dataType, setDataType] = (0, react_1.useState)(groupProperty?.dataType ?? insights_client_1.DataType.String);
+    const [quantityType, setQuantityType] = (0, react_1.useState)(groupProperty?.quantityType ?? undefined);
     const [selectedProperties, setSelectedProperties] = (0, react_1.useState)([]);
     const [propertiesMetaData, setPropertiesMetaData] = (0, react_1.useState)([]);
     const [propertiesNotFoundAlert, setPropertiesNotFoundAlert] = (0, react_1.useState)(false);
     const [validator, showValidationMessage] = (0, useValidator_1.default)();
     const [showPropertiesSelectionModal, setShowPropertiesSelectionModal] = (0, react_1.useState)(false);
     const [showSaveConfirmationModal, setShowSaveConfirmationModal] = (0, react_1.useState)(false);
-    const queryClient = (0, react_query_1.useQueryClient)();
+    const [calculatedPropertyType, setCalculatedPropertyType] = (0, react_1.useState)(groupProperty?.calculatedPropertyType ?? undefined);
+    const [isCalculatedBlockExpanded, setIsCalculatedBlockExpanded] = (0, react_1.useState)(!!calculatedPropertyType);
+    const [formula, setFormula] = (0, react_1.useState)(groupProperty?.formula ?? undefined);
+    const [formulaErrorMessage, setFormulaErrorMessage] = (0, react_1.useState)(undefined);
+    const { getAccessToken, iModelId, iModelConnection } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
+    const { data: groupProperties, isFetching: isLoadingGroupProperties } = (0, usePropertiesQuery_1.usePropertiesQuery)(iModelId, mappingId, group.id, getAccessToken, propertiesClient);
+    const { forceValidation } = (0, useFormulaValidation_1.useFormulaValidation)(propertyName.toLowerCase(), formula, groupProperties?.properties ?? [], setFormulaErrorMessage, dataType);
     const reset = (0, react_1.useCallback)(() => {
         setPropertyName("");
         setDataType(insights_client_1.DataType.String);
+        setQuantityType(undefined);
         setSelectedProperties([]);
+        setCalculatedPropertyType(undefined);
+        setFormula(undefined);
     }, []);
     const fetchPropertiesMetadata = (0, react_1.useCallback)(async () => {
         if (!iModelConnection)
@@ -95,6 +114,16 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
         }
         return { propertiesMetaData, groupPropertyDetails };
     }, [getAccessToken, group.id, group.query, groupProperty, iModelConnection, mappingId, propertiesClient]);
+    const scrollToFormulaErrorMessage = (0, react_1.useCallback)(() => {
+        setTimeout(() => {
+            if (actionContainerRef.current && customCalculationActionRef.current) {
+                actionContainerRef.current.scrollTo({
+                    top: customCalculationActionRef.current.offsetTop,
+                    behavior: "smooth",
+                });
+            }
+        }, 500);
+    }, [actionContainerRef]);
     const { data, isFetching: isLoadingProperties, isSuccess: isLoadingPropertiesSuccessful, } = (0, react_query_1.useQuery)(["properties", iModelId, mappingId, group.id, groupProperty?.id, "metadata"], fetchPropertiesMetadata);
     (0, react_1.useEffect)(() => {
         if (isLoadingPropertiesSuccessful && data?.propertiesMetaData) {
@@ -105,14 +134,29 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
                 setDataType(data.groupPropertyDetails.dataType);
                 if (data.groupPropertyDetails.quantityType)
                     setQuantityType(data.groupPropertyDetails.quantityType);
-                const properties = (0, GroupPropertyUtils_1.findProperties)(data.groupPropertyDetails.ecProperties ?? [], data.propertiesMetaData);
-                if (properties.length === 0) {
-                    setPropertiesNotFoundAlert(true);
+                if (data.groupPropertyDetails.ecProperties) {
+                    const properties = (0, GroupPropertyUtils_1.findProperties)(data.groupPropertyDetails.ecProperties, data.propertiesMetaData);
+                    if (properties.length === 0) {
+                        setPropertiesNotFoundAlert(true);
+                    }
+                    setSelectedProperties(properties);
                 }
-                setSelectedProperties(properties);
             }
         }
     }, [data, isLoadingPropertiesSuccessful]);
+    (0, react_1.useEffect)(() => {
+        if (calculatedPropertyType) {
+            setDataType(insights_client_1.DataType.Double);
+        }
+        if (isCalculatedBlockExpanded === false || !calculatedPropertyType) {
+            (0, viewerUtils_1.clearAll)();
+        }
+    }, [calculatedPropertyType, isCalculatedBlockExpanded]);
+    (0, react_1.useEffect)(() => {
+        if (formulaErrorMessage) {
+            scrollToFormulaErrorMessage();
+        }
+    }, [formulaErrorMessage, scrollToFormulaErrorMessage]);
     const { mutate: onSave, isLoading: isSaving } = (0, react_query_1.useMutation)({
         mutationFn: async () => {
             const accessToken = await getAccessToken();
@@ -121,6 +165,8 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
                 dataType,
                 quantityType,
                 ecProperties: selectedProperties.map((p) => (0, GroupPropertyUtils_1.convertToECProperties)(p)).flat(),
+                calculatedPropertyType,
+                formula,
             };
             return groupProperty
                 ? propertiesClient.updateProperty(accessToken, mappingId, group.id, groupProperty.id, newGroupProperty)
@@ -131,6 +177,9 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
             reset();
             await queryClient.invalidateQueries(["properties", iModelId, mappingId, group.id]);
         },
+        onError(error) {
+            (0, utils_1.handleError)(error.status);
+        },
     });
     const handleSaveClick = async () => {
         if (!validator.allValid()) {
@@ -147,9 +196,9 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
     const handleCloseSaveModal = () => {
         setShowSaveConfirmationModal(false);
     };
-    const isLoading = isLoadingProperties || isSaving;
+    const isLoading = isLoadingProperties || isSaving || isLoadingGroupProperties;
     return (react_1.default.createElement(react_1.default.Fragment, null,
-        react_1.default.createElement("div", { className: "gmw-group-property-action-container" },
+        react_1.default.createElement("div", { className: "gmw-group-property-action-container", ref: actionContainerRef },
             react_1.default.createElement(itwinui_react_1.Fieldset, { disabled: isLoading, className: "gmw-property-options", legend: "Property Details" },
                 react_1.default.createElement(itwinui_react_1.Text, { variant: "small", as: "small", className: "gmw-field-legend" }, "Asterisk * indicates mandatory fields."),
                 react_1.default.createElement(itwinui_react_1.LabeledInput, { id: "propertyName", label: "Property Name", value: propertyName, required: true, onChange: (event) => {
@@ -163,21 +212,29 @@ const GroupPropertyAction = ({ mappingId, group, groupProperty, onSaveSuccess, o
                         { value: insights_client_1.DataType.Integer, label: "Integer" },
                         { value: insights_client_1.DataType.Double, label: "Double" },
                         { value: insights_client_1.DataType.String, label: "String" },
-                    ], required: true, value: dataType, onChange: (value) => {
+                    ], required: true, value: calculatedPropertyType ? insights_client_1.DataType.Double : dataType, onChange: (value) => {
                         validator.showMessageFor("dataType");
                         setDataType(value);
                     }, message: validator.message("dataType", propertyName, "required"), status: validator.message("dataType", propertyName, "required") ? "negative" : undefined, onBlur: () => {
                         validator.showMessageFor("dataType");
-                    }, onShow: () => { }, onHide: () => { } }),
+                    }, disabled: calculatedPropertyType ? true : false, onShow: () => { }, onHide: () => { } }),
                 react_1.default.createElement(itwinui_react_1.LabeledSelect, { label: "Quantity Type", options: exports.quantityTypesSelectionOptions, value: quantityType, onChange: setQuantityType, onShow: () => { }, onHide: () => { }, placeholder: "No Quantity Type" })),
             propertiesNotFoundAlert && (react_1.default.createElement(itwinui_react_1.Alert, { type: "warning" }, "Warning: Could not match saved properties from the current generated list. It does not confirm or deny validity. Overwriting will occur if a new selection is made and saved.")),
-            react_1.default.createElement(itwinui_react_1.Fieldset, { className: "gmw-property-view-container", legend: "Mapped Properties" },
-                react_1.default.createElement("div", { className: "gmw-property-view-button" },
-                    react_1.default.createElement(itwinui_react_1.Button, { onClick: async () => setShowPropertiesSelectionModal(true), disabled: isLoading }, "Select Properties")),
-                react_1.default.createElement("div", { className: "gmw-properties-list" }, selectedProperties.length === 0 && !isLoading ? (react_1.default.createElement("div", { className: "gmw-empty-selection" },
-                    react_1.default.createElement(itwinui_react_1.Text, null, "No properties selected."),
-                    react_1.default.createElement(itwinui_react_1.Text, null, "Press the \"Select Properties\" button for options."))) : (selectedProperties.map((property) => (react_1.default.createElement(GroupPropertyListItem_1.GroupPropertyListItem, { key: property.key, content: `${property.displayLabel}`, title: `${property.actualECClassName}`, description: property.categoryLabel }))))))),
-        react_1.default.createElement(ActionPanel_1.default, { onSave: handleSaveClick, onCancel: onClickCancel, isLoading: isLoading, isSavingDisabled: selectedProperties.length === 0 || !propertyName || dataType === undefined }),
+            react_1.default.createElement(ScrollableExpandableBlock_1.ScrollableExpandableBlock, { title: "Mapped Properties", endIcon: react_1.default.createElement(itwinui_react_1.Icon, { fill: selectedProperties.length > 0 ? "informational" : "default" },
+                    react_1.default.createElement(itwinui_icons_react_1.SvgLabel, null)), isExpanded: selectedProperties.length > 0, setIsExpanded: () => { } },
+                react_1.default.createElement("div", { className: "gmw-property-view-container" },
+                    react_1.default.createElement("div", { className: "gmw-property-view-button" },
+                        react_1.default.createElement(itwinui_react_1.Button, { onClick: async () => setShowPropertiesSelectionModal(true), disabled: isLoading }, "Select Properties")),
+                    react_1.default.createElement("div", { className: "gmw-properties-list" }, selectedProperties.length === 0 && !isLoading ? (react_1.default.createElement("div", { className: "gmw-empty-selection" },
+                        react_1.default.createElement(itwinui_react_1.Text, null, "No properties selected."),
+                        react_1.default.createElement(itwinui_react_1.Text, null, "Press the \"Select Properties\" button for options."))) : (selectedProperties.map((property) => (react_1.default.createElement(GroupPropertyListItem_1.GroupPropertyListItem, { key: property.key, content: `${property.displayLabel}`, title: `${property.actualECClassName}`, description: property.categoryLabel }))))))),
+            react_1.default.createElement(ScrollableExpandableBlock_1.ScrollableExpandableBlock, { parentRef: actionContainerRef, ref: calculatedPropertyActionRef, title: "Calculated Property", endIcon: react_1.default.createElement(itwinui_react_1.Icon, { fill: calculatedPropertyType ? "informational" : "default" },
+                    react_1.default.createElement(itwinui_icons_react_1.SvgMeasure, null)), isExpanded: !!calculatedPropertyType, setIsExpanded: setIsCalculatedBlockExpanded },
+                react_1.default.createElement(CalculatedPropertyActionWithVisuals_1.CalculatedPropertyActionWithVisuals, { group: group, calculatedPropertyType: calculatedPropertyType, setCalculatedPropertyType: setCalculatedPropertyType })),
+            react_1.default.createElement(ScrollableExpandableBlock_1.ScrollableExpandableBlock, { parentRef: actionContainerRef, ref: customCalculationActionRef, title: "Custom Calculation", endIcon: react_1.default.createElement(itwinui_react_1.Icon, { fill: formula ? "informational" : "default" },
+                    react_1.default.createElement(itwinui_icons_react_1.SvgFunction, null)), isExpanded: formula !== undefined, setIsExpanded: () => { } },
+                react_1.default.createElement(CustomCalculationAction_1.CustomCalculationAction, { formula: formula, setFormula: setFormula, formulaErrorMessage: formulaErrorMessage, forceValidation: forceValidation, disabled: isLoading }))),
+        react_1.default.createElement(ActionPanel_1.default, { onSave: handleSaveClick, onCancel: onClickCancel, onSaveCapture: viewerUtils_1.clearAll, onCancelCapture: viewerUtils_1.clearAll, isLoading: isLoading, isSavingDisabled: !propertyName || dataType === undefined || formulaErrorMessage !== undefined }),
         react_1.default.createElement(GroupsPropertiesSelectionModal_1.GroupsPropertiesSelectionModal, { showModal: showPropertiesSelectionModal, setShowModal: setShowPropertiesSelectionModal, selectedProperties: selectedProperties, setSelectedProperties: setSelectedProperties, propertiesMetaData: propertiesMetaData }),
         react_1.default.createElement(SaveModal_1.SaveModal, { onSave: onSave, onClose: handleCloseSaveModal, showSaveModal: showSaveConfirmationModal })));
 };