UI - fix exception on empty shelterluv

config file updates

Author: urirot

src/client/src/pages/Admin.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {Tabs, Tab, Container, Paper } from "@material-ui/core";
+import {Tabs, Tab, Paper } from "@material-ui/core";
 import TabPanel from '../components/TabPanel';
 import Grid from '@material-ui/core/Grid';
 import Table from '@material-ui/core/Table';
@@ -9,7 +9,6 @@ import TableContainer from '@material-ui/core/TableContainer';
 import TableHead from '@material-ui/core/TableHead';
 import TableRow from '@material-ui/core/TableRow';
 import { withStyles } from '@material-ui/core/styles';
-import Divider from '@material-ui/core/Divider';
 import LinearProgress from '@material-ui/core/LinearProgress';
 import CircularProgress from '@material-ui/core/CircularProgress';
 import { UploadForm, DownloadForm, ExecuteForm } from '../components/Forms';

src/client/src/pages/DataView360/components/Adoptions.js

@@ -22,9 +22,6 @@ const StyledTableRow = withStyles((theme)=>({
 
 
 class Adoptions extends Component {
-    constructor(props) {
-        super(props);
-    }
 
     getAnimalIds() {
         let result = [];
@@ -35,13 +32,15 @@ class Adoptions extends Component {
                 return _.isNaN(_.parseInt(item)) !== true;
             })
         }
+
+        return result;
     }
 
     render() {
         // todo: update when we add pet info
         // todo: clean array of animal_id
         return (<Container style={{"marginTop":"1em"}}>
-                    <Typography align='center' gutterBottom='true' variant='h4'>Adoption/Foster Records(Top 3)</Typography>
+                    <Typography align='center' variant='h4'>Adoption/Foster Records(Top 3)</Typography>
                     <TableContainer style={{"marginTop":"1em"}} component={Paper} variant='outlined'>
                         <Table>
                             <TableHead>

src/client/src/pages/DataView360/components/ContactInfo.js

@@ -19,8 +19,8 @@ class ContactInfo extends Component {
         const phoneStr = _.get(this.props, "participant.phone");
         let phone = _.isEmpty(phoneStr) ? '-' : phoneStr.split(" ").join("");
 
-        return (<Container class="contactInfo">
-            <Typography align='center' gutterBottom='true' variant='h4'>Contact Info</Typography>
+        return (<Container className="contactInfo">
+            <Typography align='center' variant='h4'>Contact Info</Typography>
                 <Paper variant='outlined' style={{padding:'1em'}}>
                     <div style={{"display":"flex", "justifyContent":"space-between"}}>
                         <Typography>

src/client/src/pages/DataView360/components/Donations.js

@@ -38,8 +38,8 @@ class Donations extends Component {
         donationsSorted = donationsSorted.reverse();
         const latestDonations = donationsSorted.slice(0,ROWS_TO_SHOW);
 
-        const result = _.map(latestDonations, donation => {
-            return( <StyledTableRow>
+        const result = _.map(latestDonations, (donation, index) => {
+            return( <StyledTableRow key={index}>
                     <TableCell align="center">{donation.close_date}</TableCell>
                     <TableCell align="center">${donation.amount}</TableCell>
                     <TableCell align="center">{donation.type}</TableCell>
@@ -52,7 +52,7 @@ class Donations extends Component {
     render() {
         return (
             <Container style={{"marginTop":"1em"}}>
-                <Typography align='center' gutterBottom='true' variant='h4'>Financial Support Activity(Top 3)</Typography>
+                <Typography align='center' variant='h4'>Financial Support Activity(Top 3)</Typography>
                 <TableContainer style={{"marginTop":"1em"}} component={Paper} variant='outlined'>
                     <Table>
                         <TableHead>

src/client/src/pages/DataView360/components/SearchBar.js

@@ -1,21 +1,13 @@
 import React, { Component } from 'react';
 import {Button, Paper, Select, InputLabel, MenuItem, FormControl, TextField, IconButton} from '@material-ui/core';
 import SearchIcon from '@material-ui/icons/Search';
-import { withStyles } from '@material-ui/core/styles';
 import "./styles/SearchBar.css";
 import CircularProgress from '@material-ui/core/CircularProgress';
 
 import _ from 'lodash';
 
 const LIST_LIMIT = 200;
 
-const styles = theme => ({
-    spinner: {
-        display: 'flex',
-        marginLeft: theme.spacing(2)
-    }
-});
-
 class SearchBar extends Component {
     constructor(props) {
         super(props);
@@ -55,7 +47,7 @@ class SearchBar extends Component {
     searchParticipant(event) {
         return (
                 <form onSubmit={this.handleParticipantSearch} style={{"display":"flex"}}>
-                    <TextField style={{"min-width":"300px"}}
+                    <TextField style={{minWidth:300}}
                         error={this.state.alertMinChars}
                         helperText={this.state.alertMinChars ? "Requires 3 search characters for first and last name" : ""}
                         id="participant-search"
@@ -91,7 +83,7 @@ class SearchBar extends Component {
         }
 
         return (
-            <FormControl style={{"minWidth":"20em"}}>
+            <FormControl style={{minWidth:"20em"}}>
                 <InputLabel id="paws-participant-label">Select Participant - Top 200 Results</InputLabel>
                 <Select
                     labelId="paws-participant-label"
@@ -124,8 +116,6 @@ class SearchBar extends Component {
     };
 
     render() {
-        const { classes } = this.props;
-
         return (
             <Paper elevation={1} style={{
                     "display":"flex",
@@ -135,15 +125,11 @@ class SearchBar extends Component {
                     "justifyContent":"space-around"
                 }}>
                 {this.searchParticipant()}
-
-
                 {this.state.isSearchBusy === true ?
-                (<div className={classes.spinner}>
-                    <CircularProgress />
-                </div>) : this.selectParticipant()}
+                <CircularProgress /> : this.selectParticipant()}
             </Paper>
         )
     }
 }
 
-export default withStyles(styles)(SearchBar);
+export default SearchBar;

src/client/src/pages/DataView360/components/Volunteer.js

@@ -24,9 +24,6 @@ const StyledTableRow = withStyles((theme)=>({
 const SHIFTS_TO_SHOW = 3;
 
 class Volunteer extends Component {
-    constructor(props) {
-        super(props);
-    }
 
     createShiftRows(shifts) {
         const shiftsSorted = _.sortBy(shifts, shift => {
@@ -35,8 +32,8 @@ class Volunteer extends Component {
 
         const lastShifts = shiftsSorted.slice(shiftsSorted.length - SHIFTS_TO_SHOW, shiftsSorted.length)
 
-        const result = _.map(lastShifts, shift => {
-            return(<StyledTableRow>
+        const result = _.map(lastShifts, (shift, index) => {
+            return(<StyledTableRow key={index}>
                     <TableCell align="center">{moment(shift.from).format("YYYY-MM-DD")}</TableCell>
                     <TableCell align="center">{shift.assignment}</TableCell>
                 </StyledTableRow>);
@@ -51,7 +48,7 @@ class Volunteer extends Component {
         return (
             <div>
                 <Container style={{"marginTop":"1em"}}>
-                    <Typography align='center' gutterBottom='true' variant='h4'>Volunteer Activity</Typography>
+                    <Typography align='center' variant='h4'>Volunteer Activity</Typography>
                     <TableContainer style={{"marginTop":"1em"}} component={Paper} variant='outlined'>
                         <Table>
                             <TableHead>
@@ -75,7 +72,7 @@ class Volunteer extends Component {
                 </Container>
 
                 <Container style={{"marginTop":"1em"}}>
-                    <Typography align='center' gutterBottom='true' variant='h4'>Volunteer History(Top 3)</Typography>
+                    <Typography align='center' variant='h4'>Volunteer History(Top 3)</Typography>
                     <TableContainer style={{"marginTop":"1em"}} component={Paper} variant='outlined'>
                         <Table>
                             <TableHead>

src/docker-compose.yml

@@ -19,7 +19,7 @@ services:
     depends_on:
       - db
     volumes:
-      - src_archive:/app/static/uploads
+      - src_archive:/app/static/raw_data
     environment: 
       FLASK_ENV: development
 

src/server/Dockerfile

@@ -15,8 +15,8 @@ RUN pip install --no-cache-dir -r /requirements.txt
 COPY . .
 
 RUN mkdir /app/static \
-          /app/static/uploads \
-          /app/static/uploads/current \
+          /app/static/raw_data \
+          /app/static/raw_data/current \
           /app/static/output \
           /app/static/output/reports \
           /app/static/logs \

src/server/config.py

@@ -2,45 +2,40 @@
 import sqlalchemy as db
 from sqlalchemy_utils import database_exists, create_database
 
-# Determine if app is ran from docker or local by env var IS_LOCAL
-BASE_PATH = '/app/static/'
-POSTGRES_PASSWORD=os.getenv('POSTGRES_PASSWORD', 'thispasswordisverysecure')
-POSTGRES_DATABASE=os.getenv('POSTGRES_DATABASE', 'paws')
-POSTGRES_USER=os.getenv('POSTGRES_USER', 'postgres')
-DB = 'postgresql://' + POSTGRES_USER + ':'+ POSTGRES_PASSWORD + '@paws-compose-db/' + POSTGRES_DATABASE
-
-IS_LOCAL = os.getenv('IS_LOCAL', False)
-
-if IS_LOCAL:
-    BASE_PATH = '../local_files/'
-    DB = os.getenv('LOCAL_DB_IP',
-                   'postgresql://postgres:'+ POSTGRES_PASSWORD + '@localhost:5432/' + POSTGRES_DATABASE)
-
-#best practices is to have only one engine per application process
-#https://docs.sqlalchemy.org/en/13/core/connections.html
+# Determine if app is ran from docker or local by testing the env var "IS_LOCAL"
+IS_LOCAL = os.getenv('IS_LOCAL')
+BASE_PATH = '../local_files/' if IS_LOCAL == 'True' else '/app/static/'
+
+# Initiate postgres DB
+# best practices is to have only one engine per application process
+# https://docs.sqlalchemy.org/en/13/core/connections.html
+POSTGRES_PASSWORD = os.getenv('POSTGRES_PASSWORD', 'thispasswordisverysecure')
+POSTGRES_DATABASE = os.getenv('POSTGRES_DATABASE', 'paws')
+POSTGRES_USER = os.getenv('POSTGRES_USER', 'postgres')
+
+if IS_LOCAL == 'True':
+    DB = os.getenv('LOCAL_DB_IP', 'postgresql://postgres:' + POSTGRES_PASSWORD + '@localhost:5432/' + POSTGRES_DATABASE)
+else:
+    DB = 'postgresql://' + POSTGRES_USER + ':' + POSTGRES_PASSWORD + '@paws-compose-db/' + POSTGRES_DATABASE
+
 engine = db.create_engine(DB)
 
 if not database_exists(engine.url):
     create_database(engine.url)
 
-# print(database_exists(engine.url))
-
-# Define global reusable paths
+# Initiate local file system
 RAW_DATA_PATH = BASE_PATH + 'raw_data/'
 OUTPUT_PATH = BASE_PATH + 'output/'
 LOGS_PATH = BASE_PATH + 'logs/'
 CURRENT_SOURCE_FILES_PATH = RAW_DATA_PATH + 'current/'
 REPORT_PATH = OUTPUT_PATH + 'reports/'
 ZIPPED_FILES = BASE_PATH + 'zipped/'
 
-if BASE_PATH != '/app/static/':
-    try:
-        os.mkdir(BASE_PATH)
-        os.mkdir(RAW_DATA_PATH)
-        os.mkdir(OUTPUT_PATH)
-        os.mkdir(LOGS_PATH)
-        os.mkdir(CURRENT_SOURCE_FILES_PATH)
-        os.mkdir(REPORT_PATH)
-        os.mkdir(ZIPPED_FILES)
-    except FileExistsError as e:
-        print(e)
+os.makedirs(BASE_PATH, exist_ok=True)
+os.makedirs(RAW_DATA_PATH, exist_ok=True)
+os.makedirs(OUTPUT_PATH, exist_ok=True)
+os.makedirs(LOGS_PATH, exist_ok=True)
+os.makedirs(CURRENT_SOURCE_FILES_PATH, exist_ok=True)
+os.makedirs(REPORT_PATH, exist_ok=True)
+os.makedirs(ZIPPED_FILES, exist_ok=True)
+