Merge branch '3.1.0' into CRDCDH-1497

CBIIT · Oct 18, 2024 · 3e93f79 · 3e93f79
2 parents dbf24af + 658acc3
commit 3e93f79
Show file tree

Hide file tree

Showing 41 changed files with 684 additions and 152 deletions.
diff --git a/.env.example b/.env.example
@@ -13,6 +13,9 @@ REACT_APP_UPLOADER_CLI_WINDOWS=""
 REACT_APP_UPLOADER_CLI_MAC_X64=""
 REACT_APP_UPLOADER_CLI_MAC_ARM=""
 
+# Data Common Config
+REACT_APP_HIDDEN_MODELS=""
+
 # Optional - Frontend Build/Version
 REACT_APP_FE_VERSION=""
 

diff --git a/conf/inject.template.js b/conf/inject.template.js
@@ -11,4 +11,5 @@ window.injectedEnv = {
   REACT_APP_UPLOADER_CLI_WINDOWS: "${REACT_APP_UPLOADER_CLI_WINDOWS}",
   REACT_APP_UPLOADER_CLI_MAC_X64: "${REACT_APP_UPLOADER_CLI_MAC_X64}",
   REACT_APP_UPLOADER_CLI_MAC_ARM: "${REACT_APP_UPLOADER_CLI_MAC_ARM}",
+  REACT_APP_HIDDEN_MODELS: "${HIDDEN_MODELS}",
 };
diff --git a/public/js/injectEnv.js b/public/js/injectEnv.js
@@ -10,4 +10,5 @@ window.injectedEnv = {
   REACT_APP_GA_TRACKING_ID: "",
   REACT_APP_FE_VERSION: "",
   REACT_APP_BACKEND_API: "",
+  REACT_APP_HIDDEN_MODELS: "",
 };
diff --git a/src/assets/modelNavigator/Logo.jpg → src/assets/header/Logo.jpg b/src/assets/modelNavigator/Logo.jpg → src/assets/header/Logo.jpg
diff --git a/src/assets/modelNavigator/CDS_Logo.png b/src/assets/modelNavigator/CDS_Logo.png
diff --git a/src/assets/modelNavigator/Generic_Logo.png → src/assets/modelNavigator/genericLogo.png b/src/assets/modelNavigator/Generic_Logo.png → src/assets/modelNavigator/genericLogo.png
diff --git a/src/components/Contexts/SubmissionContext.test.tsx b/src/components/Contexts/SubmissionContext.test.tsx
@@ -53,6 +53,7 @@ const baseSubmission: Submission = {
   createdAt: "",
   updatedAt: "",
   studyID: "",
+  collaborators: [],
 };
 
 const TestChild: FC = () => {

diff --git a/src/components/DataSubmissions/CopyAdornment.tsx b/src/components/DataSubmissions/CopyAdornment.tsx
@@ -68,7 +68,7 @@ const CopyAdornment: FC<Props> = ({ _id }) => {
   };
 
   return (
-    <StyledCopyWrapper direction="row" spacing={1.625} alignItems="center">
+    <StyledCopyWrapper direction="row" gap="13px" alignItems="center">
       <StyledCopyLabel data-testid="data-submission-id-label" variant="body1">
         SUBMISSION ID:
       </StyledCopyLabel>

diff --git a/src/components/DataSubmissions/CrossValidationButton.test.tsx b/src/components/DataSubmissions/CrossValidationButton.test.tsx
@@ -54,6 +54,7 @@ const baseSubmission: Omit<
   studyID: "",
   deletingData: false,
   nodeCount: 0,
+  collaborators: [],
 };
 
 const baseAuthCtx: AuthCtxState = {

diff --git a/src/components/DataSubmissions/CrossValidationFilters.test.tsx b/src/components/DataSubmissions/CrossValidationFilters.test.tsx
@@ -52,6 +52,7 @@ const baseSubmission: Submission = {
   nodeCount: 0,
   createdAt: "",
   updatedAt: "",
+  collaborators: [],
 };
 
 const baseBatch = {