Merge pull request #171 from Digipalvelutehdas/develop

Merging to master for release

Author: brylie

.meteor/packages

@@ -76,3 +76,7 @@ kadira:flow-router
 kadira:blaze-layout
 arillo:flow-router-helpers
 useraccounts:flow-routing
+nimble:restivus
+apinf:restivus-swagger
+kurounin:pagination-blaze
+kurounin:pagination

.meteor/versions

@@ -19,6 +19,7 @@ apinf:[email protected]
 apinf:[email protected]
 apinf:[email protected]
 apinf:[email protected]
+apinf:[email protected]
 arillo:[email protected]
 [email protected]
 [email protected]
@@ -97,6 +98,7 @@ momentjs:[email protected]
 [email protected]
 [email protected]
 [email protected]
+nimble:[email protected]
 [email protected]
 [email protected]_2
 [email protected]
@@ -128,6 +130,7 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
+simple:[email protected]
 simple:[email protected]
 softwarerero:[email protected]
 [email protected]

about/client/about.html

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

apis/client/add/add.html

@@ -1,19 +1,27 @@
 <template name="addApi">
-  <div class="container">
-    <h1 class="page-header">
-      {{_ "addApi_header" }}
-    </h1>
-    {{# autoForm collection=ApisCollection id="addApiForm" type="insert" }}
-      <!--invisible auto-value field-->
-      {{> afQuickField name='latestMonitoringStatusCode' value="-1" type="hidden"}}
-      <fieldset>
-        {{> afQuickField name='name' }}
-        {{> afQuickField name='description' rows=2 }}
-        {{> afQuickField name='url' }}
-      </fieldset>
-      <button type="submit" class="btn btn-primary">
-        {{_ 'addApi_button_text' }}
-      </button>
-    {{/ autoForm }}
-  </div>
+  {{# if Template.subscriptionsReady }}
+    <div class="container">
+      <h1 class="page-header">
+        {{_ "addApi_header" }}
+      </h1>
+      {{# autoForm collection=ApisCollection id="addApiForm" type="insert" }}
+        <!--invisible auto-value field-->
+        {{> afQuickField name='latestMonitoringStatusCode' value="-1" type="hidden"}}
+        <fieldset>
+          {{> afQuickField name='name' }}
+          {{> afQuickField name='description' rows=2 }}
+          {{> afQuickField name='url' }}
+          {{> afQuickField name='lifecycleStatus' }}
+          {{# if organizationsExist }}
+            {{> afQuickField name='organizationId' }}
+          {{/ if }}
+        </fieldset>
+        <button type="submit" class="btn btn-primary">
+          {{_ 'addApi_button_text' }}
+        </button>
+      {{/ autoForm }}
+    </div>
+  {{ else }}
+    {{> spinner }}
+  {{/ if }}
 </template>

apis/client/add/add.js

@@ -1,8 +1,24 @@
-import { Apis } from "../../collection";
+// Meteor package import
+import { Template } from 'meteor/templating';
+// Import collections
+import { Organizations } from '/organizations/collection';
+import { Apis } from '../../collection';
+
+Template.addApi.onCreated( function () {
+  const instance = this;
+
+  // Subscribe to all organizations, returns only id and name
+  instance.subscribe('allOrganizationBasicDetails');
+});
 
 Template.addApi.helpers({
   ApisCollection () {
     // Make APIs collection available to template (i.e. autoform)
     return Apis;
-  }
+  },
+  organizationsExist () {
+    const organizationsCount = Organizations.find().count();
+
+    return organizationsCount > 0;
+  },
 });

apis/client/add/autoform.js

@@ -3,6 +3,9 @@ import { Roles } from 'meteor/alanning:roles';
 import { AutoForm } from 'meteor/aldeed:autoform';
 import { FlowRouter } from 'meteor/kadira:flow-router';
 
+import { Organizations } from '/organizations/collection';
+import { ApiMetadata } from '/metadata/collection';
+
 AutoForm.hooks({
   addApiForm: {
     before: {
@@ -17,6 +20,36 @@ AutoForm.hooks({
         return api;
       },
     },
+    after: {
+      insert () {
+        // Get API id
+        const apiId = this.docId;
+        // Get organization id
+        const organizationId = this.insertDoc.organizationId;
+
+        // Find the organization document
+        const organization = Organizations.findOne(organizationId);
+
+        // If organization was selected
+        if (organization) {
+          // Fill a object with organization information for metadata
+          const metadataInformation = {
+            apiBackendId: apiId,
+            organization: {
+              name: organization.name,
+              description: organization.description,
+            },
+            contact: {
+              name: organization.contact.person,
+              phone: organization.contact.phone,
+              email: organization.contact.email,
+            },
+          };
+          // Create a new metadata document
+          ApiMetadata.insert(metadataInformation);
+        }
+      },
+    },
     onSuccess (formType, apiId) {
       // Redirect to newly added API
       FlowRouter.go('viewApi', { _id: apiId });

apis/client/view/header/header.html

@@ -7,10 +7,17 @@
         <h1 id="api-header">
           {{ api.name }}
           {{> viewApiStatus api=api width="0.4" }}
+
         </h1>
+
         {{# unless api.isPublic }}
-          <span class="label label-default label-align">private</span>
+          <span class="label label-default">
+            {{_ "viewApiPageHeader_privateLabel_text" }}
+          </span>
         {{/ unless }}
+        &nbsp; <!--TODO: determine why these labels don't have margin -->
+        {{> apiLifecycleStatus api=api }}
+
         <ul class="list-inline view-api-meta-details">
           <li>
             <i class="fa fa-user"></i>

apis/client/view/header/header.less

@@ -21,10 +21,6 @@
     margin-top: 0.1em;
   }
 
-  .label-align {
-    vertical-align: text-top;
-  }
-
   .view-api-meta-details {
     padding-left: 0.5em;
     margin-left: 3.4em;

apis/client/view/lifecycle_status/lifecycle_status.html

@@ -0,0 +1,6 @@
+<template name="apiLifecycleStatus">
+    <!-- show lifecycle status label -->
+    <span class="label label-{{ labelType }}">
+      {{ lifecycleStatus }}
+    </span>
+</template>

apis/client/view/lifecycle_status/lifecycle_status.js

@@ -0,0 +1,56 @@
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+
+Template.apiLifecycleStatus.helpers({
+  labelType () {
+    // Get reference to template instance
+    const templateInstance = Template.instance();
+
+    // Placeholder for label type
+    let labelType;
+
+    // Get API lifecycle status from template instance
+    const lifecycleStatus = templateInstance.data.api.lifecycleStatus;
+
+    // Get label type based on lifecycle status
+    switch (lifecycleStatus) {
+      case 'development':
+        labelType = 'primary';
+        break;
+      case 'production':
+        labelType = 'success';
+        break;
+      case 'design':
+        labelType = 'info';
+        break;
+      case 'testing':
+        labelType = 'warning';
+        break;
+      case 'deprecated':
+        labelType = 'danger';
+        break;
+      default:
+        labelType = 'default';
+    }
+    return labelType;
+  },
+  lifecycleStatus () {
+    // Get reference to template instahce
+    const templateInstance = Template.instance();
+
+    let statusText;
+
+    if (templateInstance.data.api && templateInstance.data.api.lifecycleStatus) {
+      // Get lifecycle status from API document
+      const status = templateInstance.data.api.lifecycleStatus;
+
+      // Get status text translation
+      statusText = TAPi18n.__(`apiLifecycleStatus_labelText_${status}`);
+    } else {
+      // Get translation text for Unknown lifecycle status
+      statusText = TAPi18n.__('apiLifecycleStatus_labelText_unknown');
+    }
+
+    return statusText;
+  },
+});