synapse-react-client 3.1.7 → 3.1.9

package/dist/containers/InfiniteQueryWrapper.js

@@ -5,8 +5,7 @@ var tslib_1 = require("tslib");
 var React = tslib_1.__importStar(require("react"));
 var react_1 = require("react");
 var queryUtils_1 = require("../utils/functions/queryUtils");
-var useEntity_1 = require("../utils/hooks/SynapseAPI/entity/useEntity");
-var useGetQueryResultBundle_1 = require("../utils/hooks/SynapseAPI/entity/useGetQueryResultBundle");
+var SynapseAPI_1 = require("../utils/hooks/SynapseAPI");
 var QueryContext_1 = require("./QueryContext");
 var useImmutableTableQuery_1 = tslib_1.__importDefault(require("./useImmutableTableQuery"));
 exports.QUERY_FILTERS_EXPANDED_CSS = 'isShowingFacetFilters';
@@ -23,17 +22,17 @@ function InfiniteQueryWrapper(props) {
         componentIndex: componentIndex,
         shouldDeepLink: shouldDeepLink,
         onQueryChange: onQueryChange,
-    }), entityId = _b.entityId, versionNumber = _b.versionNumber, getInitQueryRequest = _b.getInitQueryRequest, getLastQueryRequest = _b.getLastQueryRequest, setQuery = _b.setQuery;
+    }), entityId = _b.entityId, versionNumber = _b.versionNumber, getInitQueryRequest = _b.getInitQueryRequest, getLastQueryRequest = _b.getLastQueryRequest, setQuery = _b.setQuery, resetQuery = _b.resetQuery, removeQueryFilter = _b.removeQueryFilter, removeValueFromQueryFilter = _b.removeValueFromQueryFilter, removeSelectedFacet = _b.removeSelectedFacet, removeValueFromSelectedFacet = _b.removeValueFromSelectedFacet;
     var lastQueryRequest = (0, react_1.useMemo)(function () {
         return getLastQueryRequest();
     }, [getLastQueryRequest]);
