Sync MVP-2.0.0 (M2) into MVP-2.1.0 (M3)

src/components/DataSubmissions/DataSubmissionUpload.tsx

@@ -4,6 +4,7 @@ import { useParams } from "react-router-dom";
 import { LoadingButton } from "@mui/lab";
 import {
   AlertColor,
+  Button,
   Stack,
   Typography,
   styled,
@@ -27,7 +28,7 @@ const StyledMetadataText = styled(StyledUploadTypeText)(() => ({
   },
 }));
 
-const StyledUploadFilesButton = styled(LoadingButton)(() => ({
+const StyledUploadFilesButton = styled(Button)(() => ({
   display: "flex",
   flexDirection: "column",
   padding: "12px 20px",
@@ -50,7 +51,6 @@ const StyledUploadFilesButton = styled(LoadingButton)(() => ({
     minWidth: "137px",
   }
 }));
-
 const StyledChooseFilesButton = styled(LoadingButton)(() => ({
   display: "flex",
   flexDirection: "column",
@@ -331,13 +331,12 @@ const DataSubmissionUpload = ({ submitterID, readOnly, onUpload }: Props) => {
       <StyledUploadFilesButton
         variant="contained"
         onClick={handleUploadFiles}
-        loading={isUploading}
-        disabled={readOnly || !selectedFiles?.length || !canUpload}
+        disabled={readOnly || !selectedFiles?.length || !canUpload || isUploading}
         disableElevation
         disableRipple
         disableTouchRipple
       >
-        Upload
+        {isUploading ? "Uploading..." : "Upload"}
       </StyledUploadFilesButton>
     </StyledUploadWrapper>
   );

src/config/DataCommons.ts

@@ -1,4 +1,5 @@
 import logo from "../assets/modelNavigator/Logo.jpg";
+import CDSLogo from "../assets/modelNavigator/CDS_Logo.png";
 
 /**
  * The URL of the Data Commons Model Repo
@@ -19,6 +20,8 @@ export const DataCommons: DataCommon[] = [
     name: "CDS",
     assets: null,
     configuration: {
+      pageTitle: "CDS Data Model",
+      titleIconSrc: CDSLogo,
       pdfConfig: {
         fileType: 'pdf',
         prefix: 'CDS_',
@@ -122,6 +125,7 @@ export const DataCommons: DataCommon[] = [
     name: "ICDC",
     assets: null,
     configuration: {
+      pageTitle: "ICDC Data Model",
       pdfConfig: {
         fileType: 'pdf',
         prefix: 'ICDC_',

src/content/modelNavigator/hooks/useBuildReduxStore.ts

@@ -83,6 +83,10 @@ const useBuildReduxStore = (): [{ status: Status, store: Store }, () => void, (a
           filterSections: datacommon.configuration.facetFilterSearchData.map((s) => s?.datafield),
           filterOptions: buildFilterOptionsList(datacommon),
         },
+        pageConfig: {
+          title: datacommon.configuration.pageTitle,
+          iconSrc: datacommon.configuration?.titleIconSrc,
+        },
         readMeConfig: {
           readMeUrl: assets.readme,
           readMeTitle: datacommon.configuration?.readMeTitle || defaultReadMeTitle,
@@ -97,6 +101,11 @@ const useBuildReduxStore = (): [{ status: Status, store: Store }, () => void, (a
       },
     });
 
+    // MVP-2 M2 NOTE: This resets the search history to prevent the data models
+    // from overlapping on searches. A future improvement would be to isolate
+    // the localStorage history key to the data model based on a config option.
+    store.dispatch({ type: 'SEARCH_CLEAR_HISTORY' });
+
     setStatus("success");
   };
 

src/types/DataModelNavigator.d.ts

@@ -4,6 +4,16 @@
  * Only the options that are explicitly used by CRDC Hub are defined here.
  */
 type ModelNavigatorConfig = {
+  /**
+   * The title of the Data Model Navigator page
+   *
+   * e.g. "CRDC Data Model Navigator"
+   */
+  pageTitle: string,
+  /**
+   * The icon to display in the title of the Data Model Navigator page
+   */
+  titleIconSrc?: string,
   /**
    * Provides a title to the README modal popup
    *