Merge pull request #1401 from botpress/f_fix-nodes-parsing

fix(admin): nodes parsing & ensure fingerprint
botpress · Feb 2, 2019 · 1670eb1 · 1670eb1
2 parents 6410308 + 7601e52
commit 1670eb1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 10 deletions.
diff --git a/src/bp/ui-admin/src/Pages/Components/Licensing/CustomizeLicenseForm.js b/src/bp/ui-admin/src/Pages/Components/Licensing/CustomizeLicenseForm.js
@@ -69,7 +69,7 @@ class CustomizeLicenseForm extends Component {
 
   handleLabelChanged = e => this.setState({ label: e.target.value }, () => this.updateParent())
   handleCheckboxChanged = e => this.setState({ [e.target.name]: e.target.checked }, this.calculatePrice)
-  handleInputChanged = e => this.setState({ [e.target.name]: e.target.value }, this.calculatePrice)
+  handleNumberInputChanged = e => this.setState({ [e.target.name]: e.target.valueAsNumber }, this.calculatePrice)
 
   render() {
     if (!this.props.products) {
@@ -128,7 +128,7 @@ class CustomizeLicenseForm extends Component {
                 min="0"
                 max="100"
                 value={this.state.nodes}
-                onChange={this.handleInputChanged}
+                onChange={this.handleNumberInputChanged}
               />
             </PriceItem>
             <PriceItem

diff --git a/src/bp/ui-admin/src/Pages/Components/Licensing/KeyListItem.jsx b/src/bp/ui-admin/src/Pages/Components/Licensing/KeyListItem.jsx
@@ -48,7 +48,7 @@ export default class KeyListItem extends Component {
       try {
         const licensing = await api.getLicensing()
         await licensing.delete(`/me/keys/${license.stripeSubscriptionId}`)
-        this.props.refreshLicense()
+        this.props.onLicenseUpdated({ ...license, canceled: true })
       } catch (error) {
         console.error('error canceling license')
       }
@@ -65,7 +65,7 @@ export default class KeyListItem extends Component {
     try {
       const licenseKey = await this.activateWithServerFingerprint()
       await this.updateServerKey(licenseKey)
-      this.props.refreshLicense()
+      this.props.onLicenseUpdated(licenseKey)
     } catch (error) {
       console.log('error while setting up license')
     }
@@ -133,7 +133,7 @@ export default class KeyListItem extends Component {
         <DropdownMenu>
           {license.assigned && <DropdownItem onClick={this.revealLicense}>Reveal License Key</DropdownItem>}
           <DropdownItem onClick={this.assignFingerprint}>Assign Fingerprint</DropdownItem>
-          <DropdownItem onClick={this.useOnServer}>Use on this Server</DropdownItem>
+          {this.props.clusterFingerprint && <DropdownItem onClick={this.useOnServer}>Use on this Server</DropdownItem>}
           <DropdownItem onClick={this.updateLicense}>Update License</DropdownItem>
           {!license.canceled && <DropdownItem onClick={this.disableAutoRenew}>Disable Auto-Renew</DropdownItem>}
         </DropdownMenu>
@@ -144,7 +144,7 @@ export default class KeyListItem extends Component {
   render() {
     const { license } = this.props
     const assignedClass = license.assigned ? 'assigned' : 'not-assigned'
-    const isActive = this.props.clusterFingerprint === license.fingerprint
+    const isActive = this.props.clusterFingerprint && this.props.clusterFingerprint === license.fingerprint
 
     return (
       <tr disabled={license.canceled}>
@@ -157,7 +157,7 @@ export default class KeyListItem extends Component {
           </span>
         </td>
         <td>
-          <span className="table--keys__users">{license.limits && license.limits.nodes + 1}</span>
+          <span className="table--keys__users">{license.limits && Number(license.limits.nodes) + 1}</span>
         </td>
         <td>
           <span className="table--keys__users">{license.quantities.isGoldSupport ? 'Gold' : 'Standard'}</span>

diff --git a/src/bp/ui-admin/src/Pages/MyAccount/BotpressAccount/KeyList.jsx b/src/bp/ui-admin/src/Pages/MyAccount/BotpressAccount/KeyList.jsx
@@ -11,7 +11,7 @@ import ActivateRevealKeyModal from '../../Components/Licensing/ActivateRevealKey
 import UpdateLicenseModal from '../../Components/Licensing/UpdateLicenseModal'
 import BuyLicenseModal from '../../Components/Licensing/BuyLicenseModal'
 import LoadingSection from '../../Components/LoadingSection'
-import { fetchAllKeys, fetchProducts, fetchLicensing, logoutUser } from '../../../reducers/license'
+import { fetchAllKeys, fetchProducts, fetchLicensing, logoutUser, licenseUpdated } from '../../../reducers/license'
 
 class KeyList extends Component {
   state = {
@@ -29,6 +29,11 @@ class KeyList extends Component {
 
   toggleBuyModal = () => this.setState({ buyModalOpen: !this.state.buyModalOpen })
 
+  onLicenseUpdated = license => {
+    this.props.licenseUpdated(license)
+    this.setState({ updateModalOpen: false })
+  }
+
   toggleUpdateModal = selectedLicense => {
     this.setState({
       updateModalOpen: !this.state.updateModalOpen,
@@ -86,7 +91,7 @@ class KeyList extends Component {
                 products={this.props.products}
                 clusterFingerprint={clusterFingerprint}
                 onRevealActivate={this.toggleKeyModal}
-                onLicenseUpdated={this.toggleUpdateModal}
+                onLicenseUpdated={this.onLicenseUpdated}
               />
             ))}
         </tbody>
@@ -171,7 +176,7 @@ class KeyList extends Component {
 
 const mapStateToProps = state => ({ ...state.license })
 
-const mapDispatchToProps = { fetchAllKeys, fetchProducts, fetchLicensing, logoutUser }
+const mapDispatchToProps = { fetchAllKeys, fetchProducts, fetchLicensing, logoutUser, licenseUpdated }
 export default connect(
   mapStateToProps,
   mapDispatchToProps

diff --git a/src/bp/ui-admin/src/reducers/license.js b/src/bp/ui-admin/src/reducers/license.js
@@ -9,6 +9,7 @@ export const UPDATE_LICENSING_ACCOUNT = 'license/UPDATE_LICENSING_ACCOUNT'
 export const FETCH_PRODUCTS_REQUESTED = 'license/FETCH_PRODUCTS_REQUESTED'
 export const FETCH_PRODUCTS_RECEIVED = 'license/FETCH_PRODUCTS_RECEIVED'
 export const LOGOUT_USER_FROM_LICENSE_SERVER = 'license/LOGOUT_USER_FROM_LICENSE_SERVER'
+export const LICENSE_KEY_UPDATED = 'license/LICENSE_KEY_UPDATED'
 
 const initialState = {
   license: null,
@@ -22,6 +23,12 @@ const initialState = {
 
 export default (state = initialState, action) => {
   switch (action.type) {
+    case LICENSE_KEY_UPDATED:
+      const idx = state.keys.findIndex(k => k.stripeSubscriptionId === action.license.stripeSubscriptionId)
+      return {
+        ...state,
+        keys: [...state.keys.slice(0, idx), action.license, ...state.keys.slice(idx + 1)]
+      }
     case LOGOUT_USER_FROM_LICENSE_SERVER:
       return {
         ...initialState
@@ -75,6 +82,11 @@ export default (state = initialState, action) => {
   }
 }
 
+export const licenseUpdated = license => ({
+  type: LICENSE_KEY_UPDATED,
+  license
+})
+
 export const logoutUser = () => {
   logout()
   return {