From 943e80a96f492267b51392bd7df6dc9a32a0fe1a Mon Sep 17 00:00:00 2001 From: liguohui Date: Thu, 23 Nov 2017 21:28:50 +0800 Subject: [PATCH 1/7] Fix unqiue algo for the web side in pivot.js file. --- zeppelin-web/src/app/tabledata/pivot.js | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js index 1c938ea8280..a0f61b219a4 100644 --- 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-- } } } From f996747245ea3e055df903108190760a1d4ce5da Mon Sep 17 00:00:00 2001 From: liguohui Date: Sat, 25 Nov 2017 13:38:45 +0800 Subject: [PATCH 2/7] Chart field is also draggable and sortable in the 'keys', 'groups' and 'values' --- .../src/app/tabledata/pivot_settings.html | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/zeppelin-web/src/app/tabledata/pivot_settings.html b/zeppelin-web/src/app/tabledata/pivot_settings.html index abfe73069be..8d913eaf821 100644 --- a/zeppelin-web/src/app/tabledata/pivot_settings.html +++ b/zeppelin-web/src/app/tabledata/pivot_settings.html @@ -49,7 +49,11 @@ data-drop="true" jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • {{item.name}} @@ -69,7 +73,11 @@ jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • {{item.name}} @@ -89,7 +97,11 @@ jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • Date: Mon, 27 Nov 2017 13:10:41 +0800 Subject: [PATCH 3/7] add unit test for unique algo in pivot.js --- .../src/app/tabledata/tabledata.test.js | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/zeppelin-web/src/app/tabledata/tabledata.test.js b/zeppelin-web/src/app/tabledata/tabledata.test.js index 7e41de4becf..7c9ac11f326 100644 --- 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) + }) +}) \ No newline at end of file From 99cf93da9430c68547f91b14eba5d11e397fc590 Mon Sep 17 00:00:00 2001 From: liguohui Date: Mon, 27 Nov 2017 13:24:02 +0800 Subject: [PATCH 4/7] Revert "Chart field is also draggable and sortable in the 'keys', 'groups' and 'values'" This reverts commit f996747245ea3e055df903108190760a1d4ce5da. --- .../src/app/tabledata/pivot_settings.html | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/zeppelin-web/src/app/tabledata/pivot_settings.html b/zeppelin-web/src/app/tabledata/pivot_settings.html index 8d913eaf821..abfe73069be 100644 --- a/zeppelin-web/src/app/tabledata/pivot_settings.html +++ b/zeppelin-web/src/app/tabledata/pivot_settings.html @@ -49,11 +49,7 @@ data-drop="true" jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • {{item.name}} @@ -73,11 +69,7 @@ jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • {{item.name}} @@ -97,11 +89,7 @@ jqyoui-droppable="{multiple:true, onDrop:'save()'}" class="list-unstyled" style="border-radius: 6px; margin-top: 7px;"> -
  • +
  • Date: Wed, 29 Nov 2017 08:36:10 +0800 Subject: [PATCH 5/7] add a empty line --- zeppelin-web/src/app/tabledata/pivot.js | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js index a0f61b219a4..a33d2d1e544 100644 --- a/zeppelin-web/src/app/tabledata/pivot.js +++ b/zeppelin-web/src/app/tabledata/pivot.js @@ -262,3 +262,4 @@ export default class PivotTransformation extends Transformation { } } } + From ea582d95e33afca3ac635aea7670c711c6032f65 Mon Sep 17 00:00:00 2001 From: liguohui Date: Thu, 30 Nov 2017 10:07:57 +0800 Subject: [PATCH 6/7] delete some spaces at the end of the line --- .../src/app/tabledata/tabledata.test.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/zeppelin-web/src/app/tabledata/tabledata.test.js b/zeppelin-web/src/app/tabledata/tabledata.test.js index 7c9ac11f326..3de2fa3fb72 100644 --- a/zeppelin-web/src/app/tabledata/tabledata.test.js +++ b/zeppelin-web/src/app/tabledata/tabledata.test.js @@ -54,13 +54,13 @@ describe('PivotTransformation build', function() { let config = { common: { pivot: { - keys: [{index: 4, name: '4'}, - {index: 3, name: '3'}, - {index: 4, name: '4'}, - {index: 3, name: '3'}, + 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: 3, name: '3'}, {index: 5, name: '5'}], groups: [], values: [] @@ -68,19 +68,19 @@ describe('PivotTransformation build', function() { } } pt.tableDataColumns = [ - {index: 1, name: '1'}, - {index: 2, name: '2'}, - {index: 3, name: '3'}, - {index: 4, name: '4'}, + {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) }) -}) \ No newline at end of file +}) From 2063175d5f728828fb0a2d9ccfbe00693de89090 Mon Sep 17 00:00:00 2001 From: liguohui Date: Thu, 30 Nov 2017 15:01:27 +0800 Subject: [PATCH 7/7] delete the multi empty line --- zeppelin-web/src/app/tabledata/pivot.js | 1 - 1 file changed, 1 deletion(-) diff --git a/zeppelin-web/src/app/tabledata/pivot.js b/zeppelin-web/src/app/tabledata/pivot.js index a33d2d1e544..a0f61b219a4 100644 --- a/zeppelin-web/src/app/tabledata/pivot.js +++ b/zeppelin-web/src/app/tabledata/pivot.js @@ -262,4 +262,3 @@ export default class PivotTransformation extends Transformation { } } } -