Merge branch 'master' into subject-writer-typo

api/v1/swagger.yaml

@@ -7413,6 +7413,7 @@ parameters:
         - isPublished
         - name
         - sortBy
+        - tags
         - parentAbsolutePath
         - parentId
         - relatedLinks

db/model/sample.js

@@ -323,7 +323,6 @@ module.exports = function sample(seq, dataTypes) {
 
       /**
        * Update isDeleted.
-       * Publishes the deleted sample to redis channel.
        *
        * @param {Sample} inst - The Sample instance being deleted
        * @returns {Promise} which resolves undefined or rejects if an error

db/model/subject.js

@@ -408,15 +408,17 @@ module.exports = function subject(seq, dataTypes) {
         if (inst.getDataValue('isPublished')) {
           if (inst.previous('isPublished')) {
             /*
-             * If tags were updated, send a "delete" event followed by an "add"
-             * event so that perspectives using subject tag filters will get
-             * the right realtime events. If subject tags were not updated,
-             * just send the usual "update" event.
+             * If tags OR parent were updated, send a "delete" event followed
+             * by an "add" event so that perspectives get notified and lenses
+             * can re-render correctly. Tag changes have to be handled this
+             * way for filtering.
+             * If subject tags or parent were not updated, just send the usual
+             * "update" event.
              *
              * TODO : Right now don't have the ability to mock the socket.io
              * test for this.
              */
-            if (inst.changed('tags')) {
+            if (inst.changed('tags') || inst.changed('parentId')) {
               common.publishChange(inst, eventName.del, changedKeys,
                 ignoreAttributes);
               common.publishChange(inst, eventName.add, changedKeys,

tests/api/v1/subjects/get.js

@@ -395,10 +395,25 @@ describe(`api: GET ${path}`, () => {
     });
   });
 
+  it('returns expected fields when requesting tags field', (done) => {
+    api.get(`${path}?fields=isPublished,name,tags`)
+    .set('Authorization', token)
+    .expect(constants.httpStatus.OK)
+    .end((err, res) => {
+      if (err) {
+        done(err);
+      }
+
+      expect(res.body[ZERO]).to.have.property('tags');
+      expect(res.body[ZERO]).to.have.property('name');
+      expect(res.body[ZERO]).to.have.property('isPublished');
+      done();
+    });
+  });
+
   it('pagination tests');
   it('childCount, descendentCount');
   it('by id');
   it('by abs path');
   it('returns expected fields when NOT passing ?fields=...');
-  it('sort order');
 });