synapse-react-client 3.1.1 → 3.1.3

package/dist/containers/CardContainerLogic.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import { KeyValue, SQLOperator } from '../utils/functions/sqlFunctions';
+import { SortDirection } from '../utils/synapseTypes/';
 import { GenericCardSchema, IconOptions } from './GenericCard';
 import { IconSvgOptions } from './IconSvg';
 /**
@@ -33,6 +34,11 @@ export declare type MarkdownLink = {
     matchColumnName: string;
     tooltipText?: string;
 };
+export declare type SortConfiguration = {
+    defaultColumn: string;
+    defaultDirection: SortDirection;
+    sortableColumns: string[];
+};
 export declare type CTACardLink = {
     text: string;
     link: string;
@@ -75,6 +81,7 @@ export declare type CardContainerLogicProps = {
     isHeader?: boolean;
     isAlignToLeftNav?: boolean;
     sql: string;
+    sortConfig?: SortConfiguration;
 } & CardConfiguration;
 /**
  * Class wraps around CardContainer and serves as a standalone logic container for rendering cards.

package/dist/containers/CardContainerLogic.js

@@ -10,6 +10,7 @@ var ErrorBanner_1 = require("./ErrorBanner");
 var QueryVisualizationWrapper_1 = require("./QueryVisualizationWrapper");
 var QueryContext_1 = require("./QueryContext");
 var InfiniteQueryWrapper_1 = require("./InfiniteQueryWrapper");
+var QuerySortSelector_1 = tslib_1.__importDefault(require("./QuerySortSelector"));
 var TargetEnum;
 (function (TargetEnum) {
     TargetEnum["CURRENT_WINDOW"] = "_self";
@@ -22,12 +23,22 @@ var TargetEnum;
  */
 var CardContainerLogic = function (props) {
     var sql = (0, sqlFunctions_1.insertConditionsFromSearchParams)(props.sql, props.searchParams, props.sqlOperator);
+    var sortConfig = props.sortConfig, facetAliases = props.facetAliases;
+    var defaultSortItems = sortConfig
+        ? [
+            {
+                column: sortConfig.defaultColumn,
+                direction: sortConfig.defaultDirection,
+            },
+        ]
+        : undefined;
     var initQueryRequest = {
         concreteType: 'org.sagebionetworks.repo.model.table.QueryBundleRequest',
         entityId: (0, sqlFunctions_1.parseEntityIdFromSqlStatement)(sql),
         query: {
             sql: sql,
             limit: props.limit,
+            sort: defaultSortItems,
         },
         partMask: utils_1.SynapseConstants.BUNDLE_MASK_QUERY_RESULTS |
             utils_1.SynapseConstants.BUNDLE_MASK_QUERY_COUNT |
@@ -40,6 +51,7 @@ var CardContainerLogic = function (props) {
     };
     return (React.createElement(InfiniteQueryWrapper_1.InfiniteQueryWrapper, tslib_1.__assign({}, props, { initQueryRequest: initQueryRequest }),
         React.createElement(QueryVisualizationWrapper_1.QueryVisualizationWrapper, { rgbIndex: props.rgbIndex, unitDescription: props.unitDescription, facetAliases: props.facetAliases },
+            sortConfig && (React.createElement(QuerySortSelector_1.default, { sortConfig: sortConfig, facetAliases: facetAliases })),
             React.createElement(CardContainer_1.default, tslib_1.__assign({}, props)),
             React.createElement(QueryContext_1.QueryContextConsumer, null, function (queryContext) { return React.createElement(ErrorBanner_1.ErrorBanner, { error: queryContext === null || queryContext === void 0 ? void 0 : queryContext.error }); }))));
 };

package/dist/containers/CardContainerLogic.js.map

@@ -1 +1 @@
-{"version":3,"file":"CardContainerLogic.js","sourceRoot":"","sources":["../../src/lib/containers/CardContainerLogic.tsx"],"names":[],"mappings":";;;;AAAA,mDAA8B;AAC9B,kCAA2C;AAC3C,gEAKwC;AAExC,0EAA2C;AAC3C,6CAA2C;AAG3C,yEAAuE;AACvE,+CAAqD;AACrD,+DAA6D;AAgB7D,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,sCAAwB,CAAA;IACxB,mCAAqB,CAAA;IACrB,sCAAwB,CAAA;IACxB,uCAAyB,CAAA;AAC3B,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB;AAgFD;;GAEG;AACI,IAAM,kBAAkB,GAAG,UAAC,KAA8B;IAC/D,IAAM,GAAG,GAAG,IAAA,+CAAgC,EAC1C,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,WAAW,CAClB,CAAA;IACD,IAAM,gBAAgB,GAAuB;QAC3C,YAAY,EAAE,yDAAyD;QACvE,QAAQ,EAAE,IAAA,4CAA6B,EAAC,GAAG,CAAC;QAC5C,KAAK,EAAE;YACL,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB;QACD,QAAQ,EACN,wBAAgB,CAAC,yBAAyB;YAC1C,wBAAgB,CAAC,uBAAuB;YACxC,wBAAgB,CAAC,gCAAgC;YACjD,wBAAgB,CAAC,mCAAmC;YACpD,wBAAgB,CAAC,+BAA+B;YAChD,wBAAgB,CAAC,wBAAwB;YACzC,wBAAgB,CAAC,gCAAgC;YACjD,wBAAgB,CAAC,2BAA2B;KAC/C,CAAA;IAED,OAAO,CACL,oBAAC,2CAAoB,uBAAK,KAAK,IAAE,gBAAgB,EAAE,gBAAgB;QACjE,oBAAC,qDAAyB,IACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,eAAe,EAAE,KAAK,CAAC,eAAe,EACtC,YAAY,EAAE,KAAK,CAAC,YAAY;YAEhC,oBAAC,uBAAa,uBAAK,KAAK,EAAI;YAC5B,oBAAC,mCAAoB,QAClB,UAAA,YAAY,IAAI,OAAA,oBAAC,yBAAW,IAAC,KAAK,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,GAAI,EAA3C,CAA2C,CACvC,CACG,CACP,CACxB,CAAA;AACH,CAAC,CAAA;AAtCY,QAAA,kBAAkB,sBAsC9B;AAED,kBAAe,0BAAkB,CAAA"}
+{"version":3,"file":"CardContainerLogic.js","sourceRoot":"","sources":["../../src/lib/containers/CardContainerLogic.tsx"],"names":[],"mappings":";;;;AAAA,mDAA8B;AAC9B,kCAA2C;AAC3C,gEAKwC;AAExC,0EAA2C;AAC3C,6CAA2C;AAG3C,yEAAuE;AACvE,+CAAqD;AACrD,+DAA6D;AAC7D,kFAAmD;AAgBnD,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,sCAAwB,CAAA;IACxB,mCAAqB,CAAA;IACrB,sCAAwB,CAAA;IACxB,uCAAyB,CAAA;AAC3B,CAAC,EALW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAKrB;AA0FD;;GAEG;AACI,IAAM,kBAAkB,GAAG,UAAC,KAA8B;IAC/D,IAAM,GAAG,GAAG,IAAA,+CAAgC,EAC1C,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,YAAY,EAClB,KAAK,CAAC,WAAW,CAClB,CAAA;IACO,IAAA,UAAU,GAAmB,KAAK,WAAxB,EAAE,YAAY,GAAK,KAAK,aAAV,CAAU;IAC1C,IAAM,gBAAgB,GAAG,UAAU;QACjC,CAAC,CAAC;YACE;gBACE,MAAM,EAAE,UAAU,CAAC,aAAa;gBAChC,SAAS,EAAE,UAAU,CAAC,gBAAgB;aACvC;SACF;QACH,CAAC,CAAC,SAAS,CAAA;IACb,IAAM,gBAAgB,GAAuB;QAC3C,YAAY,EAAE,yDAAyD;QACvE,QAAQ,EAAE,IAAA,4CAA6B,EAAC,GAAG,CAAC;QAC5C,KAAK,EAAE;YACL,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,KAAK,CAAC,KAAK;YAClB,IAAI,EAAE,gBAAgB;SACvB;QACD,QAAQ,EACN,wBAAgB,CAAC,yBAAyB;YAC1C,wBAAgB,CAAC,uBAAuB;YACxC,wBAAgB,CAAC,gCAAgC;YACjD,wBAAgB,CAAC,mCAAmC;YACpD,wBAAgB,CAAC,+BAA+B;YAChD,wBAAgB,CAAC,wBAAwB;YACzC,wBAAgB,CAAC,gCAAgC;YACjD,wBAAgB,CAAC,2BAA2B;KAC/C,CAAA;IAED,OAAO,CACL,oBAAC,2CAAoB,uBAAK,KAAK,IAAE,gBAAgB,EAAE,gBAAgB;QACjE,oBAAC,qDAAyB,IACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,eAAe,EAAE,KAAK,CAAC,eAAe,EACtC,YAAY,EAAE,KAAK,CAAC,YAAY;YAE/B,UAAU,IAAI,CACb,oBAAC,2BAAiB,IAChB,UAAU,EAAE,UAAU,EACtB,YAAY,EAAE,YAAY,GAC1B,CACH;YACD,oBAAC,uBAAa,uBAAK,KAAK,EAAI;YAC5B,oBAAC,mCAAoB,QAClB,UAAA,YAAY,IAAI,OAAA,oBAAC,yBAAW,IAAC,KAAK,EAAE,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,GAAI,EAA3C,CAA2C,CACvC,CACG,CACP,CACxB,CAAA;AACH,CAAC,CAAA;AAtDY,QAAA,kBAAkB,sBAsD9B;AAED,kBAAe,0BAAkB,CAAA"}

package/dist/containers/HasAccessV2.js

@@ -3,7 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HasAccessV2 = exports.useGetFileHandleDownloadType = exports.FileHandleDownloadTypeEnum = exports.GIGABYTE_SIZE = void 0;
 var tslib_1 = require("tslib");
-var react_1 = tslib_1.__importDefault(require("react"));
+var react_1 = tslib_1.__importStar(require("react"));
 var utils_1 = require("../utils");
 var getEndpoint_1 = require("../utils/functions/getEndpoint");
 var useGetAccessRequirement_1 = require("../utils/hooks/SynapseAPI/dataaccess/useGetAccessRequirement");
@@ -135,7 +135,6 @@ function HasAccessV2(props) {
     }); }, [entityId]);
     var restrictionInformation = (0, useGetAccessRequirement_1.useGetRestrictionInformation)(restrictionInformationRequest).data;
     var handleGetAccess = function () {
-        var entityId = props.entityId;
         // TODO: The fetch should really happen in the AR List component.
         // If we need to open the AR page in synapse, the logic should be in the modal and it should just close itself right away
         utils_1.SynapseClient.getAllAccessRequirements(accessToken, entityId).then(function (requirements) {
@@ -149,8 +148,7 @@ function HasAccessV2(props) {
         });
     };
     // Show Access Requirements
-    var AccessRequirements = function () {
-        var entityId = props.entityId;
+    var accessRequirementsJsx = (0, react_1.useMemo)(function () {
         if (!restrictionInformation) {
             // loading
             return react_1.default.createElement(react_1.default.Fragment, null);
@@ -178,7 +176,12 @@ function HasAccessV2(props) {
             displayAccessRequirement && (react_1.default.createElement(AccessRequirementList_1.default, { entityId: entityId, accessRequirementFromProps: accessRequirements, renderAsModal: true, onHide: function () {
                     setDisplayAccessRequirement(false);
                 } }))));
-    };
+    }, [
+        entityId,
+        restrictionInformation,
+        accessRequirements,
+        displayAccessRequirement,
+    ]);
     if (fileHandleDownloadType === undefined) {
         // note, this can't be "if (!downloadType)" since DownloadTypeEnum has a 0 value (which is falsy)
         // loading
@@ -208,7 +211,7 @@ function HasAccessV2(props) {
         react_1.default.createElement(AccessIcon, { downloadType: fileHandleDownloadType }))) : (react_1.default.createElement(AccessIcon, { downloadType: fileHandleDownloadType }));
     return (react_1.default.createElement("span", { style: { whiteSpace: 'nowrap' } },
         iconContainer,
-        react_1.default.createElement(AccessRequirements, null)));
+        accessRequirementsJsx));
 }
 exports.HasAccessV2 = HasAccessV2;
 //# sourceMappingURL=HasAccessV2.js.map

