You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by ku...@apache.org on 2017/06/29 01:16:27 UTC
zeppelin git commit: [ZEPPELIN-2672] Fix interpreter repos url tooltip
Repository: zeppelin
Updated Branches:
refs/heads/master e4022ab9f -> c59f77dce
[ZEPPELIN-2672] Fix interpreter repos url tooltip
### What is this PR for?
Fixing regression on showing interpreter repos tooltip
### What type of PR is it?
Bug Fix
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-2672
### How should this be tested?
Zeppelin > Interpreter > Repository > (Mouse over) central/local/other
### Screenshots
After this fix:
### Questions:
* Does the licenses files need update? N
* Is there breaking changes for older versions? N
* Does this needs documentation? N
Author: Nelson Costa <ne...@gmail.com>
Closes #2423 from necosta/zeppelin2672 and squashes the following commits:
50ce1c7b [Nelson Costa] [ZEPPELIN-2672] Final adjusments
5413c4ba [Nelson Costa] [ZEPPELIN-2672] Remove popover directive files
2d6514f4 [Nelson Costa] [ZEPPELIN-2672] Also fixed column selector
c2fa47af [Nelson Costa] [ZEPPELIN-2672] Fix interpreter repos url tooltip
Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c59f77dc
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c59f77dc
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c59f77dc
Branch: refs/heads/master
Commit: c59f77dcee3a88d3deef14caab414918c8687481
Parents: e4022ab
Author: Nelson Costa <ne...@gmail.com>
Authored: Tue Jun 27 08:00:20 2017 +0100
Committer: 1ambda <1a...@gmail.com>
Committed: Thu Jun 29 10:16:19 2017 +0900
----------------------------------------------------------------------
.../src/app/interpreter/interpreter.html | 10 ++------
.../app/tabledata/columnselector_settings.html | 9 ++++----
.../builtins/visualization-scatterchart.js | 12 +++++-----
.../popover-html-unsafe-popup.directive.js | 24 --------------------
.../popover-html-unsafe-popup.html | 21 -----------------
.../popover-html-unsafe.directive.js | 21 -----------------
zeppelin-web/src/index.js | 2 --
7 files changed, 12 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/app/interpreter/interpreter.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/interpreter/interpreter.html b/zeppelin-web/src/app/interpreter/interpreter.html
index d58cb3a..58d90b2 100644
--- a/zeppelin-web/src/app/interpreter/interpreter.html
+++ b/zeppelin-web/src/app/interpreter/interpreter.html
@@ -63,14 +63,8 @@ limitations under the License.
<ul class="noDot">
<li class="liVertical" ng-repeat="repo in repositories">
<a tabindex="0" class="btn btn-info" role="button"
- popover-trigger="focus"
- popover-placement="right"
- popover-html-unsafe="<label>URL: </label>
- {{repo.url}}<br>
- <label>Username: </label>
- {{repo.authentication.username}}<br>
- <label>Proxy host: </label>
- {{repo.proxy.host}}">
+ tooltip-append-to-body="true" tooltip-placement="top-left"
+ uib-tooltip="{{repo.url}}">
<span class="fa fa-database"></span>
{{repo.id}}
<span ng-if="!isDefaultRepository(repo.id)" class="fa fa-close blackOpc"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/app/tabledata/columnselector_settings.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/tabledata/columnselector_settings.html b/zeppelin-web/src/app/tabledata/columnselector_settings.html
index 9098f46..e8b0410 100644
--- a/zeppelin-web/src/app/tabledata/columnselector_settings.html
+++ b/zeppelin-web/src/app/tabledata/columnselector_settings.html
@@ -47,11 +47,10 @@ limitations under the License.
style="font-weight: 300; font-size: 13px; margin-left: 1px;"
ng-style="prop.name === 'xAxis' ? { 'background-color': '#906ebd' } : prop.name === 'yAxis' ? { 'background-color': '#cd5c5c' } : prop.name === 'group' ? { 'background-color': '#5782bd' } : ''">
{{prop.name}}
- <a tabindex="0" class="fa fa-info-circle" role="button" popover-placement="top"
- ng-if="prop.tooltip"
- style="color: white;"
- popover-trigger="focus"
- popover-html-unsafe="{{prop.tooltip}}"></a>
+ <a tabindex="0" class="fa fa-info-circle" role="button"
+ ng-if="prop.tooltip" style="color: white;"
+ tooltip-placement="top" tooltip-append-to-body="true"
+ uib-tooltip="{{prop.tooltip}}"></a>
</span>
<ul data-drop="true"
ng-model="config[prop.name]"
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js b/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js
index 2c8ba3e..d7c00db 100644
--- a/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js
+++ b/zeppelin-web/src/app/visualization/builtins/visualization-scatterchart.js
@@ -34,12 +34,12 @@ export default class ScatterchartVisualization extends Nvd3ChartVisualization {
},
{
name: 'size',
- tooltip: `<li>Size option is valid only when you drop numeric field here.</li>
- <li>When data in each axis are discrete,
- 'number of values in corresponding coordinate' will be used as size.</li>
- <li>Zeppelin consider values as discrete when the values contain string value
- or the number of distinct values are bigger than 5% of total number of values.</li>
- <li>Size field button turns to grey when the option you chose is not valid.</li>`
+ tooltip: `This option is only valid for numeric fields.
+ When data in each axis is discrete,
+ 'number of values in corresponding coordinate' will be used.
+ Zeppelin considers values as discrete when input values contain a string
+ or the number of distinct values is greater than 5% of the total number of values.
+ This field turns grey when the selected option is invalid.`
}
]
this.columnselector = new ColumnselectorTransformation(config, this.columnselectorProps)
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.directive.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.directive.js b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.directive.js
deleted file mode 100644
index 69ea454..0000000
--- a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.directive.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-angular.module('zeppelinWebApp').directive('popoverHtmlUnsafePopup', popoverHtmlUnsafePopup)
-
-function popoverHtmlUnsafePopup () {
- return {
- restrict: 'EA',
- replace: true,
- scope: {title: '@', content: '@', placement: '@', animation: '&', isOpen: '&'},
- templateUrl: 'components/popover-html-unsafe/popover-html-unsafe-popup.html'
- }
-}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.html
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.html b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.html
deleted file mode 100644
index f537aee..0000000
--- a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe-popup.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="popover {{placement}}" ng-class="{ in: isOpen(), fade: animation() }">
-<!--
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
- <div class="arrow"></div>
-
- <div class="popover-inner">
- <h3 class="popover-title" ng-bind="title" ng-show="title"></h3>
- <div class="popover-content" bind-html-unsafe="content"></div>
- </div>
-</div>
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js b/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
deleted file mode 100644
index a1f25b2..0000000
--- a/zeppelin-web/src/components/popover-html-unsafe/popover-html-unsafe.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-angular.module('zeppelinWebApp').directive('popoverHtmlUnsafe', popoverHtmlUnsafe)
-
-function popoverHtmlUnsafe ($uibTooltip) {
- 'ngInject'
-
- return $uibTooltip('popoverHtmlUnsafe', 'popover', 'click')
-}
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c59f77dc/zeppelin-web/src/index.js
----------------------------------------------------------------------
diff --git a/zeppelin-web/src/index.js b/zeppelin-web/src/index.js
index d94714a..5304225 100644
--- a/zeppelin-web/src/index.js
+++ b/zeppelin-web/src/index.js
@@ -55,8 +55,6 @@ import './components/interpreter/interpreter.directive.js'
import './components/expandCollapse/expandCollapse.directive.js'
import './components/noteName-create/notename.controller.js'
import './components/noteName-import/notenameImport.controller.js'
-import './components/popover-html-unsafe/popover-html-unsafe.directive.js'
-import './components/popover-html-unsafe/popover-html-unsafe-popup.directive.js'
import './components/editor/codeEditor.directive.js'
import './components/ngenter/ngenter.directive.js'
import './components/dropdowninput/dropdowninput.directive.js'