From 1d82988f0bacf31902147df98ab4d861b54a97db Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 15:16:45 -0800
Subject: [PATCH 1/6] SWC-6548  - Release new version of synapse-react-client 
 - Upgrade MUI  - Add `getEditedColumnModels` imperative handle to
 TableColumnSchemaForm to match SWC interface  - Fix animation/z-index of MUI
 Select causing issues in a GWT Bootstrap Modal  - Fix issue where JSON
 Subcolumn name was not used if forceDisplayOriginalColumnName was true  - Fix
 missing `key` in Breadcrumbs.tsx

---
 apps/SageAccountWeb/package.json              |   8 +-
 apps/portals/package.json                     |   4 +-
 apps/synapse-oauth-signin/package.json        |   4 +-
 packages/synapse-react-client/package.json    |  10 +-
 .../components/EntityFinder/Breadcrumbs.tsx   |   4 +-
 .../QueryVisualizationWrapper.tsx             |   2 +-
 .../ColumnModelForm.tsx                       |  23 +-
 .../TableColumnSchemaEditor.tsx               |   4 +-
 .../TableColumnSchemaEditorUtils.ts           |   4 +-
 .../TableColumnSchemaForm.tsx                 |  15 +-
 .../synapse-react-client/src/umd.index.ts     |   2 +
 pnpm-lock.yaml                                | 230 +++++++++++-------
 12 files changed, 192 insertions(+), 118 deletions(-)

diff --git a/apps/SageAccountWeb/package.json b/apps/SageAccountWeb/package.json
index 1e9e654dea..c8389402ec 100644
--- a/apps/SageAccountWeb/package.json
+++ b/apps/SageAccountWeb/package.json
@@ -7,10 +7,10 @@
     "@emotion/core": "^11.0.0",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.13.7",
-    "@mui/material": "^5.13.7",
-    "@mui/system": "^5.13.7",
-    "@mui/utils": "^5.13.7",
+    "@mui/icons-material": "^5.14.16",
+    "@mui/material": "^5.14.17",
+    "@mui/system": "^5.14.17",
+    "@mui/utils": "^5.14.17",
     "@react-hookz/web": "^23.1.0",
     "lodash-es": "^4.17.21",
     "plotly.js-basic-dist": "^2.24.3",
diff --git a/apps/portals/package.json b/apps/portals/package.json
index f6ccd53a32..33e7f36507 100644
--- a/apps/portals/package.json
+++ b/apps/portals/package.json
@@ -6,8 +6,8 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.13.7",
-    "@mui/material": "^5.13.7",
+    "@mui/icons-material": "^5.14.16",
+    "@mui/material": "^5.14.17",
     "@react-hookz/web": "^23.1.0",
     "@sage-bionetworks/react-base-table": "^1.13.4",
     "clone-deep": "^4.0.1",
diff --git a/apps/synapse-oauth-signin/package.json b/apps/synapse-oauth-signin/package.json
index df3c33c4bf..3b3c5306cd 100644
--- a/apps/synapse-oauth-signin/package.json
+++ b/apps/synapse-oauth-signin/package.json
@@ -6,8 +6,8 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.13.7",
-    "@mui/material": "^5.13.7",
+    "@mui/icons-material": "^5.14.16",
+    "@mui/material": "^5.14.17",
     "@react-hookz/web": "^23.1.0",
     "@sage-bionetworks/react-base-table": "^1.13.4",
     "history": "^5.3.0",
diff --git a/packages/synapse-react-client/package.json b/packages/synapse-react-client/package.json
index 224a1fb742..fc7bfe6d40 100644
--- a/packages/synapse-react-client/package.json
+++ b/packages/synapse-react-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "synapse-react-client",
-  "version": "3.1.61",
+  "version": "3.1.62",
   "private": false,
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -33,10 +33,10 @@
     "@brainhubeu/react-carousel": "1.19.26",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.13.7",
-    "@mui/material": "^5.13.7",
-    "@mui/system": "^5.13.7",
-    "@mui/utils": "^5.13.7",
+    "@mui/icons-material": "^5.14.16",
+    "@mui/material": "^5.14.17",
+    "@mui/system": "^5.14.17",
+    "@mui/utils": "^5.14.17",
     "@mui/x-data-grid": "5.17.26",
     "@mui/x-date-pickers": "^5.0.20",
     "@popperjs/core": "^2.11.8",
