From 0031d074681fd5da18bb18b8a8c20bd518d89ca3 Mon Sep 17 00:00:00 2001
From: Sacha Greif <sacha357@gmail.com>
Date: Fri, 28 Nov 2014 15:18:55 +0900
Subject: [PATCH] finishing post submit form refactoring

---
 client/views/comments/comment_form.html       |   2 +-
 .../views/forms/urlCustomType.html            |   2 +-
 client/views/forms/urlCustomType.js           |  18 ++
 client/views/posts/post_submit.html           |   2 +-
 client/views/posts/post_submit.js             | 263 ++++++++++--------
 collections/posts.js                          |  14 +-
 .../autoform-bs-datetimepicker.html           |   3 +
 ...icker.js => autoform-bs-datetimepicker.js} |  10 +-
 packages/telescope-datetimepicker/package.js  |   4 +-
 9 files changed, 185 insertions(+), 133 deletions(-)
 rename packages/telescope-datetimepicker/autoform-bs-datepicker.html => client/views/forms/urlCustomType.html (56%)
 create mode 100644 client/views/forms/urlCustomType.js
 create mode 100644 packages/telescope-datetimepicker/autoform-bs-datetimepicker.html
 rename packages/telescope-datetimepicker/{autoform-bs-datepicker.js => autoform-bs-datetimepicker.js} (91%)

diff --git a/client/views/comments/comment_form.html b/client/views/comments/comment_form.html
index a4f4b928a..1ebb62bbc 100644
--- a/client/views/comments/comment_form.html
+++ b/client/views/comments/comment_form.html
@@ -6,7 +6,7 @@
           <textarea id="comment" rows="3" autofocus="autofocus"></textarea>
         </div>
         <div class="comment-submit">
-          <input type="submit" class="button" value="{{_ "add_comment"}}" title="(⌘+enter)" />
+          <input type="submit" class="btn btn-primary" value="{{_ "add_comment"}}" title="(⌘+enter)" />
         </div>
       </form>
     </div>
diff --git a/packages/telescope-datetimepicker/autoform-bs-datepicker.html b/client/views/forms/urlCustomType.html
similarity index 56%
rename from packages/telescope-datetimepicker/autoform-bs-datepicker.html
rename to client/views/forms/urlCustomType.html
index c18fd946a..4025d1015 100644
--- a/packages/telescope-datetimepicker/autoform-bs-datepicker.html
+++ b/client/views/forms/urlCustomType.html
@@ -1,3 +1,3 @@
-<template name="afBootstrapDatepicker">
+<template name="afBootstrapUrl">
   <input type="text" value="" {{atts}}/>
 </template>
\ No newline at end of file
diff --git a/client/views/forms/urlCustomType.js b/client/views/forms/urlCustomType.js
new file mode 100644
index 000000000..bdc250ea7
--- /dev/null
+++ b/client/views/forms/urlCustomType.js
@@ -0,0 +1,18 @@
+AutoForm.addInputType("bootstrap-url", {
+  template: "afBootstrapUrl",
+  valueOut: function () {
+    var url = this.val();
+    if(!!url)
+      return (url.substring(0, 7) == "http://" || url.substring(0, 8) == "https://") ? url : "http://"+url;
+  }
+});
+
+Template.afBootstrapUrl.helpers({
+  atts: function addFormControlAtts() {
+    var atts = _.clone(this.atts);
+    // Add bootstrap class
+    atts = AutoForm.Utility.addClass(atts, "form-control");
+    return atts;
+  }
+});
+
diff --git a/client/views/posts/post_submit.html b/client/views/posts/post_submit.html
index ef796787e..61f9f3105 100644
--- a/client/views/posts/post_submit.html
+++ b/client/views/posts/post_submit.html
@@ -1,7 +1,7 @@
 <template name="post_submit">
 
   <div class="grid grid-module">
-    {{> quickForm collection="Posts" id="insertPostForm" type="insert" template="telescope" label-class="control-label" input-col-class="controls"}}
+    {{> quickForm collection="Posts" id="insertPostForm" template="telescope" label-class="control-label" input-col-class="controls"}}
   </div>
 
   <!-- <div class="grid submit">
