@dhyasama/totem-models 6.3.6 → 6.3.8

package/lib/Organization.js

@@ -215,8 +215,8 @@ module.exports = function(mongoose, config) {
 
           standardFields: {
 
-            // active set to false will keep the field out of system for customer, i.e., off list page, org page deal section and deal edit form
-            // if a field is active, it will show up on the org page deal section and deal edit form. there is no way to hide it in those places.
+            // Standard fields are always "on" in the system
+            // They can be configured in how they work on the deal list page
             // order for standard fields only sets the order on the list page. their position is fixed on the org page deal section and edit form.
             // order is co-mingled with order for custom fields
             // colspan is for the number of columns the field should take up on the list page
@@ -224,7 +224,6 @@ module.exports = function(mongoose, config) {
             // showOnList controls if the field will be on deal list page
 
             fundraise: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -232,7 +231,6 @@ module.exports = function(mongoose, config) {
             },
 
             sources: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -240,7 +238,6 @@ module.exports = function(mongoose, config) {
             },
 
             referrers: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -248,7 +245,6 @@ module.exports = function(mongoose, config) {
             },
 
             resources: {
-              active: { type: Boolean, default: true },
               order: { type: Number, default: 99 },
               colspan: { type: Number, default: 1 },
               showOnFilter: { type: Boolean, default: true },
@@ -282,7 +278,7 @@ module.exports = function(mongoose, config) {
               // This is the value that gets stored
               value: { type: String, trim: true, required: true },
 
-              // This is used to validate and aggregate answers for polls
+              // This is used to aggregate answers for polls
               type: { type: String, enum: ['String', 'Number', 'Boolean'], required: true }
 
             }],
@@ -501,11 +497,10 @@ module.exports = function(mongoose, config) {
 
   });
 
-  Organization.virtual('customer.deals.columns').get(function () {
+  Organization.virtual('customer.deals.fields').get(function () {
 
     // Combine ever-present fields, standard fields and custom fields into a single list and sort by column order
     // Fundraise is actually two fields, so multiply the order by ten to make room for the extra field
-    // Returns tuples of name/order
 
     var self = this;
 
@@ -514,15 +509,12 @@ module.exports = function(mongoose, config) {
     // Defaulting to off so it will be immediately apparent the customer hasn't been properly configured
     standardFields = standardFields || {
       fundraise: {
-        active: false,
         showOnList: false
       },
       sources: {
-        active: false,
         showOnList: false
       },
       referrers: {
-        active: false,
         showOnList: false
       }
     };
@@ -531,28 +523,33 @@ module.exports = function(mongoose, config) {
     var result = [];
 
     // Add the standard fields that are active
-    if (standardFields.fundraise.active && standardFields.fundraise.showOnList) {
+    if (standardFields.fundraise.showOnList) {
       result.push({
         name: 'Fundraise Amount',
+        type: 'Standard',
         order: standardFields.fundraise.order * 10,
-        colspan: standardFields.fundraise.colspan
+        colspan: standardFields.fundraise.colspan,
       }, {
         name: 'Fundraise Valuation',
-        order: standardFields.fundraise.order * 10 + 1
+        type: 'Standard',
+        order: standardFields.fundraise.order * 10 + 1,
+        colspan: standardFields.fundraise.colspan
       });
     }
 
-    if (standardFields.sources.active && standardFields.sources.showOnList) {
+    if (standardFields.sources.showOnList) {
       result.push({
         name: 'Source',
+        type: 'Standard',
         order: standardFields.sources.order * 10,
         colspan: standardFields.fundraise.colspan
       });
     }
 
-    if (standardFields.referrers.active && standardFields.referrers.showOnList) {
+    if (standardFields.referrers.showOnList) {
       result.push({
         name: 'Referrers',
+        type: 'Standard',
         order: standardFields.referrers.order * 10,
         colspan: standardFields.fundraise.colspan
       });
@@ -563,6 +560,8 @@ module.exports = function(mongoose, config) {
       if (field.display.showOnList) {
         result.push({
           name: field.label,
+          type: field.type,
+          key: field.key,
           order: field.display.order * 10,
           colspan: field.display.colspan
         });
@@ -572,15 +571,6 @@ module.exports = function(mongoose, config) {
     // Sort the combined standard and custom fields
     result = _.sortBy(result, function(item) { return item.order; });
 
-    // Put the ever-present fields at the beginning
-    result.unshift({
-      name: 'Company',
-      order: 0
-    }, {
-      name: 'Stage',
-      order: 1
-    });
-
     // Now that we have all fields combined and ordered, make column order zero-indexed and gap-free
     result = _.map(result, function(item, index) {
       item.order = index;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "6.3.6",
+  "version": "6.3.8",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",

package/test/Organization.js

@@ -1188,20 +1188,16 @@ describe('Organization', function() {
 
     it('gets deal columns for a customer', function(done) {
 
-      var columns = customer1.customer.deals.columns;
-      columns.length.should.equal(6);
-      columns[0].name.should.equal('Company');
-      columns[0].order.should.equal(0);
-      columns[1].name.should.equal('Stage');
-      columns[1].order.should.equal(1);
-      columns[2].name.should.equal('Test Field 2');
-      columns[2].order.should.equal(2);
-      columns[3].name.should.equal('Fundraise Amount');
-      columns[3].order.should.equal(3);
-      columns[4].name.should.equal('Fundraise Valuation');
-      columns[4].order.should.equal(4);
-      columns[5].name.should.equal('Test Field Last');
-      columns[5].order.should.equal(5);
+      var fields = customer1.customer.deals.fields;
+      fields.length.should.equal(4);
+      fields[0].name.should.equal('Test Field 2');
+      fields[0].order.should.equal(0);
+      fields[1].name.should.equal('Fundraise Amount');
+      fields[1].order.should.equal(1);
+      fields[2].name.should.equal('Fundraise Valuation');
+      fields[2].order.should.equal(2);
+      fields[3].name.should.equal('Test Field Last');
+      fields[3].order.should.equal(3);
 
       return done();