Backport #5090 and #4694

src/kibana/components/stringify/types/Date.js

@@ -45,6 +45,9 @@ define(function (require) {
       if (this._memoizedPattern !== pattern) {
         this._memoizedPattern = pattern;
         this._memoizedConverter = _.memoize(function converter(val) {
+          if (val === null || val === undefined) {
+            return '-';
+          }
           return moment(val).format(pattern);
         });
       }

test/unit/specs/components/stringify/_date.js

@@ -0,0 +1,20 @@
+define(function (require) {
+  return ['Date format', function () {
+    var fieldFormats;
+
+    beforeEach(module('kibana'));
+    beforeEach(inject(function (Private) {
+      fieldFormats = Private(require('registry/field_formats'));
+    }));
+
+    it('decoding an undefined or null date should return an empty string', function () {
+      var DateFormat = fieldFormats.getType('date');
+      var date = new DateFormat({
+        pattern: 'dd-MM-yyyy'
+      });
+      expect(date.convert(null)).to.be('-');
+      expect(date.convert(undefined)).to.be('-');
+    });
+
+  }];
+});

test/unit/specs/components/stringify/index.js

@@ -4,5 +4,6 @@ define(function (require) {
     describe(require('specs/components/stringify/_ip'));
     describe(require('specs/components/stringify/_source'));
     describe(require('specs/components/stringify/_url'));
+    describe(require('specs/components/stringify/_date'));
   });
 });