synapse-react-client 3.1.24 → 3.1.26

package/dist/utils/hooks/SynapseAPI/dataaccess/useDataAccessSubmission.js

@@ -5,21 +5,15 @@ var tslib_1 = require("tslib");
 var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseContext_1 = require("../../../SynapseContext");
-var dataAccessSubmissionQueryKeys = {
-    submission: function (id) { return ['dataAccessSubmission', id]; },
-    search: function (params) {
-        return params ? ['accessSubmissionSearch', params] : ['accessSubmissionSearch'];
-    },
-};
 function useGetDataAccessSubmission(submissionId, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(dataAccessSubmissionQueryKeys.submission(submissionId), function () { return __1.SynapseClient.getSubmissionById(submissionId, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getDataAccessSubmissionQueryKey(String(submissionId.toString())), function () { return __1.SynapseClient.getSubmissionById(submissionId, accessToken); }, options);
 }
 exports.default = useGetDataAccessSubmission;
 function useSearchAccessSubmissionsInfinite(params, options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useInfiniteQuery)(dataAccessSubmissionQueryKeys.search(params), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.searchDataAccessSubmissionQueryKey(params), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, __1.SynapseClient.searchAccessSubmission(tslib_1.__assign(tslib_1.__assign({}, params), { nextPageToken: context.pageParam }), accessToken)];
@@ -32,23 +26,28 @@ exports.useSearchAccessSubmissionsInfinite = useSearchAccessSubmissionsInfinite;
 function useUpdateDataAccessSubmissionState(options) {
     var _this = this;
     var queryClient = (0, react_query_1.useQueryClient)();
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     return (0, react_query_1.useMutation)(function (request) {
         return __1.SynapseClient.updateSubmissionStatus(request, accessToken);
     }, tslib_1.__assign(tslib_1.__assign({}, options), { onSuccess: function (updatedSubmission, variables, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0:
+                    case 0: 
+                    // Invalidate all searches, since updating the status will affect filtered search results
+                    return [4 /*yield*/, queryClient.invalidateQueries(keyFactory.searchDataAccessSubmissionQueryKey())
+                        // Update the query data for the updated submission
+                    ];
+                    case 1:
                         // Invalidate all searches, since updating the status will affect filtered search results
-                        queryClient.invalidateQueries(dataAccessSubmissionQueryKeys.search());
+                        _a.sent();
                         // Update the query data for the updated submission
-                        queryClient.setQueryData(dataAccessSubmissionQueryKeys.submission(variables.submissionId), updatedSubmission);
-                        if (!(options === null || options === void 0 ? void 0 : options.onSuccess)) return [3 /*break*/, 2];
+                        queryClient.setQueryData(keyFactory.getDataAccessSubmissionQueryKey(variables.submissionId), updatedSubmission);
+                        if (!(options === null || options === void 0 ? void 0 : options.onSuccess)) return [3 /*break*/, 3];
                         return [4 /*yield*/, options.onSuccess(updatedSubmission, variables, ctx)];
-                    case 1:
+                    case 2:
                         _a.sent();
-                        _a.label = 2;
-                    case 2: return [2 /*return*/];
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
                 }
             });
         }); } }));

