@itwin/grouping-mapping-widget 0.25.1 → 0.26.0

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

@@ -1,12 +1,20 @@
 /// <reference types="react" />
 import "./CalculatedPropertyAction.scss";
-import type { CalculatedProperty, Group } from "@itwin/insights-client";
+import type { Group, Property } from "@itwin/insights-client";
+/**
+ * Props for the {@link CalculatedPropertyAction} component.
+ * @public
+ */
 export interface CalculatedPropertyActionProps {
     mappingId: string;
     group: Group;
-    calculatedProperty?: CalculatedProperty;
+    calculatedProperty?: Property;
     onSaveSuccess: () => void;
     onClickCancel?: () => void;
 }
+/**
+ * Component to create or update a calculated property.
+ * @public
+ */
 export declare const CalculatedPropertyAction: ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }: CalculatedPropertyActionProps) => JSX.Element;
 //# sourceMappingURL=CalculatedPropertyAction.d.ts.map

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

@@ -39,26 +39,39 @@ require("./CalculatedPropertyAction.scss");
 const insights_client_1 = require("@itwin/insights-client");
 const SharedCalculatedPropertyForms_1 = require("./SharedCalculatedPropertyForms");
 const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
-const MappingClientContext_1 = require("../../context/MappingClientContext");
 const react_query_1 = require("@tanstack/react-query");
