Merge pull request #1921 from apinf/feature/harmonize-feedback-and-backlog

Harmonize feedback & backlog

Author: marla-singer

.meteor/packages

@@ -14,7 +14,6 @@ fortawesome:fontawesome
 raix:handlebar-helpers
 aldeed:template-extension
 iron:router
-yogiben:autoform-modals
 spiderable@1.0.14-release-testing.0
 accounts-ui@1.1.9
 tap:i18n

.meteor/versions

@@ -103,7 +103,6 @@ momentjs:moment@2.16.0
 mongo@1.1.14
 mongo-id@1.0.6
 mongo-livedata@1.0.12
-mpowaga:string-template@0.1.0
 npm-bcrypt@0.9.2
 npm-mongo@2.2.11_2
 oauth@1.1.12
@@ -163,6 +162,5 @@ useraccounts:iron-routing@1.14.2
 vsivsi:file-collection@1.3.6
 webapp@1.3.12
 webapp-hashing@1.0.9
-yogiben:autoform-modals@0.3.8
 zimme:active-route@2.3.2
 zimme:iron-router-active@2.0.1

apis/client/view/view.html

@@ -19,7 +19,7 @@
       </div> <!-- /api-metadata -->
 
       <div id="api-feedback" class="tab-pane fade">
-        {{> feedbackList api=api }}
+        {{> apiFeedback api=api feedbackItems=feedbackItems }}
       </div> <!-- /api-feedback -->
 
       {{# if currentUser }}

apis/client/view/view.js

@@ -5,6 +5,7 @@ import { Counts } from 'meteor/tmeasday:publish-counts';
 
 // Apinf imports
 import { Apis } from '/apis/collection';
+import { Feedback } from '/feedback/collection';
 import { ApiBacklogItems } from '/backlog/collection';
 import { ProxyBackends } from '/proxy_backends/collection';
 
@@ -18,6 +19,9 @@ Template.viewApi.onCreated(function () {
   // Subscribe to a single API Backend, by ID
   instance.subscribe('apiBackend', instance.apiId);
 
+  // Subscribe to API feedback items for this API Backend
+  instance.subscribe('apiBackendFeedback', instance.apiId);
+
   // Subscribe to API Backlog items for this API Backend
   instance.subscribe('apiBacklogItems', instance.apiId);
 
@@ -78,6 +82,22 @@ Template.viewApi.helpers({
 
     return backlogItems;
   },
+  feedbackItems () {
+    // Get reference to template instance
+    const instance = Template.instance();
+
+    // Get API ID
+    const apiId = instance.apiId;
+
+    // Fetch all feedback items for a specific API Backend
+    // Sort by created date
+    const feedbackItems = Feedback.find(
+      { apiBackendId: apiId },
+      { sort: { createdAt: -1 } }
+    ).fetch();
+
+    return feedbackItems;
+  },
   proxyIsConfigured () {
     // Get count of Proxies
     const proxyCount = Counts.get('proxyCount');

backlog/client/add/add.js

@@ -1,6 +1,9 @@
+import { Template } from 'meteor/templating';
+import { Modal } from 'meteor/peppelg:bootstrap-3-modal';
+
 Template.apiBacklog.events({
   'click #add-backlog-item': function () {
     // Show Add API Backlog Item modal
-    Modal.show('addApiBacklogItem');
+    Modal.show('apiBacklogItemForm', { formType: 'insert' });
   },
 });

backlog/client/add/autoform.js

@@ -3,9 +3,9 @@ import { Template } from 'meteor/templating';
 import { ApiBacklogItems } from '../../collection';
 
 Template.deleteBacklogItem.events({
-  'click #confirm-delete': function (event, instance) {
+  'click #confirm-delete': function () {
     // Get Backlog Item ID
-    const backlogItemId = instance.data.backlogItem._id;
+    const backlogItemId = Template.currentData().backlogItem._id;
 
     // Remove the Backlog Item
     ApiBacklogItems.remove(backlogItemId);