synapse-react-client 3.1.7 → 3.1.9

package/dist/utils/functions/queryUtils.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.removeLockedColumnFromFacetData = exports.isSingleNotSetValue = exports.isFacetAvailable = exports.getNextPageOfData = exports.getFieldIndex = void 0;
+exports.hasResettableFilters = exports.removeLockedColumnFromFacetData = exports.isSingleNotSetValue = exports.isFacetAvailable = exports.getNextPageOfData = exports.getFieldIndex = void 0;
 var tslib_1 = require("tslib");
 var lodash_es_1 = require("lodash-es");
 var __1 = require("..");
+var QueryFilter_1 = require("../synapseTypes/Table/QueryFilter");
 /**
  * Retrieve the index of a column using the column name
  * @param name the column name
@@ -77,6 +78,7 @@ var isSingleNotSetValue = function (facet) {
             __1.SynapseConstants.VALUE_NOT_SET);
 };
 exports.isSingleNotSetValue = isSingleNotSetValue;
+// TODO Instead of removing the facet from the data, the facet renderers should just be aware of what to hide
 function removeLockedColumnFromFacetData(data, lockedColumn) {
     var _a;
     var lockedColumnName = lockedColumn === null || lockedColumn === void 0 ? void 0 : lockedColumn.columnName;
@@ -93,4 +95,21 @@ function removeLockedColumnFromFacetData(data, lockedColumn) {
     }
 }
 exports.removeLockedColumnFromFacetData = removeLockedColumnFromFacetData;
+/**
+ * Returns true iff the query has filters applied that can be reset.
+ * This includes facet filters and additional filters that are not applied to a locked column.
+ */
+function hasResettableFilters(query, lockedColumn) {
+    var hasFacetFilters = Array.isArray(query.selectedFacets) &&
+        query.selectedFacets.filter(function (facet) { return facet.columnName !== (lockedColumn === null || lockedColumn === void 0 ? void 0 : lockedColumn.columnName); }).length > 0;
+    var hasAdditionalFilters = Array.isArray(query.additionalFilters) &&
+        query.additionalFilters.filter(function (queryFilter) {
+            return (0, QueryFilter_1.isColumnSingleValueQueryFilter)(queryFilter) ||
+                (0, QueryFilter_1.isColumnMultiValueFunctionQueryFilter)(queryFilter)
+                ? queryFilter.columnName !== (lockedColumn === null || lockedColumn === void 0 ? void 0 : lockedColumn.columnName)
+                : true;
+        }).length > 0;
+    return hasFacetFilters || hasAdditionalFilters;
+}
+exports.hasResettableFilters = hasResettableFilters;
 //# sourceMappingURL=queryUtils.js.map

package/dist/utils/functions/queryUtils.js.map

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

package/dist/utils/functions/sqlFunctions.d.ts

@@ -1,17 +1,14 @@
-import { SelectColumn, Row } from '../synapseTypes';
-export declare type KeyValue = {
-    [index: string]: string;
-};
+import { Row, SelectColumn } from '../synapseTypes';
+import { QueryFilter } from '../synapseTypes/Table/QueryFilter';
 export declare type SQLOperator = 'LIKE' | '=' | 'HAS';
-export declare const isGroupByInSql: (sql: string) => boolean;
-export declare const getWhereInsertIndex: (tokens: string[][]) => number;
 /**
- * This will construct a sql query by adding the conditions in searchParams
- * to the WHERE clause, preserving all other clauses.
- * If the searchParams are not defined, this will simply return the given sql.
+ * Given the search params, return a set of QueryFilters to narrow the the query to view just related data. May return null if a QueryFilter should not be added.
+ * @param sql
+ * @param searchParams
+ * @param operator
+ * @returns
  */
