Added support for date modified field on cards

app/api/entities/entities.js

@@ -305,6 +305,7 @@ export default {
       templates.get({ default: true }),
     ]);
     let docTemplate = template;
+    doc.editDate = date.currentUTC();
     if (doc.sharedId) {
       await this.updateEntity(this.sanitize(doc, template), template);
     } else {

app/api/entities/entitiesModel.ts

@@ -30,6 +30,7 @@ const mongoSchema = new mongoose.Schema(
       },
     ],
     creationDate: Number,
+    editDate: Number,
     metadata: mongoose.Schema.Types.Mixed,
     suggestedMetadata: mongoose.Schema.Types.Mixed,
     user: { type: mongoose.Schema.Types.ObjectId, ref: 'users' },

app/api/entities/specs/entities.spec.js

@@ -102,6 +102,7 @@ describe('entities', () => {
       expect(createdDocumentEs.user.equals(user._id)).toBe(true);
       expect(createdDocumentEs.published).toBe(false);
       expect(createdDocumentEs.creationDate).toEqual(universalTime);
+      expect(createdDocumentEs.editDate).toEqual(universalTime);
 
       expect(createdDocumentEn.title).toBe(doc.title);
       expect(createdDocumentEn.user.equals(user._id)).toBe(true);
@@ -152,21 +153,28 @@ describe('entities', () => {
         .catch(catchErrors(done));
     });
 
-    it('should return updated entity', done => {
+    it('should return updated entity with updated editDate', done => {
+      const updateTime = 2;
       const doc = {
         title: 'the dark knight',
         fullText: { 0: 'the full text!' },
         metadata: { data: [{ value: 'should not be here' }] },
       };
+
       const user = { _id: db.id() };
 
       entities
         .save(doc, { user, language: 'en' })
-        .then(createdDocument =>
-          entities.save({ ...createdDocument, title: 'updated title' }, { user, language: 'en' })
-        )
+        .then(createdDocument => {
+          spyOn(date, 'currentUTC').and.returnValue(updateTime);
+          return entities.save(
+            { ...createdDocument, title: 'updated title' },
+            { user, language: 'en' }
+          );
+        })
         .then(updatedDocument => {
           expect(updatedDocument.title).toBe('updated title');
+          expect(updatedDocument.editDate).toEqual(updateTime);
           done();
         })
         .catch(catchErrors(done));

app/api/migrations/migrations/31-editDate/index.js

@@ -0,0 +1,32 @@
+export default {
+  delta: 31,
+
+  name: 'editDate',
+
+  description: 'Adds editDate property on all entities',
+
+  async up(db) {
+    process.stdout.write(`${this.name}...\r\n`);
+    const cursor = await db.collection('entities').find({});
+
+    // eslint-disable-next-line no-await-in-loop
+    while (await cursor.hasNext()) {
+      // eslint-disable-next-line no-await-in-loop
+      const entity = await cursor.next();
+      // eslint-disable-next-line no-await-in-loop
+      let time = entity.creationDate; //entity.creationDate;
+
+      // eslint-disable-next-line no-await-in-loop
+      const logs = await db
+        .collection('updatelogs')
+        .find({ mongoId: entity._id })
+        .toArray();
+
+      if (logs.length) {
+        time = logs[0].timestamp;
+      }
+      // eslint-disable-next-line no-await-in-loop
+      await db.collection('entities').updateOne({ _id: entity._id }, { $set: { editDate: time } });
+    }
+  },
+};

app/api/migrations/migrations/31-editDate/specs/31-editDate.spec.js

@@ -0,0 +1,57 @@
+import testingDB from 'api/utils/testing_db';
+import migration from '../index.js';
+import fixtures from './fixtures.js';
+
+describe('migration editDate', () => {
+  beforeEach(async () => {
+    spyOn(process.stdout, 'write');
+    await testingDB.clearAllAndLoad(fixtures);
+  });
+
+  afterAll(async () => {
+    await testingDB.disconnect();
+  });
+
+  it('should have a delta number', () => {
+    expect(migration.delta).toBe(31);
+  });
+
+  it('should populate editDate with timestamp from updatelogs', async () => {
+    await migration.up(testingDB.mongodb);
+    const entities = await testingDB.mongodb
+      .collection('entities')
+      .find({})
+      .toArray();
+
+    const [entity1, entity2, entity3] = entities;
+    const updatelog1 = await testingDB.mongodb
+      .collection('updatelogs')
+      .findOne({ mongoId: entity1._id });
+    const updatelog2 = await testingDB.mongodb
+      .collection('updatelogs')
+      .findOne({ mongoId: entity2._id });
+    const updatelog3 = await testingDB.mongodb
+      .collection('updatelogs')
+      .findOne({ mongoId: entity3._id });
+    expect(entity1.editDate).toEqual(updatelog1.timestamp);
+    expect(entity2.editDate).toEqual(updatelog2.timestamp);
+    expect(entity3.editDate).toEqual(updatelog3.timestamp);
+  });
+
+  it('should populate editDate with creationDate if updateLogs do not exist', async () => {
+    const entity = {
+      _id: '7654',
+      title: 'new entity',
+      creationDate: '198',
+    };
+    await testingDB.clearAllAndLoad({
+      entities: [...fixtures.entities, entity],
+      updatelogs: [...fixtures.updatelogs],
+    });
+
+    await migration.up(testingDB.mongodb);
+
+    const savedEntity = await testingDB.mongodb.collection('entities').findOne({ _id: entity._id });
+    expect(savedEntity.editDate).toEqual(savedEntity.creationDate);
+  });
+});

app/api/migrations/migrations/31-editDate/specs/fixtures.js

@@ -0,0 +1,12 @@
+export default {
+  entities: [
+    { _id: 'id1', title: 'test_doc' },
+    { _id: 'id2', title: 'test_doc_1' },
+    { _id: 'id3', title: 'test_doc_2' },
+  ],
+  updatelogs: [
+    { mongoId: 'id1', timestamp: '1234' },
+    { mongoId: 'id2', timestamp: '4567' },
+    { mongoId: 'id3', timestamp: '8901' },
+  ],
+};

app/api/search/documentQueryBuilder.js

@@ -13,6 +13,7 @@ export default function() {
         'icon',
         'processed',
         'creationDate',
+        'editDate',
         'template',
         'metadata',
         'type',

app/react/Library/components/SortButtons.js

@@ -173,6 +173,11 @@ export class SortButtons extends Component {
             search,
             type: 'date',
           })}
+          {this.createSortItem('editDate', 'editDate', 'System', 'Date modified', {
+            isActive: search.sort === 'editDate',
+            search,
+            type: 'date',
+          })}
           {search.searchTerm && (
             <li
               key="relevance"

app/react/Library/components/specs/SortButtons.spec.js

@@ -72,7 +72,7 @@ describe('SortButtons', () => {
         ]);
         render();
 
-        expect(component.find('.Dropdown:not(.width-placeholder) li').length).toBe(3);
+        expect(component.find('.Dropdown:not(.width-placeholder) li').length).toBe(4);
 
         expect(
           component
@@ -104,7 +104,7 @@ describe('SortButtons', () => {
         expect(
           component
             .find('li')
-            .at(2)
+            .at(3)
             .children()
             .at(0)
             .find('span')