Merge pull request #672 from Fliplet/release/ID-4818

https://weboo.atlassian.net/browse/ID-4818

Author: simonchapman1986

js/components/timeStamp.js

@@ -1,8 +1,10 @@
 Fliplet.FormBuilder.field('timeStamp', {
   name: 'Time Stamp',
   category: 'Date & time',
-  submit: false,
   props: {
+    value: {
+      type: Object
+    },
     placeholder: {
       type: String
     },
@@ -29,6 +31,29 @@ Fliplet.FormBuilder.field('timeStamp', {
   destroyed: function() {
     Fliplet.Hooks.off('afterFormSubmit', this.afterFormSubmit);
   },
+  mounted: function() {
+    this.value = {
+      createdAt: this.createdAt,
+      updatedAt: this.updatedAt
+    };
+    this.$emit('_input', this.name, this.value);
+  },
+  watch: {
+    createdAt: function(val) {
+      this.value = {
+        createdAt: val,
+        updatedAt: this.updatedAt
+      };
+      this.$emit('_input', this.name, this.value);
+    },
+    updatedAt: function(val) {
+      this.value = {
+        createdAt: this.createdAt,
+        updatedAt: val
+      };
+      this.$emit('_input', this.name, this.value);
+    }
+  },
   methods: {
     afterFormSubmit: async function(data, form) {
       const fields = form.$instance.fields;
@@ -46,7 +71,12 @@ Fliplet.FormBuilder.field('timeStamp', {
 
       const connection = await Fliplet.DataSources.connect(dataSourceId);
 
-      if (data.result.createdAt !== data.result.updatedAt && this.updatedAt) {
+      if (data.result.createdAt !== data.result.updatedAt && this.updatedAt && this.createdAt) {
+        connection.update(data.result.id, {
+          'Created at': data.result.createdAt,
+          'Last updated': data.result.updatedAt
+        });
+      } else if (data.result.createdAt !== data.result.updatedAt && this.updatedAt) {
         connection.update(data.result.id, {
           'Last updated': data.result.updatedAt
         });

js/libs/builder.js

@@ -927,6 +927,18 @@ Fliplet().then(function() {
 
               break;
 
+            case 'flTimeStamp':
+              if (field.createdAt && !field.updatedAt) {
+                fieldNames.push('Created at');
+              } else if (!field.createdAt && field.updatedAt) {
+                fieldNames.push('Last updated');
+              } else {
+                fieldNames.push('Created at');
+                fieldNames.push('Last updated');
+              }
+
+              break;
+
             case 'flMatrix':
               _.forEach(field.rowOptions, function(row) {
                 var val = row.id ? row.id : row.label;

js/libs/core.js

@@ -222,7 +222,7 @@ Fliplet.FormBuilder = (function() {
       }
 
       component.computed._isFormField = function() {
-        return (this.showLabel || this.showLabel === undefined) && !(component.props._componentName.default === 'flCustomButton' || component.props._componentName.default === 'flTimeStamp');
+        return (this.showLabel || this.showLabel === undefined) && component.props._componentName.default !== 'flCustomButton';
       };
 
       component.computed._labelName = function() {

js/libs/form.js

@@ -1178,7 +1178,14 @@ Fliplet().then(function() {
                   appendField(field.name, value ? value[0] : null);
                   appendField(`${field.name} (accuracy)`, value ? value[1] : null);
                 } else if (type === 'flTimeStamp') {
-                  return;
+                  if (value.createdAt && !value.updatedAt) {
+                    appendField('Created at', new Date().toISOString());
+                  } else if (!value.createdAt && value.updatedAt) {
+                    appendField('Last updated', '');
+                  } else if (value.createdAt && value.updatedAt) {
+                    appendField('Created at', new Date().toISOString());
+                    appendField('Last updated', '');
+                  }
                 } else {
                   // Other inputs
                   appendField(field.name, value);