Merge branch 'master' of https://github.com/bushnoh/zeppelin

Alex Bush · Alex Bush · commit 67a93b5f5e7c · 2017-12-13T16:14:44.000Z
diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js
@@ -89,6 +89,7 @@ export default class PivotTransformation extends Transformation {
         for (let j = i + 1; j < list.length; j++) {
           if (angular.equals(list[i], list[j])) {
             list.splice(j, 1)
+            j--
           }
         }
       }
diff --git a/zeppelin-web/src/app/tabledata/tabledata.test.js b/zeppelin-web/src/app/tabledata/tabledata.test.js
@@ -13,6 +13,7 @@
  */
 
 import TableData from './tabledata.js'
+import PivotTransformation from './pivot.js'
 
 describe('TableData build', function () {
   let td
@@ -39,3 +40,47 @@ describe('TableData build', function () {
     expect(td.comment).toBe('hello')
   })
 })
+
+describe('PivotTransformation build', function() {
+  let pt
+
+  beforeEach(function () {
+    console.log(PivotTransformation)
+    pt = new PivotTransformation()
+  })
+
+  it('check the result of keys, groups and values unique', function() {
+    // set inited mock data
+    let config = {
+      common: {
+        pivot: {
+          keys: [{index: 4, name: '4'},
+                 {index: 3, name: '3'},
+                 {index: 4, name: '4'},
+                 {index: 3, name: '3'},
+                 {index: 3, name: '3'},
+                 {index: 3, name: '3'},
+                 {index: 3, name: '3'},
+                 {index: 5, name: '5'}],
+          groups: [],
+          values: []
+        }
+      }
+    }
+    pt.tableDataColumns = [
+        {index: 1, name: '1'},
+        {index: 2, name: '2'},
+        {index: 3, name: '3'},
+        {index: 4, name: '4'},
+        {index: 5, name: '5'}]
+
+    pt.setConfig(config)
+
+    pt.removeUnknown()
+
+    expect(config.common.pivot.keys.length).toBe(3)
+    expect(config.common.pivot.keys[0].index).toBe(4)
+    expect(config.common.pivot.keys[1].index).toBe(3)
+    expect(config.common.pivot.keys[2].index).toBe(5)
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -89,6 +89,7 @@ export default class PivotTransformation extends Transformation {`
`89`	`89`	`for (let j = i + 1; j < list.length; j++) {`
`90`	`90`	`if (angular.equals(list[i], list[j])) {`
`91`	`91`	`list.splice(j, 1)`
	`92`	`+ j--`
`92`	`93`	`}`
`93`	`94`	`}`
`94`	`95`	`}`