@itwin/grouping-mapping-widget 0.23.1 → 0.25.0

package/lib/cjs/components/Mappings/hooks/useMappingsOperations.js.map

@@ -1 +1 @@
-{"version":3,"file":"useMappingsOperations.js","sourceRoot":"","sources":["../../../../../src/components/Mappings/hooks/useMappingsOperations.ts"],"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 { useCallback, useState } from \"react\";\nimport type { IMappingsClient, Mapping } from \"@itwin/insights-client\";\nimport type { GroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useExtractionClient } from \"../../context/ExtractionClientContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { useFetchMappings } from \"./useFetchMappings\";\nimport { useFetchExtractionStatus } from \"./useFetchExtractionStatus\";\n\nexport interface MappingsOperationsProps extends GroupingMappingApiConfig {\n  mappingClient: IMappingsClient;\n}\n\nexport const useMappingsOperations = ({ iModelId, getAccessToken, mappingClient }: MappingsOperationsProps) => {\n  const [showImportModal, setShowImportModal] = useState<boolean | undefined>(false);\n  const [showDeleteModal, setShowDeleteModal] = useState<Mapping | undefined>(undefined);\n  const extractionClient = useExtractionClient();\n  const [showExtractionMessageModal, setShowExtractionMessageModal] = useState<boolean>(false);\n  const queryClient = useQueryClient();\n\n  const {\n    data: mappings,\n    isFetching: isLoadingMappings,\n  } = useFetchMappings(iModelId, getAccessToken, mappingClient);\n\n  const {\n    data: extractionStatus,\n    isFetching: isLoadingExtractionStatus,\n  } = useFetchExtractionStatus({ iModelId, getAccessToken, extractionClient });\n\n  const refreshExtractionStatus = useCallback(async () => {\n    await queryClient.invalidateQueries({queryKey: [\"iModelExtractionStatus\"]});\n  }, [queryClient]);\n\n  const refreshMappings = useCallback(async () => {\n    await queryClient.invalidateQueries({queryKey: [\"mappings\"]});\n  }, [queryClient]);\n\n  const { mutateAsync: toggleExtraction, isLoading: isTogglingExtraction } = useMutation({\n    mutationFn: async (mapping: Mapping) => {\n      const accessToken = await getAccessToken();\n      const newState = !mapping.extractionEnabled;\n      await mappingClient.updateMapping(accessToken, iModelId, mapping.id, { extractionEnabled: newState });\n    },\n    onSuccess: async () => {\n      await refreshMappings();\n    },\n  });\n\n  const { mutateAsync: onDelete, isLoading: isDeletingMapping} = useMutation({\n    mutationFn: async (mapping: Mapping) => {\n      const accessToken = await getAccessToken();\n      await mappingClient.deleteMapping(accessToken, iModelId, mapping.id);\n    },\n    onSuccess: async () => {\n      await refreshMappings();\n    },\n  });\n\n  const isLoading = isLoadingMappings || isLoadingExtractionStatus || isTogglingExtraction || isDeletingMapping;\n  const extractionStatusGated = extractionStatus ?? {extractionStatusIcon: {\n    iconStatus: undefined,\n    iconMessage: \"Loading...\",\n  }, extractionMessageData : []};\n\n  return { mappings, isLoading, showExtractionMessageModal, extractionStatus: extractionStatusGated, setShowExtractionMessageModal, refreshMappings, refreshExtractionStatus, toggleExtraction, onDelete, setShowImportModal, showImportModal, setShowDeleteModal, showDeleteModal, isTogglingExtraction};\n};\n"]}
+{"version":3,"file":"useMappingsOperations.js","sourceRoot":"","sources":["../../../../../src/components/Mappings/hooks/useMappingsOperations.ts"],"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 { useCallback, useEffect, useState } from \"react\";\nimport { ExtractorState } from \"@itwin/insights-client\";\nimport type { IMappingsClient, Mapping } from \"@itwin/insights-client\";\nimport type { GroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useExtractionClient } from \"../../context/ExtractionClientContext\";\nimport { useMutation, useQueryClient } from \"@tanstack/react-query\";\nimport { useFetchMappings } from \"./useFetchMappings\";\nimport { useFetchExtractionStatus } from \"./useFetchExtractionStatus\";\nimport { useExtractionStateJobContext } from \"../../context/ExtractionStateJobContext\";\n\nexport interface MappingsOperationsProps extends GroupingMappingApiConfig {\n  mappingClient: IMappingsClient;\n}\n\nexport const useMappingsOperations = ({ iModelId, getAccessToken, mappingClient }: MappingsOperationsProps) => {\n  const [showImportModal, setShowImportModal] = useState<boolean | undefined>(false);\n  const [showDeleteModal, setShowDeleteModal] = useState<Mapping | undefined>(undefined);\n  const extractionClient = useExtractionClient();\n  const [showExtractionMessageModal, setShowExtractionMessageModal] = useState<boolean>(false);\n  const queryClient = useQueryClient();\n  const [initialStateExtractionFlag, setInitialExtractionStateFlag] = useState<boolean>(true);\n  const { mappingIdJobInfo, setMappingIdJobInfo } = useExtractionStateJobContext();\n\n  const {\n    data: mappings,\n    isFetched: isMappingsFetched,\n    isFetching: isLoadingMappings,\n  } = useFetchMappings(iModelId, getAccessToken, mappingClient);\n\n  const {\n    data: extractionStatus,\n    isFetched: isExtractionStatusFetched,\n    isFetching: isLoadingExtractionStatus,\n  } = useFetchExtractionStatus({ iModelId, getAccessToken, extractionClient });\n\n  const refreshExtractionStatus = useCallback(async () => {\n    await queryClient.invalidateQueries({queryKey: [\"iModelExtractionStatus\"]});\n    setInitialExtractionStateFlag(false);\n  }, [queryClient]);\n\n  useEffect(() => {\n    if(initialStateExtractionFlag && isMappingsFetched && isExtractionStatusFetched && mappings && extractionStatus && !mappingIdJobInfo.size){\n      const newMappingIdJobInfo = new Map<string, string>();\n      const jobId = extractionStatus.latestExtractionResult.value?.jobId;\n      const state = extractionStatus.latestJobStatus?.state;\n      if((state === ExtractorState.Failed || state === ExtractorState.Succeeded)) return;\n      !!jobId && mappings.forEach((mapping) => {\n        const mappingId = mapping.id;\n        const jobId = extractionStatus.latestExtractionResult.value.jobId;\n        newMappingIdJobInfo.set(mappingId, jobId);\n      });\n      setMappingIdJobInfo(newMappingIdJobInfo);\n      setInitialExtractionStateFlag(false);\n    }\n  }, [extractionStatus, initialStateExtractionFlag, isExtractionStatusFetched, isMappingsFetched, mappingIdJobInfo.size, mappings, setMappingIdJobInfo]);\n\n  const refreshMappings = useCallback(async () => {\n    await queryClient.invalidateQueries({queryKey: [\"mappings\"]});\n  }, [queryClient]);\n\n  const { mutateAsync: toggleExtraction, isLoading: isTogglingExtraction } = useMutation({\n    mutationFn: async (mapping: Mapping) => {\n      const accessToken = await getAccessToken();\n      const newState = !mapping.extractionEnabled;\n      await mappingClient.updateMapping(accessToken, iModelId, mapping.id, { extractionEnabled: newState });\n    },\n    onSuccess: async () => {\n      await refreshMappings();\n    },\n  });\n\n  const { mutateAsync: onDelete, isLoading: isDeletingMapping} = useMutation({\n    mutationFn: async (mapping: Mapping) => {\n      const accessToken = await getAccessToken();\n      await mappingClient.deleteMapping(accessToken, iModelId, mapping.id);\n    },\n    onSuccess: async () => {\n      await refreshMappings();\n    },\n  });\n\n  const isLoading = isLoadingMappings || isTogglingExtraction || isDeletingMapping;\n  const extractionStatusGated = (!extractionStatus || isLoadingExtractionStatus) ? {\n    extractionStatusIcon: {\n      iconStatus: undefined,\n      iconMessage: \"Loading...\",\n    },\n    extractionMessageData: [],\n  } : extractionStatus;\n\n  return { mappings, isLoading, showExtractionMessageModal, extractionStatus: extractionStatusGated, setShowExtractionMessageModal, refreshMappings, refreshExtractionStatus, toggleExtraction, onDelete, setShowImportModal, showImportModal, setShowDeleteModal, showDeleteModal, isTogglingExtraction};\n};\n"]}

