synapse-react-client 4.0.20 → 4.0.22

package/dist/utils/AppUtils/session/SessionInitializedGuard.d.ts

@@ -4,11 +4,16 @@ export type SessionInitializedGuardProps = PropsWithChildren<{
     hintText?: string;
 }>;
 /**
- * SessionInitializedGuard waits for session initialization to complete before
- * rendering its children. This component displays a loading screen while the
- * session is being initialized. This is useful for components that need to ensure
- * the session state is ready before making any queries or performing operations
- * that depend on authentication status.
+ * SessionInitializedGuard displays a loading screen while the session is being
+ * initialized. This is useful for components that need to ensure the session state
+ * is ready before making any queries or performing operations that depend on
+ * authentication status.
+ *
+ * For SSG compatibility, the children are rendered within an error boundary that
+ * is keyed on the session initialization state. This allows any SSG-prefetched data
+ * to be rendered in the static HTML and be hydration-stable on the client, while
+ * still showing a loading overlay in client-mode until the session manager finishes
+ * its initial check.
  *
  * @example
  * ```tsx

package/dist/utils/AppUtils/session/SessionInitializedGuard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SessionInitializedGuard.d.ts","sourceRoot":"","sources":["../../../../src/utils/AppUtils/session/SessionInitializedGuard.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAGzC,MAAM,MAAM,4BAA4B,GAAG,iBAAiB,CAAC;IAC3D,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAC,CAAA;AAEF;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,2CAS1E"}
+{"version":3,"file":"SessionInitializedGuard.d.ts","sourceRoot":"","sources":["../../../../src/utils/AppUtils/session/SessionInitializedGuard.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,OAAO,CAAA;AAIzC,MAAM,MAAM,4BAA4B,GAAG,iBAAiB,CAAC;IAC3D,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAC,CAAA;AAEF;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,4BAA4B,2CAkB1E"}

package/dist/utils/AppUtils/session/SessionInitializedGuard.js

@@ -1,15 +1,19 @@
-import { useApplicationSessionContext as e } from "./ApplicationSessionContext.js";
-import { BlockingLoader as t } from "../../../components/LoadingScreen/LoadingScreen.js";
-import { Fragment as n, jsx as r } from "react/jsx-runtime";
+import { SynapseErrorBoundary as e } from "../../../components/error/ErrorBanner.js";
+import { useApplicationSessionContext as t } from "./ApplicationSessionContext.js";
+import { BlockingLoader as n } from "../../../components/LoadingScreen/LoadingScreen.js";
+import { Fragment as r, jsx as i, jsxs as a } from "react/jsx-runtime";
 //#region src/utils/AppUtils/session/SessionInitializedGuard.tsx
-function i(i) {
-	let { children: a, hintText: o } = i, { hasInitializedSession: s } = e();
-	return s ? /* @__PURE__ */ r(n, { children: a }) : /* @__PURE__ */ r(t, {
+function o(o) {
+	let { children: s, hintText: c } = o, { hasInitializedSession: l } = t();
+	return /* @__PURE__ */ a(r, { children: [!l && /* @__PURE__ */ i(n, {
 		show: !0,
-		hintText: o
-	});
+		hintText: c
+	}), /* @__PURE__ */ i(e, {
+		resetKeys: [l],
+		children: s
+	})] });
 }
 //#endregion
-export { i as SessionInitializedGuard };
+export { o as SessionInitializedGuard };
 
 //# sourceMappingURL=SessionInitializedGuard.js.map

package/dist/utils/AppUtils/session/SessionInitializedGuard.js.map

