fix(json-formatter): represent array of arrays properly (#899)

Teradata · Oct 2, 2017 · 42c8398 · 42c8398
1 parent 8a9b4db
commit 42c8398
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/app/components/components/json-formatter/json-formatter.component.ts b/src/app/components/components/json-formatter/json-formatter.component.ts
@@ -37,6 +37,10 @@ export class JsonFormatterDemoComponent {
     'numberProperty': 10000,
     'booleanProperty': true,
     'numberArray': [1, 2, 3, 4, 5, 6],
+    'arrayOfArrays': [
+      [1, [2, 3]],
+      [3, 4],
+    ],
     'objectArray': [{
         'prop': undefined,
       }, {

diff --git a/src/platform/core/json-formatter/json-formatter.component.ts b/src/platform/core/json-formatter/json-formatter.component.ts
@@ -137,6 +137,8 @@ export class TdJsonFormatterComponent {
       return value.toString()
           .replace(/[\r\n]/g, '')
           .replace(/\{.*\}/, '') + '{…}';
+    } else if (Array.isArray(value)) {
+      return this.getObjectName() + ' [' + value.length + ']';
     }
     return value;
   }
@@ -150,6 +152,9 @@ export class TdJsonFormatterComponent {
       if (!object) {
         return 'null';
       }
+      if (Array.isArray(object)) {
+        return 'object';
+      }
       let date: Date = new Date(object);
       if (Object.prototype.toString.call(date) === '[object Date]') {
         if (!Number.isNaN(date.getTime())) {