Merge pull request #216 from Digipalvelutehdas/develop

Merging develop to master for release 0.38.0

Author: brylie

.eslintrc

@@ -15,6 +15,10 @@
     "import/resolver": "meteor"
   },
   "rules": {
+    "arrow-body-style": [
+      2, 
+      "always"
+    ],
     "comma-dangle": [
       2,
       "always-multiline"

CONTRIBUTING.md

@@ -30,6 +30,8 @@ Use the following guidelines when contributing to this project.
   - [File structure](#file-structure)
     - [File names](#file-names)
   - [Collection/Schema structure](#collectionschema-structure)
+    - [Explicit required fields](#explicit-required-fields)
+    - [Schema changes](#schema-changes)
   - [Internationalization (i18n)](#internationalization-i18n)
     - [i18n key structure](#i18n-key-structure)
     - [Template text (HTML/Blaze)](#template-text-htmlblaze)
@@ -362,6 +364,22 @@ CollectionName.schema.i18n("schemas.collection_name");
 // Attach schema to collection for validation, etc.
 CollectionName.attachSchema(CollectionName.schema);
 ```
+### Explicit required fields
+When defining schemas, we need to designate some fields as *required* or *optional*. By default if we do not designate a field as *required* or *optional*, it will be implicitly *required*.
+
+Following the guideline of **explicit is better than implicit**, all fields should be explicitly defined as *required* or *optional*:
+
+```js
+// Schema object
+requiredField : {
+  ...
+  optional: false
+},
+optionalField: {
+  ...
+  optional: true
+}
+```
 
 ### Schema changes
 

README.md

@@ -38,9 +38,9 @@ For API consumers APInf provides simple key management, key usage analytics and
 
 
 # Development status
-[![Stories in Ready](https://badge.waffle.io/apinf/api-umbrella-dashboard.png?label=ready&title=Ready)](https://waffle.io/apinf/api-umbrella-dashboard)
+[![Stories in Ready](https://badge.waffle.io/apinf/platform.png?label=ready&title=Ready)](https://waffle.io/apinf/api-umbrella-dashboard)
 
-[![Throughput Graph](https://graphs.waffle.io/apinf/api-umbrella-dashboard/throughput.svg)](https://waffle.io/apinf/api-umbrella-dashboard/metrics)
+[![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.

about/client/about.html

@@ -28,7 +28,7 @@ <h3>
               Apinf
             </dt>
             <dd>
-              0.37.0
+              0.38.0
             </dd>
             <dt>
               API Umbrella

catalogue/client/catalogue.html api_catalog/client/api_catalog.htmlcatalogue/client/catalogue.html renamed to api_catalog/client/api_catalog.html

@@ -1,15 +1,15 @@
-<template name="catalogue">
+<template name="apiCatalog">
   <div class="container">
     <h1 class="page-header">
       {{_ "catalogue_Title" }}
     </h1>
 
-{{> catalogueToolbar apis=apis }}
+    {{> apiCatalogToolbar apis=apis }}
 
     <!-- if viewMode is table, show table -->
     {{# if gridViewMode }}
       {{# if Template.subscriptionsReady }}
-        {{> catalogueGrid apis=apis }}
+        {{> apiCatalogGrid apis=apis }}
       {{ else }}
         {{> spinner }}
       {{/ if }}
@@ -18,7 +18,7 @@ <h1 class="page-header">
     <!-- if viewMode is table, show table -->
     {{# if tableViewMode }}
       {{# if Template.subscriptionsReady }}
-        {{> catalogueTable apis=apis }}
+        {{> apiCatalogTable apis=apis }}
       {{ else }}
         {{> spinner }}
       {{/ if }}

catalogue/client/catalogue.js api_catalog/client/api_catalog.jscatalogue/client/catalogue.js renamed to api_catalog/client/api_catalog.js

@@ -6,7 +6,7 @@ import { FlowRouter } from 'meteor/kadira:flow-router';
 import { Apis } from '/apis/collection';
 import { ApiBookmarks } from '/bookmarks/collection';
 
-Template.catalogue.onCreated(function () {
+Template.apiCatalog.onCreated(function () {
   // Get reference to template instance
   const instance = this;
   // Get user id
@@ -110,12 +110,12 @@ Template.catalogue.onCreated(function () {
   });
 });
 
-Template.catalogue.onRendered(function () {
+Template.apiCatalog.onRendered(function () {
   // Activate tooltips on all relevant items
   $('.toolbar-tooltip').tooltip({ placement: 'bottom' });
 });
 
-Template.catalogue.helpers({
+Template.apiCatalog.helpers({
   apis () {
     // Return items of apis collection via Pagination
     return Template.instance().pagination.getPage();
@@ -137,22 +137,3 @@ Template.catalogue.helpers({
     return (viewMode === 'table');
   },
 });
-
-Template.catalogue.events({
-  'change #sort-select': function (event) {
-    // Set URL parameter
-    FlowRouter.setQueryParams({ sortBy: event.target.value });
-  },
-  'change [name=sort-direction]': function (event) {
-    // Set URL parameter
-    FlowRouter.setQueryParams({ sortDirection: event.target.value });
-  },
-  'change [name=filter-options]': function (event) {
-    // Set URL parameter
-    FlowRouter.setQueryParams({ filterBy: event.target.value });
-  },
-  'change [name=view-mode]': function (event) {
-    // Set URL parameter
-    FlowRouter.setQueryParams({ viewMode: event.target.value });
-  },
-});

catalogue/client/catalogue.less api_catalog/client/api_catalog.lesscatalogue/client/catalogue.less renamed to api_catalog/client/api_catalog.less

@@ -1,25 +1,5 @@
 @import "/core/client/style/bootstrap-variables.less";
 
-.sort-options-select {
-  padding-left: 0.5em;
-}
-
-.filter-options-menu {
-  padding-left: 1em;
-}
-
-.sort-filter-toolbar {
-  padding-left: 0;
-}
-
-.sort-filter-toolbar-title {
-  margin-left: 0;
-}
-
-.sort-options-form {
-  display: inline;
-}
-
 /* Class to make pagination buttons inactive */
 .inactive a {
   color: #d3d3d3 !important;

api_catalog/client/grid/grid.html

@@ -0,0 +1,9 @@
+<template name="apiCatalogGrid">
+  <div class="row">
+    {{# each api in apis }}
+    <div class="col-xl-2 col-lg-3 col-md-4 col-sm-6 col-xs-12">
+      {{> apiCard api=api }}
+    </div>
+    {{/ each }}
+  </div>
+</template>

catalogue/client/lib/router.js api_catalog/client/lib/router.jscatalogue/client/lib/router.js renamed to api_catalog/client/lib/router.js

@@ -2,7 +2,7 @@ import { Meteor } from 'meteor/meteor';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 import { BlazeLayout } from 'meteor/kadira:blaze-layout';
 
-FlowRouter.route('/catalogue', {
+FlowRouter.route('/apis', {
   // Get query parameters for Catalog page on Enter
   triggersEnter: [function (context) {
     if (!context.queryParams.sortBy) {
@@ -18,8 +18,8 @@ FlowRouter.route('/catalogue', {
       context.queryParams.filterBy = 'all';
     }
   }],
-  name: 'catalogue',
+  name: 'apiCatalog',
   action: function () {
-    BlazeLayout.render('masterLayout', { main: 'catalogue' });
+    BlazeLayout.render('masterLayout', { main: 'apiCatalog' });
   },
 });

catalogue/client/table/table.html api_catalog/client/table/table.htmlcatalogue/client/table/table.html renamed to api_catalog/client/table/table.html

@@ -1,4 +1,4 @@
-<template name="catalogueTable">
+<template name="apiCatalogTable">
   <div class="table-responsive">
     <table class="table table-striped table-bordered api-catalogue-table">
       <tbody>
@@ -17,6 +17,9 @@ <h4 class="api-catalogue-table-title">
                 {{ api.name }}
               </a>
             </h4>
+            <!-- Api LifeCycleStatus Label -->
+            {{> apiLifecycleStatus api=api }}
+            
             {{# unless api.isPublic }}
               <span class="label label-default label-align">private</span>
             {{/ unless }}