Merge pull request #84 from OpenFuturePlatform/key-master-fix

Key master fix

Author: Elaman Nazarkulov

frontend/src/actions/gateways.js

@@ -31,6 +31,14 @@ export const saveGatewayApplication = formValues => async (dispatch) => {
     await dispatch(apiPost(getGatewayApplicationsPath(), formValues));
 };
 
+export const updateGatewayApplication = (id) => async (dispatch) => {
+    const gateway = await dispatch(apiPost(getGatewayApplicationsPath(id)));
+    const error = '';
+    const payload = { id, gateway, error, loading: false };
+
+    dispatch({ type: SET_GATEWAY_APPLICATION_SET, payload });
+};
+
 export const fetchGatewayApplicationDetailsFromApi = (id) => async dispatch => {
     dispatch({ type: SET_GATEWAY_APPLICATION_SET, payload: { id, loading: true } });
 

frontend/src/components/GatewayApplicationKeyGenerate.js

@@ -38,10 +38,10 @@ class GatewayApplicationKeyGenerateComponent extends Component {
 
   onSubmit = async () => {
     const { submitWithSaving } = this.props;
-    const { expiredDate, gatewayId } = this.state;
+    const { expiredDate } = this.state;
     this.setState({ isSaving: true });
 
-    submitWithSaving({ expiredDate: expiredDate, gatewayId: gatewayId });
+    submitWithSaving({ expiredDate });
   };
 
   render() {
@@ -50,7 +50,7 @@ class GatewayApplicationKeyGenerateComponent extends Component {
     return (
       <KeyGenerateContainer>
         <Button primary type="button" floated="right" onClick={this.onShow}>
-          Generate New Key
+          Generate New Keys
         </Button>
         <Modal size="tiny" open={isVisible} onClose={this.onBackgroundClick}>
           <Modal.Header>Generate Application Key</Modal.Header>

frontend/src/components/GatewayApplicationWallet.js

@@ -8,7 +8,6 @@ import {Table} from "../components-ui/Table";
 import {WalletGenerate} from "./GatewayApplicationWalletGenerate";
 import {
   generateGatewayApplicationWallet,
-  getGatewayApplicationWallet,
   removeGatewayApplicationWallet
 } from "../actions/gateway-wallet";
 

frontend/src/scenes/GatewayApplicationSummary.js

@@ -3,7 +3,7 @@ import {Card, Grid} from "semantic-ui-react";
 import {WordWrap} from "../components-ui/WordWrap";
 import {bindActionCreators} from "redux";
 import {connect} from "react-redux";
-import {fetchGatewayApplicationDetails} from "../actions/gateways";
+import {fetchGatewayApplicationDetails, updateGatewayApplication} from "../actions/gateways";
 
 import {GatewayApplicationWallet} from "../components/GatewayApplicationWallet";
 import {getGatewayApplicationWallet} from "../actions/gateway-wallet";
@@ -28,8 +28,10 @@ class GatewayApplicationSummary extends Component {
 
     getGatewayId = () => this.props.match.params.id;
 
-    onKeyGenerate = () => {
+    onKeyGenerate = expiredDate => {
       const { gateway } = this.props;
+      this.props.actions.updateGatewayApplication(gateway.id);
+
     }
 
     render() {
@@ -52,7 +54,7 @@ class GatewayApplicationSummary extends Component {
                                     </div>
                                 </Card.Content>
                                 <Card.Content>
-                                    <GatewayKeyGenerate  gateway={gateway} onSubmit={this.onKeyGenerate()} />
+                                    <GatewayKeyGenerate  gateway={gateway} onSubmit={this.onKeyGenerate} />
                                     <div className="table-key"><strong>Access Key</strong></div>
                                     <div className="table-value table-value-background-color access-key selectable"
                                          id="credentials-sb">{gateway.apiAccessKey}
@@ -95,7 +97,8 @@ const mapDispatchToProps = dispatch => ({
     actions: bindActionCreators(
         {
             fetchGatewayApplicationDetails,
-            getGatewayApplicationWallet
+            getGatewayApplicationWallet,
+            updateGatewayApplication
         },
         dispatch
     )

payment-chooser/build/index.html

@@ -34,18 +34,14 @@
                     <h2 class="card-header-title">Your Order</h2>
                 </div>
                 <div class="card-body">
-                    <!--<ul class="list-inline">
-                        <li class="list-inline-item"><h4>Order ${orderId}</h4></li>
-                        <li class="list-inline-item">${amount} ${currency}</li>
-                    </ul>-->
                     <div class="row align-items-left">
                         <div class="col-md-6 mb-1 mb-md-0">Amount:</div>
-                        <div class="col-md-6 amount">`${currency}`</div>
+                        <div class="col-md-6 amount"></div>
                     </div>
                     <hr class="hr-space">
                     <div class="row align-items-left">
                         <div class="col-md-6 mb-1 mb-md-0">Remaining:</div>
-                        <div class="col-md-6 remaining">`${currency}`</div>
+                        <div class="col-md-6 remaining"></div>
                     </div>
                 </div>
                 <div id="countdown"></div>

payment-chooser/build/resources/static/static/js/payment-chooser.js

@@ -34,18 +34,14 @@
                     <h2 class="card-header-title">Your Order</h2>
                 </div>
                 <div class="card-body">
-                    <!--<ul class="list-inline">
-                        <li class="list-inline-item"><h4>Order ${orderId}</h4></li>
-                        <li class="list-inline-item">${amount} ${currency}</li>
-                    </ul>-->
                     <div class="row align-items-left">
                         <div class="col-md-6 mb-1 mb-md-0">Amount:</div>
-                        <div class="col-md-6 amount">`${currency}`</div>
+                        <div class="col-md-6 amount"></div>
                     </div>
                     <hr class="hr-space">
                     <div class="row align-items-left">
                         <div class="col-md-6 mb-1 mb-md-0">Remaining:</div>
-                        <div class="col-md-6 remaining">`${currency}`</div>
+                        <div class="col-md-6 remaining"></div>
                     </div>
                 </div>
                 <div id="countdown"></div>