review-I

Author: anishaswain

src/components/LoginForm/index.js

@@ -10,7 +10,6 @@ import {
 } from '@patternfly/react-core';
 import { connect } from 'dva';
 import styles from './index.less';
-import { validateEmail } from '@/utils/validator';
 
 const mapStateToProps = state => {
   const { auth } = state;
@@ -27,10 +26,8 @@ const LoginForm = props => {
 
   const handleUsernameChange = val => {
     setUsername(val);
-    const validEmail = validateEmail(val);
     setErrors({
       ...errors,
-      ...validEmail,
     });
   };
 
@@ -72,7 +69,7 @@ const LoginForm = props => {
   const form = (
     <div className={styles.section}>
       <Form className={styles.section}>
-        <FormGroup label="Email address" isRequired fieldId="horizontal-form-name">
+        <FormGroup label="Username" isRequired fieldId="horizontal-form-name">
           <TextInput
             isRequired
             type="text"

src/components/RowSelection/index.js

@@ -46,8 +46,8 @@ export default class RowSelection extends React.Component {
         {' '}
         Mark as unread
       </DropdownItem>,
-      <DropdownItem key="favourite" onClick={favoriteResult}>
-        Mark Favourited
+      <DropdownItem key="favorite" onClick={favoriteResult}>
+        Mark Favorited
       </DropdownItem>,
       <DropdownSeparator key="separator" />,
       <DropdownItem key="delete" onClick={deleteResult}>

src/pages/ExpiringResults/index.js

@@ -109,7 +109,7 @@ class ExpiringResults extends Component {
     });
   };
 
-  showDrowpdown = (e, id) => {
+  showDropdown = (e, id) => {
     // Stop propagation from going to the next page
     e.stopPropagation();
 
@@ -251,7 +251,7 @@ class ExpiringResults extends Component {
           return (
             <div>
               <EllipsisVIcon
-                onClick={e => this.showDrowpdown(e, `newrun${row.result}`)}
+                onClick={e => this.showDropdown(e, `newrun${row.result}`)}
                 className="dropbtn"
               />
               <div id={`newrun${row.result}`} style={{ display: 'none' }}>

src/pages/Overview/index.js

@@ -18,7 +18,6 @@ import {
   AccordionContent,
   AccordionToggle,
   Label,
-  Switch,
   Modal,
   Alert,
   AlertGroup,
@@ -31,6 +30,8 @@ import { formatDate, getDiffDays, getDiffDate } from '../../utils/moment_constan
 import Table from '@/components/Table';
 import styles from './index.less';
 
+const expiringLimit = 15;
+
 @connect(({ global, user, loading, dashboard }) => ({
   selectedDateRange: global.selectedDateRange,
   selectedControllers: global.selectedControllers,
@@ -84,7 +85,7 @@ class Overview extends React.Component {
     const savedData = totalResultData.filter(x => x.serverMetadata.dashboard.saved === true);
     const newData = totalResultData.filter(x => x.serverMetadata.dashboard.saved !== true);
     const expiringData = totalResultData.filter(
-      x => getDiffDays(x.serverMetadata['server.deletion']) < 15
+      x => getDiffDays(x.serverMetadata['server.deletion']) < expiringLimit
     );
     this.setState({ newData, savedData, expiringData });
   }
@@ -142,7 +143,7 @@ class Overview extends React.Component {
     });
   };
 
-  showDrowpdown = (e, id) => {
+  showDropdown = (e, id) => {
     // Stop propagation from going to the next page
     e.stopPropagation();
 
@@ -239,19 +240,6 @@ class Overview extends React.Component {
     }
   }
 
-  handleChange() {
-    const { expiringData, newData } = this.state;
-    if (expiringData.length > 0) {
-      this.setState({
-        expiringData: [],
-      });
-    } else {
-      this.setState({
-        expiringData: newData.filter(x => getDiffDays(x.serverMetadata['server.deletion']) < 15),
-      });
-    }
-  }
-
   handleModalToggle(e, rows) {
     // Stop propagation from going to the next page
     if (e !== null) {
@@ -366,7 +354,7 @@ class Overview extends React.Component {
           return (
             <div>
               <EllipsisVIcon
-                onClick={e => this.showDrowpdown(e, `newrun${row.result}`)}
+                onClick={e => this.showDropdown(e, `newrun${row.result}`)}
                 className="dropbtn"
               />
               <div id={`newrun${row.result}`} style={{ display: 'none' }}>
@@ -496,7 +484,7 @@ class Overview extends React.Component {
           return (
             <div>
               <EllipsisVIcon
-                onClick={e => this.showDrowpdown(e, `newrun${row.result}`)}
+                onClick={e => this.showDropdown(e, `newrun${row.result}`)}
                 className="dropbtn"
               />
               <div
@@ -599,17 +587,6 @@ class Overview extends React.Component {
                 <Text component={TextVariants.h1}> Overview</Text>
               </TextContent>
             </GridItem>
-            <GridItem style={{ textAlign: 'right' }}>
-              {' '}
-              <Switch
-                id="simple-switch"
-                label="Has expiring runs"
-                labelOff="Doesn't have expiring runs"
-                isChecked={expiringData.length > 0}
-                onChange={() => this.handleChange()}
-                className={styles.paddingBig}
-              />
-            </GridItem>
           </Grid>
         </Grid>
         <Grid hasGutter span={12}>