fix: rerender only accepted images

gemini-testing · Apr 6, 2018 · 2793704 · 2793704
1 parent 3975c58
commit 2793704
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/lib/static/components/state/index.js b/lib/static/components/state/index.js
@@ -33,7 +33,7 @@ export default class State extends Component {
         if (isErroredStatus(status)) {
             elem = <StateError image={Boolean(image)} actual={actualPath} reason={reason}/>;
         } else if (isSuccessStatus(status) || isUpdatedStatus(status) || (isIdleStatus(status) && expectedPath)) {
-            elem = <StateSuccess expected={expectedPath}/>;
+            elem = <StateSuccess status={status} expected={expectedPath} />;
         } else if (isFailStatus(status)) {
             elem = reason
                 ? <StateError image={true} actual={actualPath} reason={reason}/>

diff --git a/lib/static/components/state/screenshot.js b/lib/static/components/state/screenshot.js
@@ -13,8 +13,7 @@ export default class Screenshot extends Component {
         const url = this.props.imagePath
             .split('/')
             .map((item) => encodeURIComponent(item))
-            .join('/')
-            .concat(`?t=${Date.now()}`);
+            .join('/');
 
         return (
             <LazyLoad offsetVertical={800}>

diff --git a/lib/static/components/state/state-success.js b/lib/static/components/state/state-success.js
@@ -3,17 +3,28 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import Screenshot from './screenshot';
+import {isUpdatedStatus} from '../../../common-utils';
 
 export default class StateSuccess extends Component {
     static propTypes = {
+        status: PropTypes.string.isRequired,
         expected: PropTypes.string.isRequired
     }
 
     render() {
+        const imagePath = isUpdatedStatus(this.props.status)
+            ? addTimestamp(this.props.expected)
+            : this.props.expected;
+
         return (
             <div className="image-box__image">
-                <Screenshot imagePath={this.props.expected}/>
+                <Screenshot imagePath={imagePath}/>
             </div>
         );
     }
 }
+
+// for prevent image caching
+function addTimestamp(imagePath) {
+    return imagePath.concat(`?t=${Date.now()}`);
+}