@@ -1 +1 @@
-{"version":3,"file":"SessionInitializedGuard.js","names":[],"sources":["../../../../src/utils/AppUtils/session/SessionInitializedGuard.tsx"],"sourcesContent":["import { BlockingLoader } from '@/components/LoadingScreen/LoadingScreen'\nimport { PropsWithChildren } from 'react'\nimport { useApplicationSessionContext } from './ApplicationSessionContext'\n\nexport type SessionInitializedGuardProps = PropsWithChildren<{\n  /** Optional hint text to display while waiting for session initialization */\n  hintText?: string\n}>\n\n/**\n * SessionInitializedGuard waits for session initialization to complete before\n * rendering its children. This component displays a loading screen while the\n * session is being initialized. This is useful for components that need to ensure\n * the session state is ready before making any queries or performing operations\n * that depend on authentication status.\n *\n * @example\n * ```tsx\n * <SessionInitializedGuard>\n *   <ComponentThatNeedsSession />\n * </SessionInitializedGuard>\n * ```\n */\nexport function SessionInitializedGuard(props: SessionInitializedGuardProps) {\n  const { children, hintText } = props\n  const { hasInitializedSession } = useApplicationSessionContext()\n\n  if (!hasInitializedSession) {\n    return <BlockingLoader show={true} hintText={hintText} />\n  }\n\n  return <>{children}</>\n}\n"],"mappings":";;;;AAuBA,SAAgB,EAAwB,GAAqC;CAC3E,IAAM,EAAE,aAAU,gBAAa,GACzB,EAAE,6BAA0B,EAA6B;CAM/D,OAJK,IAIE,kBAAA,GAAA,EAAG,YAAW,CAAA,IAHZ,kBAAC,GAAD;EAAgB,MAAM;EAAgB;CAAW,CAAA;AAI5D"}
+{"version":3,"file":"SessionInitializedGuard.js","names":[],"sources":["../../../../src/utils/AppUtils/session/SessionInitializedGuard.tsx"],"sourcesContent":["import { BlockingLoader } from '@/components/LoadingScreen/LoadingScreen'\nimport { PropsWithChildren } from 'react'\nimport { useApplicationSessionContext } from './ApplicationSessionContext'\nimport { SynapseErrorBoundary } from '@/components/error/ErrorBanner'\n\nexport type SessionInitializedGuardProps = PropsWithChildren<{\n  /** Optional hint text to display while waiting for session initialization */\n  hintText?: string\n}>\n\n/**\n * SessionInitializedGuard displays a loading screen while the session is being\n * initialized. This is useful for components that need to ensure the session state\n * is ready before making any queries or performing operations that depend on\n * authentication status.\n *\n * For SSG compatibility, the children are rendered within an error boundary that\n * is keyed on the session initialization state. This allows any SSG-prefetched data\n * to be rendered in the static HTML and be hydration-stable on the client, while\n * still showing a loading overlay in client-mode until the session manager finishes\n * its initial check.\n *\n * @example\n * ```tsx\n * <SessionInitializedGuard>\n *   <ComponentThatNeedsSession />\n * </SessionInitializedGuard>\n * ```\n */\nexport function SessionInitializedGuard(props: SessionInitializedGuardProps) {\n  const { children, hintText } = props\n  const { hasInitializedSession } = useApplicationSessionContext()\n\n  // Render children even while the session is initializing so that SSG-prefetched\n  // (anonymous) data appears in the static HTML and is hydration-stable on the\n  // client. A non-blocking BlockingLoader (a fixed-position overlay) sits next\n  // to the children until the session manager finishes its initial check.\n  return (\n    <>\n      {!hasInitializedSession && (\n        <BlockingLoader show={true} hintText={hintText} />\n      )}\n      <SynapseErrorBoundary resetKeys={[hasInitializedSession]}>\n        {children}\n      </SynapseErrorBoundary>\n    </>\n  )\n}\n"],"mappings":";;;;;AA6BA,SAAgB,EAAwB,GAAqC;CAC3E,IAAM,EAAE,aAAU,gBAAa,GACzB,EAAE,6BAA0B,EAA6B;CAM/D,OACE,kBAAA,GAAA,EAAA,UAAA,CACG,CAAC,KACA,kBAAC,GAAD;EAAgB,MAAM;EAAgB;CAAW,CAAA,GAEnD,kBAAC,GAAD;EAAsB,WAAW,CAAC,CAAqB;EACpD;CACmB,CAAA,CACtB,EAAA,CAAA;AAEN"}

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