package/dist/utils/hooks/SynapseAPI/dataaccess/useDataAccessSubmission.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDataAccessSubmission.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/dataaccess/useDataAccessSubmission.ts"],"names":[],"mappings":";;;;AAAA,2CAQoB;AACpB,8BAAwC;AAExC,0DAA2D;AAQ3D,IAAM,6BAA6B,GAAG;IACpC,UAAU,EAAE,UAAC,EAAmB,IAAK,OAAA,CAAC,sBAAsB,EAAE,EAAE,CAAC,EAA5B,CAA4B;IACjE,MAAM,EAAE,UAAC,MAAgC;QACvC,OAAA,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAC;IAAxE,CAAwE;CAC3E,CAAA;AAED,SAAwB,0BAA0B,CAChD,YAA6B,EAC7B,OAAyD;IAEjD,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,sBAAQ,EACb,6BAA6B,CAAC,UAAU,CAAC,YAAY,CAAC,EACtD,cAAM,OAAA,iBAAa,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,EAA1D,CAA0D,EAChE,OAAO,CACR,CAAA;AACH,CAAC;AAXD,6CAWC;AAED,SAAgB,kCAAkC,CAChD,MAA+B,EAC/B,OAGC;IALH,iBAyBC;IAlBS,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,8BAAgB,EACrB,6BAA6B,CAAC,MAAM,CAAC,MAAM,CAAC,EAC5C,UAAM,OAAO;;;wBACJ,qBAAM,iBAAa,CAAC,sBAAsB,uCAE1C,MAAM,KACT,aAAa,EAAE,OAAO,CAAC,SAAS,KAElC,WAAW,CACZ,EAAA;wBAND,sBAAO,SAMN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AAzBD,gFAyBC;AAED,SAAgB,kCAAkC,CAChD,OAIC;IALH,iBAkCC;IA3BC,IAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAA;IAC5B,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,yBAAW,EAKhB,UAAC,OAAqC;QACpC,OAAA,iBAAa,CAAC,sBAAsB,CAAC,OAAO,EAAE,WAAW,CAAC;IAA1D,CAA0D,wCAEvD,OAAO,KACV,SAAS,EAAE,UAAO,iBAAiB,EAAE,SAAS,EAAE,GAAG;;;;wBACjD,yFAAyF;wBACzF,WAAW,CAAC,iBAAiB,CAAC,6BAA6B,CAAC,MAAM,EAAE,CAAC,CAAA;wBACrE,mDAAmD;wBACnD,WAAW,CAAC,YAAY,CACtB,6BAA6B,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,EAChE,iBAAiB,CAClB,CAAA;6BAEG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAA,EAAlB,wBAAkB;wBACpB,qBAAM,OAAO,CAAC,SAAS,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,CAAC,EAAA;;wBAA1D,SAA0D,CAAA;;;;;aAE7D,IAEJ,CAAA;AACH,CAAC;AAlCD,gFAkCC"}
+{"version":3,"file":"useDataAccessSubmission.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/dataaccess/useDataAccessSubmission.ts"],"names":[],"mappings":";;;;AAAA,2CAQoB;AACpB,8BAAwC;AAExC,0DAA2D;AAQ3D,SAAwB,0BAA0B,CAChD,YAA6B,EAC7B,OAAyD;IAEnD,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,+BAA+B,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,EAC3E,cAAM,OAAA,iBAAa,CAAC,iBAAiB,CAAC,YAAY,EAAE,WAAW,CAAC,EAA1D,CAA0D,EAChE,OAAO,CACR,CAAA;AACH,CAAC;AAXD,6CAWC;AAED,SAAgB,kCAAkC,CAChD,MAA+B,EAC/B,OAGC;IALH,iBAyBC;IAlBO,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,8BAAgB,EACrB,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,EACrD,UAAM,OAAO;;;wBACJ,qBAAM,iBAAa,CAAC,sBAAsB,uCAE1C,MAAM,KACT,aAAa,EAAE,OAAO,CAAC,SAAS,KAElC,WAAW,CACZ,EAAA;wBAND,sBAAO,SAMN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AAzBD,gFAyBC;AAED,SAAgB,kCAAkC,CAChD,OAIC;IALH,iBAoCC;IA7BC,IAAM,WAAW,GAAG,IAAA,4BAAc,GAAE,CAAA;IAC9B,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,yBAAW,EAKhB,UAAC,OAAqC;QACpC,OAAA,iBAAa,CAAC,sBAAsB,CAAC,OAAO,EAAE,WAAW,CAAC;IAA1D,CAA0D,wCAEvD,OAAO,KACV,SAAS,EAAE,UAAO,iBAAiB,EAAE,SAAS,EAAE,GAAG;;;;oBACjD,yFAAyF;oBACzF,qBAAM,WAAW,CAAC,iBAAiB,CACjC,UAAU,CAAC,kCAAkC,EAAE,CAChD;wBACD,mDAAmD;sBADlD;;wBAHD,yFAAyF;wBACzF,SAEC,CAAA;wBACD,mDAAmD;wBACnD,WAAW,CAAC,YAAY,CACtB,UAAU,CAAC,+BAA+B,CAAC,SAAS,CAAC,YAAY,CAAC,EAClE,iBAAiB,CAClB,CAAA;6BAEG,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAA,EAAlB,wBAAkB;wBACpB,qBAAM,OAAO,CAAC,SAAS,CAAC,iBAAiB,EAAE,SAAS,EAAE,GAAG,CAAC,EAAA;;wBAA1D,SAA0D,CAAA;;;;;aAE7D,IAEJ,CAAA;AACH,CAAC;AApCD,gFAoCC"}

package/dist/utils/hooks/SynapseAPI/dataaccess/useGetApprovedSubmissionInfo.js

@@ -7,11 +7,11 @@ var __1 = require("../../..");
 var SynapseContext_1 = require("../../../SynapseContext");
 function useGetApprovedSubmissionInfoInfinite(accessRequirementId, options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     var request = {
         accessRequirementId: accessRequirementId,
     };
-    return (0, react_query_1.useInfiniteQuery)(['approvedSubmissionInfo', request], function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getApprovedSubmissionInfoQueryKey(request), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, __1.SynapseClient.getApprovedSubmissionInfo(tslib_1.__assign(tslib_1.__assign({}, request), { nextPageToken: context.pageParam }), accessToken)];

package/dist/utils/hooks/SynapseAPI/dataaccess/useGetApprovedSubmissionInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetApprovedSubmissionInfo.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/dataaccess/useGetApprovedSubmissionInfo.ts"],"names":[],"mappings":";;;;AAAA,2CAAuE;AACvE,8BAAwC;AAExC,0DAA2D;AAM3D,SAAgB,oCAAoC,CAClD,mBAA2B,EAC3B,OAIC;IANH,iBAyBC;IAjBS,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,IAAM,OAAO,GAA8B;QACzC,mBAAmB,qBAAA;KACpB,CAAA;IACD,OAAO,IAAA,8BAAgB,EACrB,CAAC,wBAAwB,EAAE,OAAO,CAAC,EACnC,UAAM,OAAO;;;wBACJ,qBAAM,iBAAa,CAAC,yBAAyB,uCAC7C,OAAO,KAAE,aAAa,EAAE,OAAO,CAAC,SAAS,KAC9C,WAAW,CACZ,EAAA;wBAHD,sBAAO,SAGN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AAzBD,oFAyBC"}
+{"version":3,"file":"useGetApprovedSubmissionInfo.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/dataaccess/useGetApprovedSubmissionInfo.ts"],"names":[],"mappings":";;;;AAAA,2CAAuE;AACvE,8BAAwC;AAExC,0DAA2D;AAM3D,SAAgB,oCAAoC,CAClD,mBAA2B,EAC3B,OAIC;IANH,iBAyBC;IAjBO,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,IAAM,OAAO,GAA8B;QACzC,mBAAmB,qBAAA;KACpB,CAAA;IACD,OAAO,IAAA,8BAAgB,EACrB,UAAU,CAAC,iCAAiC,CAAC,OAAO,CAAC,EACrD,UAAM,OAAO;;;wBACJ,qBAAM,iBAAa,CAAC,yBAAyB,uCAC7C,OAAO,KAAE,aAAa,EAAE,OAAO,CAAC,SAAS,KAC9C,WAAW,CACZ,EAAA;wBAHD,sBAAO,SAGN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AAzBD,oFAyBC"}