diff --git a/packages/synapse-react-client/src/components/EntityFinder/Breadcrumbs.tsx b/packages/synapse-react-client/src/components/EntityFinder/Breadcrumbs.tsx
index 4e9b8205a4..0bb27e11ab 100644
--- a/packages/synapse-react-client/src/components/EntityFinder/Breadcrumbs.tsx
+++ b/packages/synapse-react-client/src/components/EntityFinder/Breadcrumbs.tsx
@@ -29,7 +29,7 @@ export const Breadcrumbs: React.FunctionComponent<BreadcrumbsProps> = ({
         </>
       )}
       {items.map((item, index) => (
-        <>
+        <React.Fragment key={index}>
           <button
             className={`BreadcrumbItem ${item.isCurrent ? 'Current' : ''}`}
             key={index}
@@ -43,7 +43,7 @@ export const Breadcrumbs: React.FunctionComponent<BreadcrumbsProps> = ({
             {item.name}
           </button>
           {index !== items.length - 1 && <span>&gt;</span>}
-        </>
+        </React.Fragment>
       ))}
     </div>
   )
diff --git a/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.tsx b/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.tsx
index 2e6016ff57..190415728b 100644
--- a/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.tsx
+++ b/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.tsx
@@ -174,7 +174,7 @@ export function QueryVisualizationWrapper(
       const forceDisplayOriginalColumnName =
         localStorage.getItem('force-display-original-column-names') === 'true'
 
-      if (!columnName || forceDisplayOriginalColumnName) {
+      if (!columnName || (forceDisplayOriginalColumnName && !jsonPath)) {
         return columnName
       }
       if (columnAliases[columnName]) {
diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
index 784f990c81..2e32b70b60 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
@@ -1,5 +1,6 @@
 import {
   Box,
+  Fade,
   FormControl,
   Link,
   MenuItem,
@@ -200,11 +201,20 @@ export default function ColumnModelForm(props: ColumnModelFormProps) {
                 'aria-label': 'Column Type',
               }}
               sx={fieldSx}
+              MenuProps={{
+                TransitionComponent: Fade,
+              }}
               disabled={disabled}
             >
               {allowedColumnTypes.map(value => {
                 return (
-                  <MenuItem value={value} key={value}>
+                  <MenuItem
+                    value={value}
+                    key={value}
+                    sx={{
+                      zIndex: 1500,
+                    }}
+                  >
                     {getColumnTypeFriendlyName(value)}
                   </MenuItem>
                 )
@@ -359,6 +369,9 @@ export default function ColumnModelForm(props: ColumnModelFormProps) {
             label="Facet Type"
             value={columnModel.facetType}
             disabled={disabled || allowedFacetTypes === null}
+            MenuProps={{
+              TransitionComponent: Fade,
+            }}
             onChange={e => {
               dispatch({
                 type: 'setColumnModelValue',
@@ -377,7 +390,13 @@ export default function ColumnModelForm(props: ColumnModelFormProps) {
           >
             {(allowedFacetTypes ?? []).map((value, index) => {
               return (
-                <MenuItem value={value} key={index}>
+                <MenuItem
+                  value={value}
+                  key={index}
+                  sx={{
+                    zIndex: 1500,
+                  }}
+                >
                   {value === undefined ? '' : getFacetTypeFriendlyName(value)}
                 </MenuItem>
               )
diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditor.tsx b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditor.tsx
index 7ef109cfe5..0b04979108 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditor.tsx
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditor.tsx
@@ -9,7 +9,7 @@ import { useDeepCompareMemoize } from 'use-deep-compare-effect'
 import { SkeletonTable } from '../Skeleton'
 import { convertToEntityType } from '../../utils/functions/EntityTypeUtils'
 import TableColumnSchemaForm, { SubmitHandle } from './TableColumnSchemaForm'
-import { Alert, Button } from '@mui/material'
+import { Alert, Button, Divider } from '@mui/material'
 import { ColumnModelFormData } from './TableColumnSchemaFormReducer'
 import {
   getViewScopeForEntity,
@@ -102,12 +102,12 @@ function _TableColumnSchemaEditor(props: TableColumnSchemaEditorProps) {
           onSubmit(formData)
         }}
       />
+      <Divider />
       {error && (
         <Alert severity={'error'} sx={{ my: 2 }}>
           {error?.message}
         </Alert>
       )}
-
       <Button
         variant="contained"
         color="primary"
diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.ts b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.ts
index e23f26d74d..c909d4543d 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.ts
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaEditorUtils.ts
@@ -266,8 +266,8 @@ export function transformFormDataToColumnModels(
 ): SetOptional<ColumnModel, 'id'>[] {
   return formData.map(
     (formEntry: ColumnModelFormData): SetOptional<ColumnModel, 'id'> => {
-      // Remove the isSelected field because it was only used for the UI.
-      const { isSelected, ...rest } = formEntry
+      // Remove the isSelected and isOriginallyDefaultColumn fields because these were only used for the UI.
+      const { isSelected, isOriginallyDefaultColumn, ...rest } = formEntry
       const columnModel = rest as SetOptional<ColumnModel, 'id'>
       if (columnModel.jsonSubColumns) {
         columnModel.jsonSubColumns = (
diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
index 265338971b..e93cb9d948 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
@@ -40,6 +40,7 @@ import {
 import {
   getAllowedColumnTypes,
   transformColumnModelsToFormData,
+  transformFormDataToColumnModels,
 } from './TableColumnSchemaEditorUtils'
 import {
   useGetAnnotationColumnModels,
@@ -82,6 +83,8 @@ export const HIERARCHY_END_COMPONENT = (
 export type SubmitHandle = {
   // Allow the parent component to trigger a submit of the form, so this may be embedded in an arbitrary modal.
   submit: () => void
+  // Imperative handle to get the data out of the form for SWC compatibility
+  getEditedColumnModels: () => SetOptional<ColumnModel, 'id'>[]
 }
 
 type TableColumnSchemaFormProps = {
@@ -174,6 +177,9 @@ const TableColumnSchemaForm = React.forwardRef<
         submit() {
           onSubmit(readFormData())
         },
+        getEditedColumnModels() {
+          return transformFormDataToColumnModels(readFormData())
+        },
       }
     },
     [onSubmit, readFormData],
@@ -225,7 +231,12 @@ const TableColumnSchemaForm = React.forwardRef<
 
   const addDefaultColumns = useCallback(() => {
     if (defaultColumnModels) {
-      addColumnSet(defaultColumnModels)
+      addColumnSet(
+        defaultColumnModels.map(cm => ({
+          ...cm,
+          id: undefined,
+        })),
+      )
     }
   }, [defaultColumnModels, addColumnSet])
 
@@ -240,8 +251,6 @@ const TableColumnSchemaForm = React.forwardRef<
       component={'form'}
       sx={{
         py: 2.5,
-        borderBottom: '2px solid',
-        borderColor: 'grey.300',
       }}
     >
       <TableColumnSchemaFormActions disabled={isSubmitting} />
diff --git a/packages/synapse-react-client/src/umd.index.ts b/packages/synapse-react-client/src/umd.index.ts
index 816d86092e..59d6f6c0ea 100644
--- a/packages/synapse-react-client/src/umd.index.ts
+++ b/packages/synapse-react-client/src/umd.index.ts
@@ -69,6 +69,7 @@ import SubscriptionPage from './components/SubscriptionPage'
 import OrientationBanner from './components/OrientationBanner/OrientationBanner'
 import AccessRequirementList from './components/AccessRequirementList/AccessRequirementList'
 import { BackendDestinationEnum } from './utils/functions'
+import TableColumnSchemaForm from './components/TableColumnSchemaEditor/TableColumnSchemaForm'
 
 // Also include scss in the bundle
 import './style/main.scss'
@@ -143,6 +144,7 @@ const SynapseComponents = {
   SubscriptionPage,
   OrientationBanner,
   AccessRequirementList,
+  TableColumnSchemaForm,
 }
 
 // Include the version in the build
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d611a0def8..3d7b726c9f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,5 +1,9 @@
 lockfileVersion: '6.0'
 
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
+
 overrides:
   word-wrap: ^1.2.4
   semver: ^7.5.4
@@ -72,17 +76,17 @@ importers:
         specifier: ^11.11.0
         version: 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
       '@mui/icons-material':
-        specifier: ^5.13.7
-        version: 5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.16
+        version: 5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0)
       '@mui/material':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@mui/system':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
       '@mui/utils':
-        specifier: ^5.13.7
-        version: 5.13.7(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@react-hookz/web':
         specifier: ^23.1.0
         version: 23.1.0(react-dom@18.2.0)(react@18.2.0)
@@ -286,11 +290,11 @@ importers:
         specifier: ^11.11.0
         version: 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
       '@mui/icons-material':
-        specifier: ^5.13.7
-        version: 5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.16
+        version: 5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0)
       '@mui/material':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@react-hookz/web':
         specifier: ^23.1.0
         version: 23.1.0(react-dom@18.2.0)(react@18.2.0)
@@ -509,11 +513,11 @@ importers:
         specifier: ^11.11.0
         version: 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
       '@mui/icons-material':
-        specifier: ^5.13.7
-        version: 5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.16
+        version: 5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0)
       '@mui/material':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@react-hookz/web':
         specifier: ^23.1.0
         version: 23.1.0(react-dom@18.2.0)(react@18.2.0)
@@ -765,23 +769,23 @@ importers:
         specifier: ^11.11.0
         version: 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
       '@mui/icons-material':
-        specifier: ^5.13.7
-        version: 5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.16
+        version: 5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0)
       '@mui/material':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@mui/system':
-        specifier: ^5.13.7
-        version: 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
       '@mui/utils':
-        specifier: ^5.13.7
-        version: 5.13.7(react@18.2.0)
+        specifier: ^5.14.17
+        version: 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@mui/x-data-grid':
         specifier: 5.17.26
-        version: 5.17.26(@mui/material@5.13.7)(@mui/system@5.13.7)(react-dom@18.2.0)(react@18.2.0)
+        version: 5.17.26(@mui/material@5.14.17)(@mui/system@5.14.17)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@mui/x-date-pickers':
         specifier: ^5.0.20
-        version: 5.0.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.13.7)(@mui/system@5.13.7)(dayjs@1.11.9)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0)
+        version: 5.0.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.17)(@mui/system@5.14.17)(@types/react@18.0.27)(dayjs@1.11.9)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0)
       '@popperjs/core':
         specifier: ^2.11.8
         version: 2.11.8
@@ -799,7 +803,7 @@ importers:
         version: 5.12.1(@rjsf/utils@5.12.1)(react@18.2.0)
       '@rjsf/mui':
         specifier: 5.12.1
-        version: 5.12.1(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/icons-material@5.13.7)(@mui/material@5.13.7)(@rjsf/core@5.12.1)(@rjsf/utils@5.12.1)(react@18.2.0)
+        version: 5.12.1(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.16)(@mui/material@5.14.17)(@rjsf/core@5.12.1)(@rjsf/utils@5.12.1)(react@18.2.0)
       '@rjsf/utils':
         specifier: 5.12.1
         version: 5.12.1(react@18.2.0)
@@ -892,7 +896,7 @@ importers:
         version: 1.0.6
       mui-one-time-password-input:
         specifier: 1.1.0
-        version: 1.1.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.13.7)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+        version: 1.1.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.17)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       papaparse:
         specifier: ^5.4.1
         version: 5.4.1
@@ -3669,11 +3673,24 @@ packages:
   /@floating-ui/core@1.3.1:
     resolution: {integrity: sha512-Bu+AMaXNjrpjh41znzHqaz3r2Nr8hHuHZT6V2LBKMhyMl0FgKA62PNYbqnfgmzOhoWZj70Zecisbo4H1rotP5g==}
 
+  /@floating-ui/core@1.5.0:
+    resolution: {integrity: sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==}
+    dependencies:
+      '@floating-ui/utils': 0.1.6
+    dev: false
+
   /@floating-ui/dom@1.4.4:
     resolution: {integrity: sha512-21hhDEPOiWkGp0Ys4Wi6Neriah7HweToKra626CIK712B5m9qkdz54OP9gVldUg+URnBTpv/j/bi/skmGdstXQ==}
     dependencies:
       '@floating-ui/core': 1.3.1
 
+  /@floating-ui/dom@1.5.3:
+    resolution: {integrity: sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==}
+    dependencies:
+      '@floating-ui/core': 1.5.0
+      '@floating-ui/utils': 0.1.6
+    dev: false
+
   /@floating-ui/react-dom@1.3.0(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-htwHm67Ji5E/pROEAr7f8IKFShuiCKHwUC/UY4vC3I5jiSvGFAYnSYiZO5MlGmads+QqvUkR9ANHEguGrDv72g==}
     peerDependencies:
@@ -3685,6 +3702,17 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
     dev: true
 
+  /@floating-ui/react-dom@2.0.3(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-wOoKUw2P24/OXbNr3bbCqWgoltsyY7lFBDPVtjj/V4WDIJ5hja2C/r+CoWmS+Y75Ahndds3wa7eJRhnJxTCJaQ==}
+    peerDependencies:
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
+    dependencies:
+      '@floating-ui/dom': 1.5.3
+      react: 18.2.0
+      react-dom: 18.2.0(react@18.2.0)
+    dev: false
+
   /@floating-ui/react@0.19.2(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-JyNk4A0Ezirq8FlXECvRtQOX/iBe5Ize0W/pLkrZjfHW9GUV7Xnq6zm6fyZuQzaHHqEnVizmvlA96e1/CkZv+w==}
     peerDependencies:
@@ -3698,6 +3726,10 @@ packages:
       tabbable: 6.2.0
     dev: true
 
+  /@floating-ui/utils@0.1.6:
+    resolution: {integrity: sha512-OfX7E2oUDYxtBvsuS4e/jSn4Q9Qb6DzgeYtsAdkPZ47znpoNsMgZw0+tVijiv3uGNR6dgNlty6r9rzIzHjtd/A==}
+    dev: false
+
   /@googlemaps/jest-mocks@2.19.2:
     resolution: {integrity: sha512-D9Kdz56gDlLZjXgBZTd/GQAOG7fe4VrvsDRrNtKCq4poiatT8RyRFf/V4le6up/6URVGboQvytdQn4ed1T4M9A==}
     dev: true
@@ -4232,8 +4264,8 @@ packages:
       - supports-color
     dev: true
 
-  /@mui/base@5.0.0-beta.6(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-jcHy6HwOX7KzRhRtL8nvIvUlxvLx2Fl6NMRCyUSQSvMTyfou9kndekz0H4HJaXvG1Y4WEifk23RYedOlrD1kEQ==}
+  /@mui/base@5.0.0-beta.23(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-9L8SQUGAWtd/Qi7Qem26+oSSgpY7f2iQTuvcz/rsGpyZjSomMMO6lwYeQSA0CpWM7+aN7eGoSY/WV6wxJiIxXw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0
@@ -4244,24 +4276,23 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.23.2
-      '@emotion/is-prop-valid': 1.2.1
-      '@mui/types': 7.2.4(@types/react@18.0.27)
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@floating-ui/react-dom': 2.0.3(react-dom@18.2.0)(react@18.2.0)
+      '@mui/types': 7.2.8(@types/react@18.0.27)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@popperjs/core': 2.11.8
       '@types/react': 18.0.27
-      clsx: 1.2.1
+      clsx: 2.0.0
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
-      react-is: 18.2.0
     dev: false
 
-  /@mui/core-downloads-tracker@5.13.7:
-    resolution: {integrity: sha512-/suIo4WoeL/OyO3KUsFVpdOmKiSAr6NpWXmQ4WLSxwKrTiha1FJxM6vwAki5W/5kR9WnVLw5E8JC4oHHsutT8w==}
+  /@mui/core-downloads-tracker@5.14.17:
+    resolution: {integrity: sha512-eE0uxrpJAEL2ZXkeGLKg8HQDafsiXY+6eNpP4lcv3yIjFfGbU6Hj9/P7Adt8jpU+6JIhmxvILGj2r27pX+zdrQ==}
     dev: false
 
-  /@mui/icons-material@5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0):
-    resolution: {integrity: sha512-zoVtkb9jYVUGfI7CobOdDBEAlpg3XESiO6cWqSDGwEma69+CBDIAwGpnO5truvQDJHBGSAfzFj3nObwxjkyA7Q==}
+  /@mui/icons-material@5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-wmOgslMEGvbHZjFLru8uH5E+pif/ciXAvKNw16q6joK6EWVWU5rDYWFknDaZhCvz8ZE/K8ZnJQ+lMG6GgHzXbg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@mui/material': ^5.0.0
@@ -4271,14 +4302,14 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.22.6
-      '@mui/material': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@babel/runtime': 7.23.2
+      '@mui/material': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.0.27
       react: 18.2.0
     dev: false
 
-  /@mui/material@5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
-    resolution: {integrity: sha512-+n453jDDm88zZM3b5YK29nZ7gXY+s+rryH9ovDbhmfSkOlFtp+KSqbXy5cTaC/UlDqDM7sYYJGq8BmJov3v9Tg==}
+  /@mui/material@5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+    resolution: {integrity: sha512-+y0VeOLWfEA4Z98We/UH6KCo8+f2HLZDK45FY+sJf8kSojLy3VntadKtC/u0itqnXXb1Pr4wKB2tSIBW02zY4Q==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@emotion/react': ^11.5.0
@@ -4294,17 +4325,17 @@ packages:
       '@types/react':
         optional: true
     dependencies:
-      '@babel/runtime': 7.22.6
+      '@babel/runtime': 7.23.2
       '@emotion/react': 11.11.1(@types/react@18.0.27)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/base': 5.0.0-beta.6(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
-      '@mui/core-downloads-tracker': 5.13.7
-      '@mui/system': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/types': 7.2.4(@types/react@18.0.27)
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@mui/base': 5.0.0-beta.23(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@mui/core-downloads-tracker': 5.14.17
+      '@mui/system': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
+      '@mui/types': 7.2.8(@types/react@18.0.27)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@types/react': 18.0.27
-      '@types/react-transition-group': 4.4.6
-      clsx: 1.2.1
+      '@types/react-transition-group': 4.4.9
+      clsx: 2.0.0
       csstype: 3.1.2
       prop-types: 15.8.1
       react: 18.2.0
@@ -4313,8 +4344,8 @@ packages:
       react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
     dev: false
 
-  /@mui/private-theming@5.13.7(@types/react@18.0.27)(react@18.2.0):
-    resolution: {integrity: sha512-qbSr+udcij5F9dKhGX7fEdx2drXchq7htLNr2Qg2Ma+WJ6q0ERlEqGSBiPiVDJkptcjeVL4DGmcf1wl5+vD4EA==}
+  /@mui/private-theming@5.14.17(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-u4zxsCm9xmQrlhVPug+Ccrtsjv7o2+rehvrgHoh0siSguvVgVQq5O3Hh10+tp/KWQo2JR4/nCEwquSXgITS1+g==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@types/react': ^17.0.0 || ^18.0.0
@@ -4324,14 +4355,14 @@ packages:
         optional: true
     dependencies:
       '@babel/runtime': 7.23.2
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@types/react': 18.0.27
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
 
-  /@mui/styled-engine@5.13.2(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
-    resolution: {integrity: sha512-VCYCU6xVtXOrIN8lcbuPmoG+u7FYuOERG++fpY74hPpEWkyFQG97F+/XfTQVYzlR2m7nPjnwVUgATcTCMEaMvw==}
+  /@mui/styled-engine@5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0):
+    resolution: {integrity: sha512-AqpVjBEA7wnBvKPW168bNlqB6EN7HxTjLOY7oi275AzD/b1C7V0wqELy6NWoJb2yya5sRf7ENf4iNi3+T5cOgw==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@emotion/react': ^11.4.1
@@ -4352,8 +4383,8 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@mui/system@5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0):
-    resolution: {integrity: sha512-7R2KdI6vr8KtnauEfg9e9xQmPk6Gg/1vGNiALYyhSI+cYztxN6WmlSqGX4bjWn/Sygp1TUE1jhFEgs7MWruhkQ==}
+  /@mui/system@5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-Ccz3XlbCqka6DnbHfpL3o3TfOeWQPR+ewvNAgm8gnS9M0yVMmzzmY6z0w/C1eebb+7ZP7IoLUj9vojg/GBaTPg==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       '@emotion/react': ^11.5.0
@@ -4371,21 +4402,21 @@ packages:
       '@babel/runtime': 7.23.2
       '@emotion/react': 11.11.1(@types/react@18.0.27)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/private-theming': 5.13.7(@types/react@18.0.27)(react@18.2.0)
-      '@mui/styled-engine': 5.13.2(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
-      '@mui/types': 7.2.4(@types/react@18.0.27)
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@mui/private-theming': 5.14.17(@types/react@18.0.27)(react@18.2.0)
+      '@mui/styled-engine': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(react@18.2.0)
+      '@mui/types': 7.2.8(@types/react@18.0.27)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@types/react': 18.0.27
-      clsx: 1.2.1
+      clsx: 2.0.0
       csstype: 3.1.2
       prop-types: 15.8.1
       react: 18.2.0
     dev: false
 
-  /@mui/types@7.2.4(@types/react@18.0.27):
-    resolution: {integrity: sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA==}
+  /@mui/types@7.2.8(@types/react@18.0.27):
+    resolution: {integrity: sha512-9u0ji+xspl96WPqvrYJF/iO+1tQ1L5GTaDOeG3vCR893yy7VcWwRNiVMmPdPNpMDqx0WV1wtEW9OMwK9acWJzQ==}
     peerDependencies:
-      '@types/react': '*'
+      '@types/react': ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
       '@types/react':
         optional: true
@@ -4393,21 +4424,25 @@ packages:
       '@types/react': 18.0.27
     dev: false
 
-  /@mui/utils@5.13.7(react@18.2.0):
-    resolution: {integrity: sha512-/3BLptG/q0u36eYED7Nhf4fKXmcKb6LjjT7ZMwhZIZSdSxVqDqSTmATW3a56n3KEPQUXCU9TpxAfCBQhs6brVA==}
+  /@mui/utils@5.14.17(@types/react@18.0.27)(react@18.2.0):
+    resolution: {integrity: sha512-yxnWgSS4J6DMFPw2Dof85yBkG02VTbEiqsikymMsnZnXDurtVGTIhlNuV24GTmFTuJMzEyTTU9UF+O7zaL8LEQ==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
+      '@types/react': ^17.0.0 || ^18.0.0
       react: ^17.0.0 || ^18.0.0
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
     dependencies:
       '@babel/runtime': 7.23.2
-      '@types/prop-types': 15.7.5
-      '@types/react-is': 18.2.1
+      '@types/prop-types': 15.7.10
+      '@types/react': 18.0.27
       prop-types: 15.8.1
       react: 18.2.0
       react-is: 18.2.0
     dev: false
 
-  /@mui/x-data-grid@5.17.26(@mui/material@5.13.7)(@mui/system@5.13.7)(react-dom@18.2.0)(react@18.2.0):
+  /@mui/x-data-grid@5.17.26(@mui/material@5.14.17)(@mui/system@5.14.17)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-eGJq9J0g9cDGLFfMmugOadZx0mJeOd/yQpHwEa5gUXyONS6qF0OhXSWyDOhDdA3l2TOoQzotMN5dY/T4Wl1KYA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -4417,17 +4452,19 @@ packages:
       react-dom: ^17.0.2 || ^18.0.0
     dependencies:
       '@babel/runtime': 7.23.2
-      '@mui/material': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
-      '@mui/system': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@mui/material': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@mui/system': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       clsx: 1.2.1
       prop-types: 15.8.1
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
       reselect: 4.1.8
+    transitivePeerDependencies:
+      - '@types/react'
     dev: false
 
-  /@mui/x-date-pickers@5.0.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.13.7)(@mui/system@5.13.7)(dayjs@1.11.9)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0):
+  /@mui/x-date-pickers@5.0.20(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.17)(@mui/system@5.14.17)(@types/react@18.0.27)(dayjs@1.11.9)(moment@2.29.4)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-ERukSeHIoNLbI1C2XRhF9wRhqfsr+Q4B1SAw2ZlU7CWgcG8UBOxgqRKDEOVAIoSWL+DWT6GRuQjOKvj6UXZceA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -4463,9 +4500,9 @@ packages:
       '@date-io/moment': 2.16.1(moment@2.29.4)
       '@emotion/react': 11.11.1(@types/react@18.0.27)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/material': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
-      '@mui/system': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/utils': 5.13.7(react@18.2.0)
+      '@mui/material': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@mui/system': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react@18.2.0)
+      '@mui/utils': 5.14.17(@types/react@18.0.27)(react@18.2.0)
       '@types/react-transition-group': 4.4.6
       clsx: 1.2.1
       dayjs: 1.11.9
@@ -4475,6 +4512,8 @@ packages:
       react-dom: 18.2.0(react@18.2.0)
       react-transition-group: 4.4.5(react-dom@18.2.0)(react@18.2.0)
       rifm: 0.12.1(react@18.2.0)
+    transitivePeerDependencies:
+      - '@types/react'
     dev: false
 
   /@ndelangen/get-tarball@3.0.9:
@@ -5011,7 +5050,7 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@rjsf/mui@5.12.1(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/icons-material@5.13.7)(@mui/material@5.13.7)(@rjsf/core@5.12.1)(@rjsf/utils@5.12.1)(react@18.2.0):
+  /@rjsf/mui@5.12.1(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/icons-material@5.14.16)(@mui/material@5.14.17)(@rjsf/core@5.12.1)(@rjsf/utils@5.12.1)(react@18.2.0):
     resolution: {integrity: sha512-d7cNFIdt6N24m5NPrNSqfCe2SUyUjX48Goo7z4J9vOHWxo5kdDfBEa3UwNA/DR9lo+9cYY7QTvKbgrTkxWU58A==}
     engines: {node: '>=14'}
     peerDependencies:
@@ -5025,8 +5064,8 @@ packages:
     dependencies:
       '@emotion/react': 11.11.1(@types/react@18.0.27)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/icons-material': 5.13.7(@mui/material@5.13.7)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/material': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@mui/icons-material': 5.14.16(@mui/material@5.14.17)(@types/react@18.0.27)(react@18.2.0)
+      '@mui/material': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@rjsf/core': 5.12.1(@rjsf/utils@5.12.1)(react@18.2.0)
       '@rjsf/utils': 5.12.1(react@18.2.0)
       react: 18.2.0
@@ -7304,6 +7343,10 @@ packages:
     resolution: {integrity: sha512-VjID5MJb1eGKthz2qUerWT8+R4b9N+CHvGCzg9fn4kWZgaF9AhdYikQio3R7wV8YY1NsQKPaCwKz1Yff+aHNUQ==}
     dev: true
 
+  /@types/prop-types@15.7.10:
+    resolution: {integrity: sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==}
+    dev: false
+
   /@types/prop-types@15.7.5:
     resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
 
@@ -7356,12 +7399,6 @@ packages:
       - react-dom
     dev: true
 
-  /@types/react-is@18.2.1:
-    resolution: {integrity: sha512-wyUkmaaSZEzFZivD8F2ftSyAfk6L+DfFliVj/mYdOXbVjRcS87fQJLTnhk6dRZPuJjI+9g6RZJO4PNCngUrmyw==}
-    dependencies:
-      '@types/react': 18.0.27
-    dev: false
-
   /@types/react-mailchimp-subscribe@2.1.1:
     resolution: {integrity: sha512-ic6ruLaDdlgwj94CeML/FGHiMacXB92bZbmJimNKVzrc147/hORPCy3nZ4MHGKBiZNVqi4NBmX1pN6i3Kbg1JA==}
     dependencies:
@@ -7411,6 +7448,12 @@ packages:
     dependencies:
       '@types/react': 18.0.27
 
+  /@types/react-transition-group@4.4.9:
+    resolution: {integrity: sha512-ZVNmWumUIh5NhH8aMD9CR2hdW0fNuYInlocZHaZ+dgk/1K49j1w/HoAuK1ki+pgscQrOFRTlXeoURtuzEkV3dg==}
+    dependencies:
+      '@types/react': 18.0.27
+    dev: false
+
   /@types/react-virtualized-auto-sizer@1.0.1:
     resolution: {integrity: sha512-GH8sAnBEM5GV9LTeiz56r4ZhMOUSrP43tAQNSRVxNexDjcNKLCEtnxusAItg1owFUFE6k0NslV26gqVClVvong==}
     dependencies:
@@ -9121,6 +9164,11 @@ packages:
     engines: {node: '>=6'}
     dev: false
 
+  /clsx@2.0.0:
+    resolution: {integrity: sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==}
+    engines: {node: '>=6'}
+    dev: false
+
   /co@4.6.0:
     resolution: {integrity: sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==}
     engines: {iojs: '>= 1.0.0', node: '>= 0.12.0'}
@@ -14113,7 +14161,7 @@ packages:
       - supports-color
     dev: true
 
-  /mui-one-time-password-input@1.1.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.13.7)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
+  /mui-one-time-password-input@1.1.0(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@mui/material@5.14.17)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0):
     resolution: {integrity: sha512-PUAsTHZk9HNewrpqo2z+xlQqnI36ltzYvvVFFe2HLsRk42TNM3W0GM6oZXpCrhNLBE4rCcujU6PhICqyzDlsXw==}
     peerDependencies:
       '@emotion/react': ^11.5.0
@@ -14128,7 +14176,7 @@ packages:
     dependencies:
       '@emotion/react': 11.11.1(@types/react@18.0.27)(react@18.2.0)
       '@emotion/styled': 11.11.0(@emotion/react@11.11.1)(@types/react@18.0.27)(react@18.2.0)
-      '@mui/material': 5.13.7(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
+      '@mui/material': 5.14.17(@emotion/react@11.11.1)(@emotion/styled@11.11.0)(@types/react@18.0.27)(react-dom@18.2.0)(react@18.2.0)
       '@types/react': 18.0.27
       react: 18.2.0
       react-dom: 18.2.0(react@18.2.0)
@@ -18673,7 +18721,3 @@ packages:
       react: 18.2.0
       use-sync-external-store: 1.2.0(react@18.2.0)
     dev: false
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false

From 0bb4e1d279eaabe8a3cbef87ad4674b828469fce Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 15:25:46 -0800
Subject: [PATCH 2/6] SWC-6548 - TableColumnSchemaForm: onSubmit + isSubmitting
 are optional

---
 .../TableColumnSchemaForm.tsx                      | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
index e93cb9d948..9b99bc6877 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/TableColumnSchemaForm.tsx
@@ -27,7 +27,7 @@ import {
   styled,
   Typography,
 } from '@mui/material'
-import { isEqual, times } from 'lodash-es'
+import { isEqual, noop, times } from 'lodash-es'
 import { selectAtom, useAtomCallback } from 'jotai/utils'
 import ColumnModelForm from './ColumnModelForm'
 import AddToList from '../../assets/icons/AddToList'
@@ -93,8 +93,8 @@ type TableColumnSchemaFormProps = {
   /* If this is an entity view, the ViewScope can be used to determine the default column models and fetch annotation column models */
   viewScope?: ViewScope
   initialData?: ColumnModel[]
-  onSubmit: (formData: ColumnModelFormData[]) => void
-  isSubmitting: boolean
+  onSubmit?: (formData: ColumnModelFormData[]) => void
+  isSubmitting?: boolean
 }
 
 const ColumnHeader: StyledComponent<BoxProps> = styled(Box, {
@@ -107,7 +107,13 @@ const TableColumnSchemaForm = React.forwardRef<
   SubmitHandle,
   TableColumnSchemaFormProps
 >(function TableColumnSchemaForm(props, ref) {
-  const { initialData, entityType, viewScope, onSubmit, isSubmitting } = props
+  const {
+    initialData,
+    entityType,
+    viewScope,
+    onSubmit = noop,
+    isSubmitting = false,
+  } = props
 
   const numColumnModels = useAtomValue(
     useMemo(() => atom(get => get(tableColumnSchemaFormDataAtom).length), []),

From 7036e3f90572b8dbda8dd3c917f401e8374f6f89 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 15:38:17 -0800
Subject: [PATCH 3/6] SWC-6548 - Add test for column alias fix

---
 ...yVisualizationWrapper.integration.test.tsx | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.integration.test.tsx b/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.integration.test.tsx
index efc6dcf38f..3457beaf98 100644
--- a/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.integration.test.tsx
+++ b/packages/synapse-react-client/src/components/QueryVisualizationWrapper/QueryVisualizationWrapper.integration.test.tsx
@@ -281,5 +281,37 @@ describe('QueryVisualizationWrapper', () => {
         )
       })
     })
+
+    test('Returns the faceted jsonSubColumn name if force-display-original-column-names is true', async () => {
+      localStorage.setItem('force-display-original-column-names', 'true')
+      const queryResponseWithJsonSubColumn = cloneDeep(queryResponse)
+      queryResponseWithJsonSubColumn.columnModels = [
+        {
+          columnType: ColumnTypeEnum.JSON,
+          name: 'someJsonColumn',
+          id: '123',
+          jsonSubColumns: [
+            {
+              name: 'Sub column name',
+              columnType: ColumnTypeEnum.STRING,
+              facetType: 'enumeration',
+              jsonPath: '$.someJsonPath',
+            },
+          ],
+        },
+      ]
+      server.use(...getHandlersForTableQuery(queryResponseWithJsonSubColumn))
+
+      render(<TestComponent />, { wrapper: createWrapper() })
+
+      await waitFor(() => {
+        const getColumnDisplayName =
+          onContextReceived.mock.lastCall![0].getColumnDisplayName
+        expect(getColumnDisplayName).toBeDefined()
+        expect(getColumnDisplayName('someJsonColumn', '$.someJsonPath')).toBe(
+          'Sub column name',
+        )
+      })
+    })
   })
 })

From 0b52634b36b78932ed2b51fa1352d50f188608f8 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 15:54:24 -0800
Subject: [PATCH 4/6] SWC-6548 - Drop unnecessary z-index override

---
 .../TableColumnSchemaEditor/ColumnModelForm.tsx  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
index 2e32b70b60..3fc1196bd5 100644
--- a/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
+++ b/packages/synapse-react-client/src/components/TableColumnSchemaEditor/ColumnModelForm.tsx
@@ -208,13 +208,7 @@ export default function ColumnModelForm(props: ColumnModelFormProps) {
             >
               {allowedColumnTypes.map(value => {
                 return (
-                  <MenuItem
-                    value={value}
-                    key={value}
-                    sx={{
-                      zIndex: 1500,
-                    }}
-                  >
+                  <MenuItem value={value} key={value}>
                     {getColumnTypeFriendlyName(value)}
                   </MenuItem>
                 )
@@ -390,13 +384,7 @@ export default function ColumnModelForm(props: ColumnModelFormProps) {
           >
             {(allowedFacetTypes ?? []).map((value, index) => {
               return (
-                <MenuItem
-                  value={value}
-                  key={index}
-                  sx={{
-                    zIndex: 1500,
-                  }}
-                >
+                <MenuItem value={value} key={index}>
                   {value === undefined ? '' : getFacetTypeFriendlyName(value)}
                 </MenuItem>
               )

From 503b2878f8598783c564c317a43223b3d886d362 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 16:08:57 -0800
Subject: [PATCH 5/6] SWC-6548 - Fix broken test (likely caused by MUI upgrade)

---
 .../TimelinePlot/TimelinePlotSpeciesSelector.test.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/synapse-react-client/src/components/TimelinePlot/TimelinePlotSpeciesSelector.test.tsx b/packages/synapse-react-client/src/components/TimelinePlot/TimelinePlotSpeciesSelector.test.tsx
index 3456610f17..75811cda67 100644
--- a/packages/synapse-react-client/src/components/TimelinePlot/TimelinePlotSpeciesSelector.test.tsx
+++ b/packages/synapse-react-client/src/components/TimelinePlot/TimelinePlotSpeciesSelector.test.tsx
@@ -1,7 +1,7 @@
 import { act, render, screen, waitFor } from '@testing-library/react'
 import React from 'react'
 import { createWrapper } from '../../testutils/TestingLibraryUtils'
-import { SynapseClient } from '../../index'
+import SynapseClient from '../../synapse-client'
 import queryResultBundleJson from '../../mocks/query/syn51735464GroupBySpecies'
 import TimelinePlotSpeciesSelector, {
   TimelinePlotSpeciesSelectorProps,
@@ -57,7 +57,7 @@ describe('TimelinePlotSpeciesSelector tests', () => {
     )
     // verify the first row has been selected by default
     expect(setSpecies).toHaveBeenCalledWith('Mus musculus')
-    const dropdown = await screen.findByRole('button')
+    const dropdown = await screen.findByRole('combobox')
     await userEvent.click(dropdown)
     await userEvent.click(await screen.findByText('Saccharomyces'))
     expect(setSpecies).toHaveBeenCalledWith('Saccharomyces')

From afb01bf4f8463ba1e1a32c3132caac423e78a929 Mon Sep 17 00:00:00 2001
From: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Date: Wed, 8 Nov 2023 16:38:55 -0800
Subject: [PATCH 6/6] SWC-6548 - Update changed snapshot

---
 .../__snapshots__/MarkdownSynapse.integration.test.tsx.snap     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/synapse-react-client/test/containers/markdown/__snapshots__/MarkdownSynapse.integration.test.tsx.snap b/packages/synapse-react-client/test/containers/markdown/__snapshots__/MarkdownSynapse.integration.test.tsx.snap
index 28ea0a889a..6ec9b53968 100644
--- a/packages/synapse-react-client/test/containers/markdown/__snapshots__/MarkdownSynapse.integration.test.tsx.snap
+++ b/packages/synapse-react-client/test/containers/markdown/__snapshots__/MarkdownSynapse.integration.test.tsx.snap
@@ -51,7 +51,7 @@ exports[`MarkdownSynapse tests Snapshot tests works with header and a link 1`] =
       >
         header 
         <a
-          class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-e43ad7-MuiTypography-root-MuiLink-root"
+          class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-jgibl5-MuiTypography-root-MuiLink-root"
           href="https://synapse.org"
           target="_blank"
         >