@@ -10,7 +10,7 @@ export declare const FTS_SEARCH_TERM = "FTS_SEARCH_TERM";
 /** @deprecated Use SEARCH_ROLE instead */
 export declare const FTS_SEARCH_ROLE = "FTS_SEARCH_ROLE";
 /**
- * Look in local storage for a set of QueryFilters to apply.  In addition, given the search params,
+ * Look in sessionStorage for a set of QueryFilters to apply.  In addition, given the search params,
  * generate a set of QueryFilters to narrow the query to view just related data.
  * May return null if a QueryFilter should not be added.
  * @param sql

package/dist/utils/functions/SqlFunctions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SqlFunctions.d.ts","sourceRoot":"","sources":["../../../src/utils/functions/SqlFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,wBAAwB,EAExB,+BAA+B,EAE/B,WAAW,EACX,GAAG,EACH,YAAY,EAEb,MAAM,iCAAiC,CAAA;AAIxC,MAAM,MAAM,WAAW,GACnB,+BAA+B,GAC/B,wBAAwB,CAAA;AAG5B,eAAO,MAAM,iCAAiC,GAAI,KAAK,MAAM,WAC5B,CAAA;AAEjC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,UAKhD;AACD,eAAO,MAAM,mCAAmC,GAC9C,KAAK,MAAM,EACX,YAAY,MAAM,WAGnB,CAAA;AAGD,eAAO,MAAM,WAAW,gBAAgB,CAAA;AACxC,eAAO,MAAM,WAAW,gBAAgB,CAAA;AAExC,0CAA0C;AAC1C,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAChD,0CAA0C;AAC1C,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAEhD;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAU,WAAkD,EAC5D,oBAAoB,MAAM,KACzB,WAAW,EAAE,GAAG,SAmGlB,CAAA;AAID,eAAO,MAAM,6BAA6B,GAAI,KAAK,MAAM,KAAG,MAG3D,CAAA;AAED,eAAO,MAAM,uCAAuC,GAClD,KAAK,MAAM,KACV;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAU7C,CAAA;AAED,eAAO,MAAM,YAAY,GACvB,eAAe,YAAY,EAAE,EAC7B,YAAY,GAAG,EAAE,oCAWlB,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GACzB,aAAa,MAAM,EACnB,gBAAgB,YAAY,EAAE,EAC9B,eAAe,WAAW,EAAE,KAC3B,MAAM,GAAG,SA0BX,CAAA"}
+{"version":3,"file":"SqlFunctions.d.ts","sourceRoot":"","sources":["../../../src/utils/functions/SqlFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,wBAAwB,EAExB,+BAA+B,EAE/B,WAAW,EACX,GAAG,EACH,YAAY,EAEb,MAAM,iCAAiC,CAAA;AAIxC,MAAM,MAAM,WAAW,GACnB,+BAA+B,GAC/B,wBAAwB,CAAA;AAG5B,eAAO,MAAM,iCAAiC,GAAI,KAAK,MAAM,WAC5B,CAAA;AAEjC,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,UAKhD;AACD,eAAO,MAAM,mCAAmC,GAC9C,KAAK,MAAM,EACX,YAAY,MAAM,WAGnB,CAAA;AAGD,eAAO,MAAM,WAAW,gBAAgB,CAAA;AACxC,eAAO,MAAM,WAAW,gBAAgB,CAAA;AAExC,0CAA0C;AAC1C,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAChD,0CAA0C;AAC1C,eAAO,MAAM,eAAe,oBAAoB,CAAA;AAEhD;;;;;;;;GAQG;AACH,eAAO,MAAM,oBAAoB,GAC/B,eAAe,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACrC,WAAU,WAAkD,EAC5D,oBAAoB,MAAM,KACzB,WAAW,EAAE,GAAG,SAqGlB,CAAA;AAID,eAAO,MAAM,6BAA6B,GAAI,KAAK,MAAM,KAAG,MAG3D,CAAA;AAED,eAAO,MAAM,uCAAuC,GAClD,KAAK,MAAM,KACV;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAU7C,CAAA;AAED,eAAO,MAAM,YAAY,GACvB,eAAe,YAAY,EAAE,EAC7B,YAAY,GAAG,EAAE,oCAWlB,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc,GACzB,aAAa,MAAM,EACnB,gBAAgB,YAAY,EAAE,EAC9B,eAAe,WAAW,EAAE,KAC3B,MAAM,GAAG,SA0BX,CAAA"}

package/dist/utils/functions/SqlFunctions.js

@@ -7,7 +7,7 @@ function o(t) {
 	return t.match(e) ? t.substring(i) : t;
 }
 var s = (e, t) => `__${t ?? ""}_${e}`, c = "SEARCH_TERM", l = "SEARCH_ROLE", u = "FTS_SEARCH_TERM", d = "FTS_SEARCH_ROLE", f = (e, i = r.LIKE, s) => {
-	let c = s ? sessionStorage.getItem(a(s)) : void 0, l = [];
+	let c = typeof sessionStorage < "u" && s ? sessionStorage.getItem(a(s)) : void 0, l = [];
 	if (c && (l = JSON.parse(c)), e) {
 		let a = (e) => e.startsWith("qw") || e.startsWith("__");
 		l = l.concat(Object.keys(e || {}).filter((t) => !a(t) && e[t] != null && e[t].trim() != "").map((a) => {

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

@@ -1 +1 @@
-{"version":3,"file":"SqlFunctions.js","names":[],"sources":["../../../src/utils/functions/SqlFunctions.ts"],"sourcesContent":["import {\n  ColumnModel,\n  ColumnMultiValueFunction,\n  ColumnMultiValueFunctionQueryFilter,\n  ColumnSingleValueFilterOperator,\n  ColumnSingleValueQueryFilter,\n  QueryFilter,\n  Row,\n  SelectColumn,\n  TextMatchesQueryFilter,\n} from '@sage-bionetworks/synapse-types'\nimport { SYNAPSE_ENTITY_ID_REGEX } from './RegularExpressions'\nimport { splitAndTrim } from './StringUtils'\n\nexport type SQLOperator =\n  | ColumnSingleValueFilterOperator\n  | ColumnMultiValueFunction\n\nconst WITHOUT_SYN_PREFIX = 3\nexport const QUERY_FILTERS_SESSION_STORAGE_KEY = (key: string) =>\n  `${key}-temp-QueryFilter-array`\n\nexport function removePrefixIfSynId(value: string) {\n  if (value.match(SYNAPSE_ENTITY_ID_REGEX)) {\n    return value.substring(WITHOUT_SYN_PREFIX)\n  }\n  return value\n}\nexport const getIgnoredQueryFilterSearchParamKey = (\n  key: string,\n  namespace?: string,\n) => {\n  return `__${namespace ?? ''}_${key}`\n}\n\n// Special search parameter key that will automatically apply a FTS search term to a Query Wrapper if present\nexport const SEARCH_TERM = 'SEARCH_TERM'\nexport const SEARCH_ROLE = 'SEARCH_ROLE'\n\n/** @deprecated Use SEARCH_TERM instead */\nexport const FTS_SEARCH_TERM = 'FTS_SEARCH_TERM'\n/** @deprecated Use SEARCH_ROLE instead */\nexport const FTS_SEARCH_ROLE = 'FTS_SEARCH_ROLE'\n\n/**\n * Look in local storage for a set of QueryFilters to apply.  In addition, given the search params,\n * generate a set of QueryFilters to narrow the query to view just related data.\n * May return null if a QueryFilter should not be added.\n * @param sql\n * @param searchParams\n * @param operator\n * @returns\n */\nexport const getAdditionalFilters = (\n  searchParams?: Record<string, string>,\n  operator: SQLOperator = ColumnSingleValueFilterOperator.LIKE,\n  sessionStorageKey?: string,\n): QueryFilter[] | undefined => {\n  const sessionStorageQueryFiltersString = sessionStorageKey\n    ? sessionStorage.getItem(\n        QUERY_FILTERS_SESSION_STORAGE_KEY(sessionStorageKey),\n      )\n    : undefined\n  let additionalFilters: QueryFilter[] = []\n  if (sessionStorageQueryFiltersString) {\n    additionalFilters = JSON.parse(\n      sessionStorageQueryFiltersString,\n    ) as QueryFilter[]\n  }\n  if (searchParams) {\n    const isQueryWrapperKey = (key: string) =>\n      key.startsWith('qw') || key.startsWith('__')\n    additionalFilters = additionalFilters.concat(\n      Object.keys(searchParams || {})\n        .filter(\n          key =>\n            !isQueryWrapperKey(key) &&\n            searchParams[key] != undefined &&\n            searchParams[key].trim() != '',\n        )\n        .map(key => {\n          if (key == SEARCH_TERM || key == FTS_SEARCH_TERM) {\n            const filter: TextMatchesQueryFilter = {\n              concreteType:\n                'org.sagebionetworks.repo.model.table.TextMatchesQueryFilter',\n              searchExpression: searchParams[key],\n            }\n            return filter\n          }\n          switch (operator) {\n            case ColumnSingleValueFilterOperator.EQUAL: {\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                values: [searchParams[key]],\n              }\n              return filter\n            }\n            case ColumnSingleValueFilterOperator.IN: {\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                values: splitAndTrim(searchParams[key]),\n              }\n              return filter\n            }\n            case ColumnMultiValueFunction.HAS: {\n              const filter: ColumnMultiValueFunctionQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnMultiValueFunctionQueryFilter',\n                columnName: key,\n                function: operator,\n                _function: operator,\n                values: splitAndTrim(searchParams[key]),\n              }\n              return filter\n            }\n            case ColumnSingleValueFilterOperator.LIKE: {\n              // If we use a LIKE statement with a synId the backend will look for a string with the first three\n              // characters being 'syn', however, it stores synIds without 'syn', so the query will fail\n              // The backend usually parses 'syn' out, but not with the LIKE clause since its expecting a regex, so we\n              // parse this out. This will cause a bug if something matches the synId regex but is in free text.\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                // Add wildcards around the value\n                values: [`%${removePrefixIfSynId(searchParams[key])}%`],\n              }\n              return filter\n            }\n            case ColumnMultiValueFunction.HAS_LIKE: {\n              const filter: ColumnMultiValueFunctionQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnMultiValueFunctionQueryFilter',\n                columnName: key,\n                function: operator,\n                _function: operator,\n                values: searchParams[key].split(',').map(param => {\n                  // Remove synId prefix for the same reasons as in the LIKE case\n                  return `%${removePrefixIfSynId(param)}%`\n                }),\n              }\n              return filter\n            }\n          }\n        }),\n    )\n  }\n\n  return additionalFilters.length === 0 ? undefined : additionalFilters\n}\n\n//parses synapse entity id from a sql query string\n//look for a pattern of 'from[some number of spaces]syn[somenumbers]` case insensitive\nexport const parseEntityIdFromSqlStatement = (sql: string): string => {\n  const matches = sql.match(/(from)\\s+(syn)\\d+/gi)\n  return matches && matches[0] ? matches[0].substr(5).trim() : ''\n}\n\nexport const parseEntityIdAndVersionFromSqlStatement = (\n  sql: string,\n): { entityId?: string; versionNumber?: number } => {\n  const regex = /from\\s+(syn\\d+)(?:\\.(\\d+))?/i\n  const matches = regex.exec(sql)\n  if (!matches) {\n    return { entityId: undefined, versionNumber: undefined }\n  }\n  return {\n    entityId: matches[1],\n    versionNumber: matches[2] ? parseInt(matches[2]) : undefined,\n  }\n}\n\nexport const resultToJson = (\n  headerColumns: SelectColumn[],\n  rowColumns: Row[],\n) => {\n  const rows = rowColumns.map(row => row.values)\n  const headers = headerColumns.map(column => column.name)\n  return rows.map(row => {\n    const obj: Record<string, string | null> = {}\n    row.forEach((text, cellIndex) => {\n      obj[headers[cellIndex]] = text\n    })\n    return obj\n  })\n}\n\n/**\n * Finds the index of the given column name in the selectColumns or columnModels.\n *\n * @returns a non-negative integer if the column is found, or undefined if the column is not found\n * @param columnName\n * @param selectColumns\n * @param columnModels\n */\nexport const getColumnIndex = (\n  columnName?: string,\n  selectColumns?: SelectColumn[],\n  columnModels?: ColumnModel[],\n): number | undefined => {\n  if (!columnName) {\n    return undefined\n  }\n\n  const lowerCaseColumnName = columnName.toLowerCase()\n\n  if (selectColumns) {\n    const findIndexResult = selectColumns.findIndex(\n      el => el.name?.toLowerCase() === lowerCaseColumnName,\n    )\n    if (findIndexResult != -1) {\n      return findIndexResult\n    }\n  }\n\n  if (columnModels) {\n    const findIndexResult = columnModels.findIndex(\n      el => el.name?.toLowerCase() === lowerCaseColumnName,\n    )\n    if (findIndexResult !== -1) {\n      return findIndexResult\n    }\n  }\n\n  return undefined\n}\n"],"mappings":"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"}
+{"version":3,"file":"SqlFunctions.js","names":[],"sources":["../../../src/utils/functions/SqlFunctions.ts"],"sourcesContent":["import {\n  ColumnModel,\n  ColumnMultiValueFunction,\n  ColumnMultiValueFunctionQueryFilter,\n  ColumnSingleValueFilterOperator,\n  ColumnSingleValueQueryFilter,\n  QueryFilter,\n  Row,\n  SelectColumn,\n  TextMatchesQueryFilter,\n} from '@sage-bionetworks/synapse-types'\nimport { SYNAPSE_ENTITY_ID_REGEX } from './RegularExpressions'\nimport { splitAndTrim } from './StringUtils'\n\nexport type SQLOperator =\n  | ColumnSingleValueFilterOperator\n  | ColumnMultiValueFunction\n\nconst WITHOUT_SYN_PREFIX = 3\nexport const QUERY_FILTERS_SESSION_STORAGE_KEY = (key: string) =>\n  `${key}-temp-QueryFilter-array`\n\nexport function removePrefixIfSynId(value: string) {\n  if (value.match(SYNAPSE_ENTITY_ID_REGEX)) {\n    return value.substring(WITHOUT_SYN_PREFIX)\n  }\n  return value\n}\nexport const getIgnoredQueryFilterSearchParamKey = (\n  key: string,\n  namespace?: string,\n) => {\n  return `__${namespace ?? ''}_${key}`\n}\n\n// Special search parameter key that will automatically apply a FTS search term to a Query Wrapper if present\nexport const SEARCH_TERM = 'SEARCH_TERM'\nexport const SEARCH_ROLE = 'SEARCH_ROLE'\n\n/** @deprecated Use SEARCH_TERM instead */\nexport const FTS_SEARCH_TERM = 'FTS_SEARCH_TERM'\n/** @deprecated Use SEARCH_ROLE instead */\nexport const FTS_SEARCH_ROLE = 'FTS_SEARCH_ROLE'\n\n/**\n * Look in sessionStorage for a set of QueryFilters to apply.  In addition, given the search params,\n * generate a set of QueryFilters to narrow the query to view just related data.\n * May return null if a QueryFilter should not be added.\n * @param sql\n * @param searchParams\n * @param operator\n * @returns\n */\nexport const getAdditionalFilters = (\n  searchParams?: Record<string, string>,\n  operator: SQLOperator = ColumnSingleValueFilterOperator.LIKE,\n  sessionStorageKey?: string,\n): QueryFilter[] | undefined => {\n  const hasSessionStorage = typeof sessionStorage !== 'undefined'\n  const sessionStorageQueryFiltersString =\n    hasSessionStorage && sessionStorageKey\n      ? sessionStorage.getItem(\n          QUERY_FILTERS_SESSION_STORAGE_KEY(sessionStorageKey),\n        )\n      : undefined\n  let additionalFilters: QueryFilter[] = []\n  if (sessionStorageQueryFiltersString) {\n    additionalFilters = JSON.parse(\n      sessionStorageQueryFiltersString,\n    ) as QueryFilter[]\n  }\n  if (searchParams) {\n    const isQueryWrapperKey = (key: string) =>\n      key.startsWith('qw') || key.startsWith('__')\n    additionalFilters = additionalFilters.concat(\n      Object.keys(searchParams || {})\n        .filter(\n          key =>\n            !isQueryWrapperKey(key) &&\n            searchParams[key] != undefined &&\n            searchParams[key].trim() != '',\n        )\n        .map(key => {\n          if (key == SEARCH_TERM || key == FTS_SEARCH_TERM) {\n            const filter: TextMatchesQueryFilter = {\n              concreteType:\n                'org.sagebionetworks.repo.model.table.TextMatchesQueryFilter',\n              searchExpression: searchParams[key],\n            }\n            return filter\n          }\n          switch (operator) {\n            case ColumnSingleValueFilterOperator.EQUAL: {\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                values: [searchParams[key]],\n              }\n              return filter\n            }\n            case ColumnSingleValueFilterOperator.IN: {\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                values: splitAndTrim(searchParams[key]),\n              }\n              return filter\n            }\n            case ColumnMultiValueFunction.HAS: {\n              const filter: ColumnMultiValueFunctionQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnMultiValueFunctionQueryFilter',\n                columnName: key,\n                function: operator,\n                _function: operator,\n                values: splitAndTrim(searchParams[key]),\n              }\n              return filter\n            }\n            case ColumnSingleValueFilterOperator.LIKE: {\n              // If we use a LIKE statement with a synId the backend will look for a string with the first three\n              // characters being 'syn', however, it stores synIds without 'syn', so the query will fail\n              // The backend usually parses 'syn' out, but not with the LIKE clause since its expecting a regex, so we\n              // parse this out. This will cause a bug if something matches the synId regex but is in free text.\n              const filter: ColumnSingleValueQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnSingleValueQueryFilter',\n                columnName: key,\n                operator: operator,\n                // Add wildcards around the value\n                values: [`%${removePrefixIfSynId(searchParams[key])}%`],\n              }\n              return filter\n            }\n            case ColumnMultiValueFunction.HAS_LIKE: {\n              const filter: ColumnMultiValueFunctionQueryFilter = {\n                concreteType:\n                  'org.sagebionetworks.repo.model.table.ColumnMultiValueFunctionQueryFilter',\n                columnName: key,\n                function: operator,\n                _function: operator,\n                values: searchParams[key].split(',').map(param => {\n                  // Remove synId prefix for the same reasons as in the LIKE case\n                  return `%${removePrefixIfSynId(param)}%`\n                }),\n              }\n              return filter\n            }\n          }\n        }),\n    )\n  }\n\n  return additionalFilters.length === 0 ? undefined : additionalFilters\n}\n\n//parses synapse entity id from a sql query string\n//look for a pattern of 'from[some number of spaces]syn[somenumbers]` case insensitive\nexport const parseEntityIdFromSqlStatement = (sql: string): string => {\n  const matches = sql.match(/(from)\\s+(syn)\\d+/gi)\n  return matches && matches[0] ? matches[0].substr(5).trim() : ''\n}\n\nexport const parseEntityIdAndVersionFromSqlStatement = (\n  sql: string,\n): { entityId?: string; versionNumber?: number } => {\n  const regex = /from\\s+(syn\\d+)(?:\\.(\\d+))?/i\n  const matches = regex.exec(sql)\n  if (!matches) {\n    return { entityId: undefined, versionNumber: undefined }\n  }\n  return {\n    entityId: matches[1],\n    versionNumber: matches[2] ? parseInt(matches[2]) : undefined,\n  }\n}\n\nexport const resultToJson = (\n  headerColumns: SelectColumn[],\n  rowColumns: Row[],\n) => {\n  const rows = rowColumns.map(row => row.values)\n  const headers = headerColumns.map(column => column.name)\n  return rows.map(row => {\n    const obj: Record<string, string | null> = {}\n    row.forEach((text, cellIndex) => {\n      obj[headers[cellIndex]] = text\n    })\n    return obj\n  })\n}\n\n/**\n * Finds the index of the given column name in the selectColumns or columnModels.\n *\n * @returns a non-negative integer if the column is found, or undefined if the column is not found\n * @param columnName\n * @param selectColumns\n * @param columnModels\n */\nexport const getColumnIndex = (\n  columnName?: string,\n  selectColumns?: SelectColumn[],\n  columnModels?: ColumnModel[],\n): number | undefined => {\n  if (!columnName) {\n    return undefined\n  }\n\n  const lowerCaseColumnName = columnName.toLowerCase()\n\n  if (selectColumns) {\n    const findIndexResult = selectColumns.findIndex(\n      el => el.name?.toLowerCase() === lowerCaseColumnName,\n    )\n    if (findIndexResult != -1) {\n      return findIndexResult\n    }\n  }\n\n  if (columnModels) {\n    const findIndexResult = columnModels.findIndex(\n      el => el.name?.toLowerCase() === lowerCaseColumnName,\n    )\n    if (findIndexResult !== -1) {\n      return findIndexResult\n    }\n  }\n\n  return undefined\n}\n"],"mappings":";;;;AAkBA,IAAM,IAAqB,GACd,KAAqC,MAChD,GAAG,EAAI;AAET,SAAgB,EAAoB,GAAe;CAIjD,OAHI,EAAM,MAAM,CAAuB,IAC9B,EAAM,UAAU,CAAkB,IAEpC;AACT;AACA,IAAa,KACX,GACA,MAEO,KAAK,KAAa,GAAG,GAAG,KAIpB,IAAc,eACd,IAAc,eAGd,IAAkB,mBAElB,IAAkB,mBAWlB,KACX,GACA,IAAwB,EAAgC,MACxD,MAC8B;CAE9B,IAAM,IADoB,OAAO,iBAAmB,OAE7B,IACjB,eAAe,QACb,EAAkC,CAAiB,CACrD,IACA,KAAA,GACF,IAAmC,CAAC;CAMxC,IALI,MACF,IAAoB,KAAK,MACvB,CACF,IAEE,GAAc;EAChB,IAAM,KAAqB,MACzB,EAAI,WAAW,IAAI,KAAK,EAAI,WAAW,IAAI;EAC7C,IAAoB,EAAkB,OACpC,OAAO,KAAK,KAAgB,CAAC,CAAC,EAC3B,QACC,MACE,CAAC,EAAkB,CAAG,KACtB,EAAa,MAAQ,QACrB,EAAa,GAAK,KAAK,KAAK,EAChC,EACC,KAAI,MAAO;GACV,IAAI,KAAA,iBAAsB,KAAA,mBAMxB,OAAO;IAJL,cACE;IACF,kBAAkB,EAAa;GAE1B;GAET,QAAQ,GAAR;IACE,KAAK,EAAgC,OAQnC,OAAO;KANL,cACE;KACF,YAAY;KACF;KACV,QAAQ,CAAC,EAAa,EAAI;IAErB;IAET,KAAK,EAAgC,IAQnC,OAAO;KANL,cACE;KACF,YAAY;KACF;KACV,QAAQ,EAAa,EAAa,EAAI;IAEjC;IAET,KAAK,EAAyB,KAS5B,OAAO;KAPL,cACE;KACF,YAAY;KACZ,UAAU;KACV,WAAW;KACX,QAAQ,EAAa,EAAa,EAAI;IAEjC;IAET,KAAK,EAAgC,MAanC,OAAO;KAPL,cACE;KACF,YAAY;KACF;KAEV,QAAQ,CAAC,IAAI,EAAoB,EAAa,EAAI,EAAE,EAAE;IAEjD;IAET,KAAK,EAAyB,UAY5B,OAAO;KAVL,cACE;KACF,YAAY;KACZ,UAAU;KACV,WAAW;KACX,QAAQ,EAAa,GAAK,MAAM,GAAG,EAAE,KAAI,MAEhC,IAAI,EAAoB,CAAK,EAAE,EACvC;IAEI;GAEX;EACF,CAAC,CACL;CACF;CAEA,OAAO,EAAkB,WAAW,IAAI,KAAA,IAAY;AACtD,GAIa,KAAiC,MAAwB;CACpE,IAAM,IAAU,EAAI,MAAM,qBAAqB;CAC/C,OAAO,KAAW,EAAQ,KAAK,EAAQ,GAAG,OAAO,CAAC,EAAE,KAAK,IAAI;AAC/D,GAEa,KACX,MACkD;CAElD,IAAM,IAAU,+BAAM,KAAK,CAAG;CAI9B,OAHK,IAGE;EACL,UAAU,EAAQ;EAClB,eAAe,EAAQ,KAAK,SAAS,EAAQ,EAAE,IAAI,KAAA;CACrD,IALS;EAAE,UAAU,KAAA;EAAW,eAAe,KAAA;CAAU;AAM3D,GAEa,KACX,GACA,MACG;CACH,IAAM,IAAO,EAAW,KAAI,MAAO,EAAI,MAAM,GACvC,IAAU,EAAc,KAAI,MAAU,EAAO,IAAI;CACvD,OAAO,EAAK,KAAI,MAAO;EACrB,IAAM,IAAqC,CAAC;EAI5C,OAHA,EAAI,SAAS,GAAM,MAAc;GAC/B,EAAI,EAAQ,MAAc;EAC5B,CAAC,GACM;CACT,CAAC;AACH,GAUa,KACX,GACA,GACA,MACuB;CACvB,IAAI,CAAC,GACH;CAGF,IAAM,IAAsB,EAAW,YAAY;CAEnD,IAAI,GAAe;EACjB,IAAM,IAAkB,EAAc,WACpC,MAAM,EAAG,MAAM,YAAY,MAAM,CACnC;EACA,IAAI,KAAmB,IACrB,OAAO;CAEX;CAEA,IAAI,GAAc;EAChB,IAAM,IAAkB,EAAa,WACnC,MAAM,EAAG,MAAM,YAAY,MAAM,CACnC;EACA,IAAI,MAAoB,IACtB,OAAO;CAEX;AAGF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "synapse-react-client",
-  "version": "4.0.20",
+  "version": "4.0.22",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",
@@ -60,6 +60,7 @@
     "cbor2": "^2.3.0",
     "classnames": "^2.5.1",
     "clickable-json": "^1.15.1",
+    "d3-sankey": "^0.12.3",
     "dagre": "^0.8.5",
     "dayjs": "^1.11.21",
     "html-react-parser": "^6.1.3",
@@ -117,12 +118,12 @@
     "ua-parser-js": "^1.0.41",
     "use-deep-compare-effect": "^1.8.1",
     "xss": "^1.0.15",
-    "zod": "^3.25.76",
+    "zod": "^4.4.3",
+    "@sage-bionetworks/markdown-it-container": "4.0.1",
+    "@sage-bionetworks/synapse-types": "0.0.7",
     "@sage-bionetworks/synapse-client": "0.0.18",
     "markdown-it-synapse": "2.0.0",
-    "markdown-it-synapse-table": "1.0.8",
-    "@sage-bionetworks/markdown-it-container": "4.0.1",
-    "@sage-bionetworks/synapse-types": "0.0.7"
+    "markdown-it-synapse-table": "1.0.8"
   },
   "peerDependencies": {
     "@sage-bionetworks/aridhia-client": "*",
@@ -149,6 +150,7 @@
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@testing-library/user-event": "^14.6.1",
+    "@types/d3-sankey": "^0.12.5",
     "@types/dagre": "^0.7.54",
     "@types/google.maps": "^3.65.1",
     "@types/history": "^4.7.11",