-    var _c = (0, useGetQueryResultBundle_1.useInfiniteQueryResultBundle)(lastQueryRequest, {
+    var _c = (0, SynapseAPI_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 = _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)
+    // 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 entity = (0, useEntity_1.useGetEntity)(entityId, versionNumber).data;
+    var entity = (0, SynapseAPI_1.useGetEntity)(entityId, versionNumber).data;
     /**
      * Since we're showing an infinite list of data, use custom pagination handling instead of pagination utils provided by
      * useImmutableTableQuery
@@ -105,7 +104,7 @@ function InfiniteQueryWrapper(props) {
             return undefined;
         }
         if (currentPage === 'ALL') {
-            // Modify the first page so the result is the concatenation of all of the fetched rows.
+            // Modify the first page so the result is the concatenation of all the fetched rows.
             return tslib_1.__assign(tslib_1.__assign({}, infiniteData === null || infiniteData === void 0 ? void 0 : infiniteData.pages[0].responseBody), { queryResult: tslib_1.__assign(tslib_1.__assign({}, (_a = infiniteData === null || infiniteData === void 0 ? void 0 : infiniteData.pages[0].responseBody) === null || _a === void 0 ? void 0 : _a.queryResult), { queryResults: tslib_1.__assign(tslib_1.__assign({}, (_c = (_b = infiniteData === null || infiniteData === void 0 ? void 0 : infiniteData.pages[0].responseBody) === null || _b === void 0 ? void 0 : _b.queryResult) === null || _c === void 0 ? void 0 : _c.queryResults), { rows: (_d = infiniteData.pages.flatMap(function (page) { var _a; return (_a = page.responseBody.queryResult) === null || _a === void 0 ? void 0 : _a.queryResults.rows; })) !== null && _d !== void 0 ? _d : [] }) }) });
         }
         return infiniteData === null || infiniteData === void 0 ? void 0 : infiniteData.pages[currentPage].responseBody;
@@ -119,18 +118,26 @@ function InfiniteQueryWrapper(props) {
         ? (0, queryUtils_1.isFacetAvailable)(data.facets, data.selectColumns)
         : true;
     /**
-     * remove a particular facet name (e.g. study) and its all possible values based on the parameter specified in the url
+     * Remove a particular facet name (e.g. study) and 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 dataWithLockedColumnFacetRemoved = (0, react_1.useMemo)(function () {
         return (0, queryUtils_1.removeLockedColumnFromFacetData)(data, lockedColumn);
     }, [data, lockedColumn]);
+    var hasResettableFilters = (0, react_1.useMemo)(function () {
+        var request = getLastQueryRequest();
+        return (0, queryUtils_1.hasResettableFilters)(request.query, lockedColumn);
+    }, [getLastQueryRequest, lockedColumn]);
+    var getColumnModel = (0, react_1.useCallback)(function (columnName) {
+        var _a, _b;
+        return (_b = (_a = data === null || data === void 0 ? void 0 : data.columnModels) === null || _a === void 0 ? void 0 : _a.find(function (cm) { return cm.name === columnName; })) !== null && _b !== void 0 ? _b : null;
+    }, [data === null || data === void 0 ? void 0 : data.columnModels]);
     var context = {
         data: dataWithLockedColumnFacetRemoved,
         isLoadingNewPage: isFetchingNextPage,
         hasNextPage: !!hasNextPage,
-        hasPreviousPage: !!hasPreviousPage,
+        hasPreviousPage: hasPreviousPage,
         isLoadingNewBundle: isLoadingNewBundle,
         getLastQueryRequest: getLastQueryRequest,
         getInitQueryRequest: getInitQueryRequest,
@@ -142,6 +149,14 @@ function InfiniteQueryWrapper(props) {
         appendNextPageToResults: appendNextPageToResults,
         goToNextPage: goToNextPage,
         goToPreviousPage: goToPreviousPage,
+        hasResettableFilters: hasResettableFilters,
+        resetQuery: resetQuery,
+        removeQueryFilter: removeQueryFilter,
+        removeValueFromQueryFilter: removeValueFromQueryFilter,
+        removeSelectedFacet: removeSelectedFacet,
+        removeValueFromSelectedFacet: removeValueFromSelectedFacet,
+        lockedColumn: lockedColumn,
+        getColumnModel: getColumnModel,
     };
     /**
      * Render the children without any formatting

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":";;;;AAAA,mDAA8B;AAC9B,+BAAiE;AACjE,4DAIsC;AACtC,wDAGkC;AAOlC,+CAIuB;AACvB,4FAA6D;AAEhD,QAAA,0BAA0B,GAAW,uBAAuB,CAAA;AAC5D,QAAA,2BAA2B,GAAW,sBAAsB,CAAA;AAYzE;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,KAAgC;IAEjE,IAAA,gBAAgB,GAMd,KAAK,iBANS,EAChB,aAAa,GAKX,KAAK,cALM,EACb,yBAAyB,GAIvB,KAAK,0BAJkB,EACzB,YAAY,GAGV,KAAK,aAHK,EACZ,cAAc,GAEZ,KAAK,eAFO,EACd,cAAc,GACZ,KAAK,eADO,CACP;IACH,IAAA,KAA8C,IAAA,gBAAQ,EAE1D,SAAS,CAAC,EAFL,kBAAkB,QAAA,EAAE,qBAAqB,QAEpC,CAAA;IAEN,IAAA,KAWF,IAAA,gCAAsB,EAAC;QACzB,gBAAgB,kBAAA;QAChB,cAAc,gBAAA;QACd,cAAc,gBAAA;QACd,aAAa,eAAA;KACd,CAAC,EAfA,QAAQ,cAAA,EACR,aAAa,mBAAA,EACb,mBAAmB,yBAAA,EACnB,mBAAmB,yBAAA,EACnB,QAAQ,cAAA,EACR,UAAU,gBAAA,EACV,iBAAiB,uBAAA,EACjB,0BAA0B,gCAAA,EAC1B,mBAAmB,yBAAA,EACnB,4BAA4B,kCAM5B,CAAA;IAEF,IAAM,gBAAgB,GAAG,IAAA,eAAO,EAAC;QAC/B,OAAO,mBAAmB,EAAE,CAAA;IAC9B,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,CAAA;IAEnB,IAAA,KASF,IAAA,yCAA4B,EAC9B,gBAAgB,EAChB;QACE,sHAAsH;QACtH,gBAAgB,EAAE,IAAI;KACvB,EACD,qBAAqB,CACtB,EAfO,YAAY,UAAA,EAClB,WAAW,iBAAA,EACX,iBAAiB,uBAAA,EACjB,aAAa,mBAAA,EACb,kBAAkB,wBAAA,EACP,cAAc,eAAA,EACzB,KAAK,WAAA,EACW,kBAAkB,oBAQnC,CAAA;IAED,2IAA2I;IAC3I,IAAM,kBAAkB,GAAG,cAAc,IAAI,kBAAkB,CAAA;IAEvD,IAAM,MAAM,GAAK,IAAA,yBAAY,EAAQ,QAAQ,EAAE,aAAa,CAAC,KAAjD,CAAiD;IAErE;;;OAGG;IACG,IAAA,KAAgC,IAAA,gBAAQ,EAAiB,CAAC,CAAC,EAA1D,WAAW,QAAA,EAAE,cAAc,QAA+B,CAAA;IAEjE,SAAe,uBAAuB;;;;;wBACpC,IAAI,CAAC,WAAW,EAAE;4BAChB,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAA;yBACF;wBACD,qBAAM,aAAa,EAAE,EAAA;;wBAArB,SAAqB,CAAA;wBACrB,cAAc,CAAC,KAAK,CAAC,CAAA;;;;;KACtB;IAED,SAAe,YAAY;;;;;wBACzB,IAAI,CAAC,WAAW,EAAE;4BAChB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;yBAClE;wBACD,IAAI,WAAW,KAAK,KAAK,EAAE;4BACzB,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAA;yBACvE;wBACD,qBAAM,aAAa,EAAE,EAAA;;wBAArB,SAAqB,CAAA;wBACrB,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,CAAA;;;;;KAChC;IAED,IAAM,eAAe,GAAG,WAAW,KAAK,KAAK,IAAI,WAAW,GAAG,CAAC,CAAA;IAEhE,SAAe,gBAAgB;;;;;wBAC7B,IAAI,WAAW,KAAK,KAAK,EAAE;4BACzB,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAA;yBAC3E;wBACD,IAAI,CAAC,eAAe,EAAE;4BACpB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAA;yBAClE;wBAED,qBAAM,iBAAiB,EAAE,EAAA;;wBAAzB,SAAyB,CAAA;wBACzB,cAAc,CAAC,WAAW,GAAG,CAAC,CAAC,CAAA;;;;;KAChC;IAED,IAAM,IAAI,GAAkC,IAAA,eAAO,EAAC;;QAClD,IACE,YAAY,IAAI,IAAI;YACpB,YAAY,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;YAC/B,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,IAAI,IAAI,EAC1C;YACA,OAAO,SAAS,CAAA;SACjB;QAED,IAAI,WAAW,KAAK,KAAK,EAAE;YACzB,oFAAoF;YACpF,OAAO,sCACF,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,CAAC,EAAE,YAAY,KACtC,WAAW,wCACN,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,CAAC,EAAE,YAAY,0CAAE,WAAW,KACnD,YAAY,wCACP,MAAA,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,CAAC,EAAE,YAAY,0CAAE,WAAW,0CAAE,YAAY,KACjE,IAAI,EACF,MAAA,YAAY,CAAC,KAAK,CAAC,OAAO,CACxB,UAAA,IAAI,YAAI,OAAA,MAAA,IAAI,CAAC,YAAa,CAAC,WAAW,0CAAE,YAAY,CAAC,IAAI,CAAA,EAAA,CAC1D,mCAAI,EAAE,SAGO,CAAA;SACvB;QAED,OAAO,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,KAAK,CAAC,WAAW,EAAE,YAAY,CAAA;IACtD,CAAC,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAA;IAE/B,IAAA,iBAAS,EAAC;QACR,IAAI,IAAI,IAAI,yBAAyB,EAAE;YACrC,yBAAyB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;SAChD;IACH,CAAC,EAAE,CAAC,IAAI,EAAE,yBAAyB,CAAC,CAAC,CAAA;IAErC,IAAM,iBAAiB,GAAG,IAAI;QAC5B,CAAC,CAAC,IAAA,6BAAgB,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC;QACnD,CAAC,CAAC,IAAI,CAAA;IAER;;;;OAIG;IACH,IAAM,gCAAgC,GAAG,IAAA,eAAO,EAAC;QAC/C,OAAO,IAAA,4CAA+B,EAAC,IAAI,EAAE,YAAY,CAAC,CAAA;IAC5D,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC,CAAA;IAExB,IAAM,oBAAoB,GAAG,IAAA,eAAO,EAAC;QACnC,IAAM,OAAO,GAAG,mBAAmB,EAAE,CAAA;QACrC,OAAO,IAAA,iCAAc,EAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAAA;IACpD,CAAC,EAAE,CAAC,mBAAmB,EAAE,YAAY,CAAC,CAAC,CAAA;IAEvC,IAAM,cAAc,GAAG,IAAA,mBAAW,EAChC,UAAC,UAAkB;;QACjB,OAAO,MAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,0CAAE,IAAI,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,IAAI,KAAK,UAAU,EAAtB,CAAsB,CAAC,mCAAI,IAAI,CAAA;IACvE,CAAC,EACD,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,YAAY,CAAC,CACrB,CAAA;IAED,IAAM,OAAO,GAA6B;QACxC,IAAI,EAAE,gCAAgC;QACtC,gBAAgB,EAAE,kBAAkB;QACpC,WAAW,EAAE,CAAC,CAAC,WAAW;QAC1B,eAAe,EAAE,eAAe;QAChC,kBAAkB,EAAE,kBAAkB;QACtC,mBAAmB,qBAAA;QACnB,mBAAmB,qBAAA;QACnB,KAAK,EAAE,KAAK;QACZ,MAAM,QAAA;QACN,mBAAmB,EAAE,QAAQ;QAC7B,iBAAiB,mBAAA;QACjB,cAAc,EAAE,kBAAkB;QAClC,uBAAuB,EAAE,uBAAuB;QAChD,YAAY,cAAA;QACZ,gBAAgB,kBAAA;QAChB,oBAAoB,sBAAA;QACpB,UAAU,YAAA;QACV,iBAAiB,mBAAA;QACjB,0BAA0B,4BAAA;QAC1B,mBAAmB,qBAAA;QACnB,4BAA4B,8BAAA;QAC5B,YAAY,cAAA;QACZ,cAAc,gBAAA;KACf,CAAA;IACD;;OAEG;IACK,IAAA,QAAQ,GAAK,KAAK,SAAV,CAAU;IAC1B,IAAM,kBAAkB,GACtB,kBAAkB,IAAI,kBAAkB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAA;IACnE,OAAO,CACL,oBAAC,mCAAoB,IAAC,YAAY,EAAE,OAAO;QACzC,6BACE,SAAS,EAAE,sBAAe,kBAAkB,cAC1C,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CACrC,IAED,QAAQ,CACL,CACe,CACxB,CAAA;AACH,CAAC;AAzMD,oDAyMC"}

package/dist/containers/QueryContext.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import { SynapseClientError } from '../utils/SynapseClientError';
-import { AsynchronousJobStatus, QueryBundleRequest, QueryResultBundle, Table } from '../utils/synapseTypes';
+import { AsynchronousJobStatus, ColumnModel, QueryBundleRequest, QueryResultBundle, Table } from '../utils/synapseTypes';
+import { ImmutableTableQueryResult } from './useImmutableTableQuery';
 export declare const QUERY_FILTERS_EXPANDED_CSS: string;
 export declare const QUERY_FILTERS_COLLAPSED_CSS: string;
 export declare type LockedColumn = {
@@ -18,13 +19,21 @@ export declare type QueryContextType = {
     getInitQueryRequest: () => QueryBundleRequest;
     /** Updates the current query with the passed request */
     executeQueryRequest: (param: QueryBundleRequest) => void;
-    /** Returns true when loading a brand new query result bundle. Will not be true when just loading the next page of query results. */
+    /** Resets the query to its initial state, clearing all filters added by the user */
+    resetQuery: ImmutableTableQueryResult['resetQuery'];
+    removeSelectedFacet: ImmutableTableQueryResult['removeSelectedFacet'];
+    removeValueFromSelectedFacet: ImmutableTableQueryResult['removeValueFromSelectedFacet'];
+    /** Removes a matching QueryFilter from the query */
+    removeQueryFilter: ImmutableTableQueryResult['removeQueryFilter'];
+    /** Removes a value from a QueryFilter. If no more values remain in the filter, the filter is also removed */
+    removeValueFromQueryFilter: ImmutableTableQueryResult['removeValueFromQueryFilter'];
+    /** Returns true when loading a brand-new query result bundle. Will not be true when just loading the next page of query results. */
     isLoadingNewBundle: boolean;
     /** The error returned by the query request, if one is encountered */
     error: SynapseClientError | null;
     /** The status of the asynchronous job. */
     asyncJobStatus?: AsynchronousJobStatus<QueryBundleRequest, QueryResultBundle>;
-    /** Whether or not facets are available to be filtered upon based on the current data */
+    /** Whether facets are available to be filtered upon based on the current data */
     isFacetsAvailable: boolean;
     /**
      * 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.
@@ -32,6 +41,9 @@ export declare type QueryContextType = {
      * The presence of a locked filter will result in a client-side modification of the active query and result bundle data.
      */
     lockedColumn?: LockedColumn;
+    /** Returns true iff the current request has resettable filters applied via facet filters or additionalFilters. Excludes filters applied to a locked column */
+    hasResettableFilters: boolean;
+    getColumnModel: (columnName: string) => ColumnModel | null;
 };
 export declare type PaginatedQueryContextType = QueryContextType & {
     /** Navigates to a particular page, where the first page has value 1 */
@@ -46,13 +58,13 @@ export declare type PaginatedQueryContextType = QueryContextType & {
 export declare type InfiniteQueryContextType = QueryContextType & {
     /** Returns true when loading a new page of query results */
     isLoadingNewPage: boolean;
-    /** Whether or not the query result bundle has a next page */
+    /** Whether the query result bundle has a next page */
     hasNextPage: boolean;
     /** Invoke this method to fetch and append the next page of rows to the data  */
     appendNextPageToResults: () => Promise<void>;
     /** Invoke to fetch and update the data with the next page of query results */
     goToNextPage: () => Promise<void>;
-    /** Whether or not the query result bundle has a previous page */
+    /** Whether the query result bundle has a previous page */
     hasPreviousPage: boolean;
     /** Invoke to fetch and update the data with the previous page of query results */
     goToPreviousPage: () => Promise<void>;

package/dist/containers/QueryContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryContext.js","sourceRoot":"","sources":["../../src/lib/containers/QueryContext.tsx"],"names":[],"mappings":";;;;AAAA,mDAA8B;AAC9B,+BAAiD;AASpC,QAAA,0BAA0B,GAAW,uBAAuB,CAAA;AAC5D,QAAA,2BAA2B,GAAW,sBAAsB,CAAA;AAgEzE;;GAEG;AACU,QAAA,YAAY,GAAG,IAAA,qBAAa,EACvC,SAAS,CACV,CAAA;AAMD;;GAEG;AACI,IAAM,oBAAoB,GAAG,UAAC,EAGT;QAF1B,QAAQ,cAAA,EACR,YAAY,kBAAA;IAEZ,OAAO,CACL,oBAAC,oBAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,IACvC,QAAQ,CACa,CACzB,CAAA;AACH,CAAC,CAAA;AATY,QAAA,oBAAoB,wBAShC;AAED,SAAgB,eAAe;IAC7B,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;KACtE;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAND,0CAMC;AAED,SAAgB,wBAAwB;IACtC,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAA;KACF;IACD,uDAAuD;IACvD,OAAO,OAAoC,CAAA;AAC7C,CAAC;AATD,4DASC;AAED,SAAgB,uBAAuB;IACrC,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAA;KACF;IACD,uDAAuD;IACvD,OAAO,OAAmC,CAAA;AAC5C,CAAC;AATD,0DASC;AAEY,QAAA,oBAAoB,GAAG,oBAAY,CAAC,QAAQ,CAAA"}
+{"version":3,"file":"QueryContext.js","sourceRoot":"","sources":["../../src/lib/containers/QueryContext.tsx"],"names":[],"mappings":";;;;AAAA,mDAA8B;AAC9B,+BAAiD;AAWpC,QAAA,0BAA0B,GAAW,uBAAuB,CAAA;AAC5D,QAAA,2BAA2B,GAAW,sBAAsB,CAAA;AA2EzE;;GAEG;AACU,QAAA,YAAY,GAAG,IAAA,qBAAa,EACvC,SAAS,CACV,CAAA;AAMD;;GAEG;AACI,IAAM,oBAAoB,GAAG,UAAC,EAGT;QAF1B,QAAQ,cAAA,EACR,YAAY,kBAAA;IAEZ,OAAO,CACL,oBAAC,oBAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,YAAY,IACvC,QAAQ,CACa,CACzB,CAAA;AACH,CAAC,CAAA;AATY,QAAA,oBAAoB,wBAShC;AAED,SAAgB,eAAe;IAC7B,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;KACtE;IACD,OAAO,OAAO,CAAA;AAChB,CAAC;AAND,0CAMC;AAED,SAAgB,wBAAwB;IACtC,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAA;KACF;IACD,uDAAuD;IACvD,OAAO,OAAoC,CAAA;AAC7C,CAAC;AATD,4DASC;AAED,SAAgB,uBAAuB;IACrC,IAAM,OAAO,GAAG,IAAA,kBAAU,EAAC,oBAAY,CAAC,CAAA;IACxC,IAAI,OAAO,KAAK,SAAS,EAAE;QACzB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAA;KACF;IACD,uDAAuD;IACvD,OAAO,OAAmC,CAAA;AAC5C,CAAC;AATD,0DASC;AAEY,QAAA,oBAAoB,GAAG,oBAAY,CAAC,QAAQ,CAAA"}

package/dist/containers/QueryCount.d.ts

@@ -1,9 +1,11 @@
-import React from 'react';
-import { FacetColumnValuesRequest } from '../utils/synapseTypes/';
+/// <reference types="react" />
+import { Query } from '../utils/synapseTypes/';
 export declare type QueryCountProps = {
-    sql: string;
-    selectedFacets?: FacetColumnValuesRequest[];
+    query: Query;
     parens?: boolean;
 };
-declare const QueryCount: React.FunctionComponent<QueryCountProps>;
+/**
+ * Shows the total count of results for a table query.
+ */
+declare function QueryCount(props: QueryCountProps): JSX.Element;
 export default QueryCount;

package/dist/containers/QueryCount.js

@@ -5,23 +5,23 @@ var react_1 = tslib_1.__importDefault(require("react"));
 var utils_1 = require("../utils/");
 var sqlFunctions_1 = require("../utils/functions/sqlFunctions");
 var useGetQueryResultBundle_1 = tslib_1.__importDefault(require("../utils/hooks/SynapseAPI/entity/useGetQueryResultBundle"));
-var QueryCount = function (_a) {
-    var _b;
-    var sql = _a.sql, selectedFacets = _a.selectedFacets, parens = _a.parens;
-    var entityId = (0, sqlFunctions_1.parseEntityIdFromSqlStatement)(sql);
+/**
+ * Shows the total count of results for a table query.
+ */
+function QueryCount(props) {
+    var _a;
+    var query = props.query, parens = props.parens;
+    var entityId = (0, sqlFunctions_1.parseEntityIdFromSqlStatement)(query.sql);
     var request = {
         concreteType: 'org.sagebionetworks.repo.model.table.QueryBundleRequest',
-        query: {
-            sql: sql,
-            selectedFacets: selectedFacets,
-        },
+        query: query,
         entityId: entityId,
         partMask: utils_1.SynapseConstants.BUNDLE_MASK_QUERY_COUNT,
     };
     var queryResult = (0, useGetQueryResultBundle_1.default)(request).data;
-    var localCount = (_b = queryResult === null || queryResult === void 0 ? void 0 : queryResult.queryCount) === null || _b === void 0 ? void 0 : _b.toLocaleString();
+    var localCount = (_a = queryResult === null || queryResult === void 0 ? void 0 : queryResult.queryCount) === null || _a === void 0 ? void 0 : _a.toLocaleString();
     /* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toLocaleString#Using_toLocaleString */
     return (react_1.default.createElement(react_1.default.Fragment, null, localCount && (parens ? "(".concat(localCount, ")") : localCount)));
-};
+}
 exports.default = QueryCount;
 //# sourceMappingURL=QueryCount.js.map

package/dist/containers/QueryCount.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryCount.js","sourceRoot":"","sources":["../../src/lib/containers/QueryCount.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AACzB,mCAA4C;AAC5C,gEAA+E;AAC/E,6HAA8F;AAY9F,IAAM,UAAU,GAA6C,UAAC,EAI7D;;QAHC,GAAG,SAAA,EACH,cAAc,oBAAA,EACd,MAAM,YAAA;IAEN,IAAM,QAAQ,GAAG,IAAA,4CAA6B,EAAC,GAAG,CAAC,CAAA;IAEnD,IAAM,OAAO,GAAuB;QAClC,YAAY,EAAE,yDAAyD;QACvE,KAAK,EAAE;YACL,GAAG,KAAA;YACH,cAAc,gBAAA;SACf;QACD,QAAQ,UAAA;QACR,QAAQ,EAAE,wBAAgB,CAAC,uBAAuB;KACnD,CAAA;IAEO,IAAM,WAAW,GAAK,IAAA,iCAAuB,EAAC,OAAO,CAAC,KAArC,CAAqC;IAE9D,IAAM,UAAU,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,0CAAE,cAAc,EAAE,CAAA;IAC5D,iIAAiI;IACjI,OAAO,CACL,8BAAC,eAAK,CAAC,QAAQ,QACZ,UAAU,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAI,UAAU,MAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CACzC,CAClB,CAAA;AACH,CAAC,CAAA;AACD,kBAAe,UAAU,CAAA"}
+{"version":3,"file":"QueryCount.js","sourceRoot":"","sources":["../../src/lib/containers/QueryCount.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AACzB,mCAA4C;AAC5C,gEAA+E;AAC/E,6HAA8F;AAQ9F;;GAEG;AACH,SAAS,UAAU,CAAC,KAAsB;;IAChC,IAAA,KAAK,GAAa,KAAK,MAAlB,EAAE,MAAM,GAAK,KAAK,OAAV,CAAU;IAC/B,IAAM,QAAQ,GAAG,IAAA,4CAA6B,EAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAEzD,IAAM,OAAO,GAAuB;QAClC,YAAY,EAAE,yDAAyD;QACvE,KAAK,EAAE,KAAK;QACZ,QAAQ,UAAA;QACR,QAAQ,EAAE,wBAAgB,CAAC,uBAAuB;KACnD,CAAA;IAEO,IAAM,WAAW,GAAK,IAAA,iCAAuB,EAAC,OAAO,CAAC,KAArC,CAAqC;IAE9D,IAAM,UAAU,GAAG,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,UAAU,0CAAE,cAAc,EAAE,CAAA;IAC5D,iIAAiI;IACjI,OAAO,CACL,8BAAC,eAAK,CAAC,QAAQ,QACZ,UAAU,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,WAAI,UAAU,MAAG,CAAC,CAAC,CAAC,UAAU,CAAC,CACzC,CAClB,CAAA;AACH,CAAC;AACD,kBAAe,UAAU,CAAA"}

package/dist/containers/QuerySortSelector.d.ts

@@ -2,7 +2,6 @@ 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

@@ -3,21 +3,22 @@ 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 QueryVisualizationWrapper_1 = require("./QueryVisualizationWrapper");
 var QuerySortSelector = function (_a) {
-    var sortConfig = _a.sortConfig, facetAliases = _a.facetAliases;
+    var sortConfig = _a.sortConfig;
     var defaultColumn = sortConfig.defaultColumn, defaultDirection = sortConfig.defaultDirection, sortableColumns = sortConfig.sortableColumns;
     var queryContext = (0, QueryContext_1.useQueryContext)();
     var getLastQueryRequest = queryContext.getLastQueryRequest, executeQueryRequest = queryContext.executeQueryRequest;
+    var getColumnDisplayName = (0, QueryVisualizationWrapper_1.useQueryVisualizationContext)().getColumnDisplayName;
     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),
+            label: getColumnDisplayName(sortableColumn),
         };
     });
     var onChange = function (value) {

package/dist/containers/QuerySortSelector.js.map

@@ -1 +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"}
+{"version":3,"file":"QuerySortSelector.js","sourceRoot":"","sources":["../../src/lib/containers/QuerySortSelector.tsx"],"names":[],"mappings":";;;AAAA,qDAAuC;AAEvC,+CAAgD;AAEhD,sFAAuD;AACvD,sEAAiC;AACjC,8EAIgD;AAChD,yEAA0E;AAM1E,IAAM,iBAAiB,GAAoD,UAAC,EAE3E;QADC,UAAU,gBAAA;IAEF,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;IACzD,IAAA,oBAAoB,GAAK,IAAA,wDAA4B,GAAE,qBAAnC,CAAmC;IACzD,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,oBAAoB,CAAC,cAAc,CAAE;SAC7C,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/QueryVisualizationWrapper.d.ts

@@ -1,4 +1,6 @@
 import React from 'react';
+import { NoContentPlaceholderType } from './table/NoContentPlaceholderType';
+import { ColumnType } from '../utils/synapseTypes';
 export declare type QueryVisualizationContextType = {
     topLevelControlsState: TopLevelControlsState;
     setTopLevelControlsState: React.Dispatch<React.SetStateAction<TopLevelControlsState>>;
@@ -6,11 +8,16 @@ export declare type QueryVisualizationContextType = {
     setColumnsToShowInTable: (newState: string[]) => void;
     selectedRowIndices: number[];
     setSelectedRowIndices: (newState: number[]) => void;
-    facetAliases?: Record<string, string>;
     rgbIndex?: number;
     unitDescription?: string;
     /** Whether to show when the table or view was last updated. */
     showLastUpdatedOn?: boolean;
+    /** Given a column name, return the display name for the column */
+    getColumnDisplayName: (columnName?: string) => string | undefined;
+    /** Given a cell value and a column type, returns the displayed value for the data */
+    getDisplayValue: (value: string, columnType: ColumnType) => string;
+    /** React node to display in place of cards/table when there are no results. */
+    NoContentPlaceholder: () => JSX.Element;
 };
 /**
  * This must be exported to use the context in class components.
@@ -29,12 +36,15 @@ export declare type QueryVisualizationWrapperProps = {
     children: React.ReactNode | React.ReactNode[];
     rgbIndex?: number;
     unitDescription?: string;
-    facetAliases?: Record<string, string>;
+    /** Mapping from column name to the name that should be shown for the column */
+    columnAliases?: Record<string, string>;
     visibleColumnCount?: number;
     hiddenColumns?: string[];
     defaultShowFacetVisualization?: boolean;
     defaultShowSearchBar?: boolean;
     showLastUpdatedOn?: boolean;
+    /** Default is INTERACTIVE */
+    noContentPlaceholderType?: NoContentPlaceholderType;
 };
 export declare type TopLevelControlsState = {
     showFacetVisualization: boolean;

package/dist/containers/QueryVisualizationWrapper.js

@@ -5,6 +5,12 @@ var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importStar(require("react"));
 var use_deep_compare_effect_1 = require("use-deep-compare-effect");
 var QueryContext_1 = require("./QueryContext");
+var NoContentAvailable_1 = tslib_1.__importDefault(require("./table/NoContentAvailable"));
+var NoContentPlaceholderType_1 = require("./table/NoContentPlaceholderType");
+var SearchResultsNotFound_1 = tslib_1.__importDefault(require("./table/SearchResultsNotFound"));
+var TableIsEmpty_1 = tslib_1.__importDefault(require("./table/TableIsEmpty"));
+var unCamelCase_1 = require("../utils/functions/unCamelCase");
+var getDataFromFromStorage_1 = require("../utils/functions/getDataFromFromStorage");
 /**
  * This must be exported to use the context in class components.
  */
@@ -32,8 +38,10 @@ exports.QueryVisualizationContextConsumer = exports.QueryVisualizationContext.Co
  */
 function QueryVisualizationWrapper(props) {
     var _a, _b;
-    var _c = (0, QueryContext_1.useQueryContext)(), data = _c.data, getLastQueryRequest = _c.getLastQueryRequest, isFacetsAvailable = _c.isFacetsAvailable, isLoadingNewBundle = _c.isLoadingNewBundle;
-    var _d = (0, react_1.useState)({
+    var _c = props.noContentPlaceholderType, noContentPlaceholderType = _c === void 0 ? NoContentPlaceholderType_1.NoContentPlaceholderType.INTERACTIVE : _c;
+    var _d = (0, QueryContext_1.useQueryContext)(), data = _d.data, getLastQueryRequest = _d.getLastQueryRequest, isFacetsAvailable = _d.isFacetsAvailable, isLoadingNewBundle = _d.isLoadingNewBundle, hasResettableFilters = _d.hasResettableFilters;
+    var _e = props.columnAliases, columnAliases = _e === void 0 ? {} : _e;
+    var _f = (0, react_1.useState)({
         showColumnFilter: true,
         showFacetFilter: true,
         showFacetVisualization: (_a = props.defaultShowFacetVisualization) !== null && _a !== void 0 ? _a : true,
@@ -41,7 +49,7 @@ function QueryVisualizationWrapper(props) {
         showDownloadConfirmation: false,
         showColumnSelectDropdown: false,
         showSqlEditor: false,
-    }), topLevelControlsState = _d[0], setTopLevelControlsState = _d[1];
+    }), topLevelControlsState = _f[0], setTopLevelControlsState = _f[1];
     (0, react_1.useEffect)(function () {
         if (!isFacetsAvailable) {
             setTopLevelControlsState(function (state) { return (tslib_1.__assign(tslib_1.__assign({}, state), { showFacetFilter: false, showFacetVisualization: false })); });
@@ -52,8 +60,8 @@ function QueryVisualizationWrapper(props) {
             setSelectedRowIndices([]);
         }
     }, [isLoadingNewBundle]);
-    var _e = (0, react_1.useState)([]), visibleColumns = _e[0], setVisibleColumns = _e[1];
-    var _f = (0, react_1.useState)([]), selectedRowIndices = _f[0], setSelectedRowIndices = _f[1];
+    var _g = (0, react_1.useState)([]), visibleColumns = _g[0], setVisibleColumns = _g[1];
+    var _h = (0, react_1.useState)([]), selectedRowIndices = _h[0], setSelectedRowIndices = _h[1];
     var lastQueryRequest = getLastQueryRequest();
     // We deep-compare-memoize the selectColumns so we don't reset visible columns when the reference changes, but not the contents (e.g. on page change)
     var selectColumns = (0, use_deep_compare_effect_1.useDeepCompareMemoize)(data === null || data === void 0 ? void 0 : data.selectColumns);
@@ -62,6 +70,31 @@ function QueryVisualizationWrapper(props) {
         // SWC-6030: If sql changes, reset what columns are visible
         setVisibleColumns((_b = selectColumns === null || selectColumns === void 0 ? void 0 : selectColumns.slice(0, (_a = props.visibleColumnCount) !== null && _a !== void 0 ? _a : Infinity).map(function (el) { return el.name; })) !== null && _b !== void 0 ? _b : []);
     }, [selectColumns, lastQueryRequest.query.sql, props.visibleColumnCount]);
+    var getColumnDisplayName = (0, react_1.useCallback)(function (columnName) {
+        // SWC-5982: if force-display-original-column-names is set, then just return the string
+        var forceDisplayOriginalColumnName = localStorage.getItem('force-display-original-column-names') === 'true';
+        if (!columnName || forceDisplayOriginalColumnName) {
+            return columnName;
+        }
+        if (columnAliases[columnName]) {
+            return columnAliases[columnName];
+        }
+        return (0, unCamelCase_1.unCamelCase)(columnName);
+    }, [columnAliases]);
+    var NoContentPlaceholder = (0, react_1.useCallback)(function () {
+        switch (noContentPlaceholderType) {
+            case NoContentPlaceholderType_1.NoContentPlaceholderType.INTERACTIVE:
+                if (hasResettableFilters) {
+                    return react_1.default.createElement(SearchResultsNotFound_1.default, null);
+                }
+                else {
+                    return react_1.default.createElement(TableIsEmpty_1.default, null);
+                }
+            case NoContentPlaceholderType_1.NoContentPlaceholderType.STATIC:
+            default:
+                return react_1.default.createElement(NoContentAvailable_1.default, null);
+        }
+    }, [noContentPlaceholderType, hasResettableFilters]);
     var context = {
         topLevelControlsState: topLevelControlsState,
         setTopLevelControlsState: setTopLevelControlsState,
@@ -69,10 +102,12 @@ function QueryVisualizationWrapper(props) {
         setColumnsToShowInTable: setVisibleColumns,
         selectedRowIndices: selectedRowIndices,
         setSelectedRowIndices: setSelectedRowIndices,
-        facetAliases: props.facetAliases,
         rgbIndex: props.rgbIndex,
         unitDescription: props.unitDescription,
         showLastUpdatedOn: props.showLastUpdatedOn,
+        getColumnDisplayName: getColumnDisplayName,
+        getDisplayValue: getDataFromFromStorage_1.getDisplayValue,
+        NoContentPlaceholder: NoContentPlaceholder,
     };
     /**
      * Render the children without any formatting

package/dist/containers/QueryVisualizationWrapper.js.map

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

package/dist/containers/QueryWrapper.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { QueryBundleRequest } from '../utils/synapseTypes';
 import { LockedColumn } from './QueryContext';
 export declare const QUERY_FILTERS_EXPANDED_CSS: string;
@@ -12,10 +12,6 @@ export declare type QueryWrapperProps = {
     onQueryResultBundleChange?: (newQueryResultBundleJson: string) => void;
     lockedColumn?: LockedColumn;
 };
-export declare type SearchQuery = {
-    columnName: string;
-    searchText: string;
-};
 /**
  * Component that manages the state of a Synapse table query. Data can be accessed via QueryContext using
  * either `useQueryContext` or `QueryContextConsumer`.

package/dist/containers/QueryWrapper.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QueryWrapper = exports.QUERY_FILTERS_COLLAPSED_CSS = exports.QUERY_FILTERS_EXPANDED_CSS = void 0;
 var tslib_1 = require("tslib");
-var React = tslib_1.__importStar(require("react"));
-var react_1 = require("react");
+var react_1 = tslib_1.__importStar(require("react"));
+var react_2 = require("react");
 var use_deep_compare_effect_1 = require("use-deep-compare-effect");
 var queryUtils_1 = require("../utils/functions/queryUtils");
-var useEntity_1 = require("../utils/hooks/SynapseAPI/entity/useEntity");
-var useGetQueryResultBundle_1 = require("../utils/hooks/SynapseAPI/entity/useGetQueryResultBundle");
+var SynapseAPI_1 = require("../utils/hooks/SynapseAPI");
 var QueryContext_1 = require("./QueryContext");
 var useImmutableTableQuery_1 = tslib_1.__importDefault(require("./useImmutableTableQuery"));
 exports.QUERY_FILTERS_EXPANDED_CSS = 'isShowingFacetFilters';
@@ -18,24 +17,24 @@ exports.QUERY_FILTERS_COLLAPSED_CSS = 'isHidingFacetFilters';
  */
 function QueryWrapper(props) {
     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 _a = (0, react_2.useState)(undefined), currentAsyncStatus = _a[0], setCurrentAsyncStatus = _a[1];
     var _b = (0, useImmutableTableQuery_1.default)({
         initQueryRequest: initQueryRequest,
         shouldDeepLink: shouldDeepLink,
         componentIndex: componentIndex,
         onQueryChange: onQueryChange,
-    }), entityId = _b.entityId, versionNumber = _b.versionNumber, getInitQueryRequest = _b.getInitQueryRequest, getLastQueryRequest = _b.getLastQueryRequest, setQuery = _b.setQuery, currentPage = _b.currentPage, pageSize = _b.pageSize, goToPage = _b.goToPage, setPageSize = _b.setPageSize;
-    var lastQueryRequest = (0, react_1.useMemo)(function () {
+    }), entityId = _b.entityId, versionNumber = _b.versionNumber, getInitQueryRequest = _b.getInitQueryRequest, getLastQueryRequest = _b.getLastQueryRequest, setQuery = _b.setQuery, currentPage = _b.currentPage, pageSize = _b.pageSize, goToPage = _b.goToPage, setPageSize = _b.setPageSize, resetQuery = _b.resetQuery, removeSelectedFacet = _b.removeSelectedFacet, removeValueFromSelectedFacet = _b.removeValueFromSelectedFacet, removeQueryFilter = _b.removeQueryFilter, removeValueFromQueryFilter = _b.removeValueFromQueryFilter;
+    var lastQueryRequest = (0, react_2.useMemo)(function () {
         return getLastQueryRequest();
     }, [getLastQueryRequest]);
-    var _c = (0, useGetQueryResultBundle_1.useGetQueryResultBundleWithAsyncStatus)(lastQueryRequest, {
+    var _c = (0, SynapseAPI_1.useGetQueryResultBundleWithAsyncStatus)(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), asyncJobStatus = _c.data, queryIsLoading = _c.isLoading, error = _c.error, newQueryIsFetching = _c.isPreviousData;
     var data = asyncJobStatus === null || asyncJobStatus === void 0 ? void 0 : asyncJobStatus.responseBody;
-    // Indicate if we're fetching data for the first time (queryIsLoading) or if we're fetching data for a brand new query (newQueryIsFetching)
+    // 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 entity = (0, useEntity_1.useGetEntity)(entityId, versionNumber).data;
+    var entity = (0, SynapseAPI_1.useGetEntity)(entityId, versionNumber).data;
     // data is sometimes undefined, which useDeepCompareEffect doesn't like, so use useDeepCompareEffectNoCheck instead
     (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(function () {
         if (data && onQueryResultBundleChange) {
@@ -46,13 +45,21 @@ function QueryWrapper(props) {
         ? (0, queryUtils_1.isFacetAvailable)(data.facets, data.selectColumns)
         : true;
     /**
-     * remove a particular facet name (e.g. study) and its all possible values based on the parameter specified in the url
+     * Remove a particular facet name (e.g. study) and 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 dataWithLockedColumnFacetRemoved = (0, react_1.useMemo)(function () {
+    var dataWithLockedColumnFacetRemoved = (0, react_2.useMemo)(function () {
         return (0, queryUtils_1.removeLockedColumnFromFacetData)(data, lockedColumn);
     }, [data, lockedColumn]);
+    var hasResettableFilters = (0, react_2.useMemo)(function () {
+        var request = getLastQueryRequest();
+        return (0, queryUtils_1.hasResettableFilters)(request.query, lockedColumn);
+    }, [getLastQueryRequest, lockedColumn]);
+    var getColumnModel = (0, react_1.useCallback)(function (columnName) {
+        var _a, _b;
+        return (_b = (_a = data === null || data === void 0 ? void 0 : data.columnModels) === null || _a === void 0 ? void 0 : _a.find(function (cm) { return cm.name === columnName; })) !== null && _b !== void 0 ? _b : null;
+    }, [data === null || data === void 0 ? void 0 : data.columnModels]);
     var context = {
         data: dataWithLockedColumnFacetRemoved,
         currentPage: currentPage,
@@ -67,14 +74,22 @@ function QueryWrapper(props) {
         isFacetsAvailable: isFacetsAvailable,
         asyncJobStatus: currentAsyncStatus,
         goToPage: goToPage,
+        hasResettableFilters: hasResettableFilters,
+        removeSelectedFacet: removeSelectedFacet,
+        removeValueFromSelectedFacet: removeValueFromSelectedFacet,
+        resetQuery: resetQuery,
+        removeQueryFilter: removeQueryFilter,
+        removeValueFromQueryFilter: removeValueFromQueryFilter,
+        lockedColumn: lockedColumn,
+        getColumnModel: getColumnModel,
     };
     /**
      * Render the children without any formatting
      */
     var children = props.children;
     var loadingCursorClass = isLoadingNewBundle ? 'SRC-logo-cursor' : '';
-    return (React.createElement(QueryContext_1.QueryContextProvider, { queryContext: context },
-        React.createElement("div", { className: "SRC-wrapper ".concat(loadingCursorClass, " ").concat(isFacetsAvailable ? 'has-facets' : '') }, children)));
+    return (react_1.default.createElement(QueryContext_1.QueryContextProvider, { queryContext: context },
+        react_1.default.createElement("div", { className: "SRC-wrapper ".concat(loadingCursorClass, " ").concat(isFacetsAvailable ? 'has-facets' : '') }, children)));
 }
 exports.QueryWrapper = QueryWrapper;
 //# sourceMappingURL=QueryWrapper.js.map

package/dist/containers/QueryWrapper.js.map

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

package/dist/containers/SearchV2.js

@@ -4,7 +4,6 @@ var tslib_1 = require("tslib");
 var core_1 = require("@material-ui/core");
 var react_1 = tslib_1.__importDefault(require("react"));
 var react_transition_group_1 = require("react-transition-group");
-var unCamelCase_1 = require("../utils/functions/unCamelCase");
 var synapseTypes_1 = require("../utils/synapseTypes");
 var QueryFilter_1 = require("../utils/synapseTypes/Table/QueryFilter");
 var QueryWrapper_1 = require("./QueryWrapper");
@@ -153,7 +152,7 @@ var Search = /** @class */ (function (_super) {
     Search.prototype.render = function () {
         var _this = this;
         var _a;
-        var _b = this.props, searchable = _b.searchable, lockedColumn = _b.lockedColumn, data = _b.queryContext.data, _c = _b.queryVisualizationContext, topLevelControlsState = _c.topLevelControlsState, facetAliases = _c.facetAliases;
+        var _b = this.props, searchable = _b.searchable, lockedColumn = _b.lockedColumn, data = _b.queryContext.data, _c = _b.queryVisualizationContext, topLevelControlsState = _c.topLevelControlsState, getColumnDisplayName = _c.getColumnDisplayName;
         var _d = this.state, searchText = _d.searchText, show = _d.show, columnName = _d.columnName;
         var searchColumns = [];
         // searchable specifies the order of the columns to search
@@ -197,7 +196,7 @@ var Search = /** @class */ (function (_super) {
                         react_1.default.createElement("p", { className: "deemphasized" },
                             react_1.default.createElement("i", null, " Search In Field: ")),
                         searchColumns.map(function (name, index) {
-                            var displayName = (0, unCamelCase_1.unCamelCase)(name, facetAliases);
+                            var displayName = getColumnDisplayName(name);
                             var isSelected = (columnName === '' && index === 0) || columnName === name;
                             return (react_1.default.createElement("div", { className: "radio", key: "search-field-".concat(name, "-").concat(index) },
                                 react_1.default.createElement("label", null,