Merge branch 'main' into PORTALS-3305

Sage-Bionetworks · Jan 9, 2025 · 9a7c2a5 · 9a7c2a5
2 parents 6eba111 + b3e26b5
commit 9a7c2a5
Show file tree

Hide file tree

Showing 93 changed files with 3,568 additions and 6,873 deletions.
diff --git a/apps/SageAccountWeb/src/components/RegisterAccount2.tsx b/apps/SageAccountWeb/src/components/RegisterAccount2.tsx
@@ -213,7 +213,7 @@ export const RegisterAccount2 = (props: RegisterAccount2Props) => {
             <Typography variant="smallText1" sx={{ marginTop: '20px' }}>
               Your <strong>password</strong> needs to be at least 8 letters. We
               recommend using a strong, unique <strong>password</strong> of
-              between 16-32 characters. You can use letters, numbers, and
+              between 8-32 characters. You can use letters, numbers, and
               punctuation marks.
             </Typography>
           </div>

diff --git a/apps/SageAccountWeb/src/components/ResetPassword.tsx b/apps/SageAccountWeb/src/components/ResetPassword.tsx
@@ -28,7 +28,7 @@ export const SetPasswordInstructions = (
     <Typography variant="headline2">{props.title}</Typography>
     <Typography variant="smallText1">
       We recommend using a strong, unique <strong>password</strong> of between
-      16-32 characters. A valid password must be at least 8 characters long and
+      8-32 characters. A valid password must be at least 8 characters long and
       must include letters, digits (0-9), and special characters
       ~!@#$%^&*_-+=`|\(){}[]:;&quot;&apos;&lt;&gt;,.?/
     </Typography>

diff --git a/apps/portals/elportal/src/pages/StudyDetailsPage.tsx b/apps/portals/elportal/src/pages/StudyDetailsPage.tsx
@@ -7,6 +7,7 @@ import {
 import DetailsPage from '@sage-bionetworks/synapse-portal-framework/components/DetailsPage/index'
 import { MarkdownSynapseFromColumnData } from '@sage-bionetworks/synapse-portal-framework/components/DetailsPage/markdown/MarkdownSynapseFromColumnData'
 import RedirectWithQuery from '@sage-bionetworks/synapse-portal-framework/components/RedirectWithQuery'
+import RedirectToURL from '@sage-bionetworks/synapse-portal-framework/components/RedirectToURL'
 import { useGetPortalComponentSearchParams } from '@sage-bionetworks/synapse-portal-framework/utils/UseGetPortalComponentSearchParams'
 import { ColumnSingleValueFilterOperator } from '@sage-bionetworks/synapse-types'
 import { Outlet, RouteObject } from 'react-router-dom'
@@ -49,63 +50,71 @@ export const studyDetailsPageRoutes: RouteObject[] = [
   {
     path: studyDetailsPageTabConfig[0].path,
     element: (
-      <DetailsPageContent
-        content={[
-          {
-            id: 'Study Description',
-            title: 'Study Description',
-            element: (
-              <MarkdownSynapseFromColumnData columnName={'studyDescription'} />
-            ),
-          },
-          {
-            id: 'Acknowledgement',
-            title: 'Acknowledgement',
-            element: (
-              <MarkdownSynapseFromColumnData columnName={'ackContext'} />
-            ),
-          },
-          {
-            id: 'acknowledgementFull',
-            element: (
-              <MarkdownSynapseFromColumnData
-                columnName={'acknowledgment'}
-                MarkdownCollapseProps={{
-                  textDescription: 'full statement',
-                  showCopyPlainText: true,
-                }}
-              />
-            ),
-          },
-          {
-            id: 'Methods',
-            title: 'Methods',
-            element: <MarkdownSynapseFromColumnData columnName={'methods'} />,
-          },
-          {
-            id: 'Related Studies',
-            title: 'Related Studies',
-            element: (
-              <DetailsPageContextConsumer columnName={'relatedStudies'}>
-                {({ value }) => {
-                  if (!value) {
-                    return null
-                  }
+      <>
+        <DetailsPageContent
+          content={[
+            {
+              id: 'Study Description',
+              title: 'Study Description',
+              element: (
+                <MarkdownSynapseFromColumnData
+                  columnName={'studyDescription'}
+                />
+              ),
+            },
+            {
+              id: 'Acknowledgement',
+              title: 'Acknowledgement',
+              element: (
+                <MarkdownSynapseFromColumnData columnName={'ackContext'} />
+              ),
+            },
+            {
+              id: 'acknowledgementFull',
+              element: (
+                <MarkdownSynapseFromColumnData
+                  columnName={'acknowledgment'}
+                  MarkdownCollapseProps={{
+                    textDescription: 'full statement',
+                    showCopyPlainText: true,
+                  }}
+                />
+              ),
+            },
+            {
+              id: 'Methods',
+              title: 'Methods',
+              element: <MarkdownSynapseFromColumnData columnName={'methods'} />,
+            },
+            {
+              id: 'Related Studies',
+              title: 'Related Studies',
+              element: (
+                <DetailsPageContextConsumer columnName={'relatedStudies'}>
+                  {({ value }) => {
+                    if (!value) {
+                      return null
+                    }
 
-                  return (
-                    <CardContainerLogic
-                      sqlOperator={ColumnSingleValueFilterOperator.IN}
-                      sql={studiesSql}
-                      {...studyCardConfiguration}
-                      searchParams={{ id: value }}
-                    />
-                  )
-                }}
-              </DetailsPageContextConsumer>
-            ),
-          },
-        ]}
-      />
+                    return (
+                      <CardContainerLogic
+                        sqlOperator={ColumnSingleValueFilterOperator.IN}
+                        sql={studiesSql}
+                        {...studyCardConfiguration}
+                        searchParams={{ id: value }}
+                      />
+                    )
+                  }}
+                </DetailsPageContextConsumer>
+              ),
+            },
+          ]}
+        />
+        <RedirectToURL
+          toURL="/Explore/Studies/DetailsPage/StudyDetails?studyKey=LLFS"
+          search="studyKey=LLFS_Metabolomics"
+        />
+      </>
     ),
   },
   {

diff --git a/apps/synapse-oauth-signin/package.json b/apps/synapse-oauth-signin/package.json
@@ -9,7 +9,6 @@
     "@mui/icons-material": "^5.15.13",
     "@mui/material": "^5.15.13",
     "@react-hookz/web": "^23.1.0",
-    "@sage-bionetworks/react-base-table": "^1.13.4",
     "@tanstack/react-query": "5.22.2",
     "katex": "^0.16.10",
     "lodash-es": "^4.17.21",

diff --git a/packages/synapse-react-client/.storybook/main.mts b/packages/synapse-react-client/.storybook/main.mts
@@ -1,5 +1,5 @@
-import { mergeConfig, defineConfig } from 'vite'
 import { StorybookConfig } from '@storybook/react-vite'
+import { defineConfig, mergeConfig } from 'vite'
 
 const config: StorybookConfig = {
   stories: ['../**/*.stories.mdx', '../**/*.stories.@(js|jsx|ts|tsx)'],
@@ -26,18 +26,17 @@ const config: StorybookConfig = {
   },
 
   typescript: {
-    // These options are from https://storybook.js.org/blog/material-ui-in-storybook/
-    check: false,
-    checkOptions: {},
+    // These options are from https://storybook.js.org/recipes/@mui/material
     reactDocgen: 'react-docgen-typescript',
     reactDocgenTypescriptOptions: {
-      // @ts-expect-error - speeds up storybook build time
-      allowSyntheticDefaultImports: false,
-      // speeds up storybook build time
-      esModuleInterop: false,
-      // makes union prop types like variant and size appear as select controls
+      // Speeds up Storybook build time
+      compilerOptions: {
+        allowSyntheticDefaultImports: false,
+        esModuleInterop: false,
+      },
+      // Makes union prop types like variant and size appear as select controls
       shouldExtractLiteralValuesFromEnum: true,
-      // makes string and boolean types that can be undefined appear as inputs and switches
+      // Makes string and boolean types that can be undefined appear as inputs and switches
       shouldRemoveUndefinedFromOptional: true,
       // Filter out third-party props from node_modules except @mui packages
       propFilter: prop =>
@@ -49,7 +48,7 @@ const config: StorybookConfig = {
 
   staticDirs: ['../public'],
 
-  viteFinal(config, { configType }) {
+  async viteFinal(config, { configType }) {
     let base,
       plugins = undefined
     // Fix deployment to github pages