package/dist/containers/HasAccessV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"HasAccessV2.js","sourceRoot":"","sources":["../../src/lib/containers/HasAccessV2.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"HasAccessV2.js","sourceRoot":"","sources":["../../src/lib/containers/HasAccessV2.tsx"],"names":[],"mappings":"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"}

package/dist/containers/InfiniteQueryWrapper.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { QueryBundleRequest } from '../utils/synapseTypes';
-import { LockedFacet } from './QueryContext';
+import { LockedColumn } from './QueryContext';
 export declare const QUERY_FILTERS_EXPANDED_CSS: string;
 export declare const QUERY_FILTERS_COLLAPSED_CSS: string;
 export declare type InfiniteQueryWrapperProps = {
@@ -10,7 +10,7 @@ export declare type InfiniteQueryWrapperProps = {
     shouldDeepLink?: boolean;
     onQueryChange?: (newQueryJson: string) => void;
     onQueryResultBundleChange?: (newQueryResultBundleJson: string) => void;
-    lockedFacet?: LockedFacet;
+    lockedColumn?: LockedColumn;
 };
 export declare type SearchQuery = {
     columnName: string;

package/dist/containers/InfiniteQueryWrapper.js

@@ -2,16 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InfiniteQueryWrapper = exports.QUERY_FILTERS_COLLAPSED_CSS = exports.QUERY_FILTERS_EXPANDED_CSS = void 0;
 var tslib_1 = require("tslib");
-var lodash_es_1 = require("lodash-es");
 var React = tslib_1.__importStar(require("react"));
 var react_1 = require("react");
-var use_deep_compare_effect_1 = tslib_1.__importDefault(require("use-deep-compare-effect"));
-var DeepLinkingUtils = tslib_1.__importStar(require("../utils/functions/deepLinkingUtils"));
 var queryUtils_1 = require("../utils/functions/queryUtils");
-var sqlFunctions_1 = require("../utils/functions/sqlFunctions");
 var useEntity_1 = require("../utils/hooks/SynapseAPI/entity/useEntity");
 var useGetQueryResultBundle_1 = require("../utils/hooks/SynapseAPI/entity/useGetQueryResultBundle");
 var QueryContext_1 = require("./QueryContext");
+var useImmutableTableQuery_1 = tslib_1.__importDefault(require("./useImmutableTableQuery"));
 exports.QUERY_FILTERS_EXPANDED_CSS = 'isShowingFacetFilters';
 exports.QUERY_FILTERS_COLLAPSED_CSS = 'isHidingFacetFilters';
 /**
@@ -19,19 +16,29 @@ exports.QUERY_FILTERS_COLLAPSED_CSS = 'isHidingFacetFilters';
  * either `useQueryContext` or `QueryContextConsumer`.
  */
 function InfiniteQueryWrapper(props) {
-    var _a, _b;
-    var initQueryRequest = props.initQueryRequest, onQueryChange = props.onQueryChange, onQueryResultBundleChange = props.onQueryResultBundleChange;
-    var _c = (0, react_1.useState)(initQueryRequest), lastQueryRequest = _c[0], setLastQueryRequest = _c[1];
-    var _d = (0, react_1.useState)(undefined), currentAsyncStatus = _d[0], setCurrentAsyncStatus = _d[1];
-    var _e = (0, useGetQueryResultBundle_1.useInfiniteQueryResultBundle)(lastQueryRequest, {
+    var initQueryRequest = props.initQueryRequest, onQueryChange = props.onQueryChange, onQueryResultBundleChange = props.onQueryResultBundleChange, lockedColumn = props.lockedColumn, componentIndex = props.componentIndex, shouldDeepLink = props.shouldDeepLink;
+    var _a = (0, react_1.useState)(undefined), currentAsyncStatus = _a[0], setCurrentAsyncStatus = _a[1];
+    var _b = (0, useImmutableTableQuery_1.default)({
+        initQueryRequest: initQueryRequest,
+        componentIndex: componentIndex,
+        shouldDeepLink: shouldDeepLink,
+        onQueryChange: onQueryChange,
+    }), entityId = _b.entityId, versionNumber = _b.versionNumber, getInitQueryRequest = _b.getInitQueryRequest, getLastQueryRequest = _b.getLastQueryRequest, setQuery = _b.setQuery;
+    var lastQueryRequest = (0, react_1.useMemo)(function () {
+        return getLastQueryRequest();
+    }, [getLastQueryRequest]);
+    var _c = (0, useGetQueryResultBundle_1.useInfiniteQueryResultBundle)(lastQueryRequest, {
         // We use `keepPreviousData` because we don't want to clear out the current data when the query is modified via the UI
         keepPreviousData: true,
-    }, setCurrentAsyncStatus), infiniteData = _e.data, hasNextPage = _e.hasNextPage, fetchPreviousPage = _e.fetchPreviousPage, fetchNextPage = _e.fetchNextPage, isFetchingNextPage = _e.isFetchingNextPage, queryIsLoading = _e.isLoading, error = _e.error, newQueryIsFetching = _e.isPreviousData, remove = _e.remove;
+    }, setCurrentAsyncStatus), infiniteData = _c.data, hasNextPage = _c.hasNextPage, fetchPreviousPage = _c.fetchPreviousPage, fetchNextPage = _c.fetchNextPage, isFetchingNextPage = _c.isFetchingNextPage, queryIsLoading = _c.isLoading, error = _c.error, newQueryIsFetching = _c.isPreviousData;
     // Indicate if we're fetching data for the first time (queryIsLoading) or if we're fetching data for a brand new query (newQueryIsFetching)
     var isLoadingNewBundle = queryIsLoading || newQueryIsFetching;
-    var _f = (0, sqlFunctions_1.parseEntityIdAndVersionFromSqlStatement)(lastQueryRequest.query.sql), entityId = _f.entityId, versionNumber = _f.versionNumber;
     var entity = (0, useEntity_1.useGetEntity)(entityId, versionNumber).data;
-    var _g = (0, react_1.useState)(0), currentPage = _g[0], setCurrentPage = _g[1];
+    /**
+     * Since we're showing an infinite list of data, use custom pagination handling instead of pagination utils provided by
+     * useImmutableTableQuery
+     */
+    var _d = (0, react_1.useState)(0), currentPage = _d[0], setCurrentPage = _d[1];
     function appendNextPageToResults() {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             return tslib_1.__generator(this, function (_a) {
@@ -103,101 +110,24 @@ function InfiniteQueryWrapper(props) {
         }
         return infiniteData === null || infiniteData === void 0 ? void 0 : infiniteData.pages[currentPage].responseBody;
     }, [currentPage, infiniteData]);
-    (0, use_deep_compare_effect_1.default)(function () {
-        if (onQueryChange) {
-            onQueryChange(JSON.stringify(lastQueryRequest.query));
-        }
-    }, [onQueryChange, lastQueryRequest.query]);
     (0, react_1.useEffect)(function () {
         if (data && onQueryResultBundleChange) {
             onQueryResultBundleChange(JSON.stringify(data));
         }
     }, [data, onQueryResultBundleChange]);
-    var componentIndex = (_a = props.componentIndex) !== null && _a !== void 0 ? _a : 0;
     var isFacetsAvailable = data
         ? (0, queryUtils_1.isFacetAvailable)(data.facets, data.selectColumns)
         : true;
-    /**
-     * Inspect the URL to see if we have a particular query request that we must show.
-     */
-    (0, react_1.useEffect)(function () {
-        var query = DeepLinkingUtils.getQueryRequestFromLink('QueryWrapper', componentIndex);
-        if (query) {
-            setLastQueryRequest(query);
-        }
-    }, []);
-    /**
-     * Pass down a deep clone (so no side affects on the child's part) of the
-     * last query request made
-     *
-     * @returns
-     * @memberof QueryWrapper
-     */
-    var getLastQueryRequest = React.useCallback(function () {
-        return (0, lodash_es_1.cloneDeep)(lastQueryRequest);
-    }, [lastQueryRequest]);
-    /**
-     * Pass down a deep clone (so no side affects on the child's part) of the
-     * first query request made
-     *
-     * @returns
-     * @memberof QueryWrapper
-     */
-    function getInitQueryRequest() {
-        return (0, lodash_es_1.cloneDeep)(props.initQueryRequest);
-    }
-    /**
-     * Execute the given query request, updating all of the data in the QueryContext to match the new query
-     * @param {*} queryRequest Query request as specified by
-     *                         https://rest-docs.synapse.org/rest/org/sagebionetworks/repo/model/table/Query.html
-     */
-    function executeQueryRequest(queryRequest) {
-        var clonedQueryRequest = (0, lodash_es_1.cloneDeep)(queryRequest);
-        setLastQueryRequest(clonedQueryRequest);
-        setCurrentPage(0);
-        if (clonedQueryRequest.query) {
-            var clonedQueryRequestJson = JSON.stringify(clonedQueryRequest.query);
-            var stringifiedQuery = encodeURIComponent(clonedQueryRequestJson);
-            if (props.shouldDeepLink) {
-                if (props.onQueryChange) {
-                    props.onQueryChange(clonedQueryRequestJson);
-                }
-                else {
-                    DeepLinkingUtils.updateUrlWithNewSearchParam('QueryWrapper', componentIndex, stringifiedQuery);
-                }
-            }
-        }
-        /**
-         * TODO: We remove the cached data because it can interfere with user controls, such as the QueryFilter.
-         * For example, if you filter on a facet with value ["a"], then value ["a", "b"], then value ["a"] again,
-         * we'll have a cache hit on the last query, so we won't get a loading state, but the controls haven't been updated
-         * to handle cache hits. Forcing a cache miss here fixes this, but ideally the controls should handle this case.
-         */
-        remove();
-        // end TODO
-    }
     /**
      * remove a particular facet name (e.g. study) and its all possible values based on the parameter specified in the url
      * this is to remove the facet from the charts, search and filter.
      * @return data: QueryResultBundle
      */
-    var dataWithLockedFacetRemoved = (0, react_1.useMemo)(function () {
-        var _a, _b;
-        var lockedFacet = (_a = props.lockedFacet) === null || _a === void 0 ? void 0 : _a.facet;
-        if (lockedFacet && data) {
-            // for details page, return data without the "locked" facet
-            var dataCopy = (0, lodash_es_1.cloneDeep)(data);
-            var facets = (_b = dataCopy.facets) === null || _b === void 0 ? void 0 : _b.filter(function (item) { return item.columnName.toLowerCase() !== lockedFacet.toLowerCase(); });
-            dataCopy.facets = facets;
-            return dataCopy;
-        }
-        else {
-            // for other pages, just return the data
-            return data;
-        }
-    }, [data, (_b = props.lockedFacet) === null || _b === void 0 ? void 0 : _b.facet]);
+    var dataWithLockedColumnFacetRemoved = (0, react_1.useMemo)(function () {
+        return (0, queryUtils_1.removeLockedColumnFromFacetData)(data, lockedColumn);
+    }, [data, lockedColumn]);
     var context = {
-        data: dataWithLockedFacetRemoved,
+        data: dataWithLockedColumnFacetRemoved,
         isLoadingNewPage: isFetchingNextPage,
         hasNextPage: !!hasNextPage,
         hasPreviousPage: !!hasPreviousPage,
@@ -206,7 +136,7 @@ function InfiniteQueryWrapper(props) {
         getInitQueryRequest: getInitQueryRequest,
         error: error,
         entity: entity,
-        executeQueryRequest: executeQueryRequest,
+        executeQueryRequest: setQuery,
         isFacetsAvailable: isFacetsAvailable,
         asyncJobStatus: currentAsyncStatus,
         appendNextPageToResults: appendNextPageToResults,

package/dist/containers/InfiniteQueryWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"InfiniteQueryWrapper.js","sourceRoot":"","sources":["../../src/lib/containers/InfiniteQueryWrapper.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"InfiniteQueryWrapper.js","sourceRoot":"","sources":["../../src/lib/containers/InfiniteQueryWrapper.tsx"],"names":[],"mappings":"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"}

package/dist/containers/QueryContext.d.ts

@@ -3,8 +3,8 @@ import { SynapseClientError } from '../utils/SynapseClientError';
 import { AsynchronousJobStatus, QueryBundleRequest, QueryResultBundle, Table } from '../utils/synapseTypes';
 export declare const QUERY_FILTERS_EXPANDED_CSS: string;
 export declare const QUERY_FILTERS_COLLAPSED_CSS: string;
-export declare type LockedFacet = {
-    facet?: string;
+export declare type LockedColumn = {
+    columnName?: string;
     value?: string;
 };
 export declare type QueryContextType = {
@@ -27,10 +27,11 @@ export declare type QueryContextType = {
     /** Whether or not facets are available to be filtered upon based on the current data */
     isFacetsAvailable: boolean;
     /**
-     * A facet may be "locked" so that it is not modifiable by the user, for example when showing only data relevant to a particular facet value on a Details Page.
-     * The value of a locked facet will result in a client-side modification of the result bundle data.
+     * A column name may be "locked" so that it is both (1) not shown to the user that the filter is active, and (2) not modifiable by the user.
+     * For example, we may show only the data matching a particular facet value on a Details Page without implying that the shown data is part of a larger table.
+     * The presence of a locked filter will result in a client-side modification of the active query and result bundle data.
      */
-    lockedFacet?: LockedFacet;
+    lockedColumn?: LockedColumn;
 };
 export declare type PaginatedQueryContextType = QueryContextType & {
     /** Navigates to a particular page, where the first page has value 1 */

package/dist/containers/QuerySortSelector.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+import { SortConfiguration } from './CardContainerLogic';
+export declare type QuerySortSelectorProps = {
+    sortConfig: SortConfiguration;
+    facetAliases?: Record<string, string>;
+};
+declare const QuerySortSelector: React.FunctionComponent<QuerySortSelectorProps>;
+export default QuerySortSelector;

package/dist/containers/QuerySortSelector.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var react_1 = tslib_1.__importStar(require("react"));
+var QueryContext_1 = require("./QueryContext");
+var unCamelCase_1 = require("../utils/functions/unCamelCase");
+var Typography_1 = tslib_1.__importDefault(require("../utils/typography/Typography"));
+var react_select_1 = tslib_1.__importDefault(require("react-select"));
+var CustomSelectWidget_1 = require("./entity/annotations/CustomSelectWidget");
+var QuerySortSelector = function (_a) {
+    var sortConfig = _a.sortConfig, facetAliases = _a.facetAliases;
+    var defaultColumn = sortConfig.defaultColumn, defaultDirection = sortConfig.defaultDirection, sortableColumns = sortConfig.sortableColumns;
+    var queryContext = (0, QueryContext_1.useQueryContext)();
+    var getLastQueryRequest = queryContext.getLastQueryRequest, executeQueryRequest = queryContext.executeQueryRequest;
+    var _b = (0, react_1.useState)(defaultColumn), sortColumn = _b[0], setSortColumn = _b[1];
+    var _c = (0, react_1.useState)(defaultDirection), sortDirection = _c[0], setSortDirection = _c[1];
+    var enumOptions = sortableColumns.map(function (sortableColumn) {
+        return {
+            value: sortableColumn,
+            label: (0, unCamelCase_1.unCamelCase)(sortableColumn, facetAliases),
+        };
+    });
+    var onChange = function (value) {
+        var lastQueryRequestDeepClone = getLastQueryRequest();
+        var newSortDirection = 'ASC';
+        if (value === sortColumn) {
+            // flip sort direction
+            newSortDirection = sortDirection === 'ASC' ? 'DESC' : 'ASC';
+        }
+        var newSortItems = value
+            ? [
+                {
+                    column: value,
+                    direction: newSortDirection,
+                },
+            ]
+            : undefined;
+        lastQueryRequestDeepClone.query.sort = newSortItems;
+        executeQueryRequest(lastQueryRequestDeepClone);
+        setSortColumn(value);
+        setSortDirection(newSortDirection);
+    };
+    return (react_1.default.createElement("div", { className: "QuerySortSelector bootstrap-4-backport" },
+        react_1.default.createElement(Typography_1.default, { variant: "label", className: "sort-by-label SRC-inlineBlock" }, "Sort by"),
+        react_1.default.createElement(react_select_1.default, { className: "react-select-container SRC-inlineBlock", value: (0, CustomSelectWidget_1.findValueOption)(sortColumn, enumOptions), options: enumOptions, onChange: function (option) { return onChange(option === null || option === void 0 ? void 0 : option.value); }, components: { Control: CustomSelectWidget_1.Control }, styles: {
+                control: function (provided) { return (tslib_1.__assign(tslib_1.__assign({}, provided), { marginLeft: '15px' })); },
+            } })));
+};
+exports.default = QuerySortSelector;
+//# sourceMappingURL=QuerySortSelector.js.map

package/dist/containers/QuerySortSelector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"QuerySortSelector.js","sourceRoot":"","sources":["../../src/lib/containers/QuerySortSelector.tsx"],"names":[],"mappings":";;;AAAA,qDAAuC;AAEvC,+CAAgD;AAEhD,8DAA4D;AAC5D,sFAAuD;AACvD,sEAAiC;AACjC,8EAIgD;AAOhD,IAAM,iBAAiB,GAAoD,UAAC,EAG3E;QAFC,UAAU,gBAAA,EACV,YAAY,kBAAA;IAEJ,IAAA,aAAa,GAAwC,UAAU,cAAlD,EAAE,gBAAgB,GAAsB,UAAU,iBAAhC,EAAE,eAAe,GAAK,UAAU,gBAAf,CAAe;IACvE,IAAM,YAAY,GAAG,IAAA,8BAAe,GAAE,CAAA;IAC9B,IAAA,mBAAmB,GAA0B,YAAY,oBAAtC,EAAE,mBAAmB,GAAK,YAAY,oBAAjB,CAAiB;IAC3D,IAAA,KAA8B,IAAA,gBAAQ,EAC1C,aAAa,CACd,EAFM,UAAU,QAAA,EAAE,aAAa,QAE/B,CAAA;IACK,IAAA,KAAoC,IAAA,gBAAQ,EAAC,gBAAgB,CAAC,EAA7D,aAAa,QAAA,EAAE,gBAAgB,QAA8B,CAAA;IAEpE,IAAM,WAAW,GAAiB,eAAe,CAAC,GAAG,CAAC,UAAA,cAAc;QAClE,OAAO;YACL,KAAK,EAAE,cAAc;YACrB,KAAK,EAAE,IAAA,yBAAW,EAAC,cAAc,EAAE,YAAY,CAAE;SAClD,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,IAAM,QAAQ,GAAG,UAAC,KAAc;QAC9B,IAAM,yBAAyB,GAAG,mBAAmB,EAAE,CAAA;QACvD,IAAI,gBAAgB,GAAkB,KAAK,CAAA;QAC3C,IAAI,KAAK,KAAK,UAAU,EAAE;YACxB,sBAAsB;YACtB,gBAAgB,GAAG,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAA;SAC5D;QAED,IAAM,YAAY,GAA2B,KAAK;YAChD,CAAC,CAAC;gBACE;oBACE,MAAM,EAAE,KAAK;oBACb,SAAS,EAAE,gBAAgB;iBAC5B;aACF;YACH,CAAC,CAAC,SAAS,CAAA;QACb,yBAAyB,CAAC,KAAK,CAAC,IAAI,GAAG,YAAY,CAAA;QACnD,mBAAmB,CAAC,yBAAyB,CAAC,CAAA;QAC9C,aAAa,CAAC,KAAK,CAAC,CAAA;QACpB,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;IACpC,CAAC,CAAA;IAED,OAAO,CACL,uCAAK,SAAS,EAAC,wCAAwC;QACrD,8BAAC,oBAAU,IAAC,OAAO,EAAC,OAAO,EAAC,SAAS,EAAC,+BAA+B,cAExD;QACb,8BAAC,sBAAM,IACL,SAAS,EAAC,wCAAwC,EAClD,KAAK,EAAE,IAAA,oCAAe,EAAC,UAAU,EAAE,WAAW,CAAC,EAC/C,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,UAAA,MAAM,IAAI,OAAA,QAAQ,CAAE,MAA4B,aAA5B,MAAM,uBAAN,MAAM,CAAwB,KAAK,CAAC,EAA9C,CAA8C,EAClE,UAAU,EAAE,EAAE,OAAO,8BAAA,EAAE,EACvB,MAAM,EAAE;gBACN,OAAO,EAAE,UAAA,QAAQ,IAAI,OAAA,uCAChB,QAAQ,KACX,UAAU,EAAE,MAAM,IAClB,EAHmB,CAGnB;aACH,GACD,CACE,CACP,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,iBAAiB,CAAA"}

package/dist/containers/QueryWrapper.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { QueryBundleRequest } from '../utils/synapseTypes';
-import { LockedFacet } from './QueryContext';
+import { LockedColumn } from './QueryContext';
 export declare const QUERY_FILTERS_EXPANDED_CSS: string;
 export declare const QUERY_FILTERS_COLLAPSED_CSS: string;
 export declare type QueryWrapperProps = {
@@ -10,7 +10,7 @@ export declare type QueryWrapperProps = {
     shouldDeepLink?: boolean;
     onQueryChange?: (newQueryJson: string) => void;
     onQueryResultBundleChange?: (newQueryResultBundleJson: string) => void;
-    lockedFacet?: LockedFacet;
+    lockedColumn?: LockedColumn;
 };
 export declare type SearchQuery = {
     columnName: string;