Merge pull request #3567 from apinf/develop

0.56.0 release

.meteor/packages

@@ -13,9 +13,7 @@ aldeed:autoform-bs-button-group-input
 aldeed:collection2
 aldeed:simple-schema
 aldeed:template-extension
-apinf:accounts-admin-ui
 apinf:accounts-fiware@0.1.1
-apinf:api-umbrella
 apinf:autoform-bs-datepicker
 apinf:fiware@0.1.1
 apinf:restivus-swagger
@@ -86,7 +84,6 @@ tap:i18n-ui
 tmeasday:publish-counts
 todda00:friendly-slugs
 tracker@1.1.3
-twbs:bootstrap
 u2622:persistent-session
 useraccounts:bootstrap
 useraccounts:core
@@ -96,3 +93,5 @@ zimme:active-route
 aldeed:autoform-select2
 natestrauser:select2
 meteorhacks:aggregate
+apinf:api-umbrella
+apinf:accounts-admin-ui

.meteor/versions

@@ -16,10 +16,11 @@ aldeed:simple-schema@1.5.3
 aldeed:template-extension@4.1.0
 allow-deny@1.0.9
 amplify@1.0.0
-apinf:accounts-admin-ui@0.3.2
+apinf:accounts-admin-ui@0.3.4
 apinf:accounts-fiware@0.1.1
 apinf:api-umbrella@1.4.1
 apinf:autoform-bs-datepicker@1.1.2
+apinf:bootstrap@3.3.7
 apinf:create-role-if-undefined@0.1.1
 apinf:first-admin@0.1.2
 apinf:fiware@0.1.3
@@ -166,7 +167,6 @@ tmeasday:publish-counts@0.8.0
 todda00:friendly-slugs@0.6.0
 tracker@1.1.3
 trever:quill@0.0.5
-twbs:bootstrap@3.3.6
 u2622:persistent-session@0.4.4
 ui@1.0.13
 underscore@1.0.10

.travis.yml

@@ -1,5 +1,7 @@
 sudo: false
 
+group: deprecated-2017Q4
+
 language: node_js
 node_js:
   - '4'

README.md

