Merge branch 'sprint' into 'master'

Sprint to Master

Closes OP-166 and OP-162

See merge request open-platform/api!172

Author: evgeny-krylov

.gitlab-ci.yml

@@ -62,6 +62,7 @@ contract-tests:
       alias: ganache
   image: openplatform/truffle
   script:
+    - apk --no-cache add make g++ python && npm i web3-utils
     - export RPC_HOST="ganache"
     - cd src/test/truffle && truffle test
 

CHANGELOG.md

@@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Show events on scaffold page
+- Updates events in realtime
+- Show message on current token expired
+- Smart contract optimization
+
+### Removed
+- Remove field description from scaffold
 
 ## [2.3.0] - 2018-06-29
 ### Added

build.gradle

@@ -1,11 +1,11 @@
 plugins {
     id 'jacoco'
     id "idea"
-    id "org.jetbrains.kotlin.jvm" version "1.2.50"
-    id "org.jetbrains.kotlin.kapt" version "1.2.50"
-    id "org.jetbrains.kotlin.plugin.spring" version "1.2.50"
-    id "org.jetbrains.kotlin.plugin.jpa" version "1.2.50"
-    id "org.springframework.boot" version "2.0.2.RELEASE"
+    id "org.jetbrains.kotlin.jvm" version "1.2.51"
+    id "org.jetbrains.kotlin.kapt" version "1.2.51"
+    id "org.jetbrains.kotlin.plugin.spring" version "1.2.51"
+    id "org.jetbrains.kotlin.plugin.jpa" version "1.2.51"
+    id "org.springframework.boot" version "2.0.3.RELEASE"
 }
 
 apply plugin: "io.spring.dependency-management"

frontend/.vscode/settings.json

