Repository: ignite Updated Branches: refs/heads/master e375ef937 -> eb6772faf
IGNITE-8336 Web console: Fixed failing E2E notebooks tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb6772fa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb6772fa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb6772fa Branch: refs/heads/master Commit: eb6772faff73a2d5579e850e7a0fcd2e1adbc7bf Parents: e375ef9 Author: Alexander Kalinin <[email protected]> Authored: Sat Apr 28 17:58:27 2018 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Sat Apr 28 17:58:27 2018 +0700 ---------------------------------------------------------------------- .../page-queries/components/queries-notebooks-list/controller.js | 2 ++ .../page-queries/components/queries-notebooks-list/style.scss | 4 ++++ .../components/queries-notebooks-list/template.tpl.pug | 2 +- .../frontend/app/components/password-visibility/index.spec.js | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6772fa/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js index 7c06f2a..2e4146c 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/controller.js @@ -103,6 +103,8 @@ export class NotebooksListCtrl { this.IgniteMessages.showError(err); } finally { + this.$scope.$applyAsync(); + await this.IgniteLoading.finish('notebooksLoading'); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6772fa/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss index 0b96b88..6cdbd39 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/style.scss @@ -27,6 +27,10 @@ background: white; } + .ui-grid-render-container-left:before { + display: none; + } + .notebook-name { a { color: #0067b9; http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6772fa/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug index 75b5e99..c6268e0 100644 --- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug +++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebooks-list/template.tpl.pug @@ -45,7 +45,7 @@ page-queries-slot(slot-name="'queriesButtons'" ng-if="!$root.IgniteDemoMode") .panel-collapse(ignite-loading='notebooksLoading' ignite-loading-text='Loading notebooks...') - .grid.ui-grid--ignite#queriesNotebooksList(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-pinning ui-grid-hovering) + .grid.ui-grid--ignite#queriesNotebooksList(ui-grid='$ctrl.gridOptions' ui-grid-resize-columns ui-grid-selection ui-grid-hovering) grid-no-data(grid-api='$ctrl.gridApi') | You have no notebooks. a.link-success(ng-click='$ctrl.createNotebook()') Create one? http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6772fa/modules/web-console/frontend/app/components/password-visibility/index.spec.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/components/password-visibility/index.spec.js b/modules/web-console/frontend/app/components/password-visibility/index.spec.js index 236e497..f887092 100644 --- a/modules/web-console/frontend/app/components/password-visibility/index.spec.js +++ b/modules/web-console/frontend/app/components/password-visibility/index.spec.js @@ -46,7 +46,7 @@ suite('password-visibility', () => { </div> `); $compile(el)($scope); - const toggleButton = el.find('password-visibility-toggle-button button'); + const toggleButton = el.find('password-visibility-toggle-button').children()[0]; $scope.$digest(); assert.isFalse(el.hasClass(PASSWORD_VISIBLE_CLASS), 'Password is hidden by default');