@@ -4,11 +4,13 @@
 
   - [Build](#build)
   - [Docker image](#docker-image)
-- [Links](#links)
 - [API Umbrella Dashboard](#api-umbrella-dashboard)
 - [Development status](#development-status)
+- [Automated testing](#testing)
 - [Nightly build](#nightly-build)
 - [Contributing](#contributing)
+- [Links](#links)
+
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -25,12 +27,6 @@
 
 [![](https://images.microbadger.com/badges/image/apinf/platform.svg)](http://microbadger.com/images/apinf/platform) [![](https://images.microbadger.com/badges/version/apinf/platform.svg)](http://microbadger.com/images/apinf/platform)
 
-# Links
-- [Documentation](http://apinf.org/docs) - APInf documentation
-- [Discussion](http://community.apinf.io) - APInf discussion
-- [Apinf Hackpad](http://apinf.hackpad.com) - Planning documents, meeting minutes
-- [Sprint planning](https://waffle.io/apinf/api-umbrella-dashboard) - waffle.io sprint plans
-
 # API Umbrella Dashboard
 The APInf platform offers a comprehensive tool for API management. Building on [API Umbrella](http://nrel.github.io/api-umbrella/), it provides enhanced user interface features for API managers and consumers alike.
 
@@ -43,17 +39,21 @@ For API consumers APInf provides simple key management, key usage analytics and
 
 [![Throughput Graph](https://graphs.waffle.io/apinf/platform/throughput.svg)](https://waffle.io/apinf/platform/metrics)
 
-## Source code visualization
-Our project source code has changed throughout the project lifespan.
-
-[![source code structure](public/Apinf-developmentActivity-upTo-0.33.1.gif)](https://archive.org/details/apinf-opensource-development-visualization-from-0.1-to-0.50)
+# Testing
 
-See the [high definition video (with music) of Apinf Development Activity up to version 0.50](https://archive.org/details/apinf-opensource-development-visualization-from-0.1-to-0.50) on the Internet Archive.
+For automated testing we use [Sauce Labs](https://saucelabs.com).
 
 # Nightly build
-You can preview our latest version at [nightly.apinf.io](http://nightly.apinf.io). Feel free to register an account and test things out.
+You can preview our latest version at [nightly.apinf.io](https://nightly.apinf.io). Feel free to register an account and test things out.
 
 # Contributing
 Please review our [Contributor Guide](https://github.com/apinf/platform/blob/develop/.github/CONTRIBUTING.md) for details on how to get involved with the project.
 
 Please follow guidelines for community involvement in our [Code of Conduct](https://github.com/apinf/platform/blob/develop/CODE_OF_CONDUCT.md)
+
+# Links
+
+More about APInf: [apinf.com](https://apinf.com).
+
+APInf saas service: [apinf.io](https://apinf.io).
+

apinf_packages/about/client/about.html

@@ -1,4 +1,4 @@
-<!-- Copyright 2017 Apinf Oy
+<!-- Copyright 2018 Apinf Oy
 This file is covered by the EUPL license.
 You may obtain a copy of the licence at
 https://joinup.ec.europa.eu/community/eupl/og_page/european-union-public-licence-eupl-v11 -->
@@ -33,13 +33,33 @@ <h3>
               Apinf
             </dt>
             <dd>
-              0.55.0
+              0.56.0
             </dd>
             <dt>
               API Umbrella
             </dt>
             <dd>
-              0.13
+              0.15
+            </dd>
+            <dt>
+              Version
+            </dt>
+            <dd id="show_version">
+            </dd>
+            <dt>
+              Branch
+            </dt>
+            <dd id="show_branch">
+            </dd>
+            <dt>
+              Commit
+            </dt>
+            <dd id="show_commit">
+            </dd>
+            <dt>
+              Tag
+            </dt>
+            <dd id="show_tag">
             </dd>
           </dl>
           <h3>
@@ -50,7 +70,7 @@ <h3>
               {{_ "aboutApinf_copyright" }}
             </dt>
             <dd>
-              2017 Apinf Oy
+              2018 Apinf Oy
             </dd>
             <dt>
               {{_ "aboutApinf_license" }}
@@ -114,7 +134,7 @@ <h3>
               {{_ "aboutApinf_contributors" }}
             </dt>
             <dd>
-              Jawid Ahmadi, Taija Björklund, Vesa Härkönen, Nazia Hasan, Ville Jyrkkä, Matti Leppänen, Philippe Luickx, Jarkko Moilanen, Alapan Mukherjee, Damir Mustafin, Sridevi Nittoor, Illya Nizyev, Yan Nunes, Brylie Christopher Oxley, Sebastian Pancia, Massimo Rangoni, Saransh Dev Singh, Shalva Usubov, Juuso Vallius, Sarala Vanipenta, Cassiano Vellames, Maurício Vieira, Daria Voytova
+              Jawid Ahmadi, Taija Björklund, Vesa Härkönen, Nazia Hasan, Ville Jyrkkä, Matti Leppänen, Philippe Luickx, Ilari Mikkonen, Jarkko Moilanen, Alapan Mukherjee, Damir Mustafin, Sridevi Nittoor, Illya Nizyev, Yan Nunes, Brylie Christopher Oxley, Sebastian Pancia, Massimo Rangoni, Saransh Dev Singh, Shalva Usubov, Juuso Vallius, Sarala Vanipenta, Cassiano Vellames, Maurício Vieira, Daria Voytova
             </dd>
             <dt>
               {{_ "aboutApinf_openSource" }}

apinf_packages/about/client/about.js

@@ -0,0 +1,12 @@
+// Meteor packages imports
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+
+Template.aboutApinf.onRendered(() => {
+  Meteor.call('fetchVersionData', (error, result) => {
+    $('#show_version').text(result.version);
+    $('#show_branch').text(result.branch);
+    $('#show_commit').text(result.commit);
+    $('#show_tag').text(result.tag);
+  });
+});

apinf_packages/about/server/methods.js

@@ -0,0 +1,10 @@
+// Meteor packages imports
+import { Meteor } from 'meteor/meteor';
+
+Meteor.methods({
+  fetchVersionData () {
+    /* global Assets */
+    const myFile = JSON.parse(Assets.getText('versions.json'));
+    return myFile;
+  },
+});

apinf_packages/analytics/collection/schema.js

@@ -21,6 +21,22 @@ const MetricsSchema = new SimpleSchema({
     type: Number,
     optional: true,
   },
+  shortestResponseTime: {
+    type: Number,
+    optional: true,
+  },
+  shortResponseTime: {
+    type: Number,
+    optional: true,
+  },
+  longResponseTime: {
+    type: Number,
+    optional: true,
+  },
+  longestResponseTime: {
+    type: Number,
+    optional: true,
+  },
   successCallsCount: {
     type: Number,
     optional: true,