package/lib/cjs/components/Mappings/hooks/useRunExtraction.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="react" />
+import type { GroupingMappingApiConfig } from "../../context/GroupingApiConfigContext";
+import type { Mapping } from "@itwin/insights-client";
+export interface FetchExtractionStatesProps extends GroupingMappingApiConfig {
+    jobId?: string;
+}
+export declare const useRunExtraction: ({ iModelId, getAccessToken, }: FetchExtractionStatesProps) => {
+    isRunExtractionLoading: boolean;
+    isRunExtractionSuccess: boolean;
+    isJobStarted: boolean;
+    setIsJobStarted: import("react").Dispatch<import("react").SetStateAction<boolean>>;
+    runExtraction: import("@tanstack/react-query").UseMutateAsyncFunction<import("@itwin/insights-client").ExtractionRun, unknown, Mapping[], unknown>;
+};
+//# sourceMappingURL=useRunExtraction.d.ts.map

package/lib/cjs/components/Mappings/hooks/useRunExtraction.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useRunExtraction = void 0;
+/*---------------------------------------------------------------------------------------------
+* Copyright (c) Bentley Systems, Incorporated. All rights reserved.
+* See LICENSE.md in the project root for license terms and full copyright notice.
+*--------------------------------------------------------------------------------------------*/
+const ExtractionClientContext_1 = require("../../context/ExtractionClientContext");
+const react_query_1 = require("@tanstack/react-query");
+const react_1 = require("react");
+const ExtractionStateJobContext_1 = require("../../context/ExtractionStateJobContext");
+const useRunExtraction = ({ iModelId, getAccessToken, }) => {
+    const extractionClient = (0, ExtractionClientContext_1.useExtractionClient)();
+    const [isJobStarted, setIsJobStarted] = (0, react_1.useState)(false);
+    const { mappingIdJobInfo, setMappingIdJobInfo } = (0, ExtractionStateJobContext_1.useExtractionStateJobContext)();
+    const { mutateAsync: runExtraction, isLoading: isRunExtractionLoading, isSuccess: isRunExtractionSuccess } = (0, react_query_1.useMutation)({
+        mutationKey: ["runExtraction"],
+        mutationFn: async (mappings) => {
+            const accessToken = await getAccessToken();
+            const mappingIds = mappings.length > 0 ? mappings.map((mapping) => { return { id: mapping.id }; }) : [];
+            const extractionRequest = {
+                mappings: mappingIds,
+            };
+            const runExtractionResponse = await extractionClient.runExtraction(accessToken, iModelId, extractionRequest);
+            return runExtractionResponse;
+        },
+        onSuccess: async (runExtractionResponse, mappings) => {
+            for (const mapping of mappings) {
+                if (mappingIdJobInfo?.get(mapping.id) === undefined) {
+                    setMappingIdJobInfo((prevMap) => {
+                        const newMap = new Map(prevMap);
+                        newMap.set(mapping.id, runExtractionResponse.id);
+                        return newMap;
+                    });
+                }
+            }
+        },
+    });
+    return { isRunExtractionLoading, isRunExtractionSuccess, isJobStarted, setIsJobStarted, runExtraction };
+};
+exports.useRunExtraction = useRunExtraction;
+//# sourceMappingURL=useRunExtraction.js.map