package/dist/utils/hooks/SynapseAPI/doi/useDOI.js

@@ -6,8 +6,8 @@ var SynapseContext_1 = require("../../../SynapseContext");
 var index_1 = require("../../../index");
 function useGetDOIAssociation(objectId, versionNumber, objectType, options) {
     if (objectType === void 0) { objectType = 'ENTITY'; }
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(['doi', 'association', objectType, objectId, versionNumber], function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getDOIAssociationQueryKey(objectType, objectId, versionNumber), function () {
         return index_1.SynapseClient.getDOIAssociation(accessToken, objectId, versionNumber, objectType);
     }, options);
 }

package/dist/utils/hooks/SynapseAPI/doi/useDOI.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDOI.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/doi/useDOI.ts"],"names":[],"mappings":";;;AACA,2CAAuD;AAEvD,0DAA2D;AAC3D,wCAA8C;AAE9C,SAAgB,oBAAoB,CAClC,QAAgB,EAChB,aAAsB,EACtB,UAAqB,EACrB,OAAoE;IADpE,2BAAA,EAAA,qBAAqB;IAGb,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,OAAO,IAAA,sBAAQ,EACb,CAAC,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAC,EAC3D;QACE,OAAA,qBAAa,CAAC,iBAAiB,CAC7B,WAAW,EACX,QAAQ,EACR,aAAa,EACb,UAAU,CACX;IALD,CAKC,EACH,OAAO,CACR,CAAA;AACH,CAAC;AAlBD,oDAkBC"}
+{"version":3,"file":"useDOI.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/doi/useDOI.ts"],"names":[],"mappings":";;;AACA,2CAAuD;AAEvD,0DAA2D;AAC3D,wCAA8C;AAE9C,SAAgB,oBAAoB,CAClC,QAAgB,EAChB,aAAsB,EACtB,UAAqB,EACrB,OAAoE;IADpE,2BAAA,EAAA,qBAAqB;IAGf,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,yBAAyB,CAAC,UAAU,EAAE,QAAQ,EAAE,aAAa,CAAC,EACzE;QACE,OAAA,qBAAa,CAAC,iBAAiB,CAC7B,WAAW,EACX,QAAQ,EACR,aAAa,EACb,UAAU,CACX;IALD,CAKC,EACH,OAAO,CACR,CAAA;AACH,CAAC;AAlBD,oDAkBC"}

package/dist/utils/hooks/SynapseAPI/download/useDownloadList.d.ts

@@ -3,14 +3,6 @@ import { UseInfiniteQueryOptions, UseMutationOptions, UseQueryOptions } from 're
 import { ActionRequiredResponse, AvailableFilesResponse, FilesStatisticsResponse } from '../../../synapseTypes/DownloadListV2/QueryResponseDetails';
 import { SynapseClientError } from '../../../SynapseClientError';
 import { AddBatchOfFilesToDownloadListResponse } from '../../../synapseTypes/DownloadListV2/AddBatchOfFilesToDownloadListResponse';
-export declare const downloadListQueryKeys: {
-    base: string[];
-    availableFiles: (request: AvailableFilesRequest) => (string | AvailableFilesRequest)[];
-    availableFilesInfinite: (request: AvailableFilesRequest) => (string | AvailableFilesRequest)[];
-    getActionsRequired: () => string[];
-    getActionsRequiredInfinite: () => string[];
-    getStatistics: () => string[];
-};
 export declare function useGetAvailableFilesToDownload(request: AvailableFilesRequest, options?: UseQueryOptions<AvailableFilesResponse, SynapseClientError, AvailableFilesResponse>): import("react-query").UseQueryResult<AvailableFilesResponse, SynapseClientError>;
 export declare function useGetAvailableFilesToDownloadInfinite(sort?: Sort, filter?: AvailableFilter, options?: UseInfiniteQueryOptions<AvailableFilesResponse, SynapseClientError, AvailableFilesResponse>): import("react-query").UseInfiniteQueryResult<AvailableFilesResponse, SynapseClientError>;
 export declare function useGetDownloadListActionsRequired(options?: UseQueryOptions<ActionRequiredResponse, SynapseClientError, ActionRequiredResponse>): import("react-query").UseQueryResult<ActionRequiredResponse, SynapseClientError>;

package/dist/utils/hooks/SynapseAPI/download/useDownloadList.js

@@ -1,34 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useAddFileToDownloadList = exports.useGetDownloadListStatistics = exports.useGetDownloadListActionsRequiredInfinite = exports.useGetDownloadListActionsRequired = exports.useGetAvailableFilesToDownloadInfinite = exports.useGetAvailableFilesToDownload = exports.downloadListQueryKeys = void 0;
+exports.useAddFileToDownloadList = exports.useGetDownloadListStatistics = exports.useGetDownloadListActionsRequiredInfinite = exports.useGetDownloadListActionsRequired = exports.useGetAvailableFilesToDownloadInfinite = exports.useGetAvailableFilesToDownload = void 0;
 var tslib_1 = require("tslib");
 var react_query_1 = require("react-query");
 var SynapseContext_1 = require("../../../SynapseContext");
 var index_1 = require("../../../index");
