fix(report): garris#1166 approve button does not work on the filtered…

… failed page.
1276stella · Apr 9, 2020 · aa06773 · aa06773
1 parent b905dd4
commit aa06773
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/compare/output/index_bundle.js b/compare/output/index_bundle.js
diff --git a/compare/src/components/molecules/ApproveButton.js b/compare/src/components/molecules/ApproveButton.js
@@ -9,7 +9,6 @@ const REMOTE_PORT = 3000;
 const APPROVE_STATUS_TO_LABEL_MAP = Object.freeze({
   INITIAL: 'Approve',
   PENDING: 'Pending...',
-  APPROVED: 'Approved',
   FAILED: 'Approve'
 });
 
@@ -65,8 +64,8 @@ class ApproveButton extends React.Component {
       });
 
       if (response.ok) {
-        this.setState({ approveStatus: 'APPROVED' });
-        this.props.approveTest(this.props.currentId, this.props.filterStatus);
+        this.setState({ approveStatus: 'INITIAL' });
+        this.props.approveTest(fileName, this.props.filterStatus);
       } else {
         const body = await response.json();
         this.setState({ approveStatus: 'FAILED', errorMsg: body.error });

diff --git a/compare/src/components/organisms/TestCard.js b/compare/src/components/organisms/TestCard.js
@@ -55,7 +55,7 @@ export default class TestCard extends React.Component {
     return (
       <CardWrapper id={this.props.id} status={status}>
         <ButtonsWrapper>
-          {status === 'fail' && isRemoteOption() && <ApproveButton fileName={info.fileName} currentId={this.props.numId} />}
+          {status === 'fail' && isRemoteOption() && <ApproveButton fileName={info.fileName}/>}
           {!onlyText && (
             <NavButtons currentId={this.props.numId} lastId={this.props.lastId} />
           )}

diff --git a/compare/src/reducers/tests.js b/compare/src/reducers/tests.js
@@ -2,8 +2,8 @@ const tests = (state = {}, action) => {
   switch (action.type) {
     case 'APPROVE_TEST':
       return Object.assign({}, state, {
-        all: state.all.map((test, i) => {
-          if (i === action.id) {
+        all: state.all.map(test => {
+          if (test.pair && (test.pair.fileName === action.id)) {
             return Object.assign({}, test, { status: 'pass' });
           }
           return test;

diff --git a/compare/webpack.config.js b/compare/webpack.config.js
@@ -1,6 +1,7 @@
 const path = require('path');
 
 module.exports = {
+  mode: 'development',
   entry: './compare/src/index.js',
   output: {
     path: path.resolve(__dirname, 'output'),