package/lib/cjs/components/Mappings/hooks/useRunExtraction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useRunExtraction.js","sourceRoot":"","sources":["../../../../../src/components/Mappings/hooks/useRunExtraction.ts"],"names":[],"mappings":";;;AAAA;;;+FAG+F;AAC/F,mFAA4E;AAC5E,uDAAoD;AAGpD,iCAAiC;AACjC,uFAAuF;AAMhF,MAAM,gBAAgB,GAAG,CAAC,EAC/B,QAAQ,EACR,cAAc,GACa,EAAE,EAAE;IAC/B,MAAM,gBAAgB,GAAG,IAAA,6CAAmB,GAAE,CAAC;IAC/C,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,IAAA,gBAAQ,EAAU,KAAK,CAAC,CAAC;IACjE,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,IAAA,wDAA4B,GAAE,CAAC;IAEjF,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,SAAS,EAAE,sBAAsB,EAAE,SAAS,EAAE,sBAAsB,EAAE,GAAG,IAAA,yBAAW,EAAC;QACvH,WAAW,EAAE,CAAC,eAAe,CAAC;QAC9B,UAAU,EAAE,KAAK,EAAE,QAAmB,EAAE,EAAE;YACxC,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;YAC3C,MAAM,UAAU,GAA+B,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YACpI,MAAM,iBAAiB,GAAyB;gBAC9C,QAAQ,EAAE,UAAU;aACrB,CAAC;YAEF,MAAM,qBAAqB,GAAG,MAAM,gBAAgB,CAAC,aAAa,CAAC,WAAW,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;YAC7G,OAAO,qBAAqB,CAAC;QAC/B,CAAC;QACD,SAAS,EAAE,KAAK,EAAE,qBAAqB,EAAE,QAAQ,EAAE,EAAE;YACnD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAC;gBAC7B,IAAG,gBAAgB,EAAE,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,SAAS,EAAC;oBACjD,mBAAmB,CAAC,CAAC,OAA4B,EAAE,EAAE;wBACnD,MAAM,MAAM,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC;wBAChC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAC;wBACjD,OAAO,MAAM,CAAC;oBAChB,CAAC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC;KACF,CAAC,CAAC;IAEH,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,YAAY,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;AAC1G,CAAC,CAAC;AAlCW,QAAA,gBAAgB,oBAkC3B","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 { useExtractionClient } from \"../../context/ExtractionClientContext\";\nimport { useMutation } from \"@tanstack/react-query\";\nimport type { GroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport type { ExtractionRequestMapping, ExtractionRunRequest, Mapping } from \"@itwin/insights-client\";\nimport { useState } from \"react\";\nimport { useExtractionStateJobContext } from \"../../context/ExtractionStateJobContext\";\n\nexport interface FetchExtractionStatesProps extends GroupingMappingApiConfig {\n  jobId?: string;\n}\n\nexport const useRunExtraction = ({\n  iModelId,\n  getAccessToken,\n}: FetchExtractionStatesProps) => {\n  const extractionClient = useExtractionClient();\n  const [isJobStarted, setIsJobStarted] = useState<boolean>(false);\n  const { mappingIdJobInfo, setMappingIdJobInfo } = useExtractionStateJobContext();\n\n  const { mutateAsync: runExtraction, isLoading: isRunExtractionLoading, isSuccess: isRunExtractionSuccess } = useMutation({\n    mutationKey: [\"runExtraction\"],\n    mutationFn: async (mappings: Mapping[]) => {\n      const accessToken = await getAccessToken();\n      const mappingIds: ExtractionRequestMapping[] = mappings.length > 0 ? mappings.map((mapping) => { return { id: mapping.id }; }) : [];\n      const extractionRequest: ExtractionRunRequest = {\n        mappings: mappingIds,\n      };\n\n      const runExtractionResponse = await extractionClient.runExtraction(accessToken, iModelId, extractionRequest);\n      return runExtractionResponse;\n    },\n    onSuccess: async (runExtractionResponse, mappings) => {\n      for (const mapping of mappings){\n        if(mappingIdJobInfo?.get(mapping.id) === undefined){\n          setMappingIdJobInfo((prevMap: Map<string, string>) => {\n            const newMap = new Map(prevMap);\n            newMap.set(mapping.id, runExtractionResponse.id);\n            return newMap;\n          });\n        }\n      }\n    },\n  });\n\n  return { isRunExtractionLoading, isRunExtractionSuccess, isJobStarted, setIsJobStarted, runExtraction };\n};\n"]}

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

