diff --git a/.travis.yml b/.travis.yml index f466db4..b40206c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,6 +38,9 @@ before_install: - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p before_script: + - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter + - chmod +x ./cc-test-reporter + - ./cc-test-reporter before-build - git clone https://github.com/oceanprotocol/barge - cd barge - bash -x start_ocean.sh --no-pleuston 2>&1 > start_ocean.log & @@ -53,6 +56,13 @@ script: - npm run test:e2e || travis_terminate 1 - ./scripts/build.sh +# Pipe the coverage data to Code Climate +after_script: + - ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.client.json client/coverage/lcov.info # Format client coverage + - ./cc-test-reporter format-coverage -t lcov -o coverage/codeclimate.server.json server/coverage/lcov.info # Format server coverage + - ./cc-test-reporter sum-coverage coverage/codeclimate.*.json -p 2 # Sum both coverage parts into coverage/codeclimate.json + - if [[ "$TRAVIS_TEST_RESULT" == 0 ]]; then ./cc-test-reporter upload-coverage; fi # Upload coverage/codeclimate.json + notifications: email: false diff --git a/README.md b/README.md index b4664d7..96ae69c 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,8 @@ [![Build Status](https://travis-ci.com/oceanprotocol/commons.svg?branch=master)](https://travis-ci.com/oceanprotocol/commons) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/6a19987e62344b1c9c1d5bc9f315c733)](https://www.codacy.com/app/ocean-protocol/commons) [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/6a19987e62344b1c9c1d5bc9f315c733)](https://www.codacy.com/app/ocean-protocol/commons) +[![Maintainability](https://api.codeclimate.com/v1/badges/ed6e8212a8d294b6aa88/maintainability)](https://codeclimate.com/github/oceanprotocol/commons/maintainability) +[![Test Coverage](https://api.codeclimate.com/v1/badges/ed6e8212a8d294b6aa88/test_coverage)](https://codeclimate.com/github/oceanprotocol/commons/test_coverage) [![code style: prettier](https://img.shields.io/badge/code_style-prettier-7b1173.svg?style=flat-square)](https://github.com/prettier/prettier) [![js oceanprotocol](https://img.shields.io/badge/js-oceanprotocol-7b1173.svg)](https://github.com/oceanprotocol/eslint-config-oceanprotocol) [![css bigchaindb](https://img.shields.io/badge/css-bigchaindb-39BA91.svg)](https://github.com/bigchaindb/stylelint-config-bigchaindb) diff --git a/client/src/components/organisms/AssetsUser.tsx b/client/src/components/organisms/AssetsUser.tsx index f0d828d..bd418bf 100644 --- a/client/src/components/organisms/AssetsUser.tsx +++ b/client/src/components/organisms/AssetsUser.tsx @@ -10,6 +10,8 @@ export default class AssetsUser extends PureComponent< { list?: boolean; recent?: number }, { results: any[]; isLoading: boolean } > { + public static contextType = User + public state = { results: [], isLoading: true } public _isMounted = false @@ -58,51 +60,46 @@ export default class AssetsUser extends PureComponent< public render() { const { account } = this.context + const { recent, list } = this.props + const { isLoading, results } = this.state + + if (!account) return null return ( - account && ( -
No Data Sets Yet.
- + Publish A Data Set -No Data Sets Yet.
+ + Publish A Data Set +