-exports.downloadListQueryKeys = {
-    /* Key used to invalidate all download list queries */
-    base: ['downloadList'],
-    availableFiles: function (request) { return tslib_1.__spreadArray(tslib_1.__spreadArray([], exports.downloadListQueryKeys.base, true), [
-        'availableFiles',
-        request,
-    ], false); },
-    availableFilesInfinite: function (request) { return tslib_1.__spreadArray(tslib_1.__spreadArray([], exports.downloadListQueryKeys.availableFiles(request), true), [
-        'infinite',
-    ], false); },
-    getActionsRequired: function () { return tslib_1.__spreadArray(tslib_1.__spreadArray([], exports.downloadListQueryKeys.base, true), ['actionsRequired'], false); },
-    getActionsRequiredInfinite: function () { return tslib_1.__spreadArray(tslib_1.__spreadArray([], exports.downloadListQueryKeys.getActionsRequired(), true), [
-        'infinite',
-    ], false); },
-    getStatistics: function () { return tslib_1.__spreadArray(tslib_1.__spreadArray([], exports.downloadListQueryKeys.base, true), ['statistics'], false); },
-};
 function useGetAvailableFilesToDownload(request, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(exports.downloadListQueryKeys.availableFiles(request), function () { return index_1.SynapseClient.getAvailableFilesToDownload(request, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getDownloadListAvailableFilesQueryKey(request), function () { return index_1.SynapseClient.getAvailableFilesToDownload(request, accessToken); }, options);
 }
 exports.useGetAvailableFilesToDownload = useGetAvailableFilesToDownload;
 function useGetAvailableFilesToDownloadInfinite(sort, filter, options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     var request = {
         concreteType: 'org.sagebionetworks.repo.model.download.AvailableFilesRequest',
     };
@@ -38,7 +22,7 @@ function useGetAvailableFilesToDownloadInfinite(sort, filter, options) {
     if (filter) {
         request.filter = filter;
     }
-    return (0, react_query_1.useInfiniteQuery)(exports.downloadListQueryKeys.availableFilesInfinite(request), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getDownloadListAvailableFilesInfiniteQueryKey(request), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, index_1.SynapseClient.getAvailableFilesToDownload(tslib_1.__assign(tslib_1.__assign({}, request), { nextPageToken: context.pageParam }), accessToken)];
         });
@@ -46,20 +30,20 @@ function useGetAvailableFilesToDownloadInfinite(sort, filter, options) {
 }
 exports.useGetAvailableFilesToDownloadInfinite = useGetAvailableFilesToDownloadInfinite;
 function useGetDownloadListActionsRequired(options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     var request = {
         concreteType: 'org.sagebionetworks.repo.model.download.ActionRequiredRequest',
     };
-    return (0, react_query_1.useQuery)(exports.downloadListQueryKeys.getActionsRequired(), function () { return index_1.SynapseClient.getDownloadListActionsRequired(request, accessToken); }, options);
+    return (0, react_query_1.useQuery)(keyFactory.getDownloadListActionsRequiredQueryKey(), function () { return index_1.SynapseClient.getDownloadListActionsRequired(request, accessToken); }, options);
 }
 exports.useGetDownloadListActionsRequired = useGetDownloadListActionsRequired;
 function useGetDownloadListActionsRequiredInfinite(options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     var request = {
         concreteType: 'org.sagebionetworks.repo.model.download.ActionRequiredRequest',
     };
-    return (0, react_query_1.useInfiniteQuery)(exports.downloadListQueryKeys.getActionsRequiredInfinite(), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getDownloadListActionsRequiredInfiniteQueryKey(), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, index_1.SynapseClient.getDownloadListActionsRequired(tslib_1.__assign(tslib_1.__assign({}, request), { nextPageToken: context.pageParam }), accessToken)];
@@ -70,13 +54,13 @@ function useGetDownloadListActionsRequiredInfinite(options) {
 }
 exports.useGetDownloadListActionsRequiredInfinite = useGetDownloadListActionsRequiredInfinite;
 function useGetDownloadListStatistics(options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(exports.downloadListQueryKeys.getStatistics(), function () { return index_1.SynapseClient.getDownloadListStatistics(accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getDownloadListStatisticsQueryKey(), function () { return index_1.SynapseClient.getDownloadListStatistics(accessToken); }, options);
 }
 exports.useGetDownloadListStatistics = useGetDownloadListStatistics;
 function useAddFileToDownloadList(options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     var queryClient = (0, react_query_1.useQueryClient)();
     return (0, react_query_1.useMutation)(tslib_1.__assign(tslib_1.__assign({}, options), { mutationFn: function (vars) {
             return index_1.SynapseClient.addFileToDownloadListV2(vars.entityId, vars.entityVersionNumber, accessToken);
@@ -85,7 +69,7 @@ function useAddFileToDownloadList(options) {
                 switch (_a.label) {
                     case 0: 
                     // PORTALS-2222: Invalidate to load the accurate results
-                    return [4 /*yield*/, queryClient.invalidateQueries(exports.downloadListQueryKeys.base)];
+                    return [4 /*yield*/, queryClient.invalidateQueries(keyFactory.getDownloadListBaseQueryKey())];
                     case 1:
                         // PORTALS-2222: Invalidate to load the accurate results
                         _a.sent();

package/dist/utils/hooks/SynapseAPI/download/useDownloadList.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDownloadList.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/download/useDownloadList.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useDownloadList.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/download/useDownloadList.ts"],"names":[],"mappings":"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"}

package/dist/utils/hooks/SynapseAPI/entity/useEntity.js

@@ -11,10 +11,10 @@ var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var EntityTypeUtils_1 = require("../../../functions/EntityTypeUtils");
 var SynapseContext_1 = require("../../../SynapseContext");
-var queryKeys_1 = require("./queryKeys");
+var QueryClientUtils_1 = require("../QueryClientUtils");
 function useGetEntity(entityId, versionNumber, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.version(entityId, versionNumber), function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityVersionQueryKey(entityId, versionNumber), function () {
         return __1.SynapseClient.getEntity(accessToken, entityId, versionNumber === null || versionNumber === void 0 ? void 0 : versionNumber.toString());
     }, options);
 }
@@ -22,14 +22,14 @@ exports.useGetEntity = useGetEntity;
 function useUpdateEntity(options) {
     var _this = this;
     var queryClient = (0, react_query_1.useQueryClient)();
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     return (0, react_query_1.useMutation)(function (entity) { return __1.SynapseClient.updateEntity(entity, accessToken); }, tslib_1.__assign(tslib_1.__assign({}, options), { onSuccess: function (updatedEntity, variables, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, queryKeys_1.invalidateAllQueriesForEntity)(queryClient, updatedEntity.id)];
+                    case 0: return [4 /*yield*/, (0, QueryClientUtils_1.invalidateAllQueriesForEntity)(queryClient, keyFactory, updatedEntity.id)];
                     case 1:
                         _a.sent();
-                        queryClient.setQueryData(queryKeys_1.entityQueryKeys.entity(updatedEntity.id), updatedEntity);
+                        queryClient.setQueryData(keyFactory.getEntityQueryKey(updatedEntity.id), updatedEntity);
                         if (!(options === null || options === void 0 ? void 0 : options.onSuccess)) return [3 /*break*/, 3];
                         return [4 /*yield*/, options.onSuccess(updatedEntity, variables, ctx)];
                     case 2:
@@ -44,11 +44,11 @@ exports.useUpdateEntity = useUpdateEntity;
 function useDeleteEntity(options) {
     var _this = this;
     var queryClient = (0, react_query_1.useQueryClient)();
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     return (0, react_query_1.useMutation)(function (entityId) { return __1.SynapseClient.deleteEntity(accessToken, entityId); }, tslib_1.__assign(tslib_1.__assign({}, options), { onSuccess: function (voidReturn, entityId, ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, queryKeys_1.invalidateAllQueriesForEntity)(queryClient, entityId)];
+                    case 0: return [4 /*yield*/, (0, QueryClientUtils_1.invalidateAllQueriesForEntity)(queryClient, keyFactory, entityId)];
                     case 1:
                         _a.sent();
                         if (!(options === null || options === void 0 ? void 0 : options.onSuccess)) return [3 /*break*/, 3];
@@ -65,15 +65,15 @@ exports.useDeleteEntity = useDeleteEntity;
 function useGetVersions(entityId, offset, limit, options) {
     if (offset === void 0) { offset = 0; }
     if (limit === void 0) { limit = 200; }
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.versionsQuery(entityId, limit, offset), function () { return __1.SynapseClient.getEntityVersions(entityId, accessToken, offset, limit); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getPaginatedEntityVersionsQueryKey(entityId, limit, offset), function () { return __1.SynapseClient.getEntityVersions(entityId, accessToken, offset, limit); }, options);
 }
 exports.useGetVersions = useGetVersions;
 function useGetVersionsInfinite(entityId, options) {
     var _this = this;
     var LIMIT = 200;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useInfiniteQuery)(queryKeys_1.entityQueryKeys.versions(entityId), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getEntityVersionsQueryKey(entityId), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, __1.SynapseClient.getEntityVersions(entityId, accessToken, context.pageParam, LIMIT)];
@@ -107,8 +107,8 @@ exports.removeStandardEntityFields = removeStandardEntityFields;
 function useGetJson(entityId, options) {
     var _a = (0, react_1.useState)(), entityMetadata = _a[0], setEntityMetadata = _a[1];
     var _b = (0, react_1.useState)(), annotations = _b[0], setAnnotations = _b[1];
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    var query = (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.json(entityId), function () { return __1.SynapseClient.getEntityJson(entityId, accessToken); }, options);
+    var _c = (0, SynapseContext_1.useSynapseContext)(), accessToken = _c.accessToken, keyFactory = _c.keyFactory;
+    var query = (0, react_query_1.useQuery)(keyFactory.getEntityJsonQueryKey(entityId), function () { return __1.SynapseClient.getEntityJson(entityId, accessToken); }, options);
     // Separate the standard fields and annotations.
     (0, react_1.useEffect)(function () {
         if (query.data) {
@@ -122,7 +122,7 @@ exports.useGetJson = useGetJson;
 function useUpdateViaJson(options) {
     var _this = this;
     var queryClient = (0, react_query_1.useQueryClient)();
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
     return (0, react_query_1.useMutation)(function (json) {
         var entityId = json.id;
         return __1.SynapseClient.updateEntityJson(entityId, json, accessToken);
@@ -132,10 +132,10 @@ function useUpdateViaJson(options) {
                 switch (_a.label) {
                     case 0:
                         entityId = data.id;
-                        return [4 /*yield*/, (0, queryKeys_1.invalidateAllQueriesForEntity)(queryClient, entityId)];
+                        return [4 /*yield*/, (0, QueryClientUtils_1.invalidateAllQueriesForEntity)(queryClient, keyFactory, entityId)];
                     case 1:
                         _a.sent();
-                        queryClient.setQueryData(queryKeys_1.entityQueryKeys.json(entityId), data);
+                        queryClient.setQueryData(keyFactory.getEntityJsonQueryKey(entityId), data);
                         if (!(options === null || options === void 0 ? void 0 : options.onSuccess)) return [3 /*break*/, 3];
                         return [4 /*yield*/, options.onSuccess(data, variables, ctx)];
                     case 2:
@@ -148,8 +148,8 @@ function useUpdateViaJson(options) {
 }
 exports.useUpdateViaJson = useUpdateViaJson;
 function useGetEntityPath(entityId, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.path(entityId), function () { return __1.SynapseClient.getEntityPath(entityId, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityPathQueryKey(entityId), function () { return __1.SynapseClient.getEntityPath(entityId, accessToken); }, options);
 }
 exports.useGetEntityPath = useGetEntityPath;
 //# sourceMappingURL=useEntity.js.map

package/dist/utils/hooks/SynapseAPI/entity/useEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEntity.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useEntity.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntity.ts"],"names":[],"mappings":"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"}

package/dist/utils/hooks/SynapseAPI/entity/useEntityBoundSchema.js

@@ -4,15 +4,14 @@ exports.useGetValidationResults = exports.useGetSchemaBinding = void 0;
 var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseContext_1 = require("../../../SynapseContext");
-var queryKeys_1 = require("./queryKeys");
 function useGetSchemaBinding(entityId, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.boundJSONSchema(entityId), function () { return __1.SynapseClient.getSchemaBinding(entityId, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityBoundJsonSchemaQueryKey(entityId), function () { return __1.SynapseClient.getSchemaBinding(entityId, accessToken); }, options);
 }
 exports.useGetSchemaBinding = useGetSchemaBinding;
 function useGetValidationResults(entityId, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.schemaValidationResults(entityId), function () { return __1.SynapseClient.getSchemaValidationResults(entityId, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntitySchemaValidationResultsQueryKey(entityId), function () { return __1.SynapseClient.getSchemaValidationResults(entityId, accessToken); }, options);
 }
 exports.useGetValidationResults = useGetValidationResults;
 //# sourceMappingURL=useEntityBoundSchema.js.map

package/dist/utils/hooks/SynapseAPI/entity/useEntityBoundSchema.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEntityBoundSchema.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntityBoundSchema.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,0DAA2D;AAG3D,yCAA6C;AAE7C,SAAgB,mBAAmB,CACjC,QAAgB,EAChB,OAA6E;IAErE,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,OAAO,IAAA,sBAAQ,EACb,2BAAe,CAAC,eAAe,CAAC,QAAQ,CAAC,EACzC,cAAM,OAAA,iBAAa,CAAC,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC,EAArD,CAAqD,EAC3D,OAAO,CACR,CAAA;AACH,CAAC;AAVD,kDAUC;AAED,SAAgB,uBAAuB,CACrC,QAAgB,EAChB,OAAgE;IAExD,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,sBAAQ,EACb,2BAAe,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EACjD,cAAM,OAAA,iBAAa,CAAC,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,EAA/D,CAA+D,EACrE,OAAO,CACR,CAAA;AACH,CAAC;AAXD,0DAWC"}
+{"version":3,"file":"useEntityBoundSchema.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntityBoundSchema.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,0DAA2D;AAI3D,SAAgB,mBAAmB,CACjC,QAAgB,EAChB,OAA6E;IAEvE,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,gCAAgC,CAAC,QAAQ,CAAC,EACrD,cAAM,OAAA,iBAAa,CAAC,gBAAgB,CAAC,QAAQ,EAAE,WAAW,CAAC,EAArD,CAAqD,EAC3D,OAAO,CACR,CAAA;AACH,CAAC;AAVD,kDAUC;AAED,SAAgB,uBAAuB,CACrC,QAAgB,EAChB,OAAgE;IAE1D,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,wCAAwC,CAAC,QAAQ,CAAC,EAC7D,cAAM,OAAA,iBAAa,CAAC,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,EAA/D,CAA+D,EACrE,OAAO,CACR,CAAA;AACH,CAAC;AAXD,0DAWC"}

package/dist/utils/hooks/SynapseAPI/entity/useEntityBundle.js

@@ -5,11 +5,10 @@ var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseConstants_1 = require("../../../SynapseConstants");
 var SynapseContext_1 = require("../../../SynapseContext");
-var queryKeys_1 = require("./queryKeys");
 function useGetEntityBundle(entityId, version, bundleRequest, options) {
     if (bundleRequest === void 0) { bundleRequest = SynapseConstants_1.ALL_ENTITY_BUNDLE_FIELDS; }
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.bundle(entityId, version, bundleRequest), function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityBundleQueryKey(entityId, version, bundleRequest), function () {
         return __1.SynapseClient.getEntityBundleV2(entityId, bundleRequest, version, accessToken);
     }, options);
 }

package/dist/utils/hooks/SynapseAPI/entity/useEntityBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"useEntityBundle.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntityBundle.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,8DAAoE;AACpE,0DAA2D;AAE3D,yCAA6C;AAE7C,SAAgB,kBAAkB,CAGhC,QAAgB,EAChB,OAAgB,EAChB,aAAgD,EAChD,OAA8D;IAD9D,8BAAA,EAAA,gBAAmB,2CAA6B;IAGxC,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,OAAO,IAAA,sBAAQ,EACb,2BAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,EACxD;QACE,OAAA,iBAAa,CAAC,iBAAiB,CAC7B,QAAQ,EACR,aAAa,EACb,OAAO,EACP,WAAW,CACZ;IALD,CAKC,EACH,OAAO,CACR,CAAA;AACH,CAAC;AApBD,gDAoBC;AAED,kBAAe,kBAAkB,CAAA"}
+{"version":3,"file":"useEntityBundle.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useEntityBundle.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,8DAAoE;AACpE,0DAA2D;AAG3D,SAAgB,kBAAkB,CAGhC,QAAgB,EAChB,OAAgB,EAChB,aAAgD,EAChD,OAA8D;IAD9D,8BAAA,EAAA,gBAAmB,2CAA6B;IAG1C,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,uBAAuB,CAAC,QAAQ,EAAE,OAAO,EAAE,aAAa,CAAC,EACpE;QACE,OAAA,iBAAa,CAAC,iBAAiB,CAC7B,QAAQ,EACR,aAAa,EACb,OAAO,EACP,WAAW,CACZ;IALD,CAKC,EACH,OAAO,CACR,CAAA;AACH,CAAC;AApBD,gDAoBC;AAED,kBAAe,kBAAkB,CAAA"}

package/dist/utils/hooks/SynapseAPI/entity/useGetEntityChildren.js

@@ -5,16 +5,15 @@ var tslib_1 = require("tslib");
 var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseContext_1 = require("../../../SynapseContext");
-var queryKeys_1 = require("./queryKeys");
 function useGetEntityChildren(request, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.children(request, false), function () { return __1.SynapseClient.getEntityChildren(request, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityChildrenQueryKey(request, false), function () { return __1.SynapseClient.getEntityChildren(request, accessToken); }, options);
 }
 exports.useGetEntityChildren = useGetEntityChildren;
 function useGetEntityChildrenInfinite(request, options) {
     var _this = this;
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useInfiniteQuery)(queryKeys_1.entityQueryKeys.children(request, true), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getEntityChildrenQueryKey(request, true), function (context) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, __1.SynapseClient.getEntityChildren(tslib_1.__assign(tslib_1.__assign({}, request), { includeTotalChildCount: context.pageParam

package/dist/utils/hooks/SynapseAPI/entity/useGetEntityChildren.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetEntityChildren.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetEntityChildren.ts"],"names":[],"mappings":";;;;AAAA,2CAOoB;AACpB,8BAAwC;AAExC,0DAA2D;AAK3D,yCAA6C;AAE7C,SAAgB,oBAAoB,CAClC,OAA8B,EAC9B,OAIC;IAEO,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,OAAO,IAAA,sBAAQ,EACb,2BAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,EACxC,cAAM,OAAA,iBAAa,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,EAArD,CAAqD,EAC3D,OAAO,CACR,CAAA;AACH,CAAC;AAdD,oDAcC;AAED,SAAgB,4BAA4B,CAC1C,OAA8B,EAC9B,OAIC;IANH,iBA6BC;IArBS,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAC3C,OAAO,IAAA,8BAAgB,EACrB,2BAAe,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,EACvC,UAAO,OAA+C;;;wBAC7C,qBAAM,iBAAa,CAAC,iBAAiB,uCAErC,OAAO,KACV,sBAAsB,EAAE,OAAO,CAAC,SAAS;4BACvC,CAAC,CAAC,KAAK;4BACP,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAClC,aAAa,EAAE,OAAO,CAAC,SAAS,KAElC,WAAW,EACX,OAAO,CAAC,MAAM,CACf,EAAA;wBAVD,sBAAO,SAUN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AA7BD,oEA6BC"}
+{"version":3,"file":"useGetEntityChildren.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetEntityChildren.ts"],"names":[],"mappings":";;;;AAAA,2CAOoB;AACpB,8BAAwC;AAExC,0DAA2D;AAM3D,SAAgB,oBAAoB,CAClC,OAA8B,EAC9B,OAIC;IAEK,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,yBAAyB,CAAC,OAAO,EAAE,KAAK,CAAC,EACpD,cAAM,OAAA,iBAAa,CAAC,iBAAiB,CAAC,OAAO,EAAE,WAAW,CAAC,EAArD,CAAqD,EAC3D,OAAO,CACR,CAAA;AACH,CAAC;AAdD,oDAcC;AAED,SAAgB,4BAA4B,CAC1C,OAA8B,EAC9B,OAIC;IANH,iBA6BC;IArBO,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IACvD,OAAO,IAAA,8BAAgB,EACrB,UAAU,CAAC,yBAAyB,CAAC,OAAO,EAAE,IAAI,CAAC,EACnD,UAAO,OAA+C;;;wBAC7C,qBAAM,iBAAa,CAAC,iBAAiB,uCAErC,OAAO,KACV,sBAAsB,EAAE,OAAO,CAAC,SAAS;4BACvC,CAAC,CAAC,KAAK;4BACP,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAClC,aAAa,EAAE,OAAO,CAAC,SAAS,KAElC,WAAW,EACX,OAAO,CAAC,MAAM,CACf,EAAA;wBAVD,sBAAO,SAUN,EAAA;;;SACF,wCAEI,OAAO,KACV,gBAAgB,EAAE,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,aAAa,EAAlB,CAAkB,IAE/C,CAAA;AACH,CAAC;AA7BD,oEA6BC"}

package/dist/utils/hooks/SynapseAPI/entity/useGetEntityHeaders.js

@@ -5,13 +5,13 @@ var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseContext_1 = require("../../../SynapseContext");
 function useGetEntityHeaders(references, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(['entityHeaders', accessToken, references], function () { return __1.SynapseClient.getEntityHeaders(references, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityHeadersQueryKey(references), function () { return __1.SynapseClient.getEntityHeaders(references, accessToken); }, options);
 }
 exports.useGetEntityHeaders = useGetEntityHeaders;
 function useGetEntityHeader(entityId, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(['entityHeader', accessToken, entityId], function () { return __1.SynapseClient.getEntityHeader(entityId, accessToken); }, options);
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityHeaderQueryKey(entityId), function () { return __1.SynapseClient.getEntityHeader(entityId, accessToken); }, options);
 }
 exports.useGetEntityHeader = useGetEntityHeader;
 //# sourceMappingURL=useGetEntityHeaders.js.map

package/dist/utils/hooks/SynapseAPI/entity/useGetEntityHeaders.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetEntityHeaders.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetEntityHeaders.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,0DAA2D;AAO3D,SAAgB,mBAAmB,CACjC,UAAyB,EACzB,OAA6E;IAErE,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,sBAAQ,EACb,CAAC,eAAe,EAAE,WAAW,EAAE,UAAU,CAAC,EAC1C,cAAM,OAAA,iBAAa,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,EAAvD,CAAuD,EAC7D,OAAO,CACR,CAAA;AACH,CAAC;AAXD,kDAWC;AAED,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,OAA2D;IAEnD,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IAE3C,OAAO,IAAA,sBAAQ,EACb,CAAC,cAAc,EAAE,WAAW,EAAE,QAAQ,CAAC,EACvC,cAAM,OAAA,iBAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAApD,CAAoD,EAC1D,OAAO,CACR,CAAA;AACH,CAAC;AAXD,gDAWC"}
+{"version":3,"file":"useGetEntityHeaders.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetEntityHeaders.ts"],"names":[],"mappings":";;;AAAA,2CAAuD;AACvD,8BAAwC;AAExC,0DAA2D;AAO3D,SAAgB,mBAAmB,CACjC,UAAyB,EACzB,OAA6E;IAEvE,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,wBAAwB,CAAC,UAAU,CAAC,EAC/C,cAAM,OAAA,iBAAa,CAAC,gBAAgB,CAAC,UAAU,EAAE,WAAW,CAAC,EAAvD,CAAuD,EAC7D,OAAO,CACR,CAAA;AACH,CAAC;AAXD,kDAWC;AAED,SAAgB,kBAAkB,CAChC,QAAgB,EAChB,OAA2D;IAErD,IAAA,KAA8B,IAAA,kCAAiB,GAAE,EAA/C,WAAW,iBAAA,EAAE,UAAU,gBAAwB,CAAA;IAEvD,OAAO,IAAA,sBAAQ,EACb,UAAU,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAC5C,cAAM,OAAA,iBAAa,CAAC,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAApD,CAAoD,EAC1D,OAAO,CACR,CAAA;AACH,CAAC;AAXD,gDAWC"}

package/dist/utils/hooks/SynapseAPI/entity/useGetQueryResultBundle.js

@@ -8,7 +8,6 @@ var react_query_1 = require("react-query");
 var __1 = require("../../..");
 var SynapseConstants_1 = require("../../../SynapseConstants");
 var SynapseContext_1 = require("../../../SynapseContext");
-var queryKeys_1 = require("./queryKeys");
 var sharedQueryDefaults = {
     staleTime: 1000 * 60 * 30, // 30 minutes
 };
@@ -22,13 +21,13 @@ var sharedQueryDefaults = {
  *  when all cases are using useGetQueryResultBundleWithAsyncStatus
  */
 function useGetQueryResultBundle(queryBundleRequest, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.tableQueryResult(queryBundleRequest, false), function () { return __1.SynapseClient.getQueryTableResults(queryBundleRequest, accessToken); }, tslib_1.__assign(tslib_1.__assign({}, sharedQueryDefaults), options));
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityTableQueryResultQueryKey(queryBundleRequest, false), function () { return __1.SynapseClient.getQueryTableResults(queryBundleRequest, accessToken); }, tslib_1.__assign(tslib_1.__assign({}, sharedQueryDefaults), options));
 }
 exports.default = useGetQueryResultBundle;
 function _useGetQueryResultBundleWithAsyncStatus(queryBundleRequest, options, setCurrentAsyncStatus) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.tableQueryResultWithAsyncStatus(queryBundleRequest, false), function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getEntityTableQueryResultWithAsyncStatusQueryKey(queryBundleRequest, false), function () {
         return __1.SynapseClient.getQueryTableAsyncJobResults(queryBundleRequest, accessToken, setCurrentAsyncStatus);
     }, tslib_1.__assign(tslib_1.__assign({}, sharedQueryDefaults), options));
 }
@@ -87,8 +86,8 @@ function useGetQueryResultBundleWithAsyncStatus(queryBundleRequest, options, set
 }
 exports.useGetQueryResultBundleWithAsyncStatus = useGetQueryResultBundleWithAsyncStatus;
 function useInfiniteQueryResultBundle(queryBundleRequest, options, setCurrentAsyncStatus) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useInfiniteQuery)(queryKeys_1.entityQueryKeys.tableQueryResult(queryBundleRequest, true), function (context) {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useInfiniteQuery)(keyFactory.getEntityTableQueryResultQueryKey(queryBundleRequest, true), function (context) {
         var offset = context.pageParam ? parseInt(context.pageParam) : 0;
         return __1.SynapseClient.getQueryTableAsyncJobResults(tslib_1.__assign(tslib_1.__assign({}, queryBundleRequest), { query: tslib_1.__assign(tslib_1.__assign({}, queryBundleRequest.query), { offset: offset }), 
             /**
@@ -153,8 +152,8 @@ exports.useInfiniteQueryResultBundle = useInfiniteQueryResultBundle;
  * Fetches all rows for a table query. Only use this request if you require all rows in a table at once.
  */
 function useGetFullTableQueryResults(queryBundleRequest, options) {
-    var accessToken = (0, SynapseContext_1.useSynapseContext)().accessToken;
-    return (0, react_query_1.useQuery)(queryKeys_1.entityQueryKeys.fullTableQueryResult(queryBundleRequest), function () {
+    var _a = (0, SynapseContext_1.useSynapseContext)(), accessToken = _a.accessToken, keyFactory = _a.keyFactory;
+    return (0, react_query_1.useQuery)(keyFactory.getFullTableQueryResultQueryKey(queryBundleRequest), function () {
         return __1.SynapseClient.getFullQueryTableResults(queryBundleRequest, accessToken);
     }, tslib_1.__assign(tslib_1.__assign({}, sharedQueryDefaults), options));
 }

package/dist/utils/hooks/SynapseAPI/entity/useGetQueryResultBundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"useGetQueryResultBundle.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetQueryResultBundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useGetQueryResultBundle.js","sourceRoot":"","sources":["../../../../../src/lib/utils/hooks/SynapseAPI/entity/useGetQueryResultBundle.ts"],"names":[],"mappings":"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"}