+const PropertiesClientContext_1 = require("../../context/PropertiesClientContext");
+/**
+ * Component to create or update a calculated property.
+ * @public
+ */
 const CalculatedPropertyAction = ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }) => {
     const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
-    const mappingClient = (0, MappingClientContext_1.useMappingClient)();
+    const propertiesClient = (0, PropertiesClientContext_1.usePropertiesClient)();
     const [propertyName, setPropertyName] = (0, react_1.useState)(calculatedProperty?.propertyName ?? "");
-    const [type, setType] = (0, react_1.useState)(calculatedProperty?.type);
+    const [type, setType] = (0, react_1.useState)(calculatedProperty?.calculatedPropertyType ?? undefined);
     const [validator, showValidationMessage] = (0, useValidator_1.default)();
     const queryClient = (0, react_query_1.useQueryClient)();
     const { mutate: saveMutation, isLoading } = (0, react_query_1.useMutation)(async (type) => {
         const accessToken = await getAccessToken();
         return calculatedProperty
-            ? mappingClient.updateCalculatedProperty(accessToken, iModelId, mappingId, group.id, calculatedProperty.id, { propertyName, type })
-            : mappingClient.createCalculatedProperty(accessToken, iModelId, mappingId, group.id, { propertyName, type });
+            ? propertiesClient.updateProperty(accessToken, mappingId, group.id, calculatedProperty.id, {
+                ...calculatedProperty,
+                propertyName,
+                dataType: calculatedProperty.dataType,
+                calculatedPropertyType: type,
+            })
+            : propertiesClient.createProperty(accessToken, mappingId, group.id, {
+                propertyName,
+                dataType: insights_client_1.DataType.Double,
+                calculatedPropertyType: type,
+            });
     }, {
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: ["calculatedProperties", iModelId, mappingId, group.id] });
+            await queryClient.invalidateQueries({ queryKey: ["properties", iModelId, mappingId, group.id] });
             onSaveSuccess();
             setPropertyName("");
-            setType(insights_client_1.CalculatedPropertyType.Undefined);
+            setType(undefined);
         },
     });
     const onSave = () => {

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

@@ -1 +1 @@
-{"version":3,"file":"CalculatedPropertyAction.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/CalculatedPropertyAction.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  Text,\n} from \"@itwin/itwinui-react\";\nimport React, { useState } from \"react\";\nimport ActionPanel from \"../../SharedComponents/ActionPanel\";\nimport useValidator from \"../hooks/useValidator\";\nimport \"./CalculatedPropertyAction.scss\";\nimport type { CalculatedProperty, Group } from \"@itwin/insights-client\";\nimport { CalculatedPropertyType } from \"@itwin/insights-client\";\nimport { SharedCalculatedPropertyForms } from \"./SharedCalculatedPropertyForms\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useMappingClient } from \"../../context/MappingClientContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\n\nexport interface CalculatedPropertyActionProps {\n  mappingId: string;\n  group: Group;\n  calculatedProperty?: CalculatedProperty;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\nexport const CalculatedPropertyAction = ({\n  mappingId,\n  group,\n  calculatedProperty,\n  onSaveSuccess,\n  onClickCancel,\n}: CalculatedPropertyActionProps) => {\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const mappingClient = useMappingClient();\n  const [propertyName, setPropertyName] = useState<string>(\n    calculatedProperty?.propertyName ?? \"\",\n  );\n  const [type, setType] = useState<CalculatedPropertyType | undefined>(calculatedProperty?.type);\n  const [validator, showValidationMessage] = useValidator();\n  const queryClient = useQueryClient();\n\n  const { mutate: saveMutation, isLoading } = useMutation(async (type: CalculatedPropertyType) => {\n    const accessToken = await getAccessToken();\n\n    return calculatedProperty\n      ? mappingClient.updateCalculatedProperty(\n        accessToken,\n        iModelId,\n        mappingId,\n        group.id,\n        calculatedProperty.id,\n        { propertyName, type },\n      )\n      : mappingClient.createCalculatedProperty(\n        accessToken,\n        iModelId,\n        mappingId,\n        group.id,\n        { propertyName, type },\n      );\n  }, {\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"calculatedProperties\", iModelId, mappingId, group.id] });\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(CalculatedPropertyType.Undefined);\n    },\n  });\n\n  const onSave = () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n\n    saveMutation(type);\n  };\n\n  return (\n    <>\n      <div className='gmw-calculated-properties-action-container'>\n        <Fieldset legend='Calculated Property Details' className='gmw-details-form'>\n          <div className='gmw-field-legend-container'>\n            <Text variant='small' as='small' className='gmw-field-legend'>\n              Asterisk * indicates mandatory fields.\n            </Text>\n          </div>\n          <SharedCalculatedPropertyForms\n            validator={validator}\n            propertyName={propertyName}\n            setPropertyName={setPropertyName}\n            type={type}\n            setType={setType}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={onClickCancel}\n        isSavingDisabled={!(type && propertyName)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}
+{"version":3,"file":"CalculatedPropertyAction.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/CalculatedPropertyAction.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  Text,\n} from \"@itwin/itwinui-react\";\nimport React, { useState } from \"react\";\nimport ActionPanel from \"../../SharedComponents/ActionPanel\";\nimport useValidator from \"../hooks/useValidator\";\nimport \"./CalculatedPropertyAction.scss\";\nimport type { CalculatedPropertyType, Group , Property} from \"@itwin/insights-client\";\nimport { DataType } from \"@itwin/insights-client\";\nimport { SharedCalculatedPropertyForms } from \"./SharedCalculatedPropertyForms\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { usePropertiesClient } from \"../../context/PropertiesClientContext\";\n\n/**\n * Props for the {@link CalculatedPropertyAction} component.\n * @public\n */\nexport interface CalculatedPropertyActionProps {\n  mappingId: string;\n  group: Group;\n  calculatedProperty?: Property;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\n/**\n * Component to create or update a calculated property.\n * @public\n */\nexport const CalculatedPropertyAction = ({\n  mappingId,\n  group,\n  calculatedProperty,\n  onSaveSuccess,\n  onClickCancel,\n}: CalculatedPropertyActionProps) => {\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const propertiesClient = usePropertiesClient();\n  const [propertyName, setPropertyName] = useState<string>(\n    calculatedProperty?.propertyName ?? \"\",\n  );\n  const [type, setType] = useState<CalculatedPropertyType | undefined>(calculatedProperty?.calculatedPropertyType ?? undefined);\n  const [validator, showValidationMessage] = useValidator();\n  const queryClient = useQueryClient();\n\n  const { mutate: saveMutation, isLoading } = useMutation(async (type: CalculatedPropertyType) => {\n    const accessToken = await getAccessToken();\n\n    return calculatedProperty\n      ? propertiesClient.updateProperty(\n        accessToken,\n        mappingId,\n        group.id,\n        calculatedProperty.id,\n        {\n          ...calculatedProperty,\n          propertyName,\n          dataType: calculatedProperty.dataType,\n          calculatedPropertyType: type,\n        },\n      )\n      : propertiesClient.createProperty(\n        accessToken,\n        mappingId,\n        group.id,\n        {\n          propertyName,\n          dataType: DataType.Double,\n          calculatedPropertyType: type,\n        },\n      );\n  }, {\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"properties\", iModelId, mappingId, group.id] });\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(undefined);\n    },\n  });\n\n  const onSave = () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n\n    saveMutation(type);\n  };\n\n  return (\n    <>\n      <div className='gmw-calculated-properties-action-container'>\n        <Fieldset legend='Calculated Property Details' className='gmw-details-form'>\n          <div className='gmw-field-legend-container'>\n            <Text variant='small' as='small' className='gmw-field-legend'>\n              Asterisk * indicates mandatory fields.\n            </Text>\n          </div>\n          <SharedCalculatedPropertyForms\n            validator={validator}\n            propertyName={propertyName}\n            setPropertyName={setPropertyName}\n            type={type}\n            setType={setType}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={onClickCancel}\n        isSavingDisabled={!(type && propertyName)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}

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

@@ -1,12 +1,20 @@
 /// <reference types="react" />
 import "./CalculatedPropertyActionWithVisuals.scss";
-import type { CalculatedProperty, Group } from "@itwin/insights-client";
+import type { GroupMinimal, Property } from "@itwin/insights-client";
+/**
+ * Props for the {@link CalculatedPropertyActionWithVisuals} component.
+ * @public
+ */
 export interface CalculatedPropertyActionWithVisualsProps {
     mappingId: string;
-    group: Group;
-    calculatedProperty?: CalculatedProperty;
+    group: GroupMinimal;
+    calculatedProperty?: Property;
     onSaveSuccess: () => void;
     onClickCancel?: () => void;
 }
+/**
+ * Component to create or update a calculated property with visualizations.
+ * @public
+ */
 export declare const CalculatedPropertyActionWithVisuals: ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }: CalculatedPropertyActionWithVisualsProps) => JSX.Element;
 //# sourceMappingURL=CalculatedPropertyActionWithVisuals.d.ts.map

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

@@ -39,20 +39,24 @@ const BboxDimensionsDecorator_1 = require("../../../decorators/BboxDimensionsDec
 const useValidator_1 = __importDefault(require("../hooks/useValidator"));
 const viewerUtils_1 = require("../../../common/viewerUtils");
 require("./CalculatedPropertyActionWithVisuals.scss");
-const MappingClientContext_1 = require("../../context/MappingClientContext");
 const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
 const insights_client_1 = require("@itwin/insights-client");
 const SharedCalculatedPropertyForms_1 = require("./SharedCalculatedPropertyForms");
 const useKeySetHiliteQueries_1 = require("../../Groups/hooks/useKeySetHiliteQueries");
 const react_query_1 = require("@tanstack/react-query");
+const PropertiesClientContext_1 = require("../../context/PropertiesClientContext");
+/**
+ * Component to create or update a calculated property with visualizations.
+ * @public
+ */
 const CalculatedPropertyActionWithVisuals = ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }) => {
     const { getAccessToken, iModelId, iModelConnection } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
     if (!iModelConnection) {
         throw new Error("This component requires an active iModelConnection.");
     }
-    const mappingClient = (0, MappingClientContext_1.useMappingClient)();
+    const propertiesClient = (0, PropertiesClientContext_1.usePropertiesClient)();
     const [propertyName, setPropertyName] = (0, react_1.useState)(calculatedProperty?.propertyName ?? "");
-    const [type, setType] = (0, react_1.useState)(calculatedProperty?.type);
+    const [type, setType] = (0, react_1.useState)(calculatedProperty?.calculatedPropertyType);
     const [bboxDecorator, setBboxDecorator] = (0, react_1.useState)();
     const [inferredSpatialData, setInferredSpatialData] = (0, react_1.useState)();
     const [validator, showValidationMessage] = (0, useValidator_1.default)();
@@ -100,14 +104,22 @@ const CalculatedPropertyActionWithVisuals = ({ mappingId, group, calculatedPrope
     const { mutate: saveMutation, isLoading } = (0, react_query_1.useMutation)(async (type) => {
         const accessToken = await getAccessToken();
         return calculatedProperty
-            ? mappingClient.updateCalculatedProperty(accessToken, iModelId, mappingId, group.id, calculatedProperty.id, { propertyName, type })
-            : mappingClient.createCalculatedProperty(accessToken, iModelId, mappingId, group.id, { propertyName, type });
+            ? propertiesClient.updateProperty(accessToken, mappingId, group.id, calculatedProperty.id, {
+                propertyName,
+                dataType: calculatedProperty.dataType,
+                calculatedPropertyType: type,
+            })
+            : propertiesClient.createProperty(accessToken, mappingId, group.id, {
+                propertyName,
+                dataType: insights_client_1.DataType.Double,
+                calculatedPropertyType: type,
+            });
     }, {
         onSuccess: async () => {
-            await queryClient.invalidateQueries({ queryKey: ["calculatedProperties", iModelId, mappingId, group.id] });
+            await queryClient.invalidateQueries({ queryKey: ["properties", iModelId, mappingId, group.id] });
             onSaveSuccess();
             setPropertyName("");
-            setType(insights_client_1.CalculatedPropertyType.Undefined);
+            setType(undefined);
         },
     });
     const onSave = () => {

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

@@ -1 +1 @@
-{"version":3,"file":"CalculatedPropertyActionWithVisuals.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/CalculatedPropertyActionWithVisuals.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { IModelApp } from \"@itwin/core-frontend\";\nimport type {\n  SelectOption,\n} from \"@itwin/itwinui-react\";\nimport {\n  Fieldset,\n  MenuItem,\n  Text,\n  ToggleSwitch,\n} from \"@itwin/itwinui-react\";\nimport React, { useEffect, useMemo, useState } from \"react\";\nimport ActionPanel from \"../../SharedComponents/ActionPanel\";\nimport {\n  BboxDimension,\n  BboxDimensionsDecorator,\n} from \"../../../decorators/BboxDimensionsDecorator\";\nimport useValidator from \"../hooks/useValidator\";\nimport { visualizeElements, zoomToElements } from \"../../../common/viewerUtils\";\nimport \"./CalculatedPropertyActionWithVisuals.scss\";\nimport { useMappingClient } from \"../../context/MappingClientContext\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { CalculatedPropertyType } from \"@itwin/insights-client\";\nimport type { CalculatedProperty, Group } from \"@itwin/insights-client\";\nimport { SharedCalculatedPropertyForms } from \"./SharedCalculatedPropertyForms\";\nimport { useGroupKeySetQuery } from \"../../Groups/hooks/useKeySetHiliteQueries\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\n\nexport interface CalculatedPropertyActionWithVisualsProps {\n  mappingId: string;\n  group: Group;\n  calculatedProperty?: CalculatedProperty;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\nexport const CalculatedPropertyActionWithVisuals = ({\n  mappingId,\n  group,\n  calculatedProperty,\n  onSaveSuccess,\n  onClickCancel,\n}: CalculatedPropertyActionWithVisualsProps) => {\n  const { getAccessToken, iModelId, iModelConnection } = useGroupingMappingApiConfig();\n  if (!iModelConnection) {\n    throw new Error(\"This component requires an active iModelConnection.\");\n  }\n  const mappingClient = useMappingClient();\n  const [propertyName, setPropertyName] = useState<string>(\n    calculatedProperty?.propertyName ?? \"\",\n  );\n  const [type, setType] = useState<CalculatedPropertyType | undefined>(calculatedProperty?.type);\n  const [bboxDecorator, setBboxDecorator] = useState<BboxDimensionsDecorator | undefined>();\n  const [inferredSpatialData, setInferredSpatialData] = useState<Map<BboxDimension, number> | undefined>();\n  const [validator, showValidationMessage] = useValidator();\n  const [colorProperty, setColorProperty] = useState<boolean>(false);\n  const { data } = useGroupKeySetQuery(group, iModelConnection, true);\n  const queryClient = useQueryClient();\n\n  const resolvedHiliteIds = useMemo(() => {\n    // Resolved ids, default to an empty array if not available\n    return data?.result?.ids ?? [];\n  }, [data?.result?.ids]);\n\n  useEffect(() => {\n    const decorator = new BboxDimensionsDecorator();\n    IModelApp.viewManager.addDecorator(decorator);\n    setBboxDecorator(decorator);\n    return () => {\n      IModelApp.viewManager.dropDecorator(decorator);\n    };\n  }, []);\n\n  useEffect(() => {\n    if (!colorProperty || resolvedHiliteIds.length === 0) {\n      return;\n    }\n    visualizeElements(resolvedHiliteIds, \"red\");\n    void zoomToElements(resolvedHiliteIds);\n  }, [colorProperty, resolvedHiliteIds]);\n\n  useEffect(() => {\n    if (!colorProperty || resolvedHiliteIds.length === 0) {\n      return;\n    }\n    const setContext = async () => {\n      if (bboxDecorator) {\n        await bboxDecorator.setContext(resolvedHiliteIds[0]);\n        setInferredSpatialData(bboxDecorator.getInferredSpatialData());\n      }\n    };\n    void setContext();\n  }, [bboxDecorator, colorProperty, resolvedHiliteIds]);\n\n  useEffect(() => {\n    if (bboxDecorator && type && inferredSpatialData) {\n      inferredSpatialData.has(BboxDimension[type as keyof typeof BboxDimension]) && colorProperty\n        ? bboxDecorator.drawContext(\n          BboxDimension[type as keyof typeof BboxDimension],\n        )\n        : bboxDecorator.clearContext();\n    }\n  }, [bboxDecorator, colorProperty, inferredSpatialData, type]);\n\n  const { mutate: saveMutation, isLoading } = useMutation(async (type: CalculatedPropertyType) => {\n    const accessToken = await getAccessToken();\n\n    return calculatedProperty\n      ? mappingClient.updateCalculatedProperty(\n        accessToken,\n        iModelId,\n        mappingId,\n        group.id,\n        calculatedProperty.id,\n        { propertyName, type },\n      )\n      : mappingClient.createCalculatedProperty(\n        accessToken,\n        iModelId,\n        mappingId,\n        group.id,\n        { propertyName, type },\n      );\n  }, {\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"calculatedProperties\", iModelId, mappingId, group.id] });\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(CalculatedPropertyType.Undefined);\n    },\n  });\n\n  const onSave = () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n\n    saveMutation(type);\n  };\n\n  const getSpatialData = (value: string) =>\n    inferredSpatialData?.has(\n      BboxDimension[value as keyof typeof BboxDimension],\n    ) && (\n      <div>\n        {`${inferredSpatialData\n          ?.get(BboxDimension[value as keyof typeof BboxDimension])\n          ?.toPrecision(4)}m`}\n      </div>\n    );\n\n  return (\n    <>\n      <div className='gmw-calculated-properties-action-container'>\n        <Fieldset legend='Calculated Property Details' className='gmw-details-form'>\n          <div className='gmw-field-legend-container'>\n            <Text variant='small' as='small' className='gmw-field-legend'>\n              Asterisk * indicates mandatory fields.\n            </Text>\n            <ToggleSwitch\n              label='Visualize Dimensions'\n              labelPosition='left'\n              disabled={isLoading}\n              checked={colorProperty}\n              onChange={() => setColorProperty((b) => !b)}\n            ></ToggleSwitch>\n          </div>\n          <SharedCalculatedPropertyForms\n            validator={validator}\n            propertyName={propertyName}\n            setPropertyName={setPropertyName}\n            type={type}\n            setType={setType}\n            itemRenderer={(option: SelectOption<string>) => (\n              <MenuItem>\n                <div className='gmw-gr-cp-menu-item'>\n                  <div>{option.label}</div>\n                  {getSpatialData(option.value)}\n                </div>\n              </MenuItem>\n            )}\n            selectedItemRenderer={(option: SelectOption<string>) => (\n              <div className='gmw-select-item'>\n                <div>{option.label}</div>\n                {getSpatialData(option.value)}\n              </div>\n            )}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={onClickCancel}\n        isSavingDisabled={!(type && propertyName)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}
+{"version":3,"file":"CalculatedPropertyActionWithVisuals.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/CalculatedPropertyActionWithVisuals.tsx"],"names":[],"mappings":"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","sourcesContent":["/*---------------------------------------------------------------------------------------------\n* Copyright (c) Bentley Systems, Incorporated. All rights reserved.\n* See LICENSE.md in the project root for license terms and full copyright notice.\n*--------------------------------------------------------------------------------------------*/\nimport { IModelApp } from \"@itwin/core-frontend\";\nimport type {\n  SelectOption,\n} from \"@itwin/itwinui-react\";\nimport {\n  Fieldset,\n  MenuItem,\n  Text,\n  ToggleSwitch,\n} from \"@itwin/itwinui-react\";\nimport React, { useEffect, useMemo, useState } from \"react\";\nimport ActionPanel from \"../../SharedComponents/ActionPanel\";\nimport {\n  BboxDimension,\n  BboxDimensionsDecorator,\n} from \"../../../decorators/BboxDimensionsDecorator\";\nimport useValidator from \"../hooks/useValidator\";\nimport { visualizeElements, zoomToElements } from \"../../../common/viewerUtils\";\nimport \"./CalculatedPropertyActionWithVisuals.scss\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { DataType } from \"@itwin/insights-client\";\nimport type { CalculatedPropertyType, GroupMinimal, Property} from \"@itwin/insights-client\";\nimport { SharedCalculatedPropertyForms } from \"./SharedCalculatedPropertyForms\";\nimport { useGroupKeySetQuery } from \"../../Groups/hooks/useKeySetHiliteQueries\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { usePropertiesClient } from \"../../context/PropertiesClientContext\";\n\n/**\n * Props for the {@link CalculatedPropertyActionWithVisuals} component.\n * @public\n */\nexport interface CalculatedPropertyActionWithVisualsProps {\n  mappingId: string;\n  group: GroupMinimal;\n  calculatedProperty?: Property;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\n/**\n * Component to create or update a calculated property with visualizations.\n * @public\n */\nexport const CalculatedPropertyActionWithVisuals = ({\n  mappingId,\n  group,\n  calculatedProperty,\n  onSaveSuccess,\n  onClickCancel,\n}: CalculatedPropertyActionWithVisualsProps) => {\n  const { getAccessToken, iModelId, iModelConnection } = useGroupingMappingApiConfig();\n  if (!iModelConnection) {\n    throw new Error(\"This component requires an active iModelConnection.\");\n  }\n  const propertiesClient = usePropertiesClient();\n  const [propertyName, setPropertyName] = useState<string>(\n    calculatedProperty?.propertyName ?? \"\",\n  );\n  const [type, setType] = useState<CalculatedPropertyType | undefined>(calculatedProperty?.calculatedPropertyType);\n  const [bboxDecorator, setBboxDecorator] = useState<BboxDimensionsDecorator | undefined>();\n  const [inferredSpatialData, setInferredSpatialData] = useState<Map<BboxDimension, number> | undefined>();\n  const [validator, showValidationMessage] = useValidator();\n  const [colorProperty, setColorProperty] = useState<boolean>(false);\n  const { data } = useGroupKeySetQuery(group, iModelConnection, true);\n  const queryClient = useQueryClient();\n\n  const resolvedHiliteIds = useMemo(() => {\n    // Resolved ids, default to an empty array if not available\n    return data?.result?.ids ?? [];\n  }, [data?.result?.ids]);\n\n  useEffect(() => {\n    const decorator = new BboxDimensionsDecorator();\n    IModelApp.viewManager.addDecorator(decorator);\n    setBboxDecorator(decorator);\n    return () => {\n      IModelApp.viewManager.dropDecorator(decorator);\n    };\n  }, []);\n\n  useEffect(() => {\n    if (!colorProperty || resolvedHiliteIds.length === 0) {\n      return;\n    }\n    visualizeElements(resolvedHiliteIds, \"red\");\n    void zoomToElements(resolvedHiliteIds);\n  }, [colorProperty, resolvedHiliteIds]);\n\n  useEffect(() => {\n    if (!colorProperty || resolvedHiliteIds.length === 0) {\n      return;\n    }\n    const setContext = async () => {\n      if (bboxDecorator) {\n        await bboxDecorator.setContext(resolvedHiliteIds[0]);\n        setInferredSpatialData(bboxDecorator.getInferredSpatialData());\n      }\n    };\n    void setContext();\n  }, [bboxDecorator, colorProperty, resolvedHiliteIds]);\n\n  useEffect(() => {\n    if (bboxDecorator && type && inferredSpatialData) {\n      inferredSpatialData.has(BboxDimension[type as keyof typeof BboxDimension]) && colorProperty\n        ? bboxDecorator.drawContext(\n          BboxDimension[type as keyof typeof BboxDimension],\n        )\n        : bboxDecorator.clearContext();\n    }\n  }, [bboxDecorator, colorProperty, inferredSpatialData, type]);\n\n  const { mutate: saveMutation, isLoading } = useMutation(async (type: CalculatedPropertyType) => {\n    const accessToken = await getAccessToken();\n\n    return calculatedProperty\n      ? propertiesClient.updateProperty(\n        accessToken,\n        mappingId,\n        group.id,\n        calculatedProperty.id,\n        {\n          propertyName,\n          dataType: calculatedProperty.dataType,\n          calculatedPropertyType: type,\n        },\n      )\n      : propertiesClient.createProperty(\n        accessToken,\n        mappingId,\n        group.id,\n        {\n          propertyName,\n          dataType: DataType.Double,\n          calculatedPropertyType: type,\n        },\n      );\n  }, {\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"properties\", iModelId, mappingId, group.id] });\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(undefined);\n    },\n  });\n\n  const onSave = () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n\n    saveMutation(type);\n  };\n\n  const getSpatialData = (value: string) =>\n    inferredSpatialData?.has(\n      BboxDimension[value as keyof typeof BboxDimension],\n    ) && (\n      <div>\n        {`${inferredSpatialData\n          ?.get(BboxDimension[value as keyof typeof BboxDimension])\n          ?.toPrecision(4)}m`}\n      </div>\n    );\n\n  return (\n    <>\n      <div className='gmw-calculated-properties-action-container'>\n        <Fieldset legend='Calculated Property Details' className='gmw-details-form'>\n          <div className='gmw-field-legend-container'>\n            <Text variant='small' as='small' className='gmw-field-legend'>\n              Asterisk * indicates mandatory fields.\n            </Text>\n            <ToggleSwitch\n              label='Visualize Dimensions'\n              labelPosition='left'\n              disabled={isLoading}\n              checked={colorProperty}\n              onChange={() => setColorProperty((b) => !b)}\n            ></ToggleSwitch>\n          </div>\n          <SharedCalculatedPropertyForms\n            validator={validator}\n            propertyName={propertyName}\n            setPropertyName={setPropertyName}\n            type={type}\n            setType={setType}\n            itemRenderer={(option: SelectOption<string>) => (\n              <MenuItem>\n                <div className='gmw-gr-cp-menu-item'>\n                  <div>{option.label}</div>\n                  {getSpatialData(option.value)}\n                </div>\n              </MenuItem>\n            )}\n            selectedItemRenderer={(option: SelectOption<string>) => (\n              <div className='gmw-select-item'>\n                <div>{option.label}</div>\n                {getSpatialData(option.value)}\n              </div>\n            )}\n          />\n        </Fieldset>\n      </div>\n      <ActionPanel\n        onSave={onSave}\n        onCancel={onClickCancel}\n        isSavingDisabled={!(type && propertyName)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}

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

@@ -1,13 +1,13 @@
 /// <reference types="react" />
-import type { CalculatedProperty } from "@itwin/insights-client";
+import type { Property } from "@itwin/insights-client";
 import "./CalculatedPropertyTable.scss";
 export interface CalculatedPropertyTableProps {
     mappingId: string;
     groupId: string;
     onClickAdd?: () => void;
-    onClickModify?: (value: CalculatedProperty) => void;
+    onClickModify?: (value: Property) => void;
     isLoading: boolean;
-    calculatedProperties: CalculatedProperty[];
+    calculatedProperties: Property[];
     refresh: () => Promise<void>;
 }
 export declare const CalculatedPropertyTable: ({ mappingId, groupId, onClickAdd, onClickModify, isLoading, calculatedProperties, refresh, }: CalculatedPropertyTableProps) => JSX.Element;

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

@@ -31,14 +31,14 @@ exports.CalculatedPropertyTable = void 0;
 const itwinui_icons_react_1 = require("@itwin/itwinui-icons-react");
 const itwinui_react_1 = require("@itwin/itwinui-react");
 const react_1 = __importStar(require("react"));
-const MappingClientContext_1 = require("../../context/MappingClientContext");
 require("./CalculatedPropertyTable.scss");
 const PropertyNameCell_1 = require("../PropertyNameCell");
 const PropertyTable_1 = require("../PropertyTable");
 const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
 const react_query_1 = require("@tanstack/react-query");
+const PropertiesClientContext_1 = require("../../context/PropertiesClientContext");
 const CalculatedPropertyTable = ({ mappingId, groupId, onClickAdd, onClickModify, isLoading, calculatedProperties, refresh, }) => {
-    const mappingClient = (0, MappingClientContext_1.useMappingClient)();
+    const propertiesClient = (0, PropertiesClientContext_1.usePropertiesClient)();
     const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
     const queryClient = (0, react_query_1.useQueryClient)();
     const columnsFactory = (0, react_1.useCallback)((handleShowDeleteModal) => [
@@ -75,9 +75,11 @@ const CalculatedPropertyTable = ({ mappingId, groupId, onClickAdd, onClickModify
     const { mutateAsync: deleteProperty } = (0, react_query_1.useMutation)({
         mutationFn: async (propertyId) => {
             const accessToken = await getAccessToken();
-            await mappingClient.deleteCalculatedProperty(accessToken, iModelId, mappingId, groupId, propertyId);
+            await propertiesClient.deleteProperty(accessToken, mappingId, groupId, propertyId);
+        },
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: ["properties", iModelId, mappingId, groupId] });
         },
-        onSuccess: async () => queryClient.invalidateQueries({ queryKey: ["calculatedProperties", iModelId, mappingId, groupId] }),
     });
     return (react_1.default.createElement(PropertyTable_1.PropertyTable, { propertyType: "Calculated", columnsFactory: columnsFactory, data: calculatedProperties, isLoading: isLoading, onClickAdd: onClickAdd, refreshProperties: refresh, deleteProperty: deleteProperty }));
 };

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

@@ -1 +1 @@
-{"version":3,"file":"CalculatedPropertyTable.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/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 { SvgDelete, SvgEdit, SvgMore } from \"@itwin/itwinui-icons-react\";\nimport {\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback } from \"react\";\nimport type { CellProps, Column } from \"react-table\";\nimport type { CalculatedProperty } from \"@itwin/insights-client\";\nimport { useMappingClient } from \"../../context/MappingClientContext\";\nimport \"./CalculatedPropertyTable.scss\";\nimport { PropertyNameCell } from \"../PropertyNameCell\";\nimport { PropertyTable } from \"../PropertyTable\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\n\nexport interface CalculatedPropertyTableProps {\n  mappingId: string;\n  groupId: string;\n  onClickAdd?: () => void;\n  onClickModify?: (value: CalculatedProperty) => void;\n  isLoading: boolean;\n  calculatedProperties: CalculatedProperty[];\n  refresh: () => Promise<void>;\n}\n\nexport const CalculatedPropertyTable = ({\n  mappingId,\n  groupId,\n  onClickAdd,\n  onClickModify,\n  isLoading,\n  calculatedProperties,\n  refresh,\n}: CalculatedPropertyTableProps) => {\n  const mappingClient = useMappingClient();\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const queryClient = useQueryClient();\n\n  const columnsFactory = useCallback(\n    (handleShowDeleteModal: (value: CalculatedProperty) => void): Column<CalculatedProperty>[] => [\n      {\n        id: \"propertyName\",\n        Header: \"Calculated Property\",\n        accessor: \"propertyName\",\n        Cell: (value: CellProps<CalculatedProperty>) => (\n          <PropertyNameCell\n            property={value.row.original}\n            onClickModify={onClickModify}\n          />\n        ),\n      },\n      {\n        id: \"dropdown\",\n        Header: \"\",\n        width: 80,\n        Cell: (value: CellProps<CalculatedProperty>) => {\n          return (\n            <DropdownMenu\n              menuItems={(close: () => void) =>\n                [\n                  onClickModify\n                    ? [\n                      <MenuItem\n                        key={0}\n                        onClick={() => {\n                          onClickModify(\n                            value.row.original\n                          );\n                          close();\n                        }\n                        }\n                        icon={<SvgEdit />}\n                      >\n                        Modify\n                      </MenuItem>,\n                    ]\n                    : [],\n                  <MenuItem\n                    key={1}\n                    onClick={() => {\n                      handleShowDeleteModal(value.row.original);\n                      close();\n                    }}\n                    icon={<SvgDelete />}\n                  >\n                    Remove\n                  </MenuItem>,\n                ].flatMap((p) => p)\n              }\n            >\n              <IconButton styleType=\"borderless\">\n                <SvgMore />\n              </IconButton>\n            </DropdownMenu>\n          );\n        },\n      },\n    ],\n    [onClickModify]\n  );\n\n  const { mutateAsync: deleteProperty } = useMutation({\n    mutationFn: async (propertyId: string) => {\n      const accessToken = await getAccessToken();\n      await mappingClient.deleteCalculatedProperty(\n        accessToken,\n        iModelId,\n        mappingId,\n        groupId,\n        propertyId,\n      );\n    },\n    onSuccess: async () => queryClient.invalidateQueries({ queryKey: [\"calculatedProperties\", iModelId, mappingId, groupId] }),\n  });\n\n  return (\n    <PropertyTable\n      propertyType=\"Calculated\"\n      columnsFactory={columnsFactory}\n      data={calculatedProperties}\n      isLoading={isLoading}\n      onClickAdd={onClickAdd}\n      refreshProperties={refresh}\n      deleteProperty={deleteProperty}\n    />\n  );\n};\n"]}
+{"version":3,"file":"CalculatedPropertyTable.js","sourceRoot":"","sources":["../../../../../src/components/Properties/CalculatedProperties/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 { SvgDelete, SvgEdit, SvgMore } from \"@itwin/itwinui-icons-react\";\nimport {\n  DropdownMenu,\n  IconButton,\n  MenuItem,\n} from \"@itwin/itwinui-react\";\nimport React, { useCallback } from \"react\";\nimport type { CellProps, Column } from \"react-table\";\nimport type { Property } from \"@itwin/insights-client\";\nimport \"./CalculatedPropertyTable.scss\";\nimport { PropertyNameCell } from \"../PropertyNameCell\";\nimport { PropertyTable } from \"../PropertyTable\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { usePropertiesClient } from \"../../context/PropertiesClientContext\";\n\nexport interface CalculatedPropertyTableProps {\n  mappingId: string;\n  groupId: string;\n  onClickAdd?: () => void;\n  onClickModify?: (value: Property) => void;\n  isLoading: boolean;\n  calculatedProperties: Property[];\n  refresh: () => Promise<void>;\n}\n\nexport const CalculatedPropertyTable = ({\n  mappingId,\n  groupId,\n  onClickAdd,\n  onClickModify,\n  isLoading,\n  calculatedProperties,\n  refresh,\n}: CalculatedPropertyTableProps) => {\n  const propertiesClient = usePropertiesClient();\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const queryClient = useQueryClient();\n\n  const columnsFactory = useCallback(\n    (handleShowDeleteModal: (value: Property) => void): Column<Property>[] => [\n      {\n        id: \"propertyName\",\n        Header: \"Calculated Property\",\n        accessor: \"propertyName\",\n        Cell: (value: CellProps<Property>) => (\n          <PropertyNameCell\n            property={value.row.original}\n            onClickModify={onClickModify}\n          />\n        ),\n      },\n      {\n        id: \"dropdown\",\n        Header: \"\",\n        width: 80,\n        Cell: (value: CellProps<Property>) => {\n          return (\n            <DropdownMenu\n              menuItems={(close: () => void) =>\n                [\n                  onClickModify\n                    ? [\n                      <MenuItem\n                        key={0}\n                        onClick={() => {\n                          onClickModify(\n                            value.row.original\n                          );\n                          close();\n                        }\n                        }\n                        icon={<SvgEdit />}\n                      >\n                        Modify\n                      </MenuItem>,\n                    ]\n                    : [],\n                  <MenuItem\n                    key={1}\n                    onClick={() => {\n                      handleShowDeleteModal(value.row.original);\n                      close();\n                    }}\n                    icon={<SvgDelete />}\n                  >\n                    Remove\n                  </MenuItem>,\n                ].flatMap((p) => p)\n              }\n            >\n              <IconButton styleType=\"borderless\">\n                <SvgMore />\n              </IconButton>\n            </DropdownMenu>\n          );\n        },\n      },\n    ],\n    [onClickModify]\n  );\n\n  const { mutateAsync: deleteProperty } = useMutation({\n    mutationFn: async (propertyId: string) => {\n      const accessToken = await getAccessToken();\n      await propertiesClient.deleteProperty(\n        accessToken,\n        mappingId,\n        groupId,\n        propertyId,\n      );\n    },\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"properties\", iModelId, mappingId, groupId] });\n    },\n  });\n\n  return (\n    <PropertyTable\n      propertyType=\"Calculated\"\n      columnsFactory={columnsFactory}\n      data={calculatedProperties}\n      isLoading={isLoading}\n      onClickAdd={onClickAdd}\n      refreshProperties={refresh}\n      deleteProperty={deleteProperty}\n    />\n  );\n};\n"]}

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

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

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

@@ -39,72 +39,90 @@ const utils_1 = require("../../../common/utils");
 require("./CustomCalculationAction.scss");
 const GroupPropertyAction_1 = require("../GroupProperties/GroupPropertyAction");
 const useFormulaValidation_1 = require("../hooks/useFormulaValidation");
-const MappingClientContext_1 = require("../../context/MappingClientContext");
 const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
 const insights_client_1 = require("@itwin/insights-client");
-const useCalculatedPropertiesQuery_1 = require("../hooks/useCalculatedPropertiesQuery");
-const useCustomCalculationsQuery_1 = require("../hooks/useCustomCalculationsQuery");
-const useGroupPropertiesQuery_1 = require("../hooks/useGroupPropertiesQuery");
+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":
-        case "number": return "Number";
+        case "double": return "Double";
+        case "integer": return "Integer";
         case "string": return "String";
         case "boolean": return "Boolean";
         default: return "Undefined";
     }
 };
-const convertToPropertyMap = (groupProperties, calculatedProperties, customCalculations, selectedPropertyName) => {
+const convertToPropertyMap = (properties, selectedPropertyName) => {
     const map = {};
     const selectedLowerName = selectedPropertyName?.toLowerCase();
-    groupProperties.forEach((p) => {
-        const lowerName = p.propertyName?.toLowerCase();
-        if (lowerName && lowerName !== selectedLowerName)
-            map[lowerName] = stringToPossibleDataType(p.dataType);
-    });
-    calculatedProperties.forEach((p) => {
-        const lowerName = p.propertyName?.toLowerCase();
-        if (lowerName)
-            map[lowerName] = "Number";
-    });
-    customCalculations.forEach((p) => {
+    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
+ */
 const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSaveSuccess, onClickCancel, }) => {
     const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
-    const mappingClient = (0, MappingClientContext_1.useMappingClient)();
+    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 ?? insights_client_1.QuantityType.Undefined);
+    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 } = (0, useFormulaValidation_1.useFormulaValidation)(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);
+    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, useGroupPropertiesQuery_1.useGroupPropertiesQuery)(iModelId, mappingId, groupId, getAccessToken, mappingClient);
-    const { data: calculatedProperties, isFetching: isLoadingCalculatedProperties } = (0, useCalculatedPropertiesQuery_1.useCalculatedPropertiesQuery)(iModelId, mappingId, groupId, getAccessToken, mappingClient);
-    const { data: customCalculationProperties, isFetching: isLoadingCustomCalculations } = (0, useCustomCalculationsQuery_1.useCustomCalculationsQuery)(iModelId, mappingId, groupId, getAccessToken, mappingClient);
+    const { data: groupProperties, isFetching: isLoadingGroupProperties } = (0, usePropertiesQuery_1.usePropertiesQuery)(iModelId, mappingId, groupId, getAccessToken, propertiesClient);
     (0, react_1.useEffect)(() => {
-        const propertiesMap = convertToPropertyMap(groupProperties ?? [], calculatedProperties ?? [], customCalculationProperties ?? []);
+        const propertiesMap = convertToPropertyMap(groupProperties?.properties ?? []);
         setProperties(propertiesMap);
-    }, [calculatedProperties, customCalculationProperties, groupProperties]);
+    }, [groupProperties]);
     const { mutate: saveMutation, isLoading: isSaving } = (0, react_query_1.useMutation)(async () => {
         const accessToken = await getAccessToken();
-        return customCalculation
-            ? mappingClient.updateCustomCalculation(accessToken, iModelId, mappingId, groupId, customCalculation.id, { propertyName, formula, quantityType })
-            : mappingClient.createCustomCalculation(accessToken, iModelId, mappingId, groupId, { propertyName, formula, quantityType });
+        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: ["customCalculations", iModelId, mappingId, groupId] });
+            await queryClient.invalidateQueries({ queryKey: ["properties", iModelId, mappingId, groupId] });
             onSaveSuccess();
             setPropertyName("");
             setFormula("");
-            setQuantityType(insights_client_1.QuantityType.Undefined);
+            setQuantityType(undefined);
         },
         onError: async (error) => {
             if (error.status === 422) {
@@ -129,7 +147,7 @@ const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSave
         }
         saveMutation();
     };
-    const isLoading = isSaving || isLoadingGroupProperties || isLoadingCalculatedProperties || isLoadingCustomCalculations;
+    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' },
@@ -145,13 +163,13 @@ const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSave
                         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/insights/operations/create-customcalculation/", target: "_blank", rel: "noreferrer" } }, "To learn more about creating custom calculation formulas, view the documentation."),
+                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: () => { } }))),
+                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 })));
 };
 exports.CustomCalculationAction = CustomCalculationAction;

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,wDAO8B;AAC9B,+CAAmD;AACnD,qFAA6D;AAC7D,sEAAwE;AACxE,iDAAoD;AACpD,0CAAwC;AACxC,gFAAuF;AACvF,wEAAqE;AAErE,6EAAsE;AACtE,qFAAqF;AAErF,4DAAsD;AACtD,wFAAqF;AACrF,oFAAiF;AACjF,8EAA2E;AAC3E,uDAAoE;AAUpE,MAAM,wBAAwB,GAAG,CAAC,GAAY,EAAoB,EAAE;IAClE,QAAQ,GAAG,EAAE,WAAW,EAAE,EAAE;QAC1B,KAAK,QAAQ,CAAC;QACd,KAAK,QAAQ,CAAC,CAAC,OAAO,QAAQ,CAAC;QAC/B,KAAK,QAAQ,CAAC,CAAC,OAAO,QAAQ,CAAC;QAC/B,KAAK,SAAS,CAAC,CAAC,OAAO,SAAS,CAAC;QACjC,OAAO,CAAC,CAAC,OAAO,WAAW,CAAC;KAC7B;AACH,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAC3B,eAAgC,EAChC,oBAA0C,EAC1C,kBAAuC,EACvC,oBAA6B,EAChB,EAAE;IACf,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,WAAW,EAAE,CAAC;IAE9D,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC5B,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAChD,IAAI,SAAS,IAAI,SAAS,KAAK,iBAAiB;YAC9C,GAAG,CAAC,SAAS,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACjC,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAChD,IAAI,SAAS;YACX,GAAG,CAAC,SAAS,CAAC,GAAG,QAAQ,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/B,MAAM,SAAS,GAAG,CAAC,CAAC,YAAY,EAAE,WAAW,EAAE,CAAC;QAChD,IAAI,SAAS,IAAI,SAAS,KAAK,iBAAiB;YAC9C,GAAG,CAAC,SAAS,CAAC,GAAG,wBAAwB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEK,MAAM,uBAAuB,GAAG,CAAC,EACtC,SAAS,EACT,OAAO,EACP,iBAAiB,EACjB,aAAa,EACb,aAAa,GACgB,EAAE,EAAE;IACjC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,IAAA,sDAA2B,GAAE,CAAC;IACnE,MAAM,aAAa,GAAG,IAAA,uCAAgB,GAAE,CAAC;IACzC,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAC9C,iBAAiB,EAAE,YAAY,IAAI,EAAE,CACtC,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,IAAA,gBAAQ,EACpC,iBAAiB,EAAE,OAAO,IAAI,EAAE,CACjC,CAAC;IACF,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAe,iBAAiB,EAAE,YAAY,IAAI,8BAAY,CAAC,SAAS,CAAC,CAAC;IAC1H,MAAM,CAAC,mBAAmB,EAAE,sBAAsB,CAAC,GAAG,IAAA,gBAAQ,EAAS,EAAE,CAAC,CAAC;IAC3E,MAAM,CAAC,SAAS,EAAE,qBAAqB,CAAC,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC1D,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,IAAA,gBAAQ,EAAc,EAAE,CAAC,CAAC;IAC9D,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAA,2CAAoB,EAAC,YAAY,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,sBAAsB,CAAC,CAAC;IACnI,MAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAC;IAErC,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,UAAU,EAAE,wBAAwB,EAAE,GAAG,IAAA,iDAAuB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAC7J,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,6BAA6B,EAAE,GAAG,IAAA,2DAA4B,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAC5K,MAAM,EAAE,IAAI,EAAE,2BAA2B,EAAE,UAAU,EAAE,2BAA2B,EAAE,GAAG,IAAA,uDAA0B,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,CAAC,CAAC;IAE/K,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,aAAa,GAAG,oBAAoB,CAAC,eAAe,IAAI,EAAE,EAAE,oBAAoB,IAAI,EAAE,EAAE,2BAA2B,IAAI,EAAE,CAAC,CAAC;QACjI,aAAa,CAAC,aAAa,CAAC,CAAC;IAC/B,CAAC,EAAE,CAAC,oBAAoB,EAAE,2BAA2B,EAAE,eAAe,CAAC,CAAC,CAAC;IAEzE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAA,yBAAW,EAAC,KAAK,IAAI,EAAE;QAE3E,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;QAE3C,OAAO,iBAAiB;YACtB,CAAC,CAAC,aAAa,CAAC,uBAAuB,CACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,iBAAiB,CAAC,EAAE,EACpB,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,CACxC;YACD,CAAC,CAAC,aAAa,CAAC,uBAAuB,CACrC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,OAAO,EACP,EAAE,YAAY,EAAE,OAAO,EAAE,YAAY,EAAE,CACxC,CAAC;IACN,CAAC,EAAE;QACD,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,WAAW,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,oBAAoB,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;YACxG,aAAa,EAAE,CAAC;YAChB,eAAe,CAAC,EAAE,CAAC,CAAC;YACpB,UAAU,CAAC,EAAE,CAAC,CAAC;YACf,eAAe,CAAC,8BAAY,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,KAAU,EAAE,EAAE;YAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;gBACxB,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,IAAA,mBAAW,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aAC3B;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE;YACzB,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,IAAI,CAAC,eAAe,EAAE,EAAE;YACtB,OAAO;SACR;QACD,YAAY,EAAE,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,QAAQ,IAAI,wBAAwB,IAAI,6BAA6B,IAAI,2BAA2B,CAAC;IAEvH,OAAO,CACL;QACE,uCAAK,SAAS,EAAC,yCAAyC;YACtD,8BAAC,wBAAQ,IAAC,MAAM,EAAC,4BAA4B,EAAC,SAAS,EAAC,kBAAkB;gBACxE,8BAAC,oBAAI,IAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAC,OAAO,EAAC,SAAS,EAAC,kBAAkB,6CAEtD;gBACP,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,qBAAK,IACJ,IAAI,EAAC,eAAe,EACpB,aAAa,EAAC,aAAa,EAC3B,kBAAkB,EAAE,EAAE,IAAI,EAAE,kFAAkF,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,wFAG/I;gBACR,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,EACpD,aAAa,EAAE,GAAG,EAAE;wBAClB,eAAe,EAAE,CAAC;oBACpB,CAAC,GACD;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,aAAa,EACvB,gBAAgB,EAAE,CAAC,CAAC,OAAO,IAAI,YAAY,IAAI,OAAO,CAAC,EACvD,SAAS,EAAE,SAAS,GACpB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AA/JW,QAAA,uBAAuB,2BA+JlC","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  Alert,\n  Fieldset,\n  LabeledInput,\n  LabeledSelect,\n  LabeledTextarea,\n  Text,\n} 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 { useMappingClient } from \"../../context/MappingClientContext\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport type { CalculatedProperty, CustomCalculation, GroupProperty } from \"@itwin/insights-client\";\nimport { QuantityType } from \"@itwin/insights-client\";\nimport { useCalculatedPropertiesQuery } from \"../hooks/useCalculatedPropertiesQuery\";\nimport { useCustomCalculationsQuery } from \"../hooks/useCustomCalculationsQuery\";\nimport { useGroupPropertiesQuery } from \"../hooks/useGroupPropertiesQuery\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\n\nexport interface CustomCalculationActionProps {\n  mappingId: string;\n  groupId: string;\n  customCalculation?: CustomCalculation;\n  onSaveSuccess: () => void;\n  onClickCancel?: () => void;\n}\n\nconst stringToPossibleDataType = (str?: string): PossibleDataType => {\n  switch (str?.toLowerCase()) {\n    case \"double\":\n    case \"number\": return \"Number\";\n    case \"string\": return \"String\";\n    case \"boolean\": return \"Boolean\";\n    default: return \"Undefined\";\n  }\n};\n\nconst convertToPropertyMap = (\n  groupProperties: GroupProperty[],\n  calculatedProperties: CalculatedProperty[],\n  customCalculations: CustomCalculation[],\n  selectedPropertyName?: string\n): PropertyMap => {\n  const map: PropertyMap = {};\n  const selectedLowerName = selectedPropertyName?.toLowerCase();\n\n  groupProperties.forEach((p) => {\n    const lowerName = p.propertyName?.toLowerCase();\n    if (lowerName && lowerName !== selectedLowerName)\n      map[lowerName] = stringToPossibleDataType(p.dataType);\n  });\n\n  calculatedProperties.forEach((p) => {\n    const lowerName = p.propertyName?.toLowerCase();\n    if (lowerName)\n      map[lowerName] = \"Number\";\n  });\n\n  customCalculations.forEach((p) => {\n    const lowerName = p.propertyName?.toLowerCase();\n    if (lowerName && lowerName !== selectedLowerName)\n      map[lowerName] = stringToPossibleDataType(p.dataType);\n  });\n\n  return map;\n};\n\nexport const CustomCalculationAction = ({\n  mappingId,\n  groupId,\n  customCalculation,\n  onSaveSuccess,\n  onClickCancel,\n}: CustomCalculationActionProps) => {\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const mappingClient = useMappingClient();\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<QuantityType>(customCalculation?.quantityType ?? QuantityType.Undefined);\n  const [formulaErrorMessage, setFormulaErrorMessage] = useState<string>(\"\");\n  const [validator, showValidationMessage] = useValidator();\n  const [properties, setProperties] = useState<PropertyMap>({});\n  const { isValid, forceValidation } = useFormulaValidation(propertyName.toLowerCase(), formula, properties, setFormulaErrorMessage);\n  const queryClient = useQueryClient();\n\n  const { data: groupProperties, isFetching: isLoadingGroupProperties } = useGroupPropertiesQuery(iModelId, mappingId, groupId, getAccessToken, mappingClient);\n  const { data: calculatedProperties, isFetching: isLoadingCalculatedProperties } = useCalculatedPropertiesQuery(iModelId, mappingId, groupId, getAccessToken, mappingClient);\n  const { data: customCalculationProperties, isFetching: isLoadingCustomCalculations } = useCustomCalculationsQuery(iModelId, mappingId, groupId, getAccessToken, mappingClient);\n\n  useEffect(() => {\n    const propertiesMap = convertToPropertyMap(groupProperties ?? [], calculatedProperties ?? [], customCalculationProperties ?? []);\n    setProperties(propertiesMap);\n  }, [calculatedProperties, customCalculationProperties, groupProperties]);\n\n  const { mutate: saveMutation, isLoading: isSaving } = useMutation(async () => {\n\n    const accessToken = await getAccessToken();\n\n    return customCalculation\n      ? mappingClient.updateCustomCalculation(\n        accessToken,\n        iModelId,\n        mappingId,\n        groupId,\n        customCalculation.id,\n        { propertyName, formula, quantityType }\n      )\n      : mappingClient.createCustomCalculation(\n        accessToken,\n        iModelId,\n        mappingId,\n        groupId,\n        { propertyName, formula, quantityType }\n      );\n  }, {\n    onSuccess: async () => {\n      await queryClient.invalidateQueries({ queryKey: [\"customCalculations\", iModelId, mappingId, groupId] });\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setFormula(\"\");\n      setQuantityType(QuantityType.Undefined);\n    },\n    onError: async (error: any) => {\n      if (error.status === 422) {\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    },\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 || isLoadingCalculatedProperties || isLoadingCustomCalculations;\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={\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          <Alert\n            type='informational'\n            clickableText='Click here.'\n            clickableTextProps={{ href: \"https://developer.bentley.com/apis/insights/operations/create-customcalculation/\", target: \"_blank\", rel: \"noreferrer\" }}\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>\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={onClickCancel}\n        isSavingDisabled={!(formula && propertyName && isValid)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}
+{"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 {\n  Alert,\n  Fieldset,\n  LabeledInput,\n  LabeledSelect,\n  LabeledTextarea,\n  Text,\n} 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\": return \"Double\";\n    case \"integer\": return \"Integer\";\n    case \"string\": return \"String\";\n    case \"boolean\": return \"Boolean\";\n    default: return \"Undefined\";\n  }\n};\n\nconst convertToPropertyMap = (\n  properties: Property[],\n  selectedPropertyName?: string\n): 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)\n      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 = ({\n  mappingId,\n  groupId,\n  customCalculation,\n  onSaveSuccess,\n  onClickCancel,\n}: CustomCalculationActionProps) => {\n  const { getAccessToken, iModelId } = useGroupingMappingApiConfig();\n  const propertiesClient = usePropertiesClient();\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<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(async () => {\n\n    const accessToken = await getAccessToken();\n\n    if(customCalculation){\n      return propertiesClient.updateProperty(\n        accessToken,\n        mappingId,\n        groupId,\n        customCalculation.id,\n        {\n          propertyName,\n          dataType: customCalculation.dataType,\n          formula,\n          quantityType,\n        }\n      );\n    }\n\n    if(inferredDataType){\n      return propertiesClient.createProperty(\n        accessToken,\n        mappingId,\n        groupId,\n        {\n          propertyName,\n          dataType: inferToPropertyDataType(inferredDataType),\n          formula,\n          quantityType,\n        }\n      );\n    }\n    return;\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 (\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    },\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={\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          <Alert\n            type='informational'\n            clickableText='Click here.'\n            clickableTextProps={{ href: \"https://developer.bentley.com/apis/grouping-and-mapping/operations/create-property/#customcalculations\", target: \"_blank\", rel: \"noreferrer\" }}\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\n        onSave={onSave}\n        onCancel={onClickCancel}\n        isSavingDisabled={!(formula && propertyName && isValid)}\n        isLoading={isLoading}\n      />\n    </>\n  );\n};\n"]}

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

@@ -1,12 +1,12 @@
 /// <reference types="react" />
-import type { CustomCalculation } from "@itwin/insights-client";
+import type { Property } from "@itwin/insights-client";
 export interface CustomCalculationTableProps {
     mappingId: string;
     groupId: string;
     onClickAdd?: () => void;
-    onClickModify?: (value: CustomCalculation) => void;
+    onClickModify?: (value: Property) => void;
     isLoading: boolean;
-    customCalculations: CustomCalculation[];
+    customCalculations: Property[];
     refresh: () => Promise<void>;
 }
 export declare const CustomCalculationTable: ({ mappingId, groupId, onClickAdd, onClickModify, isLoading, customCalculations, refresh, }: CustomCalculationTableProps) => JSX.Element;