fix merge conflicts

Author: armine-fliplet

css/builder.css

@@ -1204,10 +1204,6 @@ form hr {
   border: 0;
 }
 
-#data-source-provider {
-  margin-bottom: -10px;
-}
-
 .columns-notification .btn-generate-columns {
   margin-top: 10px;
 }
@@ -1396,3 +1392,11 @@ form hr {
 .form-group.fl-typeahead .selectize-input.focus {
   border-color: #00abd1;
 }
+
+.timeStamp {
+  font-size: 13px;
+  text-align: center;
+  color: #514f4f;
+  padding: 10px 10px;
+  background-color: #eaeaea;
+}

css/form.css

@@ -1095,6 +1095,22 @@ html[dir="rtl"] .radio.radio-icon input[type="radio"] + label > span.check {
   border-radius: 4px;
 }
 
+.tox .tox-toolbar__primary {
+  justify-content: space-between;
+}
+
+.tox:not(.tox-tinymce-inline) .tox-editor-header {
+  padding: 4px !important;
+}
+
+.tox .tox-toolbar__group {
+  padding: 0px !important;
+}
+
+.tox.tox-tinymce {
+  min-height: 130px !important;
+}
+
 @media screen and (max-width: 1280px) {
   .tox-toolbar__primary {
     justify-content: space-between;
@@ -1647,3 +1663,11 @@ form hr {
   background-color: #e0e0e0;
   font-weight: bold;
 }
+
+.timeStamp {
+  font-size: 16px;
+  text-align: center;
+  color: #514f4f;
+  padding: 10px 10px;
+  background-color: #eaeaea;
+}

js/build.templates.js

@@ -0,0 +1,90 @@
+Fliplet.FormBuilder.field('timeStamp', {
+  name: 'Time Stamp',
+  category: 'Date & time',
+  props: {
+    value: {
+      type: Object
+    },
+    placeholder: {
+      type: String
+    },
+    description: {
+      type: String
+    },
+    createdAt: {
+      type: Boolean,
+      default: true
+    },
+    updatedAt: {
+      type: Boolean,
+      default: true
+    },
+    showLabel: {
+      type: Boolean,
+      default: false
+    },
+    label: undefined
+  },
+  created: function() {
+    Fliplet.Hooks.on('afterFormSubmit', this.afterFormSubmit);
+  },
+  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;
+      const hasTimeStamp = fields.some(field => field._type === 'flTimeStamp');
+
+      if (!hasTimeStamp) {
+        return;
+      }
+
+      const dataSourceId = data.result && data.result.dataSourceId;
+
+      if (!dataSourceId) {
+        return;
+      }
+
+      const connection = await Fliplet.DataSources.connect(dataSourceId);
+
+      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
+        });
+      } else if (this.createdAt) {
+        connection.update(data.result.id, {
+          'Created at': data.result.createdAt
+        });
+      }
+    }
+  }
+});

js/components/timeStamp.js

@@ -73,7 +73,7 @@ Fliplet.FormBuilder.field('wysiwyg', {
   },
   mounted: function() {
     var $vm = this;
-    var lineHeight = 40;
+    var lineHeight = 55;
 
     this.tinymceId = _.kebabCase(this.name) + '-' + $(this.$refs.textarea).parents('[data-form-builder-id]').data('formBuilderId');
 
@@ -97,7 +97,7 @@ Fliplet.FormBuilder.field('wysiwyg', {
         : [
           'undo redo',
           'bold italic underline',
-          'alignleft aligncenter alignright alignjustify | bullist numlist outdent indent',
+          'alignleft aligncenter alignright alignjustify | bullist numlist | outdent indent',
           'ltr rtl | link | removeformat code fullscreen',
           'table tabledelete | tableprops tablerowprops tablecellprops',
           'tableinsertrowbefore tableinsertrowafter tabledeleterow | tableinsertcolbefore tableinsertcolafter tabledeletecol'

js/components/wysiwyg.js

@@ -0,0 +1 @@
+Fliplet.FormBuilder.configuration('timeStamp');

js/configurations/timeStamp.js

@@ -960,6 +960,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/interface.templates.js

@@ -752,6 +752,15 @@ Fliplet.FormBuilder = (function() {
 
             break;
 
+          case 'flTimeStamp':
+            if (!this.updatedAt && !this.createdAt) {
+              _.assignIn(this.errors, {
+                timeStampOption: 'Select at least one timestamp saving option to continue'
+              });
+            }
+
+            break;
+
           default:
             // nothing
         }

js/libs/builder.js

@@ -1180,6 +1180,15 @@ Fliplet().then(function() {
                 } else if (type === 'flGeolocation') {
                   appendField(field.name, value ? value[0] : null);
                   appendField(`${field.name} (accuracy)`, value ? value[1] : null);
+                } else if (type === 'flTimeStamp') {
+                  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);