Merge branch 'master' into 403-db-matching

Author: Stephen Poserina

.gitignore

@@ -18,6 +18,8 @@ start_env.sh
 
 /src/server/venv/
 /src/local_files/
-/src/server/secrets.py
+/src/server/secrets_dict.py
 /src/server/local_files/
 .mypy_cache/
+*secrets*
+*kustomization*

src/README.md

@@ -17,11 +17,12 @@ _Docker Compose instructions_
 - Install Docker Compose - `https://docs.docker.com/compose/install/`      
 - Most package managers have it as `docker-compose` and it's largely just a shell script.    
 - `docker-compose up -d` to bring up the application.
+- Scheduler docker will not start. To run the scheduler, use profile flag `production-only` as explained in the Production Environment section.
 
 #### Finally - Run The UI on http://localhost:3000
 
 ---------------------------------------
-Deploy
+Production Environment
 ---------------------------------------
 - `docker-compose` should use the profile flag `production-only`. i.e: `docker-compose --profile production-only up
 ` and `docker-compose --profile production-only build`

src/client/Dockerfile

@@ -16,6 +16,7 @@ RUN npm install --silent
 COPY public ./public
 COPY src ./src
 
+RUN npx browserslist@latest --update-db
 RUN npm run build
 
 # add app

src/client/package-lock.json

@@ -6,6 +6,7 @@
         "@material-ui/core": "^4.9.14",
         "@material-ui/icons": "^4.9.1",
         "@material-ui/lab": "^4.0.0-alpha.53",
+        "@material-ui/styles": "^4.11.4",
         "@testing-library/jest-dom": "^4.2.4",
         "@testing-library/react": "^9.5.0",
         "@testing-library/user-event": "^7.2.1",

src/client/package.json

@@ -8,7 +8,7 @@ import Login from './pages/Login/Login';
 import Logout from './pages/Login/Logout';
 import HomePage from './pages/Home';
 import Admin from './pages/Admin';
-import Search360 from './pages/DataView360/Search/Search';
+import {Search360} from './pages/DataView360/Search/Search';
 import View360 from './pages/DataView360/View/View360';
 import About from './pages/About';
 import RefreshDlg from './components/RefreshDlg';
@@ -17,16 +17,17 @@ import Refresh from './components/Refresh';
 
 import useToken from './pages/Login/useToken';
 import Box from "@material-ui/core/Box";
+import {RFM} from "./pages/RFM/RFM";
 
 let jwt = require('jsonwebtoken');
 
 const REFRESH_POPUP_TIME = 300 // seconds
 
 // Triggers token expiration check
 const sleep = time => new Promise(resolve => setTimeout(resolve, time))
-const expTimer = () => sleep(500).then(() => ({}))
+let expTimer = () => sleep(500).then(() => ({}));
 
-const AuthContext = React.createContext()
+const AuthContext = React.createContext();
 
 function AuthProvider({children}) {
     const [state, setState] = React.useState({
@@ -39,6 +40,7 @@ function AuthProvider({children}) {
         expTimer().then(
             user => setState({status: 'success', error: null, user})
         )
+        expTimer = () => sleep(100000).then(() => ({}));
     },)
 
     return (
@@ -76,7 +78,6 @@ function useAuthState() {
 
 
 function AuthenticatedApp() {
-
     const {access_token, setToken} = useToken();
 
     let decoded = jwt.decode(access_token, {complete: true});
@@ -140,6 +141,10 @@ function AuthenticatedApp() {
                             <View360 access_token={access_token}/>
                         </Route>
 
+                         <Route path="/rfm">
+                            <RFM access_token={access_token}/>
+                        </Route>
+
                         <Route path="/check">
                             <Check access_token={access_token}/>
                         </Route>
@@ -168,7 +173,6 @@ function Home() {
 }
 
 function App() {
-
     return (
         <AuthProvider>
             <Home/>

src/client/src/App.js

@@ -29,6 +29,9 @@ class Header extends Component {
                             {this.props.headerType !== 'Login' && <Button size="large" component={RouterLink} to="/360view/search">360
                                 DataView</Button>
                             }
+                            {this.props.headerType !== 'Login' && <Button size="large" component={RouterLink} to="/rfm">RFM
+                                </Button>
+                            }
                             <Button size="large" component={RouterLink} to="/about">About us</Button>
                             {this.props.headerType !== 'Login' &&
                             <Button size="large" component={RouterLink} to="/logout">Log Out</Button>}

src/client/src/components/Header.js

@@ -61,7 +61,7 @@ const getList = (listName) => {
 };
 
 
-export default function About(props) {
+export default function About() {
     return (
         <Container maxWidth={"md"} style={{"padding": "1em"}}>
             <Grid container direction="column" spacing={1}>

src/client/src/pages/About.js

@@ -172,7 +172,7 @@ class Admin extends Component {
                                                 const fileName = file.split("-")[0];
                                                 let fileDate = file.split("-").slice(1).join().split(".")[0];
                                                 let fileDateOnlyNumbers = fileDate.replaceAll(",", "");
-                                                let fileDateFormatted = moment.utc(fileDateOnlyNumbers, "YYYYMMDDhmmss").local().format("MMMM Do YYYY, h:mm:ss a");
+                                                let fileDateFormatted = moment(fileDateOnlyNumbers, "YYYYMMDDhmmss").local().format("MMMM Do YYYY, h:mm:ss a");
 
                                                 return (
                                                     <TableRow key={index}>