@@ -38,43 +38,35 @@ const useValidator_1 = __importDefault(require("../hooks/useValidator"));
 require("./CalculatedPropertyAction.scss");
 const insights_client_1 = require("@itwin/insights-client");
 const SharedCalculatedPropertyForms_1 = require("./SharedCalculatedPropertyForms");
-const utils_1 = require("../../../common/utils");
 const GroupingApiConfigContext_1 = require("../../context/GroupingApiConfigContext");
 const MappingClientContext_1 = require("../../context/MappingClientContext");
+const react_query_1 = require("@tanstack/react-query");
 const CalculatedPropertyAction = ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }) => {
     const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
     const mappingClient = (0, MappingClientContext_1.useMappingClient)();
     const [propertyName, setPropertyName] = (0, react_1.useState)(calculatedProperty?.propertyName ?? "");
     const [type, setType] = (0, react_1.useState)(calculatedProperty?.type);
-    const [isLoading, setIsLoading] = (0, react_1.useState)(false);
     const [validator, showValidationMessage] = (0, useValidator_1.default)();
-    const onSave = async () => {
-        if (!validator.allValid() || !type) {
-            showValidationMessage(true);
-            return;
-        }
-        try {
-            setIsLoading(true);
-            const accessToken = await getAccessToken();
-            calculatedProperty
-                ? await mappingClient.updateCalculatedProperty(accessToken, iModelId, mappingId, group.id, calculatedProperty.id, {
-                    propertyName,
-                    type,
-                })
-                : await mappingClient.createCalculatedProperty(accessToken, iModelId, mappingId, group.id, {
-                    propertyName,
-                    type,
-                });
+    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 });
+    }, {
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: ["calculatedProperties", iModelId, mappingId, group.id] });
             onSaveSuccess();
             setPropertyName("");
             setType(insights_client_1.CalculatedPropertyType.Undefined);