@@ -1,44 +1,45 @@
 {
-    "name": "client",
-    "version": "0.1.0",
-    "private": true,
-    "proxy": {
-        "/oauth2/authorization/google": {
-            "target": "http://localhost:8080"
-        },
-        "/api/*": {
-            "target": "http://localhost:8080"
-        }
+  "name": "client",
+  "version": "0.1.0",
+  "private": true,
+  "proxy": {
+    "/oauth2": {
+      "target": "http://localhost:8080"
     },
-    "dependencies": {
-        "axios": "^0.16.2",
-        "ethjs": "^0.4.0",
-        "ethjs-unit": "^0.1.6",
-        "moment": "^2.22.2",
-        "react": "^16.4.1",
-        "react-copy-to-clipboard": "^5.0.1",
-        "react-dates": "^17.0.0",
-        "react-dom": "^16.4.1",
-        "react-redux": "^5.0.5",
-        "react-router-dom": "^4.1.1",
-        "react-scripts": "^1.1.4",
-        "react-semantic-redux-form": "^1.2.6",
-        "react-table": "^6.8.6",
-        "redux": "^3.7.1",
-        "redux-form": "^7.0.1",
-        "redux-thunk": "^2.2.0",
-        "semantic-ui-react": "^0.78.2",
-        "styled-components": "^3.3.3",
-        "web3": "^1.0.0-beta.34",
-        "websocket": "^1.0.26"
-    },
-    "scripts": {
-        "start": "react-scripts start",
-        "build": "react-scripts build",
-        "test": "react-scripts test --env=jsdom",
-        "eject": "react-scripts eject"
-    },
-    "devDependencies": {
-        "lodash": "^4.17.10"
+    "/api/*": {
+      "target": "http://localhost:8080"
     }
+  },
+  "dependencies": {
+    "axios": "^0.16.2",
+    "ethjs": "^0.4.0",
+    "ethjs-unit": "^0.1.6",
+    "ethjs-util": "^0.1.6",
+    "moment": "^2.22.2",
+    "react": "^16.4.1",
+    "react-copy-to-clipboard": "^5.0.1",
+    "react-dates": "^17.0.0",
+    "react-dom": "^16.4.1",
+    "react-redux": "^5.0.5",
+    "react-router-dom": "^4.1.1",
+    "react-scripts": "^1.1.4",
+    "react-semantic-redux-form": "^1.2.6",
+    "react-table": "^6.8.6",
+    "redux": "^3.7.1",
+    "redux-form": "^7.0.1",
+    "redux-thunk": "^2.2.0",
+    "semantic-ui-react": "^0.81.3",
+    "styled-components": "^3.3.3",
+    "web3": "^1.0.0-beta.34",
+    "websocket": "^1.0.26"
+  },
+  "scripts": {
+    "start": "react-scripts start",
+    "build": "react-scripts build",
+    "test": "react-scripts test --env=jsdom",
+    "eject": "react-scripts eject"
+  },
+  "devDependencies": {
+    "lodash": "^4.17.10"
+  }
 }

frontend/package-lock.json

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Route, Switch } from 'react-router-dom';
+import { Route, Switch, Redirect } from 'react-router-dom';
 import { fetchGlobalProperties } from './actions/global-properties';
 import { fetchUser } from './actions/index';
 import { connect } from 'react-redux';
@@ -10,34 +10,31 @@ import { Container } from 'semantic-ui-react';
 import './css/main.css';
 
 class App extends Component {
-  componentDidMount() {
-    this.fetchUser();
-    this.props.fetchGlobalProperties();
+  async componentDidMount() {
+    await this.props.fetchUser();
+    await this.props.fetchGlobalProperties();
   }
 
-  async fetchUser() {
-    try {
-      await this.props.fetchUser();
-    } catch (e) {
-      // if 404 then
-      // this.props.history.push('/');
-    }
-  }
-
-  render() {
+  renderAuthorizedContent = () => {
     const { auth, globalProperties } = this.props;
-
-    if (!auth || !globalProperties) {
+    if (!auth.isAuthorized || !globalProperties.network.id) {
       return null;
     }
 
     return (
-      <Container>
+      <Switch>
+        <Route path="/scaffolds" component={Scaffolds} />
+        <Route path="/keys" component={Keys} />
+        <Redirect from="*" to="/scaffolds" />
+      </Switch>
+    );
+  };
+
+  render() {
+    return (
+      <Container style={{ paddingTop: '10px', paddingBottom: '50px' }}>
         <Header />
-        <Switch>
-          <Route path="/scaffolds" component={Scaffolds} />
-          <Route path="/keys" component={Keys} />
-        </Switch>
+        {this.renderAuthorizedContent()}
       </Container>
     );
   }

frontend/package.json

@@ -0,0 +1,41 @@
+import axios from 'axios';
+import { setAuthorized } from '.';
+import { parseApiError } from '../utils/parseApiError';
+
+export const request = (method, url, data, params) => async dispatch => {
+  try {
+    const { data: response, headers } = await axios({
+      method,
+      url,
+      params,
+      data
+    });
+
+    if (!headers['content-type'].includes('application/json')) {
+      dispatch(setAuthorized(false));
+      const error = { message: 'Api request finished without application/json content-type' };
+      throw error;
+    }
+
+    return response;
+  } catch (e) {
+    const response = e.response || {};
+    const status = response.status;
+
+    if (status === 401 || status === 403) {
+      dispatch(setAuthorized(false));
+    }
+
+    throw parseApiError(e);
+  }
+};
+
+export const apiGet = (url, params) => async dispatch => await dispatch(request('get', url, {}, params));
+
+export const apiPost = (url, data) => async dispatch => await dispatch(request('post', url, data, {}));
+
+export const apiPatch = (url, data) => async dispatch => await dispatch(request('patch', url, data, {}));
+
+export const apiPut = (url, data) => async dispatch => await dispatch(request('put', url, data, {}));
+
+export const apiDelete = (url, data) => async dispatch => await dispatch(request('delete', url, data));

frontend/src/App.js

@@ -1,18 +1,19 @@
-import axios from 'axios';
-import {LOAD_SCAFFOLD_FIELDS, SET_SCAFFOLD_TEMPLATES} from './types';
-import {sortBy} from 'lodash';
+import { LOAD_SCAFFOLD_FIELDS, SET_SCAFFOLD_TEMPLATES } from './types';
+import { sortBy } from 'lodash';
+import { getTemplatesPath } from '../utils/apiPathes';
+import { apiGet, apiPost } from './apiRequest';
 
-export const setTemplate = (fields) => async dispatch => {
-  dispatch({type: LOAD_SCAFFOLD_FIELDS, payload: fields});
+export const setTemplate = fields => async dispatch => {
+  dispatch({ type: LOAD_SCAFFOLD_FIELDS, payload: fields });
 };
 
 export const fetchTemplates = () => async dispatch => {
-  const result = await axios.get('/api/scaffolds/templates');
-  dispatch({type: SET_SCAFFOLD_TEMPLATES, payload: sortBy(result.data, 'name')})
+  const data = await dispatch(apiGet(getTemplatesPath()));
+  dispatch({ type: SET_SCAFFOLD_TEMPLATES, payload: sortBy(data, 'name') });
 };
 
-export const saveTemplate = (values) => async dispatch => {
-  const result = await axios.post('/api/scaffolds/templates', {...values});
+export const saveTemplate = values => async dispatch => {
+  const result = await dispatch(apiPost(getTemplatesPath(), { ...values }));
   dispatch(fetchTemplates());
   return result;
 };