From b52a2efdceda60162a6fd0bd586fa3b49f0b748a Mon Sep 17 00:00:00 2001 From: Oleksii Orel Date: Tue, 14 Jan 2020 13:26:48 +0200 Subject: [PATCH] Implemented the 'Get Started' page for UD (#15642) * Implemented the 'Get Started' page for UD Signed-off-by: Oleksii Orel * fix locator for Search field * remove checkSearchField method from UNDER_REPAIR group in WorkspacesListTest Co-authored-by: Sergey Skorik --- .../src/app/dashboard/dashboard-config.ts | 14 +- .../last-workspaces.controller.spec.ts | 6 +- .../last-workspaces.directive.spec.ts | 18 +- .../demo-components.controller.ts | 6 +- .../app/demo-components/demo-components.html | 44 +++-- .../src/app/get-started/get-started-config.ts | 40 +++++ .../template-list/template-list.controller.ts | 162 ++++++++++++++++++ .../template-list/template-list.html | 72 ++++++++ .../template-list/template-list.styl | 112 ++++++++++++ .../template/template.directive.ts | 30 ++++ .../app/get-started/template/template.html | 24 +++ .../app/get-started/template/template.styl | 33 ++++ dashboard/src/app/index.module.ts | 8 +- dashboard/src/app/navbar/navbar.controller.ts | 63 +++---- dashboard/src/app/navbar/navbar.html | 60 ++++--- .../list-stacks/list-stacks.controller.ts | 54 +++--- .../import-custom-stack.styl | 1 - .../list-workspaces.controller.ts | 7 +- .../list-workspaces/list-workspaces.html | 15 +- .../src/components/utils/random.service.ts | 2 +- .../widget/list/che-list-header.html | 8 +- .../widget/list/che-list-header.styl | 23 --- .../widget/toolbar/che-toolbar.styl | 4 +- dashboard/yarn.lock | 61 ++++--- .../dashboard/DashboardFactories.java | 2 +- .../dashboard/workspaces/WorkspaceShare.java | 2 +- .../dashboard/workspaces/Workspaces.java | 2 +- .../workspaces/WorkspacesListTest.java | 3 +- 28 files changed, 673 insertions(+), 203 deletions(-) create mode 100644 dashboard/src/app/get-started/get-started-config.ts create mode 100644 dashboard/src/app/get-started/template-list/template-list.controller.ts create mode 100644 dashboard/src/app/get-started/template-list/template-list.html create mode 100644 dashboard/src/app/get-started/template-list/template-list.styl create mode 100644 dashboard/src/app/get-started/template/template.directive.ts create mode 100644 dashboard/src/app/get-started/template/template.html create mode 100644 dashboard/src/app/get-started/template/template.styl diff --git a/dashboard/src/app/dashboard/dashboard-config.ts b/dashboard/src/app/dashboard/dashboard-config.ts index 1073a25c53..200c9d98ae 100644 --- a/dashboard/src/app/dashboard/dashboard-config.ts +++ b/dashboard/src/app/dashboard/dashboard-config.ts @@ -15,6 +15,7 @@ import {DashboardLastWorkspacesController} from './last-workspaces/last-workspac import {DashboardLastWorkspaces} from './last-workspaces/last-workspaces.directive'; import {DashboardPanel} from './dashboard-panel/dashboard-panel.directive'; import {CheWorkspace} from '../../components/api/workspace/che-workspace.factory'; +import {MENU_ITEM} from '../navbar/navbar.controller'; export class DashboardConfig { @@ -33,16 +34,17 @@ export class DashboardConfig { title: 'Dashboard', templateUrl: 'app/dashboard/dashboard.html', resolve: { - check: ['$q', '$location', 'cheWorkspace', ($q: ng.IQService, $location: ng.ILocationService, cheWorkspace: CheWorkspace) => { + check: ['$q', '$window', 'cheWorkspace', ($q: ng.IQService, $window: ng.IWindowService, cheWorkspace: CheWorkspace) => { + const defer = $q.defer(); cheWorkspace.fetchWorkspaces().then(() => { if (cheWorkspace.getWorkspaces().length === 0) { - $location.path('/create-workspace'); - } - }, (error: any) => { - if (error.status === 304 && cheWorkspace.getWorkspaces().length === 0) { - $location.path('/create-workspace'); + $window.open(MENU_ITEM.getStarted, '_self'); + defer.reject(); + } else { + defer.resolve(); } }); + return defer.promise; }] } }); diff --git a/dashboard/src/app/dashboard/last-workspaces/last-workspaces.controller.spec.ts b/dashboard/src/app/dashboard/last-workspaces/last-workspaces.controller.spec.ts index c5fd67f9f9..e1bffb7b77 100644 --- a/dashboard/src/app/dashboard/last-workspaces/last-workspaces.controller.spec.ts +++ b/dashboard/src/app/dashboard/last-workspaces/last-workspaces.controller.spec.ts @@ -9,9 +9,9 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -import { DashboardLastWorkspacesController } from "./last-workspaces.controller"; -import { CheWorkspace } from "../../../components/api/workspace/che-workspace.factory"; -import { CheNotification } from "../../../components/notification/che-notification.factory"; +import {DashboardLastWorkspacesController} from './last-workspaces.controller'; +import {CheWorkspace} from '../../../components/api/workspace/che-workspace.factory'; +import {CheNotification} from '../../../components/notification/che-notification.factory'; declare const expect: (param: any) => { toHaveBeenCalledTimes: any; diff --git a/dashboard/src/app/dashboard/last-workspaces/last-workspaces.directive.spec.ts b/dashboard/src/app/dashboard/last-workspaces/last-workspaces.directive.spec.ts index 1823b8495f..08fe3def40 100644 --- a/dashboard/src/app/dashboard/last-workspaces/last-workspaces.directive.spec.ts +++ b/dashboard/src/app/dashboard/last-workspaces/last-workspaces.directive.spec.ts @@ -9,8 +9,8 @@ * Contributors: * Red Hat, Inc. - initial API and implementation */ -import { IAugmentedJQuery, ITemplateCacheService, ICompileService, IRootScopeService, ICompileProvider } from "angular"; -import { CheHttpBackend } from "../../../components/api/test/che-http-backend"; +import {IAugmentedJQuery, ITemplateCacheService, ICompileService, IRootScopeService, ICompileProvider} from 'angular'; +import {CheHttpBackend} from '../../../components/api/test/che-http-backend'; /** * @author Lucia Jelinkova @@ -22,11 +22,11 @@ describe(`Last workspaces directive >`, () => { let directiveElement: IAugmentedJQuery; beforeAll(() => { - // this call replaces the inner directive with mocked value. - // the reason is that we want to test only itself and not - // underlying directives. Those should be tested separately. + // this call replaces the inner directive with mocked value. + // the reason is that we want to test only itself and not + // underlying directives. Those should be tested separately. // NOTE: it is possible that if another test mocks the same directive, it will fail. In that - // case the whole call needs to be extracted and executed before all .spec files. + // case the whole call needs to be extracted and executed before all .spec files. angular.module('userDashboard').config(function ($compileProvider: ICompileProvider) { $compileProvider.directive('cheWorkspaceItem', function () { var def = { @@ -124,8 +124,10 @@ describe(`Last workspaces directive >`, () => { } function moreWorkspacesDirectiveTest(workspacesCount: number, workspacesDisplayedCount: number = workspacesCount) { - $scope.dashboardLastWorkspacesController.workspaces = - Array.from(new Array(workspacesCount)).map((x, i) => {return {} }); + $scope.dashboardLastWorkspacesController.workspaces = + Array.from(new Array(workspacesCount)).map((x, i) => { + return {} + }); $scope.$digest(); let emptyLabel = directiveElement.find('.last-workspaces-empty-label'); diff --git a/dashboard/src/app/demo-components/demo-components.controller.ts b/dashboard/src/app/demo-components/demo-components.controller.ts index af0e944822..a4ef6e5d33 100644 --- a/dashboard/src/app/demo-components/demo-components.controller.ts +++ b/dashboard/src/app/demo-components/demo-components.controller.ts @@ -99,9 +99,7 @@ export class DemoComponentsController { orderNumber: 1 }] }; - } - $onInit(): void { const tab = this.$location.search().tab; if (Tab[tab]) { this.selectedIndex = parseInt(Tab[tab], 10); @@ -199,14 +197,14 @@ export class DemoComponentsController { {text: 'Starting workspace runtime', inProgressText: 'Retrieving the stack\'s image and launching it', logs: '', hasError: false}, {text: 'Starting workspace agent', inProgressText: 'Agents provide RESTful services like intellisense and SSH', logs: '', hasError: false}, {text: 'Open IDE', inProgressText: '', logs: '', hasError: false} - ] + ]; this.loader.getLoadingSteps = () => allSteps; let currentProgressStep = 0; this.loader.getCurrentProgressStep = () => currentProgressStep; this.loader.nextStep = () => { currentProgressStep++; currentProgressStep = currentProgressStep % (allSteps.length); - } + }; this.loader.pause = () => { this.loader.paused = !this.loader.paused; }; diff --git a/dashboard/src/app/demo-components/demo-components.html b/dashboard/src/app/demo-components/demo-components.html index b75ca5c693..220bd309b5 100644 --- a/dashboard/src/app/demo-components/demo-components.html +++ b/dashboard/src/app/demo-components/demo-components.html @@ -306,27 +306,26 @@ Ultima Syriarum est Palaestina per intervalla magna protenta, cultis abundans te
- - - +
@@ -440,31 +439,38 @@ Ultima Syriarum est Palaestina per intervalla magna protenta, cultis abundans te
- +
SAVE button - +
- +
APPLY button - +
- +
CANCEL button - +
- +
@@ -485,14 +491,16 @@ Ultima Syriarum est Palaestina per intervalla magna protenta, cultis abundans te
+ ng-click="demoComponentsController.loader.pause()" + value="{{demoComponentsController.loader.paused}}">
+ che-exclude-steps="[demoComponentsController.loader.getLoadingSteps().length-1]" + che-step="{{demoComponentsController.loader.getCurrentProgressStep()}}" + che-switch-on-iteration="true">
diff --git a/dashboard/src/app/get-started/get-started-config.ts b/dashboard/src/app/get-started/get-started-config.ts new file mode 100644 index 0000000000..66c6673f8b --- /dev/null +++ b/dashboard/src/app/get-started/get-started-config.ts @@ -0,0 +1,40 @@ +/* + * Copyright (c) 2015-2018 Red Hat, Inc. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ +'use strict'; + +import {TemplateListController} from './template-list/template-list.controller'; +import {Template} from './template/template.directive'; + +/** + * @ngdoc controller + * @name getStarted:GetStartedConfig + * @description This class is used for configuring all get started devfiles. + * @author Oleksii Orel + */ +export class GetStartedConfig { + + constructor(register: che.IRegisterService) { + register.directive('cheTemplate', Template); + + register.controller('TemplateListController', TemplateListController); + + // config routes + register.app.config(['$routeProvider', ($routeProvider: any) => { + $routeProvider.accessWhen('/getstarted', { + title: 'Get Started', + templateUrl: 'app/get-started/template-list/template-list.html', + controller: 'TemplateListController', + controllerAs: 'templateListController' + }); + }]); + } +} diff --git a/dashboard/src/app/get-started/template-list/template-list.controller.ts b/dashboard/src/app/get-started/template-list/template-list.controller.ts new file mode 100644 index 0000000000..40b41cd6db --- /dev/null +++ b/dashboard/src/app/get-started/template-list/template-list.controller.ts @@ -0,0 +1,162 @@ +/* + * Copyright (c) 2015-2018 Red Hat, Inc. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ +'use strict'; +import {CreateWorkspaceSvc} from '../../workspaces/create-workspace/create-workspace.service'; +import {CheWorkspace} from '../../../components/api/workspace/che-workspace.factory'; +import {DevfileRegistry, IDevfileMetaData} from '../../../components/api/devfile-registry.factory'; +import { + ICheButtonDropdownMainAction, + ICheButtonDropdownOtherAction +} from '../../../components/widget/button-dropdown/che-button-dropdown.directive'; +import {CheNotification} from '../../../components/notification/che-notification.factory'; + + +/** + * @ngdoc controller + * @name template.list.controller:TemplateListController + * @description This class is handling the controller for a template list + * @author Oleksii Orel + */ +export class TemplateListController { + + static $inject = [ + '$q', + 'cheWorkspace', + 'devfileRegistry', + 'createWorkspaceSvc', + '$filter', + '$log', + 'cheNotification']; + + private $q: ng.IQService; + private $log: ng.ILogService; + private $filter: ng.IFilterService; + private cheNotification: CheNotification; + private devfileRegistry: DevfileRegistry; + private createWorkspaceSvc: CreateWorkspaceSvc; + /** + * Create button config. + */ + private createButtonConfig: { + mainAction: ICheButtonDropdownMainAction, + otherActions: Array + }; + + private isLoading: boolean; + private isCreating: boolean; + private devfileRegistryUrl: string; + private selectedDevfile: IDevfileMetaData | undefined; + + private searchValue: string = ''; + private devfiles: Array = []; + private filteredDevfiles: Array = []; + + /** + * Default constructor that is using resource + */ + constructor($q: ng.IQService, + cheWorkspace: CheWorkspace, + devfileRegistry: DevfileRegistry, + createWorkspaceSvc: CreateWorkspaceSvc, + $filter: ng.IFilterService, + $log: ng.ILogService, + cheNotification: CheNotification) { + this.$q = $q; + this.$log = $log; + this.$filter = $filter; + this.cheNotification = cheNotification; + this.devfileRegistry = devfileRegistry; + this.createWorkspaceSvc = createWorkspaceSvc; + this.devfileRegistryUrl = cheWorkspace.getWorkspaceSettings().cheWorkspaceDevfileRegistryUrl; + + this.createButtonConfig = { + mainAction: { + title: 'Create & Open', + type: 'button', + action: () => { + this.isCreating = true; + this.createWorkspace().then((workspace: che.IWorkspace) => { + this.createWorkspaceSvc.redirectToIDE(workspace); + }).catch(() => this.isCreating = false); + } + }, + otherActions: [{ + title: 'Create & Proceed Editing', + type: 'button', + action: () => { + this.isCreating = true; + this.createWorkspace().then((workspace: che.IWorkspace) => { + this.createWorkspaceSvc.redirectToDetails(workspace); + }).catch(() => this.isCreating = false); + }, + orderNumber: 1 + }] + }; + + this.init(); + } + + private init(): void { + this.isLoading = true; + this.devfileRegistry.fetchDevfiles(this.devfileRegistryUrl).then((devfiles: Array) => { + this.devfiles = devfiles; + this.applyFilter(); + }, (error: any) => { + const message = 'Failed to load devfiles meta list.'; + this.cheNotification.showError(message); + this.$log.error(message, error); + }).finally(() => { + this.isLoading = false; + }); + } + + private createWorkspace(): ng.IPromise { + if (!this.selectedDevfile || !this.selectedDevfile.links || !this.selectedDevfile.links.self) { + return this.$q.reject({data: {message: 'There is no selected Template.'}}); + } + const selfLink = this.selectedDevfile.links.self; + return this.devfileRegistry.fetchDevfile(this.devfileRegistryUrl, selfLink).then(() => { + const devfile = this.devfileRegistry.getDevfile(this.devfileRegistryUrl, selfLink); + const attributes = {stackName: this.selectedDevfile.displayName}; + return this.createWorkspaceSvc.createWorkspaceFromDevfile(devfile, attributes, true); + }); + } + + applyFilter(): void { + if (!this.searchValue) { + this.clearFilter(); + return; + } + const value = this.searchValue.toLocaleLowerCase(); + this.filteredDevfiles = this.$filter('filter')(this.devfiles, devfile => { + return devfile.displayName.toLowerCase().includes(value) || devfile.description.toLowerCase().includes(value); + }); + if (this.filteredDevfiles.findIndex(devfile => devfile === this.selectedDevfile) === -1) { + this.selectedDevfile = undefined; + } + } + + clearFilter(): void { + if (this.searchValue) { + this.searchValue = ''; + } + this.filteredDevfiles = this.devfiles; + } + + onSelect(devfile: IDevfileMetaData): void { + this.selectedDevfile = devfile; + } + + isCreateButtonDisabled(): boolean { + return this.isCreating || !this.selectedDevfile || !this.selectedDevfile.links || !this.selectedDevfile.links.self; + } +} diff --git a/dashboard/src/app/get-started/template-list/template-list.html b/dashboard/src/app/get-started/template-list/template-list.html new file mode 100644 index 0000000000..c3261eaa1e --- /dev/null +++ b/dashboard/src/app/get-started/template-list/template-list.html @@ -0,0 +1,72 @@ + + + + + + + +
+ +
+
+
Select a Template
+
Use a sample template to create your first workspace.
+
+
+
+
+
+
+ +
+
+
+
+
+
+ {{templateListController.filteredDevfiles.length}} items +
+
+ +
+ + + + +
+ There are no templates. +
+ + + +
+
+ diff --git a/dashboard/src/app/get-started/template-list/template-list.styl b/dashboard/src/app/get-started/template-list/template-list.styl new file mode 100644 index 0000000000..e0f14754c8 --- /dev/null +++ b/dashboard/src/app/get-started/template-list/template-list.styl @@ -0,0 +1,112 @@ +.getting-started-toolbar + border-bottom 1px solid $very-light-grey-background-color + user-select none + + md-toolbar + height: 110px; + + div.che-toolbar-header div:last-child + bottom initial + + div.che-toolbar-title + display inline-block + font-weight bold + text-align left + margin-left 10px + + .layout-align-start-center + .custom-template + float left + margin-right 20px + + .che-button + margin 0 + font-size 14px !important + font-weight bold !important + padding 0 20px !important + height 40px !important + line-height 40px !important + +md-content.getting-started + background-color $very-light-grey-background-color + padding-left 10px + + & > * + background-color $background-color + + .getting-started-list + che-box-shadow() + margin 15px + + .template-header + margin 15px + + .header-title + font-weight bold + font-size 133% + + .template-search + height 34px + max-width 150px + border 1px solid $list-header-blue-color + che-border-radius(2px) + + input + width 100% + padding 0 10px + border none + outline none + font-size 12px + text-overflow ellipsis + color $default-dark-color + input: + + :-webkit-input-placeholder + position relative + right 8px + color $list-header-blue-color + text-transform capitalize + text-align center + input: + + :-moz-placeholder + position relative + right 8px + color $list-header-blue-color + text-transform capitalize + text-align center + + .search-icon + text-align end + color $list-header-blue-color + + .close-icon + outline none + text-align center + color $default-color + + i + line-height 34px + font-size 16px + + .template-info + text-align end + font-weight bold + margin 0 10px + + .templates-area + width 100% + user-select none + + .selected + background-color #F2F7FD + border-color $primary-color + + che-button-save-flat + float left + width 100% + padding 15px + + .che-button + width inherit + margin 0 diff --git a/dashboard/src/app/get-started/template/template.directive.ts b/dashboard/src/app/get-started/template/template.directive.ts new file mode 100644 index 0000000000..8be16b567f --- /dev/null +++ b/dashboard/src/app/get-started/template/template.directive.ts @@ -0,0 +1,30 @@ +/* + * Copyright (c) 2015-2018 Red Hat, Inc. + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + */ +'use strict'; + +/** + * @ngDoc directive + * @name template.directive:Template + * @description This class is handling the directive to handle the container with get-started template + * @author Oleksii Orel + */ +export class Template implements ng.IDirective { + restrict = 'E'; + templateUrl = 'app/get-started/template/template.html'; + replace = true; + + scope = { + devfile: '=' + }; + + constructor () { } +} diff --git a/dashboard/src/app/get-started/template/template.html b/dashboard/src/app/get-started/template/template.html new file mode 100644 index 0000000000..fdb588e95e --- /dev/null +++ b/dashboard/src/app/get-started/template/template.html @@ -0,0 +1,24 @@ + +
+
+ +
+

+ {{devfile.displayName}} +

+

+ {{devfile.description}} +

+
diff --git a/dashboard/src/app/get-started/template/template.styl b/dashboard/src/app/get-started/template/template.styl new file mode 100644 index 0000000000..c8d16e53f7 --- /dev/null +++ b/dashboard/src/app/get-started/template/template.styl @@ -0,0 +1,33 @@ +.get-started-template + outline none + margin 15px 0 0 15px + padding 15px + border 2px solid #ededed + border-radius 2px + display inline-block + overflow hidden + float left + width 260px + height 240px + + p + max-width 100% + overflow hidden + text-overflow ellipsis + white-space normal + +.devfile-item-icon + width 70px + height 70px + overflow hidden + margin-bottom 10px + + img + height inherit + + .display-name + font-weight bold + font-size 133% + + .description + font-weight bold diff --git a/dashboard/src/app/index.module.ts b/dashboard/src/app/index.module.ts index 6095912e17..a3c0e03a37 100755 --- a/dashboard/src/app/index.module.ts +++ b/dashboard/src/app/index.module.ts @@ -25,6 +25,7 @@ import {NavbarConfig} from './navbar/navbar-config'; import {ProxySettingsConfig} from './proxy/proxy-settings.constant'; import {WorkspacesConfig} from './workspaces/workspaces-config'; import {StacksConfig} from './stacks/stacks-config'; +import {GetStartedConfig} from './get-started/get-started-config'; import {DemoComponentsController} from './demo-components/demo-components.controller'; import {CheBranding} from '../components/branding/che-branding.factory'; import {ChePreferences} from '../components/api/che-preferences.factory'; @@ -152,14 +153,14 @@ angular.element(document).ready(() => { // load Keycloak return keycloakLoad(keycloakSettings).then(() => { // init Keycloak - var theUseNonce: boolean; + let theUseNonce: boolean; if (typeof keycloakSettings['che.keycloak.use_nonce'] === 'string') { theUseNonce = keycloakSettings['che.keycloak.use_nonce'].toLowerCase() === 'true'; } - var initOptions = { + let initOptions = { useNonce: theUseNonce, redirectUrl: keycloakSettings['che.keycloak.redirect_url.dashboard'] - } + }; return keycloakInit(keycloakAuth.config, initOptions); }).then((keycloak: any) => { keycloakAuth.isPresent = true; @@ -492,6 +493,7 @@ new NavbarConfig(instanceRegister); new WorkspacesConfig(instanceRegister); new DashboardConfig(instanceRegister); new StacksConfig(instanceRegister); +new GetStartedConfig(instanceRegister); new FactoryConfig(instanceRegister); new OrganizationsConfig(instanceRegister); new TeamsConfig(instanceRegister); diff --git a/dashboard/src/app/navbar/navbar.controller.ts b/dashboard/src/app/navbar/navbar.controller.ts index 01c9c8727b..5a05a666d3 100644 --- a/dashboard/src/app/navbar/navbar.controller.ts +++ b/dashboard/src/app/navbar/navbar.controller.ts @@ -14,22 +14,31 @@ import {CheAPI} from '../../components/api/che-api.factory'; import {CheKeycloak} from '../../components/api/che-keycloak.factory'; import {CheService} from '../../components/api/che-service.factory'; +export const MENU_ITEM = { + dashboard: '#/', + getStarted: '#/getstarted', + workspaces: '#/workspaces', + stacks: '#/stacks', + factories: '#/factories', + administration: '#/administration', + usermanagement: '#/admin/usermanagement', + organizations: '#/organizations', + account: '#/account' +}; + export class CheNavBarController { - static $inject = ['$mdSidenav', '$scope', '$location', '$route', 'cheAPI', '$window', 'chePermissions', 'cheKeycloak', 'cheService']; + static $inject = ['$mdSidenav', + '$scope', + '$location', + '$route', + 'cheAPI', + '$window', + 'chePermissions', + 'cheKeycloak', + 'cheService']; - menuItemUrl = { - dashboard: '#/', - workspaces: '#/workspaces', - administration: '#/administration', - // subsections - plugins: '#/admin/plugins', - factories: '#/factories', - account: '#/account', - stacks: '#/stacks', - organizations: '#/organizations', - usermanagement: '#/admin/usermanagement' - }; + menuItemUrl = MENU_ITEM; accountItems = [ { @@ -87,9 +96,7 @@ export class CheNavBarController { $onInit(): void { this.isKeycloackPresent = this.cheKeycloak.isPresent(); - this.profile = this.cheAPI.getProfile().getProfile(); - this.userServices = this.chePermissions.getUserServices(); // highlight navbar menu item @@ -104,14 +111,13 @@ export class CheNavBarController { this.isPermissionServiceAvailable = false; this.resolvePermissionServiceAvailability().then((isAvailable: boolean) => { this.isPermissionServiceAvailable = isAvailable; - if (isAvailable) { if (this.chePermissions.getSystemPermissions()) { this.updateData(); } else { this.chePermissions.fetchSystemPermissions() - .catch((error: any) => { - // noop + .catch(() => { + // fetch unhandled rejection }) .finally(() => { this.updateData(); @@ -141,8 +147,8 @@ export class CheNavBarController { this.organizations = organization.getOrganizations(); const user = this.cheAPI.getUser().getUser(); organization.fetchOrganizationByName(user.name) - .catch((error: any) => { - // noop + .catch(() => { + // fetch unhandled rejection }) .finally(() => { this.hasPersonalAccount = angular.isDefined(organization.getOrganizationByName(user.name)); @@ -150,10 +156,6 @@ export class CheNavBarController { }); } - reload(): void { - this.$route.reload(); - } - /** * Returns user nickname. * @return {string} @@ -167,7 +169,6 @@ export class CheNavBarController { /** * Returns number of workspaces. - * * @return {number} */ getWorkspacesNumber(): number { @@ -176,7 +177,6 @@ export class CheNavBarController { /** * Returns number of factories. - * * @return {number} */ getFactoriesNumber(): number { @@ -185,7 +185,6 @@ export class CheNavBarController { /** * Returns number of all organizations. - * * @return {number} */ getOrganizationsNumber(): number { @@ -198,7 +197,6 @@ export class CheNavBarController { /** * Returns number of root organizations. - * * @return {number} */ getRootOrganizationsNumber(): number { @@ -212,22 +210,17 @@ export class CheNavBarController { return rootOrganizations.length; } - openLinkInNewTab(url: string): void { - this.$window.open(url, '_blank'); - } - /** * Opens user profile in new browser page. */ - gotoProfile(): void { + private gotoProfile(): void { this.$location.path('/account'); } /** * Logout. */ - logout(): void { + private logout(): void { this.cheKeycloak.logout(); } - } diff --git a/dashboard/src/app/navbar/navbar.html b/dashboard/src/app/navbar/navbar.html index 1db49747b1..df89f614dc 100644 --- a/dashboard/src/app/navbar/navbar.html +++ b/dashboard/src/app/navbar/navbar.html @@ -13,25 +13,25 @@ --> diff --git a/dashboard/src/app/stacks/list-stacks/list-stacks.controller.ts b/dashboard/src/app/stacks/list-stacks/list-stacks.controller.ts index 5f80841479..dbb0c34675 100644 --- a/dashboard/src/app/stacks/list-stacks/list-stacks.controller.ts +++ b/dashboard/src/app/stacks/list-stacks/list-stacks.controller.ts @@ -12,6 +12,7 @@ 'use strict'; import {CheWorkspace} from '../../../components/api/workspace/che-workspace.factory'; import {DevfileRegistry, IDevfileMetaData} from '../../../components/api/devfile-registry.factory'; +import {CheNotification} from '../../../components/notification/che-notification.factory'; const DEFAULT_COLUMN = 'displayName'; @@ -24,32 +25,42 @@ const DEFAULT_COLUMN = 'displayName'; */ export class ListStacksController { - static $inject = ['$scope', 'cheWorkspace', '$location', 'devfileRegistry', 'cheListHelperFactory']; + static $inject = ['$scope', + '$location', + 'cheWorkspace', + 'devfileRegistry', + 'cheListHelperFactory', + '$log', + 'cheNotification']; private $location: ng.ILocationService; - - private cheWorkspace: CheWorkspace; private devfileRegistry: DevfileRegistry; private cheListHelper: che.widget.ICheListHelper; + private $log: ng.ILogService; + private cheNotification: CheNotification; private orderBy: string; private searchBy: string; private searchStr: string; - private pluginRegistryUrl: string; - + private devfileRegistryUrl: string; private isLoading: boolean; /** * Default constructor that is using resource */ constructor($scope: ng.IScope, - cheWorkspace: CheWorkspace, - $location: ng.ILocationService, - devfileRegistry: DevfileRegistry, - cheListHelperFactory: che.widget.ICheListHelperFactory) { + $location: ng.ILocationService, + cheWorkspace: CheWorkspace, + devfileRegistry: DevfileRegistry, + cheListHelperFactory: che.widget.ICheListHelperFactory, + $log: ng.ILogService, + cheNotification: CheNotification) { this.$location = $location; - this.cheWorkspace = cheWorkspace; this.devfileRegistry = devfileRegistry; + this.$log = $log; + this.cheNotification = cheNotification; + + this.devfileRegistryUrl = cheWorkspace.getWorkspaceSettings().cheWorkspaceDevfileRegistryUrl; const helperId = 'devfiles-meta-list'; this.cheListHelper = cheListHelperFactory.getHelper(helperId); @@ -58,9 +69,8 @@ export class ListStacksController { }); this.orderBy = DEFAULT_COLUMN; - - // TODO remove this after cheListHelper improvement - this.searchBy = 'tmpFilterColumn'; + // + this.searchBy = '$'; this.loadDevfiles(); } @@ -72,18 +82,12 @@ export class ListStacksController { loadDevfiles(): void { this.isLoading = true; - this.pluginRegistryUrl = this.cheWorkspace.getWorkspaceSettings().cheWorkspaceDevfileRegistryUrl; - this.devfileRegistry.fetchDevfiles(this.pluginRegistryUrl).then((data: Array) => { - const devfileMetaDatas = data.map((devfileMetaData: IDevfileMetaData) => { - - // TODO remove this after cheListHelper improvement - devfileMetaData[this.searchBy]= `${devfileMetaData.displayName} ${devfileMetaData.description} ${devfileMetaData.globalMemoryLimit}`; - - return devfileMetaData; - }); - this.cheListHelper.setList(devfileMetaDatas, DEFAULT_COLUMN); + this.devfileRegistry.fetchDevfiles(this.devfileRegistryUrl).then((data: Array) => { + this.cheListHelper.setList(data, 'displayName'); }, (error: any) => { - console.log('Failed to load devfiles meta list', error); + const message = 'Failed to load devfiles meta list.'; + this.cheNotification.showError(message); + this.$log.error(message, error); }).finally(() => { this.isLoading = false; }); @@ -102,7 +106,7 @@ export class ListStacksController { updateFilters(): void { this.cheListHelper.clearFilters(); - const filter: {[searchBy: string]: string} = {}; + const filter: { [searchBy: string]: string } = {}; if (this.searchStr) { filter[this.searchBy] = this.searchStr; } diff --git a/dashboard/src/app/workspaces/create-workspace/import-custom-stack/import-custom-stack.styl b/dashboard/src/app/workspaces/create-workspace/import-custom-stack/import-custom-stack.styl index 1551618f16..4167243573 100644 --- a/dashboard/src/app/workspaces/create-workspace/import-custom-stack/import-custom-stack.styl +++ b/dashboard/src/app/workspaces/create-workspace/import-custom-stack/import-custom-stack.styl @@ -13,7 +13,6 @@ md-tab-content.md-active .import-custom-stack .config-import animation-duration .5s animation-delay 0s animation-name devfile-by-url-height - overflow hidden @keyframes devfile-by-url-height 0% diff --git a/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts b/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts index 43adc8947b..e66b8228ee 100644 --- a/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts +++ b/dashboard/src/app/workspaces/list-workspaces/list-workspaces.controller.ts @@ -28,7 +28,7 @@ export class ListWorkspacesCtrl { static $inject = ['$log', '$mdDialog', '$q', 'lodash', 'cheAPI', 'cheNotification', 'cheBranding', 'cheWorkspace', 'cheNamespaceRegistry', 'confirmDialogService', '$scope', 'cheListHelperFactory']; - $q: ng.IQService; + $q: ng.IQService; $log: ng.ILogService; lodash: any; $mdDialog: ng.material.IDialogService; @@ -39,7 +39,6 @@ export class ListWorkspacesCtrl { state: string; isInfoLoading: boolean; - workspaceFilter: any; userWorkspaces: che.IWorkspace[]; workspaceCreationLink: string; @@ -84,7 +83,6 @@ export class ListWorkspacesCtrl { this.state = 'loading'; this.isInfoLoading = true; this.isExactMatch = false; - this.workspaceFilter = {config: {name: ''}}; this.namespaceFilter = {namespace: ''}; // map of all workspaces with additional info by id: @@ -100,8 +98,7 @@ export class ListWorkspacesCtrl { // callback when search value is changed this.onSearchChanged = (str: string) => { - this.workspaceFilter.config.name = str; - this.cheListHelper.applyFilter('name', this.workspaceFilter); + this.cheListHelper.applyFilter('$', str ? str : {}); }; // callback when namespace is changed diff --git a/dashboard/src/app/workspaces/list-workspaces/list-workspaces.html b/dashboard/src/app/workspaces/list-workspaces/list-workspaces.html index 4a76039c07..79837bb1fc 100644 --- a/dashboard/src/app/workspaces/list-workspaces/list-workspaces.html +++ b/dashboard/src/app/workspaces/list-workspaces/list-workspaces.html @@ -12,13 +12,14 @@ --> -A workspace is where your projects live and run. Create workspaces from stacks that define projects, runtimes, and commands. + + A workspace is where your projects live and run. Create workspaces from stacks that define projects, runtimes, and commands. +
@@ -69,7 +66,7 @@
-
-
+
- + {{deleteButtonDisableMessage}} diff --git a/dashboard/src/components/widget/list/che-list-header.styl b/dashboard/src/components/widget/list/che-list-header.styl index f07cfbbf3b..c286a46ba9 100644 --- a/dashboard/src/components/widget/list/che-list-header.styl +++ b/dashboard/src/components/widget/list/che-list-header.styl @@ -157,26 +157,3 @@ .che-list-item-checkbox-main display inline-block - -.che-list-search-input - float right - width 150px - overflow hidden - - display inline-block - box-sizing content-box - min-height 30px !important - height 30px !important - margin-top 15px !important - margin-bottom 0 - box-shadow none !important - border-color $list-header-blue-color !important - - .search-icon i:before - color $primary-color - - .search-input input::-webkit-input-placeholder - color $list-header-blue-color !important - - .search-input input::-moz-placeholder - color $list-header-blue-color !important diff --git a/dashboard/src/components/widget/toolbar/che-toolbar.styl b/dashboard/src/components/widget/toolbar/che-toolbar.styl index 5040a44703..037e4af273 100644 --- a/dashboard/src/components/widget/toolbar/che-toolbar.styl +++ b/dashboard/src/components/widget/toolbar/che-toolbar.styl @@ -14,7 +14,7 @@ $toolbar-height = 60px .che-toolbar a:hover span text-decoration none -.che-toolbar a, +.che-toolbar *:not(.custom-template) > a, .che-toolbar md-icon, .che-toolbar .che-toolbar-subheader, .che-toolbar .che-toolbar-title-label @@ -76,7 +76,7 @@ $toolbar-height = 60px .che-toolbar-control-button md-icon vertical-align inherit -.che-toolbar .che-button.md-button +.che-toolbar *:not(.custom-template) > .che-button.md-button color $white-color !important font-size 13px !important font-weight bold !important diff --git a/dashboard/yarn.lock b/dashboard/yarn.lock index 005244dd69..9602f9260a 100644 --- a/dashboard/yarn.lock +++ b/dashboard/yarn.lock @@ -4106,6 +4106,18 @@ glob@7.0.x: once "^1.3.0" path-is-absolute "^1.0.0" +glob@7.1.5: + version "7.1.5" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" + integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== + dependencies: + fs.realpath "^1.0.0" + inflight "^1.0.4" + inherits "2" + minimatch "^3.0.4" + once "^1.3.0" + path-is-absolute "^1.0.0" + glob@^3.2.11: version "3.2.11" resolved "https://registry.yarnpkg.com/glob/-/glob-3.2.11.tgz#4a973f635b9190f715d10987d5c00fd2815ebe3d" @@ -4147,18 +4159,6 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.1.5: - version "7.1.5" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" - integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ== - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - glob@~3.1.21: version "3.1.21" resolved "https://registry.yarnpkg.com/glob/-/glob-3.1.21.tgz#d29e0a055dea5138f4d07ed40e8982e83c2066cd" @@ -7350,22 +7350,22 @@ moment@*: resolved "https://registry.yarnpkg.com/moment/-/moment-2.9.0.tgz#77ec1175fa294f42627f10c8e6de6302c036f6d5" integrity sha1-d+wRdfopT0JifxDI5t5jAsA29tU= -monaco-editor-core@^0.14.6: +monaco-editor-core@0.14.6: version "0.14.6" resolved "https://registry.yarnpkg.com/monaco-editor-core/-/monaco-editor-core-0.14.6.tgz#25fae6a2e7c7da6eb2a3bba653a283627dc624e4" integrity sha512-B7ZFmTO/4L+ff07Qmxt2TB0/nux80dVyah5AQaeuWCAD3H5wuaGOszAWBZEU6hEalSYTXv+O9bnTxnjXZG6tuw== -monaco-languageclient@^0.9.0: - version "0.9.1" - resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.9.1.tgz#dccd26ae0be4d1014395b406e924baae9f8eb9b5" - integrity sha512-mDwbYk67UVPf41RnhfMLRME08NsK2/JeqCkkhPL+wef6rZQNHRb/U2bMMuW/MVVM/yT2DYFy5f7cLNm63FYGMw== +monaco-languageclient@0.9.0: + version "0.9.0" + resolved "https://registry.yarnpkg.com/monaco-languageclient/-/monaco-languageclient-0.9.0.tgz#4b65684e277edab07625e76eb3d3d93e8f2130fa" + integrity sha512-N8IdHUnV8Sq2nfm3dSZ0SpILmGhqrTvdXkL0BFfJvV2vcKYVVQ36AXJNqCRImmovkeNUHLyQMeHTqOwvMMVxCQ== dependencies: glob-to-regexp "^0.3.0" vscode-base-languageclient "4.4.0" vscode-jsonrpc "^3.6.2" vscode-uri "^1.0.5" -monaco-languages@^1.8.0: +monaco-languages@1.8.0: version "1.8.0" resolved "https://registry.yarnpkg.com/monaco-languages/-/monaco-languages-1.8.0.tgz#aeacf40b0f8d0130c4b43c6c143b55f86e6b909d" integrity sha512-vC/lqNgSslQT3vSlNOpyT34ELK0eoNbA/rHUvTUjQemIiR1GpRMKhuwB21BqzWk+0MjZuJydGSCQMCebBge7jg== @@ -8998,6 +8998,11 @@ regenerate@^1.2.1: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg== +regenerator-runtime@0.13.3: + version "0.13.3" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" + integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== + regenerator-runtime@^0.10.5: version "0.10.5" resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz#336c3efc1220adcedda2c9fab67b5a7955a33658" @@ -9008,11 +9013,6 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.3: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== - regenerator-transform@^0.10.0: version "0.10.1" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd" @@ -10653,10 +10653,10 @@ ultron@1.0.x: resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa" integrity sha1-rOEWq1V80Zc4ak6I9GhTeMiy5Po= -umd-compat-loader@^2.1.1: - version "2.1.2" - resolved "https://registry.yarnpkg.com/umd-compat-loader/-/umd-compat-loader-2.1.2.tgz#abf89be1591940a236cf8fa87f88d6d6f5a8da35" - integrity sha512-RkTlsfrCxUISWqiTtYFFJank7b2Hhl4V2pc29nl0xOEGvvuVkpy1xnufhXfTituxgpW0HSrDk0JHlvPYZxEXKQ== +umd-compat-loader@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/umd-compat-loader/-/umd-compat-loader-2.1.1.tgz#1a44674f57deeb429f4d1533668453a3cf322422" + integrity sha512-rbU2eHzW6tp64cF3X9o93wNYeG6hwvmTTktnd4nW9CdY2rMdw/py0J4C9h/b9HNfn1H0HF7jQQNxGvrm5qio7g== dependencies: ast-types "^0.9.2" loader-utils "^1.0.3" @@ -11024,7 +11024,12 @@ vscode-languageserver-protocol@3.14.1, vscode-languageserver-protocol@^3.10.0: vscode-jsonrpc "^4.0.0" vscode-languageserver-types "3.14.0" -vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.10.0, vscode-languageserver-types@^3.14.0: +vscode-languageserver-types@3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.10.0.tgz#944e5308f3b36a3f372c766f1a344e903ec9c389" + integrity sha512-vxmCsVZGwq8X40SuLP8Ix7V0rq5V/7iQUjRVe2Oxm+TbmjxtjK4dpHHXQCUawjA4fhPA9FwjSRbDhbvQmYCfMw== + +vscode-languageserver-types@3.14.0, vscode-languageserver-types@^3.14.0: version "3.14.0" resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.14.0.tgz#d3b5952246d30e5241592b6dde8280e03942e743" integrity sha512-lTmS6AlAlMHOvPQemVwo3CezxBp0sNB95KNPkqp3Nxd5VFEnuG1ByM0zlRWos0zjO3ZWtkvhal0COgiV1xIA4A== diff --git a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/DashboardFactories.java b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/DashboardFactories.java index afdc3e3fee..669a11437c 100644 --- a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/DashboardFactories.java +++ b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/DashboardFactories.java @@ -105,7 +105,7 @@ public class DashboardFactories { String BULK_CHECKBOX = "//md-checkbox[@aria-label='Factory list']"; String DELETE_FACTORY_BTN_ID = "delete-item-button"; String DELETE_DIALOG_BUTTON_ID = "ok-dialog-button"; - String SEARCH_FACTORY_FIELD = "//input[@ng-placeholder='Search']"; + String SEARCH_FACTORY_FIELD = "//input[placeholder='Search']"; } private interface AddActionWindow { diff --git a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/WorkspaceShare.java b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/WorkspaceShare.java index e126396725..a3b7b748af 100644 --- a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/WorkspaceShare.java +++ b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/WorkspaceShare.java @@ -36,7 +36,7 @@ public class WorkspaceShare { private interface Locators { String ADD_DEVELOPER_BUTTON_XPATH = "//che-button-primary[@che-button-title='Add Developer']"; String BULK_SELECTION_ID = "share-workspace-bulk-selection"; - String FILTER_MEMBERS_BY_NAME_FIELD_XPATH = "//input[@ng-placeholder='Search']"; + String FILTER_MEMBERS_BY_NAME_FIELD_XPATH = "//share-workspace//input[@placeholder='Search']"; String MEMBER_ITEM_XPATH_PATTERN = "//div[@id='member-email-%s']"; String MEMBER_NAME_XPATH = MEMBER_ITEM_XPATH_PATTERN + "//span[@data-user-email]"; String MEMBER_CHECKBOX_XPATH = MEMBER_ITEM_XPATH_PATTERN + "//md-checkbox"; diff --git a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/Workspaces.java b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/Workspaces.java index 2728d97838..381b01e5e2 100644 --- a/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/Workspaces.java +++ b/tests/legacy-e2e/che-selenium-test/src/main/java/org/eclipse/che/selenium/pageobject/dashboard/workspaces/Workspaces.java @@ -72,7 +72,7 @@ public class Workspaces { String DELETE_WORKSPACE_BTN = "delete-item-button"; String DELETE_DIALOG_BUTTON = "//md-dialog[@role='dialog']//button[text()='Delete']"; String BULK_CHECKBOX = "//md-checkbox[@aria-label='Workspace list']"; - String SEARCH_WORKSPACE_FIELD = "//input[@ng-placeholder='Search']"; + String SEARCH_WORKSPACE_FIELD = "//input[@placeholder='Search']"; String NO_WORKSPACE_FOUND = "//span[text()='No workspaces found.']"; String WORKSPACE_ITEM_NAME = "//div[@class='workspace-name-clip' and contains(@id, '/%s')]"; String WORKSPACE_ITEM_XPATH = "//div[@id='ws-name-%s']"; diff --git a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java index 8ef6fe3539..bef45e5865 100644 --- a/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java +++ b/tests/legacy-e2e/che-selenium-test/src/test/java/org/eclipse/che/selenium/dashboard/workspaces/WorkspacesListTest.java @@ -13,7 +13,6 @@ package org.eclipse.che.selenium.dashboard.workspaces; import static java.util.Arrays.asList; import static org.eclipse.che.commons.lang.NameGenerator.generate; -import static org.eclipse.che.selenium.core.TestGroup.UNDER_REPAIR; import static org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces.Locators.WORKSPACE_ITEM_ADD_PROJECT_BUTTON; import static org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces.Locators.WORKSPACE_ITEM_CONFIGURE_BUTTON; import static org.eclipse.che.selenium.pageobject.dashboard.workspaces.Workspaces.Locators.WORKSPACE_ITEM_STOP_START_WORKSPACE_BUTTON; @@ -177,7 +176,7 @@ public class WorkspacesListTest { workspaces.waitDeleteWorkspaceBtnDisappearance(); } - @Test(groups = UNDER_REPAIR) + @Test public void checkSearchField() throws Exception { int nameLength = WORKSPACE_NAME.length(); int existingWorkspacesCount = testWorkspaceServiceClient.getWorkspacesCount();