+        },
+    });
+    const onSave = () => {
+        if (!validator.allValid() || !type) {
+            showValidationMessage(true);
+            return;
         }
-        catch (error) {
-            (0, utils_1.handleError)(error.status);
-        }
-        finally {
-            setIsLoading(false);
-        }
+        saveMutation(type);
     };
     return (react_1.default.createElement(react_1.default.Fragment, null,
         react_1.default.createElement("div", { className: 'gmw-calculated-properties-action-container' },

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,wDAG8B;AAC9B,+CAAwC;AACxC,qFAA6D;AAC7D,yEAAiD;AACjD,2CAAyC;AAEzC,4DAAgE;AAChE,mFAAgF;AAChF,iDAAoD;AACpD,qFAAqF;AACrF,6EAAsE;AAU/D,MAAM,wBAAwB,GAAG,CAAC,EACvC,SAAS,EACT,KAAK,EACL,kBAAkB,EAClB,aAAa,EACb,aAAa,GACiB,EAAE,EAAE;IAClC,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,kBAAkB,EAAE,YAAY,IAAI,EAAE,CACvC,CAAC;IACF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAqC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAC/F,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,IAAA,gBAAQ,EAAU,KAAK,CAAC,CAAC;IAC3D,MAAM,CAAC,SAAS,EAAE,qBAAqB,CAAC,GAAG,IAAA,sBAAY,GAAE,CAAC;IAE1D,MAAM,MAAM,GAAG,KAAK,IAAI,EAAE;QACxB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE;YAClC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,IAAI;YACF,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnB,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;YAE3C,kBAAkB;gBAChB,CAAC,CAAC,MAAM,aAAa,CAAC,wBAAwB,CAC5C,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,CAAC,EAAE,EACR,kBAAkB,CAAC,EAAE,EACrB;oBACE,YAAY;oBACZ,IAAI;iBACL,CACF;gBACD,CAAC,CAAC,MAAM,aAAa,CAAC,wBAAwB,CAC5C,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,CAAC,EAAE,EACR;oBACE,YAAY;oBACZ,IAAI;iBACL,CACF,CAAC;YACJ,aAAa,EAAE,CAAC;YAChB,eAAe,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,CAAC,wCAAsB,CAAC,SAAS,CAAC,CAAC;SAC3C;QAAC,OAAO,KAAU,EAAE;YACnB,IAAA,mBAAW,EAAC,KAAK,CAAC,MAAM,CAAC,CAAC;SAC3B;gBAAS;YACR,YAAY,CAAC,KAAK,CAAC,CAAC;SACrB;IACH,CAAC,CAAC;IAEF,OAAO,CACL;QACE,uCAAK,SAAS,EAAC,4CAA4C;YACzD,8BAAC,wBAAQ,IAAC,MAAM,EAAC,6BAA6B,EAAC,SAAS,EAAC,kBAAkB;gBACzE,uCAAK,SAAS,EAAC,4BAA4B;oBACzC,8BAAC,oBAAI,IAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAC,OAAO,EAAC,SAAS,EAAC,kBAAkB,6CAEtD,CACH;gBACN,8BAAC,6DAA6B,IAC5B,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,GAChB,CACO,CACP;QACN,8BAAC,qBAAW,IACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,CAAC,CAAC,IAAI,IAAI,YAAY,CAAC,EACzC,SAAS,EAAE,SAAS,GACpB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AApFW,QAAA,wBAAwB,4BAoFnC","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 { handleError } from \"../../../common/utils\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport { useMappingClient } from \"../../context/MappingClientContext\";\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 [isLoading, setIsLoading] = useState<boolean>(false);\n  const [validator, showValidationMessage] = useValidator();\n\n  const onSave = async () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n    try {\n      setIsLoading(true);\n\n      const accessToken = await getAccessToken();\n\n      calculatedProperty\n        ? await mappingClient.updateCalculatedProperty(\n          accessToken,\n          iModelId,\n          mappingId,\n          group.id,\n          calculatedProperty.id,\n          {\n            propertyName,\n            type,\n          },\n        )\n        : await mappingClient.createCalculatedProperty(\n          accessToken,\n          iModelId,\n          mappingId,\n          group.id,\n          {\n            propertyName,\n            type,\n          },\n        );\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(CalculatedPropertyType.Undefined);\n    } catch (error: any) {\n      handleError(error.status);\n    } finally {\n      setIsLoading(false);\n    }\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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;+FAG+F;AAC/F,wDAG8B;AAC9B,+CAAwC;AACxC,qFAA6D;AAC7D,yEAAiD;AACjD,2CAAyC;AAEzC,4DAAgE;AAChE,mFAAgF;AAChF,qFAAqF;AACrF,6EAAsE;AACtE,uDAAoE;AAU7D,MAAM,wBAAwB,GAAG,CAAC,EACvC,SAAS,EACT,KAAK,EACL,kBAAkB,EAClB,aAAa,EACb,aAAa,GACiB,EAAE,EAAE;IAClC,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,kBAAkB,EAAE,YAAY,IAAI,EAAE,CACvC,CAAC;IACF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,IAAA,gBAAQ,EAAqC,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAC/F,MAAM,CAAC,SAAS,EAAE,qBAAqB,CAAC,GAAG,IAAA,sBAAY,GAAE,CAAC;IAC1D,MAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAC;IAErC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,GAAG,IAAA,yBAAW,EAAC,KAAK,EAAE,IAA4B,EAAE,EAAE;QAC7F,MAAM,WAAW,GAAG,MAAM,cAAc,EAAE,CAAC;QAE3C,OAAO,kBAAkB;YACvB,CAAC,CAAC,aAAa,CAAC,wBAAwB,CACtC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,CAAC,EAAE,EACR,kBAAkB,CAAC,EAAE,EACrB,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB;YACD,CAAC,CAAC,aAAa,CAAC,wBAAwB,CACtC,WAAW,EACX,QAAQ,EACR,SAAS,EACT,KAAK,CAAC,EAAE,EACR,EAAE,YAAY,EAAE,IAAI,EAAE,CACvB,CAAC;IACN,CAAC,EAAE;QACD,SAAS,EAAE,KAAK,IAAI,EAAE;YACpB,MAAM,WAAW,CAAC,iBAAiB,CAAC,EAAE,QAAQ,EAAE,CAAC,sBAAsB,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;YAC3G,aAAa,EAAE,CAAC;YAChB,eAAe,CAAC,EAAE,CAAC,CAAC;YACpB,OAAO,CAAC,wCAAsB,CAAC,SAAS,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,GAAG,EAAE;QAClB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE;YAClC,qBAAqB,CAAC,IAAI,CAAC,CAAC;YAC5B,OAAO;SACR;QAED,YAAY,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,CAAC;IAEF,OAAO,CACL;QACE,uCAAK,SAAS,EAAC,4CAA4C;YACzD,8BAAC,wBAAQ,IAAC,MAAM,EAAC,6BAA6B,EAAC,SAAS,EAAC,kBAAkB;gBACzE,uCAAK,SAAS,EAAC,4BAA4B;oBACzC,8BAAC,oBAAI,IAAC,OAAO,EAAC,OAAO,EAAC,EAAE,EAAC,OAAO,EAAC,SAAS,EAAC,kBAAkB,6CAEtD,CACH;gBACN,8BAAC,6DAA6B,IAC5B,SAAS,EAAE,SAAS,EACpB,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,OAAO,GAChB,CACO,CACP;QACN,8BAAC,qBAAW,IACV,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,aAAa,EACvB,gBAAgB,EAAE,CAAC,CAAC,IAAI,IAAI,YAAY,CAAC,EACzC,SAAS,EAAE,SAAS,GACpB,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AA/EW,QAAA,wBAAwB,4BA+EnC","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"]}

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

@@ -37,13 +37,14 @@ const react_1 = __importStar(require("react"));
 const ActionPanel_1 = __importDefault(require("../../SharedComponents/ActionPanel"));
 const BboxDimensionsDecorator_1 = require("../../../decorators/BboxDimensionsDecorator");
 const useValidator_1 = __importDefault(require("../hooks/useValidator"));
-const utils_1 = require("../../../common/utils");
 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 CalculatedPropertyActionWithVisuals = ({ mappingId, group, calculatedProperty, onSaveSuccess, onClickCancel, }) => {
     const { getAccessToken, iModelId, iModelConnection } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
     if (!iModelConnection) {
@@ -53,11 +54,11 @@ const CalculatedPropertyActionWithVisuals = ({ mappingId, group, calculatedPrope
     const [propertyName, setPropertyName] = (0, react_1.useState)(calculatedProperty?.propertyName ?? "");
     const [type, setType] = (0, react_1.useState)(calculatedProperty?.type);
     const [bboxDecorator, setBboxDecorator] = (0, react_1.useState)();
-    const [isLoading, setIsLoading] = (0, react_1.useState)(false);
     const [inferredSpatialData, setInferredSpatialData] = (0, react_1.useState)();
     const [validator, showValidationMessage] = (0, useValidator_1.default)();
     const [colorProperty, setColorProperty] = (0, react_1.useState)(false);
     const { data } = (0, useKeySetHiliteQueries_1.useGroupKeySetQuery)(group, iModelConnection, true);
+    const queryClient = (0, react_query_1.useQueryClient)();
     const resolvedHiliteIds = (0, react_1.useMemo)(() => {
         // Resolved ids, default to an empty array if not available
         return data?.result?.ids ?? [];
@@ -96,33 +97,25 @@ const CalculatedPropertyActionWithVisuals = ({ mappingId, group, calculatedPrope
                 : bboxDecorator.clearContext();
         }
     }, [bboxDecorator, colorProperty, inferredSpatialData, type]);
-    const onSave = async () => {
+    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 });
+    }, {
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: ["calculatedProperties", iModelId, mappingId, group.id] });
+            onSaveSuccess();
+            setPropertyName("");
+            setType(insights_client_1.CalculatedPropertyType.Undefined);
+        },
+    });
+    const onSave = () => {
         if (!validator.allValid() || !type) {
             showValidationMessage(true);
             return;
         }
-        try {
-            setIsLoading(true);
-            const accessToken = await getAccessToken();
-            calculatedProperty
-                ? await mappingClient.updateCalculatedProperty(accessToken, iModelId, mappingId, group.id, calculatedProperty.id, {
-                    propertyName,
-                    type,
-                })
-                : await mappingClient.createCalculatedProperty(accessToken, iModelId, mappingId, group.id, {
-                    propertyName,
-                    type,
-                });
-            onSaveSuccess();
-            setPropertyName("");
-            setType(undefined);
-        }
-        catch (error) {
-            (0, utils_1.handleError)(error.status);
-        }
-        finally {
-            setIsLoading(false);
-        }
+        saveMutation(type);
     };
     const getSpatialData = (value) => inferredSpatialData?.has(BboxDimensionsDecorator_1.BboxDimension[value]) && (react_1.default.createElement("div", null, `${inferredSpatialData
         ?.get(BboxDimensionsDecorator_1.BboxDimension[value])

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 { handleError } from \"../../../common/utils\";\nimport { visualizeElements, zoomToElements } from \"../../../common/viewerUtils\";\nimport \"./CalculatedPropertyActionWithVisuals.scss\";\nimport { useMappingClient } from \"../../context/MappingClientContext\";\nimport { useGroupingMappingApiConfig } from \"../../context/GroupingApiConfigContext\";\nimport type { CalculatedProperty, CalculatedPropertyType, Group } from \"@itwin/insights-client\";\nimport { SharedCalculatedPropertyForms } from \"./SharedCalculatedPropertyForms\";\nimport { useGroupKeySetQuery } from \"../../Groups/hooks/useKeySetHiliteQueries\";\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 [isLoading, setIsLoading] = useState<boolean>(false);\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\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 onSave = async () => {\n    if (!validator.allValid() || !type) {\n      showValidationMessage(true);\n      return;\n    }\n    try {\n      setIsLoading(true);\n\n      const accessToken = await getAccessToken();\n\n      calculatedProperty\n        ? await mappingClient.updateCalculatedProperty(\n          accessToken,\n          iModelId,\n          mappingId,\n          group.id,\n          calculatedProperty.id,\n          {\n            propertyName,\n            type,\n          },\n        )\n        : await mappingClient.createCalculatedProperty(\n          accessToken,\n          iModelId,\n          mappingId,\n          group.id,\n          {\n            propertyName,\n            type,\n          },\n        );\n      onSaveSuccess();\n      setPropertyName(\"\");\n      setType(undefined);\n    } catch (error: any) {\n      handleError(error.status);\n    } finally {\n      setIsLoading(false);\n    }\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 { 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"]}

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

@@ -36,52 +36,49 @@ 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 CalculatedPropertyTable = ({ mappingId, groupId, onClickAdd, onClickModify, isLoading, calculatedProperties, refresh, }) => {
     const mappingClient = (0, MappingClientContext_1.useMappingClient)();
     const { getAccessToken, iModelId } = (0, GroupingApiConfigContext_1.useGroupingMappingApiConfig)();
+    const queryClient = (0, react_query_1.useQueryClient)();
     const columnsFactory = (0, react_1.useCallback)((handleShowDeleteModal) => [
         {
-            Header: "Table",
-            columns: [
-                {
-                    id: "propertyName",
-                    Header: "Calculated Property",
-                    accessor: "propertyName",
-                    Cell: (value) => (react_1.default.createElement(PropertyNameCell_1.PropertyNameCell, { property: value.row.original, onClickModify: onClickModify })),
-                },
-                {
-                    id: "dropdown",
-                    Header: "",
-                    width: 80,
-                    Cell: (value) => {
-                        return (react_1.default.createElement(itwinui_react_1.DropdownMenu, { menuItems: (close) => [
-                                onClickModify
-                                    ? [
-                                        react_1.default.createElement(itwinui_react_1.MenuItem, { key: 0, onClick: () => {
-                                                onClickModify(value.row.original);
-                                                close();
-                                            }, icon: react_1.default.createElement(itwinui_icons_react_1.SvgEdit, null) }, "Modify"),
-                                    ]
-                                    : [],
-                                react_1.default.createElement(itwinui_react_1.MenuItem, { key: 1, onClick: () => {
-                                        handleShowDeleteModal(value.row.original);
+            id: "propertyName",
+            Header: "Calculated Property",
+            accessor: "propertyName",
+            Cell: (value) => (react_1.default.createElement(PropertyNameCell_1.PropertyNameCell, { property: value.row.original, onClickModify: onClickModify })),
+        },
+        {
+            id: "dropdown",
+            Header: "",
+            width: 80,
+            Cell: (value) => {
+                return (react_1.default.createElement(itwinui_react_1.DropdownMenu, { menuItems: (close) => [
+                        onClickModify
+                            ? [
+                                react_1.default.createElement(itwinui_react_1.MenuItem, { key: 0, onClick: () => {
+                                        onClickModify(value.row.original);
                                         close();
-                                    }, icon: react_1.default.createElement(itwinui_icons_react_1.SvgDelete, null) }, "Remove"),
-                            ].flatMap((p) => p) },
-                            react_1.default.createElement(itwinui_react_1.IconButton, { styleType: "borderless" },
-                                react_1.default.createElement(itwinui_icons_react_1.SvgMore, { style: {
-                                        width: "16px",
-                                        height: "16px",
-                                    } }))));
-                    },
-                },
-            ],
+                                    }, icon: react_1.default.createElement(itwinui_icons_react_1.SvgEdit, null) }, "Modify"),
+                            ]
+                            : [],
+                        react_1.default.createElement(itwinui_react_1.MenuItem, { key: 1, onClick: () => {
+                                handleShowDeleteModal(value.row.original);
+                                close();
+                            }, icon: react_1.default.createElement(itwinui_icons_react_1.SvgDelete, null) }, "Remove"),
+                    ].flatMap((p) => p) },
+                    react_1.default.createElement(itwinui_react_1.IconButton, { styleType: "borderless" },
+                        react_1.default.createElement(itwinui_icons_react_1.SvgMore, null))));
+            },
         },
     ], [onClickModify]);
-    const deleteProperty = (0, react_1.useCallback)(async (propertyId) => {
-        const accessToken = await getAccessToken();
-        await mappingClient.deleteCalculatedProperty(accessToken, iModelId, mappingId, groupId, propertyId);
-    }, [getAccessToken, groupId, iModelId, mappingClient, mappingId]);
+    const { mutateAsync: deleteProperty } = (0, react_query_1.useMutation)({
+        mutationFn: async (propertyId) => {
+            const accessToken = await getAccessToken();
+            await mappingClient.deleteCalculatedProperty(accessToken, iModelId, mappingId, groupId, propertyId);
+        },
+        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 }));
 };
 exports.CalculatedPropertyTable = CalculatedPropertyTable;

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 } 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\";\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\n  const columnsFactory = useCallback(\n    (handleShowDeleteModal: (value: CalculatedProperty) => void) => [\n      {\n        Header: \"Table\",\n        columns: [\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                      style={{\n                        width: \"16px\",\n                        height: \"16px\",\n                      }}\n                    />\n                  </IconButton>\n                </DropdownMenu>\n              );\n            },\n          },\n        ],\n      },\n    ],\n    [onClickModify]\n  );\n\n  const deleteProperty = useCallback(async (propertyId: string) => {\n    const accessToken = await getAccessToken();\n    await mappingClient.deleteCalculatedProperty(\n      accessToken,\n      iModelId,\n      mappingId,\n      groupId,\n      propertyId,\n    );\n  }, [getAccessToken, groupId, iModelId, mappingClient, mappingId]);\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 { 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"]}

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

@@ -42,7 +42,10 @@ 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 PropertiesContext_1 = require("../../context/PropertiesContext");
+const useCalculatedPropertiesQuery_1 = require("../hooks/useCalculatedPropertiesQuery");
+const useCustomCalculationsQuery_1 = require("../hooks/useCustomCalculationsQuery");
+const useGroupPropertiesQuery_1 = require("../hooks/useGroupPropertiesQuery");
+const react_query_1 = require("@tanstack/react-query");
 const stringToPossibleDataType = (str) => {
     switch (str?.toLowerCase()) {
         case "double":
@@ -77,76 +80,34 @@ const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSave
     const mappingClient = (0, MappingClientContext_1.useMappingClient)();
     const [propertyName, setPropertyName] = (0, react_1.useState)(customCalculation?.propertyName ?? "");
     const [formula, setFormula] = (0, react_1.useState)(customCalculation?.formula ?? "");
-    const { groupProperties, setGroupProperties, calculatedProperties, setCalculatedProperties, customCalculationProperties, setCustomCalculationProperties, } = (0, PropertiesContext_1.usePropertiesContext)();
     const [quantityType, setQuantityType] = (0, react_1.useState)(customCalculation?.quantityType ?? insights_client_1.QuantityType.Undefined);
-    const [isLoading, setIsLoading] = (0, react_1.useState)(true);
     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 initialize = (0, react_1.useCallback)(async () => {
-        const accessToken = await getAccessToken();
-        const [groupProps, calcProps, customCalcProps] = await Promise.all([
-            mappingClient.getGroupProperties(accessToken, iModelId, mappingId, groupId),
-            mappingClient.getCalculatedProperties(accessToken, iModelId, mappingId, groupId),
-            mappingClient.getCustomCalculations(accessToken, iModelId, mappingId, groupId),
-        ]);
-        setGroupProperties(groupProps);
-        setCalculatedProperties(calcProps);
-        setCustomCalculationProperties(customCalcProps);
-    }, [getAccessToken, groupId, iModelId, mappingClient, mappingId, setCalculatedProperties, setCustomCalculationProperties, setGroupProperties]);
-    const fetchAllProperties = (0, react_1.useCallback)(async () => {
-        setIsLoading(true);
-        try {
-            if (!groupProperties || !calculatedProperties || !customCalculationProperties) {
-                await initialize();
-            }
-        }
-        catch (error) {
-            (0, utils_1.handleError)(error.status);
-        }
-        finally {
-            setIsLoading(false);
-        }
-    }, [calculatedProperties, customCalculationProperties, groupProperties, initialize]);
+    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);
     (0, react_1.useEffect)(() => {
         const propertiesMap = convertToPropertyMap(groupProperties ?? [], calculatedProperties ?? [], customCalculationProperties ?? []);
         setProperties(propertiesMap);
     }, [calculatedProperties, customCalculationProperties, groupProperties]);
-    (0, react_1.useEffect)(() => {
-        void fetchAllProperties();
-    }, [fetchAllProperties]);
-    const onSave = async () => {
-        if (!validator.allValid()) {
-            showValidationMessage(true);
-            return;
-        }
-        if (!forceValidation()) {
-            return;
-        }
-        try {
-            setIsLoading(true);
-            const accessToken = await getAccessToken();
-            customCalculation
-                ? await mappingClient.updateCustomCalculation(accessToken, iModelId, mappingId, groupId, customCalculation.id, {
-                    propertyName,
-                    formula,
-                    quantityType,
-                })
-                : await mappingClient.createCustomCalculation(accessToken, iModelId, mappingId, groupId, {
-                    propertyName,
-                    formula,
-                    quantityType,
-                });
+    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 });
+    }, {
+        onSuccess: async () => {
+            await queryClient.invalidateQueries({ queryKey: ["customCalculations", iModelId, mappingId, groupId] });
             onSaveSuccess();
             setPropertyName("");
             setFormula("");
             setQuantityType(insights_client_1.QuantityType.Undefined);
-        }
-        catch (error) {
-            // error instanceof Response refuses to be true when it should be.
+        },
+        onError: async (error) => {
             if (error.status === 422) {
-                error = error;
                 const erroredResponse = await error.json();
                 if (erroredResponse.error.code === "InvalidInsightsRequest" &&
                     erroredResponse.error.target === "formula") {
@@ -156,11 +117,19 @@ const CustomCalculationAction = ({ mappingId, groupId, customCalculation, onSave
             else {
                 (0, utils_1.handleError)(error.status);
             }
+        },
+    });
+    const onSave = () => {
+        if (!validator.allValid()) {
+            showValidationMessage(true);
+            return;
         }
-        finally {
-            setIsLoading(false);
+        if (!forceValidation()) {
+            return;
         }
+        saveMutation();
     };
+    const isLoading = isSaving || isLoadingGroupProperties || isLoadingCalculatedProperties || isLoadingCustomCalculations;
     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' },