-export declare const insertConditionsFromSearchParams: (sql: string, searchParams?: KeyValue, operator?: SQLOperator) => string;
-export declare const formatSQLFromParser: (tokens: string[][]) => string;
+export declare const generateQueryFilterFromSearchParams: (searchParams?: Record<string, string>, operator?: SQLOperator) => QueryFilter[] | undefined;
 export declare const parseEntityIdFromSqlStatement: (sql: string) => string;
 export declare const parseEntityIdAndVersionFromSqlStatement: (sql: string) => {
     entityId: string;

package/dist/utils/functions/sqlFunctions.js

@@ -1,165 +1,71 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resultToJson = exports.parseEntityIdAndVersionFromSqlStatement = exports.parseEntityIdFromSqlStatement = exports.formatSQLFromParser = exports.insertConditionsFromSearchParams = exports.getWhereInsertIndex = exports.isGroupByInSql = void 0;
-var tslib_1 = require("tslib");
-var sql_parser_1 = require("sql-parser");
+exports.resultToJson = exports.parseEntityIdAndVersionFromSqlStatement = exports.parseEntityIdFromSqlStatement = exports.generateQueryFilterFromSearchParams = void 0;
 var RegularExpressions_1 = require("../functions/RegularExpressions");
-// look for "group by", multi-line and case insensitive
-var GROUP_BY_REGEX = /group by/im;
-var isGroupByInSql = function (sql) {
-    return GROUP_BY_REGEX.test(sql);
-};
-exports.isGroupByInSql = isGroupByInSql;
+var QueryFilter_1 = require("../synapseTypes/Table/QueryFilter");
 var WITHOUT_SYN_PREFIX = 3;
-var generateTokenUsingOperator = function (literal, operator, match) {
-    var usedMatchForLike = match;
-    if (match.match(RegularExpressions_1.SYNAPSE_ENTITY_ID_REGEX)) {
-        // If we use a LIKE statement with a synId the backend will look for a string with the first three
-        // characters being 'syn', however, it stores synIds without 'syn', so the query will fail
-        // The backend usually parses 'syn' out, but not with the LIKE clause since its expecting a regex, so we
-        // parse this out. This will cause a bug if something matches the synId regex but is in free text.
-        usedMatchForLike = match.substring(WITHOUT_SYN_PREFIX);
-    }
-    // form the has clause, e.g sql = ".... HAS ('condition1', 'condition2',...,'conditionN')
-    var matchForHas = match
-        .split(',')
-        // NOTE - Using single quotes to surround the search term is necessary for the backend parser.
-        .map(function (el) { return "'".concat(el, "'"); })
-        .join(',');
-    switch (operator) {
-        case 'LIKE':
-            return [
-                ['LITERAL', literal, '1'],
-                ['OPERATOR', operator, '1'],
-                ['STRING', "%".concat(usedMatchForLike, "%"), '1'],
-            ];
-        case 'HAS':
-            return [
-                ['LITERAL', literal, '1'],
-                ['OPERATOR', operator, '1'],
-                /*
-                  Using PARAMETER as hack, the parser will use the exact value for a PARAMETER value,
-                  it won't add quotes around the argument or remove parens (which is the standard behavior
-                  for type STRING) that would cause an error on the backend
-                */
-                ['PARAMETER', "(".concat(matchForHas, ")"), '1'],
-            ];
-        default:
-            // default use operator as-is
-            return [
-                ['LITERAL', literal, '1'],
-                ['OPERATOR', operator, '1'],
-                ['STRING', match, '1'],
-            ];
-    }
-};
-var getWhereInsertIndex = function (tokens) {
-    var existingWhereIndex = tokens.findIndex(function (el) { return el[0] === 'WHERE'; });
-    if (existingWhereIndex !== -1) {
-        return existingWhereIndex;
-    }
-    var targetIndex = tokens.findIndex(function (el) { return el[0] === 'GROUP'; });
-    if (targetIndex !== -1) {
-        return targetIndex;
-    }
-    targetIndex = tokens.findIndex(function (el) { return el[0] === 'HAVING'; });
-    if (targetIndex !== -1) {
-        return targetIndex;
-    }
-    targetIndex = tokens.findIndex(function (el) { return el[0] === 'ORDER'; });
-    if (targetIndex !== -1) {
-        return targetIndex;
-    }
-    //else insert it at the end
-    targetIndex = tokens.findIndex(function (el) { return el[0] === 'EOF'; });
-    return targetIndex;
-};
-exports.getWhereInsertIndex = getWhereInsertIndex;
 /**
- * This will construct a sql query by adding the conditions in searchParams
- * to the WHERE clause, preserving all other clauses.
- * If the searchParams are not defined, this will simply return the given sql.
+ * Given the search params, return a set of QueryFilters to narrow the the query to view just related data. May return null if a QueryFilter should not be added.
+ * @param sql
+ * @param searchParams
+ * @param operator
+ * @returns
  */
-var insertConditionsFromSearchParams = function (sql, searchParams, operator) {
+var generateQueryFilterFromSearchParams = function (searchParams, operator) {
     if (operator === void 0) { operator = 'LIKE'; }
-    // TODO: Replace SQL manipulation with QueryFilters. See PORTALS-2157
-    // if there are no search params, or if all search params are QueryWrapper queries
     if (!searchParams) {
-        return sql;
+        return;
     }
     var isQueryWrapperKey = function (key) { return key.startsWith('QueryWrapper'); };
     var searchParamKeys = Object.keys(searchParams);
     if (searchParamKeys.length === 0 ||
         searchParamKeys.every(isQueryWrapperKey)) {
-        return sql;
-    }
-    var tokens = sql_parser_1.lexer.tokenize(sql);
-    // we want to either create a where clause or insert into the where clause
-    var foundIndex = tokens.findIndex(function (el) { return el[0] === 'WHERE'; });
-    var whereClauseIndex = (0, exports.getWhereInsertIndex)(tokens);
-    var indexAfterWhereClause = whereClauseIndex + 1;
-    if (foundIndex === -1) {
-        // insert a where clause
-        tokens.splice(whereClauseIndex, 0, ['WHERE', 'WHERE', '1']);
+        return;
     }
-    else {
-        // if this is inserting into a where clause then we have to make sure that the logic is chained
-        tokens.splice(indexAfterWhereClause, 0, ['CONDITIONAL', 'AND', '1']);
-    }
-    var searchParamsLen = Object.keys(searchParams).length;
-    Object.keys(searchParams).forEach(function (key, index) {
-        var token = generateTokenUsingOperator(key, operator, searchParams[key]);
-        if (index < searchParamsLen - 1) {
-            // make sure to chain the ANDs until the last one
-            token.unshift(['CONDITIONAL', 'AND', '1']);
+    return Object.keys(searchParams)
+        .filter(function (key) { return !isQueryWrapperKey(key); })
+        .map(function (key) {
+        if (operator === 'HAS') {
+            var filter = {
+                concreteType: 'org.sagebionetworks.repo.model.table.ColumnMultiValueFunctionQueryFilter',
+                columnName: key,
+                function: QueryFilter_1.ColumnMultiValueFunction.HAS,
+                values: searchParams[key].split(','),
+            };
+            return filter;
         }
-        tokens.splice.apply(tokens, tslib_1.__spreadArray([indexAfterWhereClause, 0], token, false));
-    });
-    return (0, exports.formatSQLFromParser)(tokens);
-};
-exports.insertConditionsFromSearchParams = insertConditionsFromSearchParams;
-var formatSQLFromParser = function (tokens) {
-    // replace all DBLSTRINGs (escaped strings) with LITERALs
-    tokens.forEach(function (value) {
-        if (value[0] === 'DBLSTRING') {
-            value[0] = 'LITERAL';
+        else if (operator === 'LIKE') {
+            var value = searchParams[key];
+            if (value.match(RegularExpressions_1.SYNAPSE_ENTITY_ID_REGEX)) {
+                // If we use a LIKE statement with a synId the backend will look for a string with the first three
+                // characters being 'syn', however, it stores synIds without 'syn', so the query will fail
+                // The backend usually parses 'syn' out, but not with the LIKE clause since its expecting a regex, so we
+                // parse this out. This will cause a bug if something matches the synId regex but is in free text.
+                value = value.substring(WITHOUT_SYN_PREFIX);
+            }
+            var filter = {
+                concreteType: 'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',
+                columnName: key,
+                operator: QueryFilter_1.ColumnSingleValueFilterOperator.LIKE,
+                // Add wildcards around the value
+                values: ["%".concat(value, "%")],
+            };
+            return filter;
+        }
+        else {
+            // operator is '='
+            // The backend doesn't have an '=' operator for query filters, but we can just use LIKE without wildcards.
+            var filter = {
+                concreteType: 'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',
+                columnName: key,
+                operator: QueryFilter_1.ColumnSingleValueFilterOperator.LIKE,
+                values: [searchParams[key]],
+            };
+            return filter;
         }
     });
-    // if synId has a DOT (e.g. 'syn123.2') then we have to alter the sql produced
-    var dotIndex = tokens.findIndex(function (val) { return val[0] === 'DOT'; });
-    if (dotIndex !== -1) {
-        // Given sql with a versioned entity, e.g. "select * from syn123.2"
-        // Tokens has the form:
-        /*
-        [
-          ["SELECT" , "select"],
-          ..
-          ["FROM", "from"],
-          ["LITERAL", "syn123"],
-          ["DOT", "."],
-          ["LITERAL", "2"],
-    
-          which we need to transform to
-    
-          ["SELECT" , "select"],
-          ..
-          ["FROM", "from"],
-          ["LITERAL", "syn123.2"],
-        */
-        var synId_1 = tokens[dotIndex - 1][1];
-        var version = tokens[dotIndex + 1][1];
-        var synIdWithVersion = "".concat(synId_1, ".").concat(version);
-        tokens.splice(dotIndex, 2);
-        tokens[dotIndex - 1] = ['LITERAL', synIdWithVersion];
-    }
-    var newSql = sql_parser_1.parser.parse(tokens).toString();
-    // construct the sql using their formatter and then alter it to remove erroneous
-    // backticks from the table identifier: e.g. (their output) `syn1234` ->  (our output) syn1234
-    var synId = tokens[tokens.findIndex(function (el) { return el[0] === 'FROM'; }) + 1][1];
-    var synIdWithBackticks = "`".concat(synId, "`");
-    return newSql.replace(synIdWithBackticks, synId);
 };
-exports.formatSQLFromParser = formatSQLFromParser;
+exports.generateQueryFilterFromSearchParams = generateQueryFilterFromSearchParams;
 //parses synapse entity id from a sql query string
 //look for a pattern of 'from[some number of spaces]syn[somenumbers]` case insensitive
 var parseEntityIdFromSqlStatement = function (sql) {

package/dist/utils/functions/sqlFunctions.js.map

@@ -1 +1 @@
-{"version":3,"file":"sqlFunctions.js","sourceRoot":"","sources":["../../../src/lib/utils/functions/sqlFunctions.ts"],"names":[],"mappings":";;;;AAAA,yCAA0C;AAE1C,sEAAyE;AAQzE,uDAAuD;AACvD,IAAM,cAAc,GAAG,YAAY,CAAA;AAC5B,IAAM,cAAc,GAAG,UAAC,GAAW;IACxC,OAAO,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AACD,IAAM,kBAAkB,GAAG,CAAC,CAAA;AAE5B,IAAM,0BAA0B,GAAG,UACjC,OAAe,EACf,QAAqB,EACrB,KAAa;IAEb,IAAI,gBAAgB,GAAG,KAAK,CAAA;IAC5B,IAAI,KAAK,CAAC,KAAK,CAAC,4CAAuB,CAAC,EAAE;QACxC,kGAAkG;QAClG,0FAA0F;QAC1F,wGAAwG;QACxG,kGAAkG;QAClG,gBAAgB,GAAG,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAA;KACvD;IACD,yFAAyF;IACzF,IAAM,WAAW,GAAG,KAAK;SACtB,KAAK,CAAC,GAAG,CAAC;QACX,8FAA8F;SAC7F,GAAG,CAAC,UAAA,EAAE,IAAI,OAAA,WAAI,EAAE,MAAG,EAAT,CAAS,CAAC;SACpB,IAAI,CAAC,GAAG,CAAC,CAAA;IACZ,QAAQ,QAAQ,EAAE;QAChB,KAAK,MAAM;YACT,OAAO;gBACL,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC;gBACzB,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC;gBAC3B,CAAC,QAAQ,EAAE,WAAI,gBAAgB,MAAG,EAAE,GAAG,CAAC;aACzC,CAAA;QACH,KAAK,KAAK;YACR,OAAO;gBACL,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC;gBACzB,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC;gBAC3B;;;;kBAIE;gBACF,CAAC,WAAW,EAAE,WAAI,WAAW,MAAG,EAAE,GAAG,CAAC;aACvC,CAAA;QACH;YACE,6BAA6B;YAC7B,OAAO;gBACL,CAAC,SAAS,EAAE,OAAO,EAAE,GAAG,CAAC;gBACzB,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,CAAC;gBAC3B,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,CAAC;aACvB,CAAA;KACJ;AACH,CAAC,CAAA;AAEM,IAAM,mBAAmB,GAAG,UAAC,MAAkB;IACpD,IAAM,kBAAkB,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,EAAjB,CAAiB,CAAC,CAAA;IACpE,IAAI,kBAAkB,KAAK,CAAC,CAAC,EAAE;QAC7B,OAAO,kBAAkB,CAAA;KAC1B;IACD,IAAI,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,EAAjB,CAAiB,CAAC,CAAA;IAC3D,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE;QACtB,OAAO,WAAW,CAAA;KACnB;IACD,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAlB,CAAkB,CAAC,CAAA;IACxD,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE;QACtB,OAAO,WAAW,CAAA;KACnB;IACD,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,EAAjB,CAAiB,CAAC,CAAA;IACvD,IAAI,WAAW,KAAK,CAAC,CAAC,EAAE;QACtB,OAAO,WAAW,CAAA;KACnB;IACD,2BAA2B;IAC3B,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,EAAf,CAAe,CAAC,CAAA;IACrD,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA;AApBY,QAAA,mBAAmB,uBAoB/B;AAED;;;;GAIG;AACI,IAAM,gCAAgC,GAAG,UAC9C,GAAW,EACX,YAAuB,EACvB,QAA8B;IAA9B,yBAAA,EAAA,iBAA8B;IAE9B,qEAAqE;IACrE,kFAAkF;IAClF,IAAI,CAAC,YAAY,EAAE;QACjB,OAAO,GAAG,CAAA;KACX;IACD,IAAM,iBAAiB,GAAG,UAAC,GAAW,IAAK,OAAA,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,EAA9B,CAA8B,CAAA;IACzE,IAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACjD,IACE,eAAe,CAAC,MAAM,KAAK,CAAC;QAC5B,eAAe,CAAC,KAAK,CAAC,iBAAiB,CAAC,EACxC;QACA,OAAO,GAAG,CAAA;KACX;IACD,IAAM,MAAM,GAAe,kBAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;IAC9C,0EAA0E;IAC1E,IAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,OAAO,EAAjB,CAAiB,CAAC,CAAA;IAC5D,IAAM,gBAAgB,GAAG,IAAA,2BAAmB,EAAC,MAAM,CAAC,CAAA;IACpD,IAAM,qBAAqB,GAAG,gBAAgB,GAAG,CAAC,CAAA;IAClD,IAAI,UAAU,KAAK,CAAC,CAAC,EAAE;QACrB,wBAAwB;QACxB,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAA;KAC5D;SAAM;QACL,+FAA+F;QAC/F,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC,EAAE,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;KACrE;IACD,IAAM,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,MAAM,CAAA;IACxD,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,KAAK;QAC3C,IAAM,KAAK,GAAG,0BAA0B,CAAC,GAAG,EAAE,QAAQ,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;QAC1E,IAAI,KAAK,GAAG,eAAe,GAAG,CAAC,EAAE;YAC/B,iDAAiD;YACjD,KAAK,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAA;SAC3C;QACD,MAAM,CAAC,MAAM,OAAb,MAAM,yBAAQ,qBAAqB,EAAE,CAAC,GAAK,KAAK,UAAC;IACnD,CAAC,CAAC,CAAA;IACF,OAAO,IAAA,2BAAmB,EAAC,MAAM,CAAC,CAAA;AACpC,CAAC,CAAA;AAxCY,QAAA,gCAAgC,oCAwC5C;AAEM,IAAM,mBAAmB,GAAG,UAAC,MAAkB;IACpD,yDAAyD;IACzD,MAAM,CAAC,OAAO,CAAC,UAAA,KAAK;QAClB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;YAC5B,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA;SACrB;IACH,CAAC,CAAC,CAAA;IACF,8EAA8E;IAC9E,IAAM,QAAQ,GAAG,MAAM,CAAC,SAAS,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,EAAhB,CAAgB,CAAC,CAAA;IAC1D,IAAI,QAAQ,KAAK,CAAC,CAAC,EAAE;QACnB,mEAAmE;QACnE,uBAAuB;QACvB;;;;;;;;;;;;;;;UAeE;QAEF,IAAM,OAAK,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACrC,IAAM,OAAO,GAAG,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;QACvC,IAAM,gBAAgB,GAAG,UAAG,OAAK,cAAI,OAAO,CAAE,CAAA;QAC9C,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAA;QAC1B,MAAM,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;KACrD;IACD,IAAM,MAAM,GAAG,mBAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAY,CAAA;IACxD,gFAAgF;IAChF,8FAA8F;IAC9F,IAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,UAAA,EAAE,IAAI,OAAA,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,EAAhB,CAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACrE,IAAM,kBAAkB,GAAG,WAAK,KAAK,MAAI,CAAA;IACzC,OAAO,MAAM,CAAC,OAAO,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;AAClD,CAAC,CAAA;AAzCY,QAAA,mBAAmB,uBAyC/B;AAED,kDAAkD;AAClD,sFAAsF;AAC/E,IAAM,6BAA6B,GAAG,UAAC,GAAW;IACvD,IAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAA;IAChD,OAAO,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAA;AACjE,CAAC,CAAA;AAHY,QAAA,6BAA6B,iCAGzC;AAEM,IAAM,uCAAuC,GAAG,UACrD,GAAW;IAEX,IAAM,KAAK,GAAG,8BAA8B,CAAA;IAC5C,IAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAA;KACZ;IACD,OAAO;QACL,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;QACpB,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;KAC7D,CAAA;AACH,CAAC,CAAA;AAZY,QAAA,uCAAuC,2CAYnD;AAEM,IAAM,YAAY,GAAG,UAC1B,aAA6B,EAC7B,UAAiB;IAEjB,IAAM,MAAM,GAAQ,EAAE,CAAA;IACtB,IAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,UAAA,GAAG,IAAI,OAAA,GAAG,CAAC,MAAM,EAAV,CAAU,CAAC,CAAA;IAC9C,IAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,UAAA,MAAM,IAAI,OAAA,MAAM,CAAC,IAAI,EAAX,CAAW,CAAC,CAAA;IACxD,IAAI,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,KAAK;QACtB,MAAM,CAAC,KAAK,CAAC,GAAG,EAAO,CAAA;QACvB,GAAG,CAAC,OAAO,CAAC,UAAC,IAAI,EAAE,SAAS;YAC1B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAA;QAC1C,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IACF,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAdY,QAAA,YAAY,gBAcxB"}
+{"version":3,"file":"sqlFunctions.js","sourceRoot":"","sources":["../../../src/lib/utils/functions/sqlFunctions.ts"],"names":[],"mappings":"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"}

package/dist/utils/functions/unCamelCase.d.ts

@@ -1 +1 @@
-export declare const unCamelCase: (str: string | undefined, facetAliases?: Record<string, string>) => string | undefined;
+export declare const unCamelCase: (str: string) => string;

package/dist/utils/functions/unCamelCase.js

@@ -1,17 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.unCamelCase = void 0;
-// SWC-5982: check once, which means this value should be set before loading the react component
-var forceDisplayOriginalColumnName = localStorage.getItem('force-display-original-column-names') === 'true';
-var unCamelCase = function (str, facetAliases) {
+var unCamelCase = function (str) {
     // https://stackoverflow.com/questions/4149276/how-to-convert-camelcase-to-camel-case
-    // SWC-5982: if force-display-original-column-names is set, then just return the string
-    if (!str || forceDisplayOriginalColumnName) {
-        return str;
-    }
-    if (facetAliases === null || facetAliases === void 0 ? void 0 : facetAliases[str]) {
-        return facetAliases[str];
-    }
     return (str
         // insert a space between lower & upper
         .replace(/([a-z])([A-Z])/g, '$1 $2')

package/dist/utils/functions/unCamelCase.js.map

@@ -1 +1 @@
-{"version":3,"file":"unCamelCase.js","sourceRoot":"","sources":["../../../src/lib/utils/functions/unCamelCase.ts"],"names":[],"mappings":";;;AAAA,gGAAgG;AAChG,IAAM,8BAA8B,GAClC,YAAY,CAAC,OAAO,CAAC,qCAAqC,CAAC,KAAK,MAAM,CAAA;AAEjE,IAAM,WAAW,GAAG,UACzB,GAAuB,EACvB,YAAqC;IAErC,qFAAqF;IACrF,uFAAuF;IACvF,IAAI,CAAC,GAAG,IAAI,8BAA8B,EAAE;QAC1C,OAAO,GAAG,CAAA;KACX;IACD,IAAI,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAG,GAAG,CAAC,EAAE;QACvB,OAAO,YAAY,CAAC,GAAG,CAAC,CAAA;KACzB;IACD,OAAO,CACL,GAAG;QACD,uCAAuC;SACtC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,0DAA0D;SACzD,OAAO,CAAC,0BAA0B,EAAE,SAAS,CAAC;QAC/C,gCAAgC;SAC/B,OAAO,CAAC,IAAI,EAAE,UAAC,GAAW;QACzB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAA;IAC1B,CAAC,CAAC,CACL,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,WAAW,eAuBvB"}
+{"version":3,"file":"unCamelCase.js","sourceRoot":"","sources":["../../../src/lib/utils/functions/unCamelCase.ts"],"names":[],"mappings":";;;AAAO,IAAM,WAAW,GAAG,UAAC,GAAW;IACrC,qFAAqF;IACrF,OAAO,CACL,GAAG;QACD,uCAAuC;SACtC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACpC,0DAA0D;SACzD,OAAO,CAAC,0BAA0B,EAAE,SAAS,CAAC;QAC/C,gCAAgC;SAC/B,OAAO,CAAC,IAAI,EAAE,UAAC,GAAW;QACzB,OAAO,GAAG,CAAC,WAAW,EAAE,CAAA;IAC1B,CAAC,CAAC,CACL,CAAA;AACH,CAAC,CAAA;AAbY,QAAA,WAAW,eAavB"}

package/dist/utils/hooks/useGetInfoFromIds.d.ts

@@ -1,13 +1,13 @@
-import { EntityHeader, UserGroupHeader } from '../synapseTypes';
-export declare type HookType = 'ENTITY_HEADER' | 'USER_PROFILE';
+import { EntityHeader, Evaluation, UserGroupHeader } from '../synapseTypes';
+export declare type HookType = 'ENTITY_HEADER' | 'USER_PROFILE' | 'EVALUATION_QUEUE';
 export declare type UseGetInfoFromIdsProps = {
     ids: string[];
     type: HookType;
 };
 /**
- * React hook to get user profiles or entities. Utilizes a custom cache in sessionStorage.
+ * React hook to get user profiles or entities or evaluation queues. Utilizes a custom cache in sessionStorage.
  *
  * For fetching just one entity or usergroup, see useGetEntity/useGetUserGroupHeader hooks powered by react-query
  * @returns
  */
-export default function useGetInfoFromIds<T extends EntityHeader | UserGroupHeader>(props: UseGetInfoFromIdsProps): T[];
+export default function useGetInfoFromIds<T extends EntityHeader | UserGroupHeader | Evaluation>(props: UseGetInfoFromIdsProps): T[];

package/dist/utils/hooks/useGetInfoFromIds.js

@@ -27,6 +27,17 @@ var entityHeaderTemplate = {
     modifiedBy: 'null',
     isLatestVersion: true, // If this version is the latest version of the entity
 };
+var evaluationTemplate = {
+    id: 'unknown',
+    etag: 'Unknown',
+    name: 'Unknown',
+    description: 'Unknown',
+    ownerId: 'null',
+    createdOn: 'null',
+    contentSource: 'Unknown',
+    submissionInstructionsMessage: 'Unknown',
+    submissionReceiptMessage: 'Unknown', // Message to display to users upon successful submission to this Evaluation.
+};
 var getEntityHeaderItems = function (lookupList, token) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
     var newData, notFound, notFoundPlaceholders;
     return tslib_1.__generator(this, function (_a) {
@@ -53,8 +64,21 @@ var getUserGroupHeaderItems = function (lookupList) { return tslib_1.__awaiter(v
         }
     });
 }); };
+var getEvaluationItems = function (lookupList, token) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+    var newData, notFound, notFoundPlaceholders;
+    return tslib_1.__generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, SynapseClient_1.getEvaluations)(lookupList, token)];
+            case 1:
+                newData = _a.sent();
+                notFound = lookupList.filter(function (item) { return newData.results.map(function (item) { return item.id; }).indexOf(item) === -1; });
+                notFoundPlaceholders = notFound.map(function (item) { return (tslib_1.__assign(tslib_1.__assign({}, evaluationTemplate), { id: item, name: item })); });
+                return [2 /*return*/, tslib_1.__spreadArray(tslib_1.__spreadArray([], newData.results, true), notFoundPlaceholders, true)];
+        }
+    });
+}); };
 /**
- * React hook to get user profiles or entities. Utilizes a custom cache in sessionStorage.
+ * React hook to get user profiles or entities or evaluation queues. Utilizes a custom cache in sessionStorage.
  *
  * For fetching just one entity or usergroup, see useGetEntity/useGetUserGroupHeader hooks powered by react-query
  * @returns
@@ -68,40 +92,50 @@ function useGetInfoFromIds(props) {
         return type === 'USER_PROFILE' ? 'ownerId' : 'id';
     };
     var storageKey = function (type) {
-        return type === 'USER_PROFILE'
-            ? __1.SynapseConstants.USER_PROFILE_STORAGE_KEY
-            : __1.SynapseConstants.ENTITY_HEADER_STORAGE_KEY;
+        switch (type) {
+            case 'USER_PROFILE':
+                return __1.SynapseConstants.USER_PROFILE_STORAGE_KEY;
+            case 'ENTITY_HEADER':
+                return __1.SynapseConstants.ENTITY_HEADER_STORAGE_KEY;
+            case 'EVALUATION_QUEUE':
+                return __1.SynapseConstants.EVALUATIONS_STORAGE_KEY;
+            default:
+                return '';
+        }
     };
     // look at current list of data, see if incoming ids has new data,
     // if so grab those ids
     var curList = data.map(function (el) { return el[idProp(type)]; });
     var incomingList = ids.filter(function (el) { return el !== __1.SynapseConstants.VALUE_NOT_SET; });
     var newValues = (0, lodash_es_1.uniq)(lodash_es_1.without.apply(void 0, tslib_1.__spreadArray([incomingList], curList, false)));
-    var saveToSessionStorage = function (data, type) {
-        if (!data.length) {
-            return;
-        }
-        //get what's there
-        var dataInStorage = sessionStorage.getItem(storageKey(type));
-        try {
-            var dataInStorageAsObjectArr = dataInStorage
-                ? JSON.parse(dataInStorage)
-                : [];
-            //get an array of ids for items already in storage
-            var ids_1 = dataInStorageAsObjectArr.map(function (item) { return item[idProp(type)]; });
-            //push all the new data if ids are new
-            for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
-                var dataObject = data_1[_i];
-                if (!ids_1.includes(dataObject[idProp(type)])) {
-                    dataInStorageAsObjectArr.push(dataObject);
+    (0, react_1.useEffect)(function () {
+        var saveToSessionStorage = function (data, type) {
+            if (!data.length) {
+                return;
+            }
+            //get what's there
+            var dataInStorage = sessionStorage.getItem(storageKey(type));
+            try {
+                var dataInStorageAsObjectArr = dataInStorage
+                    ? JSON.parse(dataInStorage)
+                    : [];
+                //get an array of ids for items already in storage
+                var ids_1 = dataInStorageAsObjectArr.map(function (item) { return item[idProp(type)]; });
+                //push all the new data if ids are new
+                for (var _i = 0, data_1 = data; _i < data_1.length; _i++) {
+                    var dataObject = data_1[_i];
+                    if (!ids_1.includes(dataObject[idProp(type)])) {
+                        dataInStorageAsObjectArr.push(dataObject);
+                    }
                 }
+                sessionStorage.setItem(storageKey(type), JSON.stringify(dataInStorageAsObjectArr));
             }
-            sessionStorage.setItem(storageKey(type), JSON.stringify(dataInStorageAsObjectArr));
-        }
-        catch (e) {
-            sessionStorage.setItem(storageKey(type), JSON.stringify(data));
-        }
-    };
+            catch (e) {
+                sessionStorage.setItem(storageKey(type), JSON.stringify(data));
+            }
+        };
+        saveToSessionStorage(data, type);
+    }, [data, type]);
     // Alina TODO: check if the items are already in Local Storage before making server call.
     // Michael TODO: There's a bug where the data held in useGetInfoFromIds will be stale if the user token changes,
     // this can be solved by using the useCompare hook on the token to track when it changes
@@ -112,49 +146,57 @@ function useGetInfoFromIds(props) {
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!(newValues.length > 0)) return [3 /*break*/, 10];
+                        if (!(newValues.length > 0)) return [3 /*break*/, 13];
                         _b.label = 1;
                     case 1:
