synapse-react-client 3.1.8 → 3.1.9

package/dist/containers/TotalQueryResults.js

@@ -1,214 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var lodash_es_1 = require("lodash-es");
-var react_1 = tslib_1.__importStar(require("react"));
+var react_1 = tslib_1.__importDefault(require("react"));
 var SkeletonInlineBlock_1 = require("../assets/skeletons/SkeletonInlineBlock");
-var getDataFromFromStorage_1 = require("../utils/functions/getDataFromFromStorage");
-var synapseTypes_1 = require("../utils/synapseTypes");
-var QueryFilter_1 = require("../utils/synapseTypes/Table/QueryFilter");
 var QueryVisualizationWrapper_1 = require("./QueryVisualizationWrapper");
 var QueryWrapper_1 = require("./QueryWrapper");
 var QueryContext_1 = require("./QueryContext");
-var SelectionCriteriaPill_1 = tslib_1.__importDefault(require("./widgets/facet-nav/SelectionCriteriaPill"));
-var FacetFilterControls_1 = require("./widgets/query-filter/FacetFilterControls");
-var RangeFacetFilter_1 = require("./widgets/query-filter/RangeFacetFilter");
 var IconSvg_1 = tslib_1.__importDefault(require("./IconSvg"));
-// This is a stateful component so that during load the component can hold onto the previous
-// total instead of showing 0 results for the intermittent loading state.
-var TotalQueryResults = function (_a) {
-    var _b;
-    var style = _a.style, frontText = _a.frontText, _c = _a.endText, endText = _c === void 0 ? '' : _c, _d = _a.hideIfUnfiltered, hideIfUnfiltered = _d === void 0 ? false : _d;
-    var _e = (0, QueryContext_1.useQueryContext)(), data = _e.data, isLoadingNewBundle = _e.isLoadingNewBundle, getLastQueryRequest = _e.getLastQueryRequest, executeQueryRequest = _e.executeQueryRequest, getInitQueryRequest = _e.getInitQueryRequest, error = _e.error;
-    var _f = (0, QueryVisualizationWrapper_1.useQueryVisualizationContext)(), topLevelControlsState = _f.topLevelControlsState, unitDescription = _f.unitDescription;
+var SelectionCriteriaPills_1 = tslib_1.__importDefault(require("./widgets/facet-nav/SelectionCriteriaPills"));
+function TotalQueryResults(props) {
+    var style = props.style, frontText = props.frontText, _a = props.endText, endText = _a === void 0 ? '' : _a, _b = props.hideIfUnfiltered, hideIfUnfiltered = _b === void 0 ? false : _b;
+    var _c = (0, QueryContext_1.useQueryContext)(), data = _c.data, isLoadingNewBundle = _c.isLoadingNewBundle, resetQuery = _c.resetQuery, error = _c.error, hasResettableFilters = _c.hasResettableFilters;
+    var _d = (0, QueryVisualizationWrapper_1.useQueryVisualizationContext)(), topLevelControlsState = _d.topLevelControlsState, unitDescription = _d.unitDescription;
     var total = data === null || data === void 0 ? void 0 : data.queryCount;
-    var _g = (0, react_1.useState)([]), facetsWithSelection = _g[0], setFacetsWithSelection = _g[1];
-    var applyChanges = function (facets) {
-        var queryRequest = (0, lodash_es_1.cloneDeep)(getLastQueryRequest());
-        queryRequest.query.selectedFacets = facets;
-        queryRequest.query.offset = 0;
-        executeQueryRequest(queryRequest);
-    };
-    var getEnumFacetsWithSelections = function (facets) {
-        var enumFacets = facets.filter(function (facet) { return facet.facetType === 'enumeration'; });
-        var enumFacetsWithSelections = enumFacets.filter(function (facet) {
-            return facet.facetValues.filter(function (value) { return value.isSelected === true; }).length > 0;
-        });
-        return enumFacetsWithSelections;
-    };
-    var getRangeFacetsWithSelections = function (facets) {
-        var rangeFacets = facets.filter(function (facet) { return facet.facetType === 'range'; });
-        var rangeFacetsWithSelections = rangeFacets.filter(function (facet) { return facet.selectedMax || facet.selectedMin; });
-        return rangeFacetsWithSelections;
-    };
-    var getDisplayValueForEntityColumn = function (entityHeaders, facetValue) {
-        var _a;
-        var entity = entityHeaders.find(function (item) { return item.id === facetValue; });
-        return (_a = entity === null || entity === void 0 ? void 0 : entity.name) !== null && _a !== void 0 ? _a : facetValue;
-    };
-    var getDisplayValueEvaluationIdColumn = function (evaluations, facetValue) {
-        var evaluation = evaluations.find(function (item) { return item.id === facetValue; });
-        return (evaluation === null || evaluation === void 0 ? void 0 : evaluation.name) || facetValue;
-    };
-    var getDisplayValueUserIdColumn = function (userProfiles, facetValue) {
-        var userProfile = userProfiles.find(function (item) { return item.ownerId === facetValue; });
-        return (userProfile === null || userProfile === void 0 ? void 0 : userProfile.userName) || facetValue;
-    };
-    var transformEnumFacetsForSelectionDisplay = (0, react_1.useCallback)(function (facets, columnModels) {
-        var lookUpEntityHeaders = (0, getDataFromFromStorage_1.getStoredEntityHeaders)();
-        var lookUpUserProfiles = (0, getDataFromFromStorage_1.getStoredUserProfiles)();
-        var lookUpEvaluations = (0, getDataFromFromStorage_1.getStoredEvaluation)();
-        var filteredEnumWithSelectedValuesOnly = [];
-        facets.forEach(function (facet) {
-            var columnModel = columnModels.find(function (model) { return model.name === facet.columnName; });
-            facet.facetValues.forEach(function (facetValue) {
-                if (facetValue.isSelected) {
-                    var displayValue = facetValue.value;
-                    switch (columnModel === null || columnModel === void 0 ? void 0 : columnModel.columnType) {
-                        case synapseTypes_1.ColumnType.ENTITYID:
-                        case synapseTypes_1.ColumnType.ENTITYID_LIST:
-                            displayValue = getDisplayValueForEntityColumn(lookUpEntityHeaders, facetValue.value);
-                            break;
-                        case synapseTypes_1.ColumnType.USERID:
-                        case synapseTypes_1.ColumnType.USERID_LIST:
-                            displayValue = getDisplayValueUserIdColumn(lookUpUserProfiles, facetValue.value);
-                            break;
-                        case synapseTypes_1.ColumnType.EVALUATIONID:
-                            displayValue = getDisplayValueEvaluationIdColumn(lookUpEvaluations, facetValue.value);
-                            break;
-                        default:
-                            displayValue = facetValue.value;
-                            break;
-                    }
-                    filteredEnumWithSelectedValuesOnly.push({
-                        facet: facet,
-                        displayValue: displayValue,
-                        selectedValue: facetValue,
-                    });
-                }
-            });
-        });
-        return filteredEnumWithSelectedValuesOnly;
-    }, []);
-    (0, react_1.useEffect)(function () {
-        if (data) {
-            var rangeFacetsWithSelections = getRangeFacetsWithSelections(data.facets);
-            var enumFacetsWithSelections = getEnumFacetsWithSelections(data.facets);
-            var rangeFacetsForDisplay = rangeFacetsWithSelections.map(function (facet) { return ({
-                facet: facet,
-            }); });
-            var enumFacetsForDisplay = transformEnumFacetsForSelectionDisplay(enumFacetsWithSelections, data.columnModels);
-            setFacetsWithSelection(tslib_1.__spreadArray(tslib_1.__spreadArray([], rangeFacetsForDisplay, true), enumFacetsForDisplay, true));
-        }
-    }, [data, transformEnumFacetsForSelectionDisplay]);
-    var removeFacetSelection = function (facetWithSelection) {
-        var facet = facetWithSelection.facet, selectedValue = facetWithSelection.selectedValue;
-        if (facet.facetType === 'enumeration') {
-            (0, FacetFilterControls_1.applyChangesToValuesColumn)(getLastQueryRequest(), facet, applyChanges, selectedValue === null || selectedValue === void 0 ? void 0 : selectedValue.value, false);
-        }
-        else {
-            (0, FacetFilterControls_1.applyChangesToRangeColumn)(getLastQueryRequest(), facet, applyChanges, [
-                RangeFacetFilter_1.RadioValuesEnum.ANY,
-                RangeFacetFilter_1.RadioValuesEnum.ANY,
-            ]);
-        }
-    };
-    var removeColumnSearchQuerySelection = function (columnName, value) {
-        var _a;
-        var cloneLastQueryRequest = (0, lodash_es_1.cloneDeep)(getLastQueryRequest());
-        if (!cloneLastQueryRequest.query.additionalFilters) {
-            return;
-        }
-        cloneLastQueryRequest.query.additionalFilters =
-            (_a = cloneLastQueryRequest.query.additionalFilters) === null || _a === void 0 ? void 0 : _a.reduce(function (filtered, el) {
-                if ((0, QueryFilter_1.isColumnSingleValueQueryFilter)(el) ||
-                    (0, QueryFilter_1.isColumnMultiValueFunctionQueryFilter)(el)) {
-                    // For column-specific QueryFilters, filter out matching values on the matching column
-                    var newElement = {
-                        columnName: el.columnName,
-                        values: el.columnName === columnName
-                            ? el.values.filter(function (el) { return el !== value; })
-                            : el.values,
-                        operator: (0, QueryFilter_1.isColumnSingleValueQueryFilter)(el)
-                            ? el.operator
-                            : undefined,
-                        function: (0, QueryFilter_1.isColumnMultiValueFunctionQueryFilter)(el)
-                            ? el.function
-                            : undefined,
-                        concreteType: el.concreteType,
-                    };
-                    // Drop this QueryFilter if it has no more values
-                    if (newElement.values.length > 0) {
-                        filtered.push(newElement);
-                    }
-                }
-                else {
-                    // Don't alter/drop non-column-specific QueryFilters
-                    filtered.push(el);
-                }
-                return filtered;
-            }, []);
-        executeQueryRequest(cloneLastQueryRequest);
-    };
-    var removeTextMatchesQueryFilter = function (queryFilter) {
-        var cloneLastQueryRequest = (0, lodash_es_1.cloneDeep)(getLastQueryRequest());
-        if (!cloneLastQueryRequest.query.additionalFilters) {
-            return;
-        }
-        cloneLastQueryRequest.query.additionalFilters =
-            cloneLastQueryRequest.query.additionalFilters.filter(function (el) {
-                return !((0, QueryFilter_1.isTextMatchesQueryFilter)(el) &&
-                    el.searchExpression === queryFilter.searchExpression);
-            });
-        executeQueryRequest(cloneLastQueryRequest);
-    };
-    var clearAll = function () {
-        var initQueryRequest = (0, lodash_es_1.cloneDeep)(getInitQueryRequest());
-        initQueryRequest.query.additionalFilters = [];
-        executeQueryRequest(initQueryRequest);
-    };
-    var searchSelectionCriteriaPillProps = (_b = getLastQueryRequest().query.additionalFilters) === null || _b === void 0 ? void 0 : _b.reduce(function (pillProps, el) {
-        if ((0, QueryFilter_1.isTextMatchesQueryFilter)(el)) {
-            pillProps.push({
-                key: "fulltextsearch-".concat(el.searchExpression),
-                filter: {
-                    value: el.searchExpression,
-                },
-                onRemove: function () { return removeTextMatchesQueryFilter(el); },
-            });
-        }
-        else if ((0, QueryFilter_1.isColumnSingleValueQueryFilter)(el) ||
-            (0, QueryFilter_1.isColumnMultiValueFunctionQueryFilter)(el)) {
-            var columnName_1 = el.columnName;
-            el.values.forEach(function (value) {
-                pillProps.push({
-                    key: "columnsearch-".concat(value),
-                    filter: {
-                        columnName: columnName_1,
-                        value: value,
-                    },
-                    onRemove: function () {
-                        return removeColumnSearchQuerySelection(el.columnName, value);
-                    },
-                });
-            });
-        }
-        else {
-            console.warn('Encountered unexpected QueryFilter: ', el);
-        }
-        return pillProps;
-    }, []);
     var showFacetFilter = topLevelControlsState === null || topLevelControlsState === void 0 ? void 0 : topLevelControlsState.showFacetFilter;
-    var hasFilters = facetsWithSelection.length > 0 ||
-        (searchSelectionCriteriaPillProps &&
-            searchSelectionCriteriaPillProps.length > 0);
+    var showClearAll = hasResettableFilters;
     if (error) {
         return react_1.default.createElement(react_1.default.Fragment, null);
     }
     return (react_1.default.createElement("div", { className: "TotalQueryResults ".concat(showFacetFilter
             ? QueryWrapper_1.QUERY_FILTERS_EXPANDED_CSS
-            : QueryWrapper_1.QUERY_FILTERS_COLLAPSED_CSS, " ").concat(hasFilters ? 'hasFilters' : ''), style: style }, isLoadingNewBundle ? (react_1.default.createElement(SkeletonInlineBlock_1.SkeletonInlineBlock, { width: 100 })) : (react_1.default.createElement(react_1.default.Fragment, null,
-        (hasFilters || !hideIfUnfiltered) && (react_1.default.createElement("div", { className: "TotalQueryResults__topbar" },
+            : QueryWrapper_1.QUERY_FILTERS_COLLAPSED_CSS, " ").concat(hasResettableFilters ? 'hasFilters' : ''), style: style }, isLoadingNewBundle ? (react_1.default.createElement(SkeletonInlineBlock_1.SkeletonInlineBlock, { width: 100 })) : (react_1.default.createElement(react_1.default.Fragment, null,
+        (hasResettableFilters || !hideIfUnfiltered) && (react_1.default.createElement("div", { className: "TotalQueryResults__topbar" },
             react_1.default.createElement("span", { className: "SRC-boldText" },
                 frontText,
                 " ", total === null || total === void 0 ? void 0 :
@@ -217,18 +30,11 @@ var TotalQueryResults = function (_a) {
                 unitDescription,
                 ' ',
                 endText),
-            (facetsWithSelection.length > 0 ||
-                (searchSelectionCriteriaPillProps &&
-                    searchSelectionCriteriaPillProps.length > 2)) && (react_1.default.createElement("a", { onClick: clearAll, className: "TotalQueryResults__topbar__clearall" },
+            showClearAll && (react_1.default.createElement("a", { onClick: resetQuery, className: "TotalQueryResults__topbar__clearall" },
                 react_1.default.createElement(IconSvg_1.default, { options: { icon: 'deleteSweep' } }),
                 "Clear all filters")))),
         react_1.default.createElement("div", { className: "TotalQueryResults__selections" },
-            searchSelectionCriteriaPillProps &&
-                searchSelectionCriteriaPillProps.map(function (props) { return (react_1.default.createElement(SelectionCriteriaPill_1.default, tslib_1.__assign({}, props, { key: props.key }))); }),
-            facetsWithSelection.map(function (selectedFacet, index) {
-                var _a, _b, _c;
-                return (react_1.default.createElement(SelectionCriteriaPill_1.default, { key: "facets-".concat((_c = (_b = (_a = selectedFacet.selectedValue) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : selectedFacet.displayValue) !== null && _c !== void 0 ? _c : index), facetWithSelection: selectedFacet, onRemove: function () { return removeFacetSelection(selectedFacet); } }));
-            }))))));
-};
+            react_1.default.createElement(SelectionCriteriaPills_1.default, null))))));
+}
 exports.default = TotalQueryResults;
 //# sourceMappingURL=TotalQueryResults.js.map

package/dist/containers/TotalQueryResults.js.map

@@ -1 +1 @@
-{"version":3,"file":"TotalQueryResults.js","sourceRoot":"","sources":["../../src/lib/containers/TotalQueryResults.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"TotalQueryResults.js","sourceRoot":"","sources":["../../src/lib/containers/TotalQueryResults.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AACzB,+EAA6E;AAE7E,yEAA0E;AAC1E,+CAGuB;AACvB,+CAAgD;AAChD,8DAA+B;AAC/B,8GAA+E;AAU/E,SAAS,iBAAiB,CAAC,KAA6B;IAC9C,IAAA,KAAK,GAAwD,KAAK,MAA7D,EAAE,SAAS,GAA6C,KAAK,UAAlD,EAAE,KAA2C,KAAK,QAApC,EAAZ,OAAO,mBAAG,EAAE,KAAA,EAAE,KAA6B,KAAK,iBAAV,EAAxB,gBAAgB,mBAAG,KAAK,KAAA,CAAU;IACpE,IAAA,KACJ,IAAA,8BAAe,GAAE,EADX,IAAI,UAAA,EAAE,kBAAkB,wBAAA,EAAE,UAAU,gBAAA,EAAE,KAAK,WAAA,EAAE,oBAAoB,0BACtD,CAAA;IAEb,IAAA,KACJ,IAAA,wDAA4B,GAAE,EADxB,qBAAqB,2BAAA,EAAE,eAAe,qBACd,CAAA;IAEhC,IAAM,KAAK,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU,CAAA;IAE9B,IAAM,eAAe,GAAG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,eAAe,CAAA;IAE9D,IAAM,YAAY,GAAG,oBAAoB,CAAA;IACzC,IAAI,KAAK,EAAE;QACT,OAAO,6DAAK,CAAA;KACb;IACD,OAAO,CACL,uCACE,SAAS,EAAE,4BACT,eAAe;YACb,CAAC,CAAC,yCAA0B;YAC5B,CAAC,CAAC,0CAA2B,cAC7B,oBAAoB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAE,EAC9C,KAAK,EAAE,KAAK,IAEX,kBAAkB,CAAC,CAAC,CAAC,CACpB,8BAAC,yCAAmB,IAAC,KAAK,EAAE,GAAG,GAAI,CACpC,CAAC,CAAC,CAAC,CACF;QACG,CAAC,oBAAoB,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC9C,uCAAK,SAAS,EAAC,2BAA2B;YACxC,wCAAM,SAAS,EAAC,cAAc;gBAC3B,SAAS;qBAAG,KAAK,aAAL,KAAK;gBAAL,KAAK,CAAE,cAAc,EAAE;;gBAAG,eAAe;gBAAE,GAAG;gBAC1D,OAAO,CACH;YACN,YAAY,IAAI,CACf,qCACE,OAAO,EAAE,UAAU,EACnB,SAAS,EAAC,qCAAqC;gBAE/C,8BAAC,iBAAO,IAAC,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,GAAI;oCAE3C,CACL,CACG,CACP;QACD,uCAAK,SAAS,EAAC,+BAA+B;YAC5C,8BAAC,gCAAsB,OAAG,CACtB,CACL,CACJ,CACG,CACP,CAAA;AACH,CAAC;AAED,kBAAe,iBAAiB,CAAA"}

package/dist/containers/UserCardListRotate.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { KeyValue, SQLOperator } from '../utils/functions/sqlFunctions';
+import { SQLOperator } from '../utils/functions/sqlFunctions';
 import { FacetColumnRequest } from '../utils/synapseTypes/Table';
 import { UserCardSize } from './UserCard';
 export declare type UserCardListRotateProps = {
@@ -11,7 +11,7 @@ export declare type UserCardListRotateProps = {
     summaryLinkText?: string;
     selectedFacets?: FacetColumnRequest[];
     sqlOperator?: SQLOperator;
-    searchParams?: KeyValue;
+    searchParams?: Record<string, string>;
 };
 export declare const getDisplayIds: (ids: string[] | undefined, count: number | undefined, storageUidKey: string) => string[];
 declare const UserCardListRotate: React.FunctionComponent<UserCardListRotateProps>;

package/dist/containers/UserCardListRotate.js

@@ -57,12 +57,12 @@ var UserCardListRotate = function (_a) {
     (0, use_deep_compare_effect_1.useDeepCompareEffectNoCheck)(function () {
         var fetchData = function () {
             return tslib_1.__awaiter(this, void 0, void 0, function () {
-                var sqlUsed, entityId, partMask, request, queryResultBundle, queryResult, ownerIdColumnIndex_1, ids, newIds;
+                var additionalFilters, entityId, partMask, request, queryResultBundle, queryResult, ownerIdColumnIndex_1, ids, newIds;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
                             setIsLoading(true);
-                            sqlUsed = (0, sqlFunctions_1.insertConditionsFromSearchParams)(sql, searchParams, sqlOperator);
+                            additionalFilters = (0, sqlFunctions_1.generateQueryFilterFromSearchParams)(searchParams, sqlOperator);
                             entityId = (0, sqlFunctions_1.parseEntityIdFromSqlStatement)(sql);
                             partMask = utils_1.SynapseConstants.BUNDLE_MASK_QUERY_RESULTS;
                             request = {
@@ -70,7 +70,8 @@ var UserCardListRotate = function (_a) {
                                 concreteType: 'org.sagebionetworks.repo.model.table.QueryBundleRequest',
                                 entityId: entityId,
                                 query: {
-                                    sql: sqlUsed,
+                                    sql: sql,
+                                    additionalFilters: additionalFilters,
                                     selectedFacets: selectedFacets,
                                 },
                             };

package/dist/containers/UserCardListRotate.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserCardListRotate.js","sourceRoot":"","sources":["../../src/lib/containers/UserCardListRotate.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"UserCardListRotate.js","sourceRoot":"","sources":["../../src/lib/containers/UserCardListRotate.tsx"],"names":[],"mappings":";;;;AAAA,qDAAuC;AACvC,gEAIwC;AACxC,kCAA0D;AAM1D,sDAAkD;AAClD,wEAAyC;AAEzC,8DAA2D;AAC3D,mDAAwC;AACxC,0DAA2D;AAC3D,mDAAwD;AACxD,mEAAqE;AAErE,IAAM,cAAc,GAAG,kBAAkB,CAAA;AACzC,IAAM,qBAAqB,GAAG,CAAC,CAAA;AAcxB,IAAM,aAAa,GAAG,UAC3B,GAAkB,EAClB,KAAqC,EACrC,aAAqB;IAFrB,oBAAA,EAAA,QAAkB;IAClB,sBAAA,EAAA,6BAAqC;IAGrC,IAAI,SAAS,GAAa,EAAE,CAAA;IAC5B,IAAI,MAAM,GAAa,EAAE,CAAA;IACzB,IAAM,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IACxD,IAAI,YAAY,IAAI,IAAI,EAAE;QACxB,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;KACrC;IACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE;QACrB,sBAAsB;QACtB,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QAC5B,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;QAC3D,OAAO,MAAM,CAAA;KACd;SAAM;QACL,uBAAuB;QACvB,IAAM,QAAQ,GAAG,GAAG,CAAC,MAAM,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAA;QAC9D,IAAI,QAAQ,CAAC,MAAM,IAAI,KAAK,EAAE;YAC5B,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;YACjC,YAAY,CAAC,OAAO,CAClB,aAAa,EACb,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CACzC,CAAA;YACD,OAAO,MAAM,CAAA;SACd;aAAM;YACL,YAAY,CAAC,UAAU,CAAC,aAAa,CAAC,CAAA;YACtC,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;YAClD,YAAY,CAAC,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAA;YACzD,OAAO,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;SAC7B;KACF;AACH,CAAC,CAAA;AAjCY,QAAA,aAAa,iBAiCzB;AAED,IAAM,kBAAkB,GAAqD,UAAC,EAU7E;QATC,GAAG,SAAA,EACH,KAAK,WAAA,EACL,8BAA8B,EAA9B,sBAAsB,mBAAG,KAAK,KAAA,EAC9B,YAAsB,EAAtB,IAAI,mBAAG,kCAAe,KAAA,EACtB,WAAW,iBAAA,EACX,eAAe,qBAAA,EACf,cAAc,oBAAA,EACd,YAAY,kBAAA,EACZ,WAAW,iBAAA;IAEH,IAAA,WAAW,GAAK,IAAA,kCAAiB,GAAE,YAAxB,CAAwB;IACrC,IAAA,KAAwB,IAAA,gBAAQ,EAAW,EAAE,CAAC,EAA7C,OAAO,QAAA,EAAE,UAAU,QAA0B,CAAA;IAC9C,IAAA,KAA4B,IAAA,gBAAQ,GAAqB,EAAxD,SAAS,QAAA,EAAE,YAAY,QAAiC,CAAA;IACzD,IAAA,KAA4B,IAAA,gBAAQ,GAAW,EAA9C,SAAS,QAAA,EAAE,YAAY,QAAuB,CAAA;IACrD,IAAI,OAAO,GAAG,IAAI,CAAA;IAClB,IAAM,aAAa,GAAG,UAAG,cAAc,cAAI,GAAG,cAAI,IAAI,CAAC,SAAS,CAC9D,cAAc,CACf,CAAE,CAAA;IACH,IAAA,qDAA2B,EAAC;QAC1B,IAAM,SAAS,GAAG;;;;;;4BAChB,YAAY,CAAC,IAAI,CAAC,CAAA;4BACZ,iBAAiB,GAAG,IAAA,kDAAmC,EAC3D,YAAY,EACZ,WAAW,CACZ,CAAA;4BACK,QAAQ,GAAG,IAAA,4CAA6B,EAAC,GAAG,CAAC,CAAA;4BAC7C,QAAQ,GAAG,wBAAgB,CAAC,yBAAyB,CAAA;4BACrD,OAAO,GAAuB;gCAClC,QAAQ,UAAA;gCACR,YAAY,EAAE,yDAAyD;gCACvE,QAAQ,UAAA;gCACR,KAAK,EAAE;oCACL,GAAG,KAAA;oCACH,iBAAiB,mBAAA;oCACjB,cAAc,gBAAA;iCACf;6BACF,CAAA;4BAEyB,qBAAM,qBAAa,CAAC,wBAAwB,CACpE,OAAO,EACP,WAAW,CACZ,EAAA;;4BAHK,iBAAiB,GAAG,SAGzB;4BACO,WAAW,GAAK,iBAAiB,YAAtB,CAAsB;4BACzC,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,YAAY,CAAC,IAAI,EAAE;gCAE5B,uBAAqB,WAAW,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CACnE,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,UAAU,KAAK,yBAAU,CAAC,MAAM,EAAnC,CAAmC,CAC1C,CAAA;gCACK,GAAG,GAAa,WAAW,CAAC,YAAY,CAAC,IAAI;qCAChD,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,CAAC,oBAAkB,CAAC,EAA5B,CAA4B,CAAC;qCACtC,MAAM,CAAC,UAAC,EAAE,IAAmB,OAAA,EAAE,KAAK,IAAI,EAAX,CAAW,CAAC,CAAA;gCAC5C,IAAI,OAAO,EAAE;oCACL,MAAM,GAAG,IAAA,qBAAa,EAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAAA;oCACvD,UAAU,CAAC,MAAM,CAAC,CAAA;oCAClB,IAAI,sBAAsB,EAAE;wCAC1B,YAAY,CAAC,iBAAiB,CAAC,CAAA;qCAChC;oCACD,YAAY,CAAC,KAAK,CAAC,CAAA;iCACpB;6BACF;iCAAM;gCACL,OAAO,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAA;6BACtD;;;;;SACF,CAAA;QACD,SAAS,EAAE,CAAA;QAEX,OAAO;YACL,OAAO,GAAG,KAAK,CAAA;QACjB,CAAC,CAAA;IACH,CAAC,EAAE,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,CAAA;IAExE,OAAO,CACL,uCAAK,SAAS,EAAC,yCAAyC;QACrD,SAAS,IAAI,8BAAC,sCAAqB,OAAG;QACtC,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,CACrC,qCAAG,SAAS,EAAC,aAAa,wBAAsB,CACjD;QACA,CAAC,SAAS,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,CACnC,8BAAC,sBAAY,IAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,GAAI,CAC7D;QACA,WAAW,IAAI,eAAe,IAAI,CACjC,uCAAK,SAAS,EAAC,6BAA6B;YAC1C,8BAAC,wBAAM,IACL,SAAS,EAAC,MAAM,EAChB,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,IAAI,EACT,IAAI,EAAE,WAAW,IAEhB,eAAe,CACT,CACL,CACP,CACG,CACP,CAAA;AACH,CAAC,CAAA;AAED,kBAAe,kBAAkB,CAAA"}

package/dist/containers/home_page/goals/Goals.Desktop.js

@@ -14,7 +14,7 @@ function GoalsDesktop(_a) {
                     title,
                     " "),
                 countSql && (react_1.default.createElement("span", { className: "Goals__Card__header__count" },
-                    react_1.default.createElement(QueryCount_1.default, { parens: false, sql: countSql }))))),
+                    react_1.default.createElement(QueryCount_1.default, { parens: false, query: { sql: countSql } }))))),
         react_1.default.createElement("div", { className: "Goals__Card__summary" },
             react_1.default.createElement("p", null,
                 " ",

package/dist/containers/home_page/goals/Goals.Desktop.js.map

@@ -1 +1 @@
-{"version":3,"file":"Goals.Desktop.js","sourceRoot":"","sources":["../../../../src/lib/containers/home_page/goals/Goals.Desktop.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AAEzB,sFAAuD;AACvD,mDAAwC;AAExC,SAAwB,YAAY,CAAC,EAMpB;QALf,KAAK,WAAA,EACL,IAAI,UAAA,EACJ,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,KAAK,WAAA;IAEL,OAAO,CACL,uCAAK,SAAS,EAAC,kCAAkC;QAC/C,uCACE,SAAS,EAAC,qBAAqB,EAC/B,KAAK,EAAE,EAAE,UAAU,EAAE,eAAQ,KAAK,OAAI,EAAE;YAExC;gBACE,wCAAM,SAAS,EAAC,4BAA4B;;oBAAG,KAAK;wBAAS;gBAC5D,QAAQ,IAAI,CACX,wCAAM,SAAS,EAAC,4BAA4B;oBAC1C,8BAAC,oBAAU,IAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,GAAI,CACvC,CACR,CACC,CACA;QACN,uCAAK,SAAS,EAAC,sBAAsB;YACnC;;gBAAK,OAAO;oBAAM;YAClB,8BAAC,wBAAM,IACL,SAAS,EAAC,iCAAiC,EAC3C,OAAO,EAAC,WAAW,EACnB,IAAI,EAAE,IAAI,cAGH,CACL,CACF,CACP,CAAA;AACH,CAAC;AAlCD,+BAkCC"}
+{"version":3,"file":"Goals.Desktop.js","sourceRoot":"","sources":["../../../../src/lib/containers/home_page/goals/Goals.Desktop.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AAEzB,sFAAuD;AACvD,mDAAwC;AAExC,SAAwB,YAAY,CAAC,EAMpB;QALf,KAAK,WAAA,EACL,IAAI,UAAA,EACJ,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,KAAK,WAAA;IAEL,OAAO,CACL,uCAAK,SAAS,EAAC,kCAAkC;QAC/C,uCACE,SAAS,EAAC,qBAAqB,EAC/B,KAAK,EAAE,EAAE,UAAU,EAAE,eAAQ,KAAK,OAAI,EAAE;YAExC;gBACE,wCAAM,SAAS,EAAC,4BAA4B;;oBAAG,KAAK;wBAAS;gBAC5D,QAAQ,IAAI,CACX,wCAAM,SAAS,EAAC,4BAA4B;oBAC1C,8BAAC,oBAAU,IAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAI,CAClD,CACR,CACC,CACA;QACN,uCAAK,SAAS,EAAC,sBAAsB;YACnC;;gBAAK,OAAO;oBAAM;YAClB,8BAAC,wBAAM,IACL,SAAS,EAAC,iCAAiC,EAC3C,OAAO,EAAC,WAAW,EACnB,IAAI,EAAE,IAAI,cAGH,CACL,CACF,CACP,CAAA;AACH,CAAC;AAlCD,+BAkCC"}

package/dist/containers/home_page/goals/Goals.Mobile.js

@@ -9,7 +9,7 @@ function GoalsMobile(_a) {
     var link = _a.link, summary = _a.summary, countSql = _a.countSql, title = _a.title;
     var titleElement = (react_1.default.createElement("div", { className: "Goals__Mobile__Header" },
         countSql && (react_1.default.createElement("span", { className: "Goals__Mobile__Header__Count" },
-            react_1.default.createElement(QueryCount_1.default, { parens: false, sql: countSql }))),
+            react_1.default.createElement(QueryCount_1.default, { parens: false, query: { sql: countSql } }))),
         react_1.default.createElement("span", { className: "Goals__Mobile__Header__Title" },
             " ",
             title,

package/dist/containers/home_page/goals/Goals.Mobile.js.map

@@ -1 +1 @@
-{"version":3,"file":"Goals.Mobile.js","sourceRoot":"","sources":["../../../../src/lib/containers/home_page/goals/Goals.Mobile.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AAEzB,mFAAoD;AACpD,sFAAuD;AACvD,mDAAwC;AAExC,SAAwB,WAAW,CAAC,EAKnB;QAJf,IAAI,UAAA,EACJ,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,KAAK,WAAA;IAEL,IAAM,YAAY,GAAG,CACnB,uCAAK,SAAS,EAAC,uBAAuB;QACnC,QAAQ,IAAI,CACX,wCAAM,SAAS,EAAC,8BAA8B;YAC5C,8BAAC,oBAAU,IAAC,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,QAAQ,GAAI,CACvC,CACR;QACD,wCAAM,SAAS,EAAC,8BAA8B;;YAAG,KAAK;gBAAS,CAC3D,CACP,CAAA;IACD,IAAM,OAAO,GAAG,CACd,uCAAK,SAAS,EAAC,6CAA6C;QAC1D,yCAAI,OAAO,CAAK;QAChB,8BAAC,wBAAM,IACL,OAAO,EAAC,WAAW,EACnB,SAAS,EAAC,mCAAmC,EAC7C,IAAI,EAAE,IAAI,cAGH,CACL,CACP,CAAA;IACD,OAAO,8BAAC,2BAAiB,IAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAI,CAAA;AACrE,CAAC;AA7BD,8BA6BC"}
+{"version":3,"file":"Goals.Mobile.js","sourceRoot":"","sources":["../../../../src/lib/containers/home_page/goals/Goals.Mobile.tsx"],"names":[],"mappings":";;;AAAA,wDAAyB;AAEzB,mFAAoD;AACpD,sFAAuD;AACvD,mDAAwC;AAExC,SAAwB,WAAW,CAAC,EAKnB;QAJf,IAAI,UAAA,EACJ,OAAO,aAAA,EACP,QAAQ,cAAA,EACR,KAAK,WAAA;IAEL,IAAM,YAAY,GAAG,CACnB,uCAAK,SAAS,EAAC,uBAAuB;QACnC,QAAQ,IAAI,CACX,wCAAM,SAAS,EAAC,8BAA8B;YAC5C,8BAAC,oBAAU,IAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAI,CAClD,CACR;QACD,wCAAM,SAAS,EAAC,8BAA8B;;YAAG,KAAK;gBAAS,CAC3D,CACP,CAAA;IACD,IAAM,OAAO,GAAG,CACd,uCAAK,SAAS,EAAC,6CAA6C;QAC1D,yCAAI,OAAO,CAAK;QAChB,8BAAC,wBAAM,IACL,OAAO,EAAC,WAAW,EACnB,SAAS,EAAC,mCAAmC,EAC7C,IAAI,EAAE,IAAI,cAGH,CACL,CACP,CAAA;IACD,OAAO,8BAAC,2BAAiB,IAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,GAAI,CAAA;AACrE,CAAC;AA7BD,8BA6BC"}

package/dist/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.js

@@ -27,12 +27,13 @@ var QUERY_FILTERS_COLLAPSED_CSS = 'isHidingFacetFilters';
 var QueryWrapperPlotNav = function (props) {
     var _a = React.useState(false), showExportMetadata = _a[0], setShowExportMetadata = _a[1];
     var searchParams = props.searchParams, sql = props.sql, sqlOperator = props.sqlOperator, tableConfiguration = props.tableConfiguration, name = props.name, cardConfiguration = props.cardConfiguration, facetsToPlot = props.facetsToPlot, facetsToFilter = props.facetsToFilter, hideDownload = props.hideDownload, hideQueryCount = props.hideQueryCount, hideSqlEditorControl = props.hideSqlEditorControl, searchConfiguration = props.searchConfiguration, _b = props.limit, limit = _b === void 0 ? SynapseConstants_1.DEFAULT_PAGE_SIZE : _b, initQueryJson = props.initQueryJson, showLastUpdatedOn = props.showLastUpdatedOn;
-    var sqlUsed = (0, sqlFunctions_1.insertConditionsFromSearchParams)(sql, searchParams, sqlOperator);
+    var additionalFilters = (0, sqlFunctions_1.generateQueryFilterFromSearchParams)(searchParams, sqlOperator);
     // use initQuery if set, otherwise use sql
     var query = initQueryJson
         ? JSON.parse(initQueryJson)
         : {
-            sql: sqlUsed,
+            sql: sql,
+            additionalFilters: additionalFilters,
             limit: limit,
             offset: 0,
         };

package/dist/containers/query_wrapper_plot_nav/QueryWrapperPlotNav.js.map

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

package/dist/containers/row_renderers/utils/Icon.d.ts

@@ -1,8 +1,7 @@
 import * as React from 'react';
-import { KeyValue } from '../../../utils/functions/sqlFunctions';
 declare type IconProps = {
     type: string;
-    iconOptions?: KeyValue;
+    iconOptions?: Record<string, string>;
     value?: string;
     isHeader?: boolean;
     cssClass?: string;

package/dist/containers/row_renderers/utils/Icon.js.map

@@ -1 +1 @@
-{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../../src/lib/containers/row_renderers/utils/Icon.tsx"],"names":[],"mappings":";;;;AAAA,mDAA8B;AAC9B,oEA0CwC;AAExC,6DAA4E;AAC5E,2EAAyF;AACzF,+EAA6F;AAC7F,iEAAgF;AAChF,6EAA4F;AAC5F,+DAA8E;AAC9E,6DAA4E;AAC5E,+DAA8E;AAC9E,2DAA0E;AAE1E,6DAyBqC;AAGrC,kEAAmC;AAUnC,IAAM,cAAc;IAClB,GAAC,0BAAO,IAAG,oBAAC,iBAAO,IAAC,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,GAAI;OACrD,CAAA;AAED,IAAM,YAAY;IAChB,GAAC,2BAAQ,IAAG,uBAAQ;IACpB,GAAC,yBAAM,IAAG,0BAAQ;IAClB,GAAC,uBAAI,IAAG,4BAAU;IAClB,GAAC,+BAAY,IAAG,iCAAc;IAC9B,GAAC,iCAAc,IAAG,mCAAgB;IAClC,YAAY;IACZ,GAAC,8BAAW,IAAG,0BAAW;IAC1B,GAAC,wBAAK,IAAG,oBAAK;IACd,GAAC,+BAAY,IAAG,+BAAgB;IAChC,GAAC,oCAAiB,IAAG,+BAAgB;IACrC,GAAC,gCAAa,IAAG,gCAAiB;IAClC,GAAC,qCAAkB,IAAG,gCAAiB;IACvC,GAAC,2BAAQ,IAAG,2BAAY;IACxB,GAAC,0BAAO,IAAG,sBAAO;IAClB,GAAC,0BAAO,IAAG,sBAAO;IAClB,GAAC,wBAAK,IAAG,sBAAO;IAChB,GAAC,+BAAY,IAAG,kCAAgB;IAChC,GAAC,yBAAM,IAAG,2BAAS;IACnB,GAAC,wBAAK,IAAG,0BAAQ;IACjB,GAAC,0BAAO,IAAG,sBAAO;IAClB,GAAC,yBAAM,IAAG,qBAAM;IAChB,GAAC,wBAAK,IAAG,oBAAK;IACd,GAAC,yBAAM,IAAG,qBAAM;IAChB,GAAC,6BAAU,IAAG,4BAAa;IAC3B,GAAC,2BAAQ,IAAG,uBAAQ;IACpB,GAAC,yBAAM,IAAG,qBAAM;IAChB,GAAC,2BAAQ,IAAG,uBAAQ;IACpB,GAAC,wBAAK,IAAG,oBAAK;IACd,GAAC,yBAAM,IAAG,qBAAM;IAChB,GAAC,2BAAQ,IAAG,uBAAQ;IACpB,GAAC,2BAAQ,IAAG,uBAAQ;IACpB,GAAC,0BAAO,IAAG,sBAAO;IAClB,GAAC,8BAAW,IAAG,0BAAW;IAC1B,GAAC,gCAAa,IAAG,2BAAY;IAC7B,GAAC,yBAAM,IAAG,2BAAS;IACnB,GAAC,uBAAI,IAAG,yBAAO;IACf,GAAC,+BAAY,IAAG,2BAAY;IAC5B,GAAC,kCAAe,IACd,6DAA6D;IAC/D,GAAC,oCAAiB,IAChB,+DAA+D;IACjE,GAAC,sCAAmB,IAClB,iEAAiE;IACnE,GAAC,+CAA4B,IAC3B,mFAAmF;OACtF,CAAA;AACD,IAAM,IAAI,GAAuC,UAAC,EAKjD;QAJC,IAAI,UAAA,EACJ,aAAU,EAAV,KAAK,mBAAG,EAAE,KAAA,EACV,WAAW,iBAAA,EACX,QAAQ,cAAA;IAER,IAAM,OAAO,GAAG,cAAc,CAAC,KAAK,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,CAAA;IAC7D,IAAI,OAAO;QAAE,OAAO,OAAO,CAAA;IAE3B,IAAM,OAAO,yCAAQ,YAAY,GAAK,WAAW,CAAE,CAAA;IACnD,8EAA8E;IAC9E,sEAAsE;IACtE,IAAM,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;IACtD,IAAM,SAAS,GAAG,kBAAW,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAE,CAAA;IAC7C,IAAI,cAAc,IAAI,IAAI,EAAE;QAC1B,OAAO,CAAC,IAAI,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAA;QAC1C,OAAO,yCAAK,CAAA;KACb;IACD,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACtC,OAAO,6BAAK,GAAG,EAAE,cAAc,EAAE,SAAS,EAAE,SAAS,GAAI,CAAA;KAC1D;IACD,OAAO,CACL;QACE,oBAAC,cAAc,IAAC,SAAS,EAAE,SAAS,GAAI,CACnC,CACR,CAAA;AACH,CAAC,CAAA;AACD,kBAAe,IAAI,CAAA"}
+{"version":3,"file":"Icon.js","sourceRoot":"","sources":["../../../../src/lib/containers/row_renderers/utils/Icon.tsx"],"names":[],"mappings":"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"}

package/dist/containers/table/StandaloneQueryWrapper.d.ts

@@ -12,9 +12,6 @@ declare type SearchParams = {
 export declare type Operator = {
     sqlOperator?: SQLOperator;
 };
-export declare type QueryCount = {
-    showQueryCount?: boolean;
-};
 declare type OwnProps = {
     sql: string;
     showTopLevelControls?: boolean;

package/dist/containers/table/StandaloneQueryWrapper.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var react_1 = tslib_1.__importDefault(require("react"));
-var lodash_es_1 = require("lodash-es");
 var sqlFunctions_1 = require("../../utils/functions/sqlFunctions");
 var SynapseTable_1 = tslib_1.__importDefault(require("./SynapseTable"));
 var utils_1 = require("../../utils");
@@ -18,8 +17,9 @@ var SynapseContext_1 = require("../../utils/SynapseContext");
 var QueryVisualizationWrapper_1 = require("../QueryVisualizationWrapper");
 var EntityTypeUtils_1 = require("../../utils/functions/EntityTypeUtils");
 var LastUpdatedOn_1 = tslib_1.__importDefault(require("../query_wrapper_plot_nav/LastUpdatedOn"));
+var NoContentPlaceholderType_1 = require("./NoContentPlaceholderType");
 var generateInitQueryRequest = function (sql) {
-    return (0, lodash_es_1.cloneDeep)({
+    return {
         partMask: utils_1.SynapseConstants.BUNDLE_MASK_QUERY_FACETS |
             utils_1.SynapseConstants.BUNDLE_MASK_QUERY_COUNT |
             utils_1.SynapseConstants.BUNDLE_MASK_QUERY_SELECT_COLUMNS |
@@ -33,24 +33,26 @@ var generateInitQueryRequest = function (sql) {
             limit: 25,
             offset: 0,
         },
-    });
+    };
 };
 /**
  * This component was initially implemented on the portal side. It renders a SynapseTable if a title is provided.
  * If showTopLevelControls is set to true, then the SynapseTable will also include the TopLevelControls (search, export table, column selection).
  */
 var StandaloneQueryWrapper = function (props) {
-    var title = props.title, searchParams = props.searchParams, sqlOperator = props.sqlOperator, showAccessColumn = props.showAccessColumn, sql = props.sql, hideDownload = props.hideDownload, hideQueryCount = props.hideQueryCount, name = props.name, _a = props.showTopLevelControls, showTopLevelControls = _a === void 0 ? false : _a, searchConfiguration = props.searchConfiguration, _b = props.unitDescription, unitDescription = _b === void 0 ? 'Results' : _b, rgbIndex = props.rgbIndex, showLastUpdatedOn = props.showLastUpdatedOn, rest = tslib_1.__rest(props, ["title", "searchParams", "sqlOperator", "showAccessColumn", "sql", "hideDownload", "hideQueryCount", "name", "showTopLevelControls", "searchConfiguration", "unitDescription", "rgbIndex", "showLastUpdatedOn"]);
+    var title = props.title, searchParams = props.searchParams, sqlOperator = props.sqlOperator, showAccessColumn = props.showAccessColumn, sql = props.sql, hideDownload = props.hideDownload, hideQueryCount = props.hideQueryCount, name = props.name, _a = props.showTopLevelControls, showTopLevelControls = _a === void 0 ? false : _a, searchConfiguration = props.searchConfiguration, _b = props.unitDescription, unitDescription = _b === void 0 ? 'Results' : _b, rgbIndex = props.rgbIndex, showLastUpdatedOn = props.showLastUpdatedOn, _c = props.noContentPlaceholderType, noContentPlaceholderType = _c === void 0 ? showTopLevelControls
+        ? NoContentPlaceholderType_1.NoContentPlaceholderType.INTERACTIVE
+        : NoContentPlaceholderType_1.NoContentPlaceholderType.STATIC : _c, rest = tslib_1.__rest(props, ["title", "searchParams", "sqlOperator", "showAccessColumn", "sql", "hideDownload", "hideQueryCount", "name", "showTopLevelControls", "searchConfiguration", "unitDescription", "rgbIndex", "showLastUpdatedOn", "noContentPlaceholderType"]);
     var derivedQueryRequestFromSearchParams = generateInitQueryRequest(sql);
     if (searchParams) {
-        derivedQueryRequestFromSearchParams.query.sql =
-            (0, sqlFunctions_1.insertConditionsFromSearchParams)(derivedQueryRequestFromSearchParams.query.sql, searchParams, sqlOperator);
+        derivedQueryRequestFromSearchParams.query.additionalFilters =
+            (0, sqlFunctions_1.generateQueryFilterFromSearchParams)(searchParams, sqlOperator);
     }
     var synapseContext = (0, SynapseContext_1.useSynapseContext)();
     var entityId = (0, sqlFunctions_1.parseEntityIdFromSqlStatement)(sql);
     var entity = (0, useEntity_1.useGetEntity)(entityId).data;
     return (react_1.default.createElement(QueryWrapper_1.QueryWrapper, tslib_1.__assign({}, rest, { initQueryRequest: derivedQueryRequestFromSearchParams }),
-        react_1.default.createElement(QueryVisualizationWrapper_1.QueryVisualizationWrapper, tslib_1.__assign({ rgbIndex: rgbIndex, unitDescription: unitDescription, showLastUpdatedOn: showLastUpdatedOn }, rest),
+        react_1.default.createElement(QueryVisualizationWrapper_1.QueryVisualizationWrapper, tslib_1.__assign({ rgbIndex: rgbIndex, unitDescription: unitDescription, showLastUpdatedOn: showLastUpdatedOn, noContentPlaceholderType: noContentPlaceholderType }, rest),
             react_1.default.createElement(QueryContext_1.QueryContextConsumer, null, function (queryContext) {
                 if (queryContext === undefined) {
                     throw new Error('No queryContext found when calling QueryContextConsumer');

package/dist/containers/table/StandaloneQueryWrapper.js.map

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

package/dist/containers/table/SynapseTable.d.ts

@@ -32,12 +32,6 @@ export declare type SynapseTableProps = {
     columnLinks?: LabelLinkConfig;
     hideDownload?: boolean;
     isRowSelectionVisible?: boolean;
-    /**
-     * If true, columns created by the COUNT function will render with a link to Synapse that opens the disaggregated query results filtered by the conditions of that row.
-     * Note that this is very brittle and only supports one column at a time. See SWC-6075 for more information. Default false.
-     */
-    linkCountToDisaggregatedQuery?: boolean;
-    showNoContentAvailableWhenEmpty?: boolean;
 };
 export default class SynapseTable extends React.Component<SynapseTableProps, SynapseTableState> {
     constructor(props: SynapseTableProps);
@@ -61,7 +55,6 @@ export default class SynapseTable extends React.Component<SynapseTableProps, Syn
      */
     private allRowsHaveId;
     private isEntityViewOrDataset;
-    private showGroupRowData;
     private renderTable;
     /**
      * Handle a column having been selected

package/dist/containers/table/SynapseTable.js

@@ -52,16 +52,6 @@ var SynapseTable = /** @class */ (function (_super) {
     function SynapseTable(props) {
         var _this = _super.call(this, props) || this;
         _this.tableElement = undefined;
-        _this.showGroupRowData = function (selectedRow) {
-            // magic happens - parse query, deep copy query bundle request, modify, encode, send to Synapse.org.  Easy!
-            var queryCopy = _this.props.queryContext.getLastQueryRequest().query;
-            var parsed = (0, SynapseTableUtils_1.getSqlUnderlyingDataForRow)(selectedRow, queryCopy.sql, _this.props.queryContext.data);
-            queryCopy.sql = parsed.newSql;
-            var queryJSON = JSON.stringify(queryCopy);
-            // encode this copy of the query (json)
-            var encodedQuery = btoa(queryJSON);
-            return "".concat(getEndpoint_1.PRODUCTION_ENDPOINT_CONFIG.PORTAL, "#!Synapse:").concat(parsed.synId, "/tables/query/").concat(encodedQuery);
-        };
         _this.renderTable = function (headers, columnModels, facets, rows) {
             var _a, _b;
             var lastQueryRequest = (_b = (_a = _this.props.queryContext).getLastQueryRequest) === null || _b === void 0 ? void 0 : _b.call(_a);
@@ -399,11 +389,9 @@ var SynapseTable = /** @class */ (function (_super) {
     SynapseTable.prototype.createTableRows = function (rows, headers, isShowingAccessColumn, isShowingDownloadColumn, isShowingAddToV2DownloadListColumn, isRowSelectionVisible) {
         var _this = this;
         var rowsFormatted = [];
-        var _a = this.props, data = _a.queryContext.data, _b = _a.queryVisualizationContext, columnsToShowInTable = _b.columnsToShowInTable, selectedRowIndices = _b.selectedRowIndices, setSelectedRowIndices = _b.setSelectedRowIndices, _c = _a.columnLinks, columnLinks = _c === void 0 ? [] : _c, _d = _a.linkCountToDisaggregatedQuery, linkCountToDisaggregatedQuery = _d === void 0 ? false : _d;
-        var _e = data, _f = _e.selectColumns, selectColumns = _f === void 0 ? [] : _f, _g = _e.columnModels, columnModels = _g === void 0 ? [] : _g;
-        var _h = this.state, mapEntityIdToHeader = _h.mapEntityIdToHeader, mapUserIdToHeader = _h.mapUserIdToHeader;
-        // find column indices that are COUNT type
-        var countColumnIndexes = (0, SynapseTableUtils_1.getCountFunctionColumnIndices)(this.props.queryContext.getLastQueryRequest().query.sql);
+        var _a = this.props, data = _a.queryContext.data, _b = _a.queryVisualizationContext, columnsToShowInTable = _b.columnsToShowInTable, selectedRowIndices = _b.selectedRowIndices, setSelectedRowIndices = _b.setSelectedRowIndices, _c = _a.columnLinks, columnLinks = _c === void 0 ? [] : _c;
+        var _d = data, _e = _d.selectColumns, selectColumns = _e === void 0 ? [] : _e, _f = _d.columnModels, columnModels = _f === void 0 ? [] : _f;
+        var _g = this.state, mapEntityIdToHeader = _g.mapEntityIdToHeader, mapUserIdToHeader = _g.mapUserIdToHeader;
         rows.forEach(function (row, rowIndex) {
             var _a, _b, _c;
             var entityVersionNumber = (_a = row.versionNumber) === null || _a === void 0 ? void 0 : _a.toString();
@@ -415,12 +403,10 @@ var SynapseTable = /** @class */ (function (_super) {
                     return el.matchColumnName === columnName;
                 });
                 var index = _this.findSelectionIndex(_this.state.sortedColumnSelection, columnName);
-                var isCountColumn = countColumnIndexes.includes(colIndex);
-                var linkToDisaggregatedQuery = isCountColumn && linkCountToDisaggregatedQuery;
                 var isBold = index === -1 ? '' : 'SRC-boldText';
                 if (isColumnActive) {
-                    return (React.createElement(ExpandableTableDataCell_1.default, { className: "SRC_noBorderTop", key: "(".concat(rowIndex).concat(columnValue).concat(colIndex, ")") }, linkToDisaggregatedQuery ? (React.createElement("a", { href: _this.showGroupRowData(row), target: "_blank", rel: "noopener noreferrer" },
-                        React.createElement("p", { className: isBold }, columnValue))) : (React.createElement(SynapseTableCell_1.SynapseTableCell, { columnType: headers[colIndex].columnType, columnValue: columnValue, isBold: isBold, mapEntityIdToHeader: mapEntityIdToHeader, mapUserIdToHeader: mapUserIdToHeader, columnLinkConfig: columnLinkConfig, columnName: columnName, rowData: row.values, selectColumns: selectColumns, columnModels: columnModels, rowId: row.rowId, rowVersionNumber: row.versionNumber }))));
+                    return (React.createElement(ExpandableTableDataCell_1.default, { className: "SRC_noBorderTop", key: "(".concat(rowIndex).concat(columnValue).concat(colIndex, ")") },
+                        React.createElement(SynapseTableCell_1.SynapseTableCell, { columnType: headers[colIndex].columnType, columnValue: columnValue, isBold: isBold, mapEntityIdToHeader: mapEntityIdToHeader, mapUserIdToHeader: mapUserIdToHeader, columnLinkConfig: columnLinkConfig, columnName: columnName, rowData: row.values, selectColumns: selectColumns, columnModels: columnModels, rowId: row.rowId, rowVersionNumber: row.versionNumber })));
                 }
                 return React.createElement("td", { className: "SRC-hidden", key: "(".concat(rowIndex, ",").concat(colIndex, ")") });
             });