Merge pull request #1907 from apinf/feature/autoform-datepicker

Use bootstrap-datepicker for metadata Dates

Author: marla-singer

.meteor/packages

@@ -74,3 +74,5 @@ shell-server@0.2.1
 tmeasday:publish-counts
 percolate:migrations
 michalvalasek:autoform-bootstrap-colorpicker
+rajit:bootstrap3-datepicker
+apinf:autoform-bs-datepicker

.meteor/versions

@@ -16,6 +16,7 @@ allow-deny@1.0.5
 amplify@1.0.0
 apinf:accounts-admin-ui@0.3.1
 apinf:api-umbrella@1.4.1
+apinf:autoform-bs-datepicker@1.1.2
 apinf:create-role-if-undefined@0.1.1
 apinf:first-admin@0.1.2
 autoupdate@1.3.12
@@ -119,6 +120,7 @@ promise@0.8.8
 raix:eventemitter@0.1.3
 raix:handlebar-helpers@0.2.5
 raix:ui-dropped-event@0.0.7
+rajit:bootstrap3-datepicker@1.5.1
 random@1.0.10
 rate-limit@1.0.6
 reactive-dict@1.1.8

core/helper_functions/format_date.js

@@ -0,0 +1,10 @@
+import moment from 'moment';
+/*
+  Check file name for provided extensions
+  @param {Date} date - Date object to be formatted
+  @param {string} dateFormat - Date format, eg. "MMMM DD YYYY" (default)
+*/
+export function formatDate (date, dateFormat = 'MMMM DD YYYY') {
+  // Return formatted date
+  return moment(date).format(dateFormat);
+}

core/lib/i18n/en.i18n.json

@@ -92,6 +92,7 @@
   "apiIntro_steps_welcome_intro": "Welcome",
   "apiIntro_skipLabel": "Skip",
   "apiIntro_quickTour_button_text": "Quick tour",
+  "apiMetadata_dateInvalid": "End date must be after begin date",
   "apiRemoveAuthorizedUser_cancelButton_text": "No, cancel",
   "apiRemoveAuthorizedUser_confirmation_text": "Are you sure you want to remove this authorized user?",
   "apiRemoveAuthorizedUser_modalTitle": "Remove authorized user",
@@ -392,10 +393,12 @@
                   "label": "Description"
               },
               "validSince": {
-                  "label": "Valid since"
+                  "label": "Valid since",
+                  "placeholder": "Click to select date"
               },
               "validUntil": {
-                  "label": "Valid until"
+                  "label": "Valid until",
+                  "placeholder": "Click to select date"
               },
               "serviceLevelAgreement": {
                   "label": "Service Level Agreement"

metadata/client/edit/autoform.js

@@ -1,3 +1,8 @@
+import { AutoForm } from 'meteor/aldeed:autoform';
+import { Router } from 'meteor/iron:router';
+
+import $ from 'jquery';
+
 AutoForm.addHooks('editApiMetadataForm', {
   before: {
     insert (metadata) {
@@ -18,10 +23,3 @@ AutoForm.addHooks('editApiMetadataForm', {
     $('#apiMetadataModal').modal('hide');
   },
 });
-
-AutoForm.addHooks('updateApiMetadataForm', {
-  onSuccess () {
-    // Close modal dialogue
-    $('#apiMetadataModal').modal('hide');
-  },
-});

metadata/client/edit/edit.html

@@ -27,7 +27,7 @@ <h4 class="modal-title" id="editMetadataFormLabel">
           {{# if metadata }}
           {{> quickForm
             collection=apiMetadataCollection
-            id="updateApiMetadataForm"
+            id="editApiMetadataForm"
             type="update"
             doc=metadata
             omitFields="apiBackendId"

metadata/client/edit/edit.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
 import { ApiMetadata } from '../../collection';
 
 Template.editApiMetadata.helpers({

metadata/client/view/metadata.js

@@ -1,3 +1,5 @@
+import { Template } from 'meteor/templating';
+import { formatDate } from '/core/helper_functions/format_date';
 import { ApiMetadata } from '../../collection';
 
 Template.viewApiMetadata.onCreated(function () {
@@ -20,6 +22,24 @@ Template.viewApiMetadata.helpers({
     // TODO: migrate ApiMetadata schema to use 'apiId' instead of 'apiBackendId'
     const apiMetadata = ApiMetadata.findOne({ apiBackendId: apiId });
 
+    // Check apiMetadata is defined
+    if (apiMetadata) {
+      // Check service is defined
+      if (apiMetadata.service) {
+        const service = apiMetadata.service;
+        // Format validSince if defined
+        if (service.validSince) {
+          service.validSince = formatDate(service.validSince);
+        }
+        // Format validUntil if defined
+        if (service.validUntil) {
+          service.validUntil = formatDate(service.validUntil);
+        }
+        // Attach formatted dates to metadata service object
+        apiMetadata.service = service;
+      }
+    }
+
     return apiMetadata;
   },
 });

metadata/collection/permisisons.js metadata/collection/permissions.jsmetadata/collection/permisisons.js renamed to metadata/collection/permissions.js

@@ -1,12 +1,14 @@
+import { SimpleSchema } from 'meteor/aldeed:simple-schema';
+import { TAPi18n } from 'meteor/tap:i18n';
 import { ApiMetadata } from '/metadata/collection';
 
 ApiMetadata.schema = new SimpleSchema({
   // TODO: migrate to use 'apiId' instead of 'apiBackendId'
-  'apiBackendId': {
+  apiBackendId: {
     type: String,
     regEx: SimpleSchema.RegEx.Id,
   },
-  'organization': {
+  organization: {
     type: Object,
     optional: true,
   },
@@ -18,7 +20,7 @@ ApiMetadata.schema = new SimpleSchema({
     type: String,
     optional: true,
   },
-  'contact': {
+  contact: {
     type: Object,
     optional: true,
   },
@@ -34,7 +36,7 @@ ApiMetadata.schema = new SimpleSchema({
     type: String,
     optional: true,
   },
-  'service': {
+  service: {
     type: Object,
     optional: true,
   },
@@ -49,17 +51,46 @@ ApiMetadata.schema = new SimpleSchema({
   'service.validSince': {
     type: Date,
     optional: true,
+    autoform: {
+      type: 'bootstrap-datepicker',
+    },
   },
   'service.validUntil': {
     type: Date,
     optional: true,
+    autoform: {
+      type: 'bootstrap-datepicker',
+    },
+    custom () {
+      let validation;
+      const validSince = this.field('service.validSince').value;
+      const validUntil = this.value;
+
+      // validUntil must be after validSince
+      if (
+        (validSince instanceof Date) &&
+        (validUntil instanceof Date) &&
+        validUntil < validSince
+      ) {
+        validation = 'dateError';
+      }
+      return validation;
+    },
   },
   'service.serviceLevelAgreement': {
     type: String,
     optional: true,
   },
 });
 
+// Fetch dateInvalid message
+const dateInvalid = TAPi18n.__('apiMetadata_dateInvalid');
+
+// Define custom validation error messages
+ApiMetadata.schema.messages({
+  dateError: dateInvalid,
+});
+
 // Enable translations (i18n)
 ApiMetadata.schema.i18n('schemas.apiMetadata');