-                        _b.trys.push([1, 9, , 10]);
+                        _b.trys.push([1, 12, , 13]);
                         newIds = Array.from(newValues);
-                        newReferences = type === 'USER_PROFILE'
-                            ? newIds
-                            : newIds.map(function (el) { return ({ targetId: el }); });
+                        newReferences = type === 'ENTITY_HEADER'
+                            ? newIds.map(function (el) { return ({ targetId: el }); })
+                            : newIds;
                         newReferencesChunks = (0, lodash_es_1.chunk)(newReferences, 45);
                         totalData_1 = [];
                         _i = 0, newReferencesChunks_1 = newReferencesChunks;
                         _b.label = 2;
                     case 2:
-                        if (!(_i < newReferencesChunks_1.length)) return [3 /*break*/, 8];
+                        if (!(_i < newReferencesChunks_1.length)) return [3 /*break*/, 11];
                         newReferences_1 = newReferencesChunks_1[_i];
-                        if (!(type === 'USER_PROFILE')) return [3 /*break*/, 4];
-                        return [4 /*yield*/, getUserGroupHeaderItems(newReferences_1)];
-                    case 3:
-                        _a = _b.sent();
-                        return [3 /*break*/, 6];
-                    case 4: return [4 /*yield*/, getEntityHeaderItems(newReferences_1, accessToken)];
-                    case 5:
-                        _a = _b.sent();
-                        _b.label = 6;
+                        newData = [];
+                        _a = type;
+                        switch (_a) {
+                            case 'USER_PROFILE': return [3 /*break*/, 3];
+                            case 'ENTITY_HEADER': return [3 /*break*/, 5];
+                            case 'EVALUATION_QUEUE': return [3 /*break*/, 7];
+                        }
+                        return [3 /*break*/, 9];
+                    case 3: return [4 /*yield*/, getUserGroupHeaderItems(newReferences_1)];
+                    case 4:
+                        newData = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 5: return [4 /*yield*/, getEntityHeaderItems(newReferences_1, accessToken)];
                     case 6:
-                        newData = _a;
+                        newData = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 7: return [4 /*yield*/, getEvaluationItems(newReferences_1, accessToken)];
+                    case 8:
+                        newData = _b.sent();
+                        return [3 /*break*/, 9];
+                    case 9:
                         totalData_1.push.apply(totalData_1, newData);
-                        _b.label = 7;
-                    case 7:
+                        _b.label = 10;
+                    case 10:
                         _i++;
                         return [3 /*break*/, 2];
-                    case 8:
+                    case 11:
                         if (!isCancelled) {
                             setData(function (oldData) { return oldData.concat.apply(oldData, totalData_1); });
                         }
-                        return [3 /*break*/, 10];
-                    case 9:
+                        return [3 /*break*/, 13];
+                    case 12:
                         error_1 = _b.sent();
                         console.error('Error on data retrieval', error_1);
-                        return [3 /*break*/, 10];
-                    case 10:
-                        saveToSessionStorage(data, type);
-                        return [2 /*return*/];
+                        return [3 /*break*/, 13];
+                    case 13: return [2 /*return*/];
                 }
             });
         }); };

package/dist/utils/hooks/useGetInfoFromIds.js.map

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