Merge pull request #698 from CBIIT/BENTO-2194

package.json

@@ -20,7 +20,7 @@
     "babel-loader": "8.0.5",
     "babel-plugin-named-asset-import": "^0.3.4",
     "babel-preset-react-app": "^7.0.1",
-    "bento-components": "^1.0.1",
+    "bento-components": "^1.0.2",
     "bfj": "6.1.1",
     "case-sensitive-paths-webpack-plugin": "2.2.0",
     "classnames": "^2.2.6",

src/bento/globalFooterData.js

@@ -40,18 +40,17 @@ export default {
 
     {
       title: 'System Info',
+      systemInfoInLinkSection: true,
       items: [
         {
           text: 'Release Notes',
           link: 'https://github.com/CBIIT/bento-frontend/releases',
         },
         {
           text: `FE Version: ${env.REACT_APP_FE_VERSION || '0.0.0'}`,
-          link: '',
         },
         {
           text: `BE Version: ${env.REACT_APP_BE_VERSION || '0.0.0'}`,
-          link: '',
         },
         {
           text: 'System Info Page',

src/components/Footer/FooterThemConfig.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import _ from 'lodash';
+import { MuiThemeProvider, createTheme } from '@material-ui/core/styles';
+import themes, { overrides } from '../../themes';
+
+export default ({
+  children,
+}) => {
+  const themesLight = _.cloneDeep(themes.light);
+  themesLight.overrides.MuiDivider = {
+    root: {
+      height: '0px',
+    },
+  };
+
+  const computedTheme = createTheme({
+    ...themesLight,
+    ...overrides,
+  });
+
+  return (
+    <MuiThemeProvider theme={computedTheme}>
+      {children}
+    </MuiThemeProvider>
+  );
+};

src/components/Footer/FooterView.js

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Footer } from 'bento-components';
 import FooterData from '../../bento/globalFooterData';
 import env from '../../utils/env';
+import CustomThemeProvider from './FooterThemConfig';
 
 const FILE_SERVICE_API = env.REACT_APP_FILE_SERVICE_API;
 
@@ -20,7 +21,11 @@ const ICDCFooter = () => {
     getSystems();
   }, [FooterData]);
 
-  return <><Footer data={footerUpdatedData} /></>;
+  return (
+    <CustomThemeProvider>
+      <Footer data={footerUpdatedData} />
+    </CustomThemeProvider>
+  );
 };
 
 export default ICDCFooter;