diff --git a/client/views/posts/post_submit.js b/client/views/posts/post_submit.js
index c7fe3ea84..34a417a59 100644
--- a/client/views/posts/post_submit.js
+++ b/client/views/posts/post_submit.js
@@ -1,43 +1,64 @@
 AutoForm.debug()
 AutoForm.hooks({
   insertPostForm: {
-    before: {
-      insert: function(doc, template) {
-        console.log(doc)
-      },
-      update: function(docId, modifier, template) {},
-      "methodName": function(doc, template) {}
-    },
-    after: {
-      insert: function(error, result, template) {
-        console.log(error)
-        console.log(result)
-      },
-      update: function(error, result, template) {},
-      "methodName": function(error, result, template) {}
-    },
-    // Called when form does not have a `type` attribute
     onSubmit: function(insertDoc, updateDoc, currentDoc) {
-      console.log(insertDoc)
-      console.log(updateDoc)
-      console.log(currentDoc)
+
+      var properties = insertDoc;
+      var submit = this;
+
+      // ------------------------------ Checks ------------------------------ //
+
+      if (!Meteor.user()) {
+        throwError(i18n.t('you_must_be_logged_in'));
+        return false;
+      }
+
+      // ------------------------------ Callbacks ------------------------------ //
+
+      // run all post submit client callbacks on properties object successively
+      properties = postSubmitClientCallbacks.reduce(function(result, currentFunction) {
+          return currentFunction(result);
+      }, properties);
+
+      // console.log(properties)
+
+      // ------------------------------ Insert ------------------------------ //
+      if (properties) {
+        Meteor.call('post', properties, function(error, post) {
+          if(error){
+            submit.done(error);
+          }else{
+            // note: find a way to do this in onSuccess instead?
+            trackEvent("new post", {'postId': post._id});
+            if(post.status === STATUS_PENDING)
+              throwError('Thanks, your post is awaiting approval.');
+            Router.go('/posts/'+post._id);
+            submit.done();
+          }
+        });
+      }
+
+      return false
     },
 
-    // Called when any operation succeeds, where operation will be
-    // "insert", "update", "submit", or the method name.
     onSuccess: function(operation, result, template) {
-      console.log(operation)
-      console.log(result)
+      // not used right now because I can't find a way to pass the "post" object to this callback
+      // console.log(post)
+      // trackEvent("new post", {'postId': post._id});
+      // if(post.status === STATUS_PENDING)
+      //   throwError('Thanks, your post is awaiting approval.');
+      // Router.go('/posts/'+post._id);
     }, 
 
-    // Called when any operation fails, where operation will be
-    // "validation", "insert", "update", "submit", or the method name.
     onError: function(operation, error, template) {
-      console.log(operation)
-      console.log(error)
+      throwError(error.reason.split('|')[0]); // workaround because error.details returns undefined
+      clearSeenErrors();
+      // $(e.target).removeClass('disabled');
+      if (error.error == 603) {
+        var dupePostId = error.reason.split('|')[1];
+        Router.go('/posts/'+dupePostId);
+      }
     }
-    // formToDoc: function(doc, ss, formId) {},
-    // docToForm: function(doc, ss, formId) {},
 
     // Called at the beginning and end of submission, respectively.
     // This is the place to disable/enable buttons or the form,
@@ -91,115 +112,115 @@ AutoForm.hooks({
 
 // };
 
-// Template[getTemplate('post_submit')].events({
-//   'change input[name=status]': function (e, i) {
-//     Session.set('currentPostStatus', e.currentTarget.value);
-//   },
-//   'click input[type=submit]': function(e, instance){
-//     e.preventDefault();
+Template[getTemplate('post_submit')].events({
+  // 'change input[name=status]': function (e, i) {
+  //   Session.set('currentPostStatus', e.currentTarget.value);
+  // },
+  // 'click input[type=submit]': function(e, instance){
+  //   e.preventDefault();
 
-//     $(e.target).addClass('disabled');
+  //   $(e.target).addClass('disabled');
 
-//     // ------------------------------ Checks ------------------------------ //
+  //   // ------------------------------ Checks ------------------------------ //
 
-//     if(!Meteor.user()){
-//       throwError(i18n.t('you_must_be_logged_in'));
-//       return false;
-//     }
+  //   if(!Meteor.user()){
+  //     throwError(i18n.t('you_must_be_logged_in'));
+  //     return false;
+  //   }
 
-//     // ------------------------------ Properties ------------------------------ //
+  //   // ------------------------------ Properties ------------------------------ //
 
-//     // Basic Properties
+  //   // Basic Properties
 
-//     var properties = {
-//       title: $('#title').val(),
-//       body: instance.editor.exportFile(),
-//       sticky: $('#sticky').is(':checked'),
-//       userId: $('#postUser').val(),
-//       status: parseInt($('input[name=status]:checked').val())
-//     };
+  //   var properties = {
+  //     title: $('#title').val(),
+  //     body: instance.editor.exportFile(),
+  //     sticky: $('#sticky').is(':checked'),
+  //     userId: $('#postUser').val(),
+  //     status: parseInt($('input[name=status]:checked').val())
+  //   };
 
-//     // PostedAt
+  //   // PostedAt
 
-//     var $postedAtDate = $('#postedAtDate');
-//     var $postedAtTime = $('#postedAtTime');
-//     var setPostedAt = false;
-//     var postedAt = new Date(); // default to current browser date and time
-//     var postedAtDate = $postedAtDate.datepicker('getDate');
-//     var postedAtTime = $postedAtTime.val();
+  //   var $postedAtDate = $('#postedAtDate');
+  //   var $postedAtTime = $('#postedAtTime');
+  //   var setPostedAt = false;
+  //   var postedAt = new Date(); // default to current browser date and time
+  //   var postedAtDate = $postedAtDate.datepicker('getDate');
+  //   var postedAtTime = $postedAtTime.val();
 
-//     if ($postedAtDate.exists() && postedAtDate != "Invalid Date"){ // if custom date is set, use it
-//       postedAt = postedAtDate;
-//       setPostedAt = true;
-//     }
+  //   if ($postedAtDate.exists() && postedAtDate != "Invalid Date"){ // if custom date is set, use it
+  //     postedAt = postedAtDate;
+  //     setPostedAt = true;
+  //   }
 
-//     if ($postedAtTime.exists() && postedAtTime.split(':').length==2){ // if custom time is set, use it
-//       var hours = postedAtTime.split(':')[0];
-//       var minutes = postedAtTime.split(':')[1];
-//       postedAt = moment(postedAt).hour(hours).minute(minutes).toDate();
-//       setPostedAt = true;
-//     }
+  //   if ($postedAtTime.exists() && postedAtTime.split(':').length==2){ // if custom time is set, use it
+  //     var hours = postedAtTime.split(':')[0];
+  //     var minutes = postedAtTime.split(':')[1];
+  //     postedAt = moment(postedAt).hour(hours).minute(minutes).toDate();
+  //     setPostedAt = true;
+  //   }
 
-//     if(setPostedAt) // if either custom date or time has been set, pass result to properties
-//       properties.postedAt = postedAt;
+  //   if(setPostedAt) // if either custom date or time has been set, pass result to properties
+  //     properties.postedAt = postedAt;
 
 
-//     // URL
+  //   // URL
 
-//     var url = $('#url').val();
-//     if(!!url){
-//       var cleanUrl = (url.substring(0, 7) == "http://" || url.substring(0, 8) == "https://") ? url : "http://"+url;
-//       properties.url = cleanUrl;
-//     }
+  //   var url = $('#url').val();
+  //   if(!!url){
+  //     var cleanUrl = (url.substring(0, 7) == "http://" || url.substring(0, 8) == "https://") ? url : "http://"+url;
+  //     properties.url = cleanUrl;
+  //   }
 
-//     // ------------------------------ Callbacks ------------------------------ //
+  //   // ------------------------------ Callbacks ------------------------------ //
 
-//     // run all post submit client callbacks on properties object successively
-//     properties = postSubmitClientCallbacks.reduce(function(result, currentFunction) {
-//         return currentFunction(result);
-//     }, properties);
+  //   // run all post submit client callbacks on properties object successively
+  //   properties = postSubmitClientCallbacks.reduce(function(result, currentFunction) {
+  //       return currentFunction(result);
+  //   }, properties);
 
-//     // console.log(properties)
+  //   // console.log(properties)
 
-//     // ------------------------------ Insert ------------------------------ //
-//     if (properties) {
-//       Meteor.call('post', properties, function(error, post) {
-//         if(error){
-//           throwError(error.reason);
-//           clearSeenErrors();
-//           $(e.target).removeClass('disabled');
-//           if(error.error == 603)
-//             Router.go('/posts/'+error.details);
-//         }else{
-//           trackEvent("new post", {'postId': post._id});
-//           if(post.status === STATUS_PENDING)
-//             throwError('Thanks, your post is awaiting approval.');
-//           Router.go('/posts/'+post._id);
-//         }
-//       });
-//     } else {
-//       $(e.target).removeClass('disabled');      
-//     }
+  //   // ------------------------------ Insert ------------------------------ //
+  //   if (properties) {
+  //     Meteor.call('post', properties, function(error, post) {
+  //       if(error){
+  //         throwError(error.reason);
+  //         clearSeenErrors();
+  //         $(e.target).removeClass('disabled');
+  //         if(error.error == 603)
+  //           Router.go('/posts/'+error.details);
+  //       }else{
+  //         trackEvent("new post", {'postId': post._id});
+  //         if(post.status === STATUS_PENDING)
+  //           throwError('Thanks, your post is awaiting approval.');
+  //         Router.go('/posts/'+post._id);
+  //       }
+  //     });
+  //   } else {
+  //     $(e.target).removeClass('disabled');      
+  //   }
 
-//   },
-//   'click .get-title-link': function(e){
-//     e.preventDefault();
-//     var url=$("#url").val();
-//     var $getTitleLink = $(".get-title-link");
-//     $getTitleLink.addClass("loading");
-//     if(url){
-//       $.get(url, function(response){
-//           if ((suggestedTitle=((/<title>(.*?)<\/title>/m).exec(response.responseText))) != null){
-//               $("#title").val(suggestedTitle[1]);
-//           }else{
-//               alert("Sorry, couldn't find a title...");
-//           }
-//           $getTitleLink.removeClass("loading");
-//        });
-//     }else{
-//       alert("Please fill in an URL first!");
-//       $getTitleLink.removeClass("loading");
-//     }
-//   }
+  // },
+  // 'click .get-title-link': function(e){
+  //   e.preventDefault();
+  //   var url=$("#url").val();
+  //   var $getTitleLink = $(".get-title-link");
+  //   $getTitleLink.addClass("loading");
+  //   if(url){
+  //     $.get(url, function(response){
+  //         if ((suggestedTitle=((/<title>(.*?)<\/title>/m).exec(response.responseText))) != null){
+  //             $("#title").val(suggestedTitle[1]);
+  //         }else{
+  //             alert("Sorry, couldn't find a title...");
+  //         }
+  //         $getTitleLink.removeClass("loading");
+  //      });
+  //   }else{
+  //     alert("Please fill in an URL first!");
+  //     $getTitleLink.removeClass("loading");
+  //   }
+  // }
 
-// });
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/collections/posts.js b/collections/posts.js
index cdb1ae8f4..f2ddc2f3d 100644
--- a/collections/posts.js
+++ b/collections/posts.js
@@ -27,6 +27,7 @@ postSchemaObject = {
   },    
   title: {
     type: String,
+    optional: false,
     label: "Title",
     editable: true,
     autoform: {
@@ -39,7 +40,8 @@ postSchemaObject = {
     optional: true,
     editable: true,
     autoform: {
-      editable: true
+      editable: true,
+      type: "bootstrap-url"
     }
   },
   body: {
@@ -164,6 +166,13 @@ postSchemaObject = {
       omit: true
     }
   },
+  author: {
+    type: String,
+    optional: true,
+    autoform: {
+      omit: true
+    }
+  },
   userId: {
     type: String, // XXX
     optional: true,
@@ -286,7 +295,8 @@ Meteor.methods({
 
       if(typeof postWithSameLink !== 'undefined'){
         Meteor.call('upvotePost', postWithSameLink);
-        throw new Meteor.Error(603, i18n.t('this_link_has_already_been_posted'), postWithSameLink._id);
+        // note: error.details returns undefined on the client, so add post ID to reason        
+        throw new Meteor.Error('603', i18n.t('this_link_has_already_been_posted') + '|' + postWithSameLink._id, postWithSameLink._id);
       }
     }
 
diff --git a/packages/telescope-datetimepicker/autoform-bs-datetimepicker.html b/packages/telescope-datetimepicker/autoform-bs-datetimepicker.html
new file mode 100644
index 000000000..ad088f8f5
--- /dev/null
+++ b/packages/telescope-datetimepicker/autoform-bs-datetimepicker.html
@@ -0,0 +1,3 @@
+<template name="afBootstrapDateTimePicker">
+  <input type="text" value="" {{atts}}/>
+</template>
\ No newline at end of file
diff --git a/packages/telescope-datetimepicker/autoform-bs-datepicker.js b/packages/telescope-datetimepicker/autoform-bs-datetimepicker.js
similarity index 91%
rename from packages/telescope-datetimepicker/autoform-bs-datepicker.js
rename to packages/telescope-datetimepicker/autoform-bs-datetimepicker.js
index c61926859..7ac6f0bc8 100644
--- a/packages/telescope-datetimepicker/autoform-bs-datepicker.js
+++ b/packages/telescope-datetimepicker/autoform-bs-datetimepicker.js
@@ -1,5 +1,5 @@
 AutoForm.addInputType("bootstrap-datetimepicker", {
-  template: "afBootstrapDatepicker",
+  template: "afBootstrapDateTimePicker",
   valueOut: function () {
     // var val = this.datepicker('getUTCDate');
     if (!!this.data("DateTimePicker").getDate()) {
@@ -36,7 +36,7 @@ AutoForm.addInputType("bootstrap-datetimepicker", {
   }
 });
 
-Template.afBootstrapDatepicker.helpers({
+Template.afBootstrapDateTimePicker.helpers({
     atts: function addFormControlAtts() {
       var atts = _.clone(this.atts);
       // Add bootstrap class
@@ -45,7 +45,7 @@ Template.afBootstrapDatepicker.helpers({
     }
   });
 
-Template.afBootstrapDatepicker.rendered = function () {
+Template.afBootstrapDateTimePicker.rendered = function () {
   var $input = this.$('input');
   var data = this.data;
 
@@ -84,9 +84,9 @@ Template.afBootstrapDatepicker.rendered = function () {
 
 };
 
-Template.afBootstrapDatepicker.destroyed = function () {
+Template.afBootstrapDateTimePicker.destroyed = function () {
   // this.$('input').datepicker('remove');
-  this.data('DateTimePicker').destroy();
+  this.$('input').data('DateTimePicker').destroy();
 };
 
 function utcToLocal(utcDate) {
diff --git a/packages/telescope-datetimepicker/package.js b/packages/telescope-datetimepicker/package.js
index 59f0d893a..81acbb729 100644
--- a/packages/telescope-datetimepicker/package.js
+++ b/packages/telescope-datetimepicker/package.js
@@ -16,8 +16,8 @@ Package.onUse(function(api) {
 
   api.addFiles([
     'datetimepicker.scss',
-    'autoform-bs-datepicker.html',
-    'autoform-bs-datepicker.js',
+    'autoform-bs-datetimepicker.html',
+    'autoform-bs-datetimepicker.js',
     'bootstrap-collapse-transitions.js',
     'fonts/glyphicons-halflings-regular.eot',
     'fonts/glyphicons-halflings-regular.svg',