+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dashboard/src/app/admin/user-management/account-profile/account-profile.styl b/dashboard/src/app/admin/user-management/account-profile/account-profile.styl
new file mode 100644
index 0000000000..2ba6ba3599
--- /dev/null
+++ b/dashboard/src/app/admin/user-management/account-profile/account-profile.styl
@@ -0,0 +1,8 @@
+.account-profile
+ padding 0 14px
+
+ .che-input-desktop
+ margin-top -1px
+
+ .che-select
+ margin-top -2px
diff --git a/dashboard/src/app/admin/user-management/add-user/add-user.controller.ts b/dashboard/src/app/admin/user-management/add-user/add-user.controller.ts
new file mode 100644
index 0000000000..c1fa184fd0
--- /dev/null
+++ b/dashboard/src/app/admin/user-management/add-user/add-user.controller.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {AdminsUserManagementCtrl} from '../user-management.controller';
+
+/**
+ * This class is handling the controller for the add user
+ * @author Oleksii Orel
+ */
+export class AdminsAddUserController {
+ private $mdDialog: ng.material.IDialogService;
+ private lodash: any;
+ private cheNotification: any;
+ private cheUser: any;
+ private callbackController: AdminsUserManagementCtrl;
+ private newUserName: string;
+ private newUserEmail: string;
+ private newUserPassword: string;
+ private organizations: ArrayA name is required.
+ The name has to be less than 128 characters long.
+ A last name is required.
+ The name has to be less than 128 characters long.
+ Should be numbers and may start with a '+'.
+ The phone number has to be more than 7 characters long.
+ The phone number has to be less than 15 characters long.
+ The name has to be less than 128 characters long.
+
+
+
+
+
+
+
+
+
+
+
+ User login to be less than 100 characters long.
+ Enter a valid email address.
+ User email has to be less than 100 characters long
+
+
+
+
+ User password should contain both letters and digits
+ User password should contain at least 8 characters.
+ User password has to be less than 100 characters long.
+
+
+
+ Minimum 8 characters, both letters and digits.
+
+
+
+
+ Confirm password has to be less than 100 characters long.
+
+ Passwords do not match.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Email
+ ![]()
+ {{user.email}}
+
+
+ Login
+ {{user.name}}
+
+
+ Organizations
+ {{adminsUserManagementCtrl.userOrganizationCount[user.id] ? adminsUserManagementCtrl.userOrganizationCount[user.id] : '-'}}
+
+
+ Actions
+
+
+
+
+
+
+
+
+ No users found.
+
+ There are no users.
+
+ true if Keycloak is present.
+ *
+ * @returns {boolean}
+ */
+ isKeycloakPresent(): boolean {
+ return this.cheKeycloak.isPresent();
+ }
+
+ /**
+ * Opens user profile in new browser page.
+ */
+ gotoProfile(): void {
+ const url = this.cheKeycloak.getProfileUrl();
+ this.$window.open(url);
+ }
+
+ /**
+ * Logout.
+ */
+ logout(): void {
+ this.cheKeycloak.logout();
+ }
+
}
diff --git a/dashboard/src/app/navbar/navbar.directive.ts b/dashboard/src/app/navbar/navbar.directive.ts
index 0baa7dbb76..338666e395 100644
--- a/dashboard/src/app/navbar/navbar.directive.ts
+++ b/dashboard/src/app/navbar/navbar.directive.ts
@@ -30,7 +30,7 @@ export class CheNavBar {
this.replace = false;
this.templateUrl = 'app/navbar/navbar.html';
this.controller = 'CheNavBarController';
- this.controllerAs = 'navbarCtrl';
+ this.controllerAs = 'navbarController';
}
}
diff --git a/dashboard/src/app/navbar/navbar.html b/dashboard/src/app/navbar/navbar.html
index a4b4922d1f..b98ad2d8f9 100644
--- a/dashboard/src/app/navbar/navbar.html
+++ b/dashboard/src/app/navbar/navbar.html
@@ -12,8 +12,9 @@
-->
+
@@ -23,7 +24,7 @@
-
-
+
+ href="{{navbarController.menuItemUrl.stacks}}" layout-align="left">
+
+
diff --git a/dashboard/src/app/organizations/create-organizations/create-organizations.controller.ts b/dashboard/src/app/organizations/create-organizations/create-organizations.controller.ts
new file mode 100644
index 0000000000..cd78c0c77c
--- /dev/null
+++ b/dashboard/src/app/organizations/create-organizations/create-organizations.controller.ts
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc controller
+ * @name organizations.create.controller:CreateOrganizationController
+ * @description This class is handling the controller for the new organization creation.
+ * @author Oleksii Orel
+ */
+export class CreateOrganizationController {
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * Log service.
+ */
+ private $log: ng.ILogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Current organization's name.
+ */
+ private organizationName: string;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * The list of users to invite.
+ */
+ private members: Array;
+ /**
+ * Parent organization name.
+ */
+ private parentQualifiedName: string;
+ /**
+ * Parent organization id.
+ */
+ private parentOrganizationId: string;
+ /**
+ * List of members of parent organization.
+ */
+ private parentOrganizationMembers: Array;
+
+ /**
+ * Default constructor
+ * @ngInject for Dependency injection
+ */
+ constructor(cheOrganization: che.api.ICheOrganization, chePermissions: che.api.IChePermissions, cheUser: any, cheNotification: any,
+ $location: ng.ILocationService, $q: ng.IQService, $log: ng.ILogService, $rootScope: che.IRootScopeService,
+ initData: any) {
+ this.cheOrganization = cheOrganization;
+ this.chePermissions = chePermissions;
+ this.cheUser = cheUser;
+ this.cheNotification = cheNotification;
+ this.$location = $location;
+ this.$q = $q;
+ this.$log = $log;
+ $rootScope.showIDE = false;
+
+ this.organizationName = '';
+ this.isLoading = false;
+ this.members = [];
+
+ // injected by route provider
+ this.parentQualifiedName = initData.parentQualifiedName;
+ this.parentOrganizationId = initData.parentOrganizationId;
+ this.parentOrganizationMembers = initData.parentOrganizationMembers;
+ }
+
+ /**
+ * Check if the name is unique.
+ * @param name
+ * @returns {boolean}
+ */
+ isUniqueName(name: string): boolean {
+ let organizations = this.cheOrganization.getOrganizations();
+ let account = this.parentQualifiedName ? this.parentQualifiedName + '/' : '';
+ if (!organizations.length) {
+ return true;
+ } else {
+ for (let i = 0; i < organizations.length; i++) {
+ if (organizations[i].qualifiedName === account + name) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+
+ /**
+ * Performs new organization creation.
+ */
+ createOrganization(): void {
+ this.isLoading = true;
+ this.cheOrganization.createOrganization(this.organizationName, this.parentOrganizationId).then((organization: che.IOrganization) => {
+ this.addPermissions(organization, this.members);
+ this.cheOrganization.fetchOrganizations();
+ }, (error: any) => {
+ this.isLoading = false;
+ let message = error.data && error.data.message ? error.data.message : 'Failed to create organization ' + this.organizationName + '.';
+ this.cheNotification.showError(message);
+ });
+ }
+
+ /**
+ * Add permissions for members in pointed organization.
+ *
+ * @param organization {che.IOrganization} organization
+ * @param members members to be added to organization
+ */
+ addPermissions(organization: che.IOrganization, members: Array) {
+ let promises = [];
+ members.forEach((member: che.IMember) => {
+ if (member.id && member.id !== this.cheUser.getUser().id) {
+ let actions = this.cheOrganization.getActionsFromRoles(member.roles);
+ let permissions = {
+ instanceId: organization.id,
+ userId: member.id,
+ domainId: 'organization',
+ actions: actions
+ };
+
+ let promise = this.chePermissions.storePermissions(permissions);
+ promises.push(promise);
+ }
+ });
+
+ this.$q.all(promises).then(() => {
+ this.isLoading = false;
+ this.$location.path('/organization/' + organization.qualifiedName);
+ }, (error: any) => {
+ this.isLoading = false;
+ let message = error.data && error.data.message ? error.data.message : 'Failed to create organization ' + this.organizationName + '.';
+ this.cheNotification.showError(message);
+ });
+ }
+}
diff --git a/dashboard/src/app/organizations/create-organizations/create-organizations.html b/dashboard/src/app/organizations/create-organizations/create-organizations.html
new file mode 100644
index 0000000000..d4898a1631
--- /dev/null
+++ b/dashboard/src/app/organizations/create-organizations/create-organizations.html
@@ -0,0 +1,62 @@
+;
+ /**
+ * Map of organization members.
+ */
+ private organizationMembers: Map;
+ /**
+ * Map of organization total resources.
+ */
+ private organizationTotalResources: Map;
+ /**
+ * Map of organization available resources.
+ */
+ private organizationAvailableResources: Map;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * On update function.
+ */
+ private onUpdate: Function;
+
+ /**
+ * Parent organization name.
+ */
+ private parentName: string;
+ /**
+ * Parent organization id.
+ */
+ private parentId: string;
+ /**
+ * Organization order by.
+ */
+ private organizationOrderBy: string;
+ /**
+ * Organization filter.
+ */
+ private organizationFilter: {name: string};
+ /**
+ * User services.
+ */
+ private userServices: che.IUserServices;
+ /**
+ * Selection and filtration helper.
+ */
+ private cheListHelper: che.widget.ICheListHelper;
+ /**
+ * todo
+ */
+ private resourceLimits: che.resource.ICheResourceLimits;
+ /**
+ * todo
+ */
+ private organizationActions: che.resource.ICheOrganizationActions;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $scope: ng.IScope, chePermissions: che.api.IChePermissions, cheResourcesDistribution: che.api.ICheResourcesDistribution, cheOrganization: che.api.ICheOrganization, cheNotification: any, confirmDialogService: any, $route: ng.route.IRouteService, organizationsPermissionService: OrganizationsPermissionService, cheListHelperFactory: che.widget.ICheListHelperFactory, resourcesService: che.service.IResourcesService) {
+ this.$q = $q;
+ this.cheNotification = cheNotification;
+ this.chePermissions = chePermissions;
+ this.cheOrganization = cheOrganization;
+ this.confirmDialogService = confirmDialogService;
+ this.cheResourcesDistribution = cheResourcesDistribution;
+ this.resourceLimits = resourcesService.getResourceLimits();
+ this.organizationActions = resourcesService.getOrganizationActions();
+
+ this.parentName = $route.current.params.organizationName;
+ this.organizationOrderBy = 'name';
+ this.organizationFilter = {name: ''};
+
+ const helperId = 'list-organizations';
+ this.cheListHelper = cheListHelperFactory.getHelper(helperId);
+ $scope.$on('$destroy', () => {
+ cheListHelperFactory.removeHelper(helperId);
+ });
+
+ this.userServices = this.chePermissions.getUserServices();
+ this.organizationsPermissionService = organizationsPermissionService;
+
+ $scope.$watch(() => {
+ return this.organizations;
+ }, (newValue: Array, oldValue: Array) => {
+ if (newValue && !angular.equals(newValue, oldValue)) {
+ this.processOrganizations();
+ }
+ });
+ this.processOrganizations();
+ }
+
+ /**
+ * Callback when name is changed.
+ *
+ * @param str {string} a string to filter organizations.
+ */
+ onSearchChanged(str: string): void {
+ this.organizationFilter.name = str;
+ this.cheListHelper.applyFilter('name', this.organizationFilter);
+ }
+
+ /**
+ * Returns true if user has manage permission.
+ *
+ * @returns {boolean}
+ */
+ hasManagePermission(): boolean {
+ if (this.parentId) {
+ return this.organizationsPermissionService.isUserAllowedTo(this.organizationActions.MANAGE_SUB_ORGANIZATION, this.parentId);
+ }
+ return this.userServices.hasAdminUserService;
+ }
+
+ /**
+ * Process organization - retrieving additional data.
+ */
+ processOrganizations(): void {
+ if (angular.isUndefined(this.organizations)) {
+ return;
+ }
+ if (this.parentName) {
+ const parentOrganization = this.cheOrganization.getOrganizationByName(this.parentName);
+ this.parentId = parentOrganization ? parentOrganization.id : null;
+ }
+ if (this.organizations && this.organizations.length) {
+ this.organizationMembers = new Map();
+ this.organizationTotalResources = new Map();
+ this.organizationAvailableResources = new Map();
+ const promises = [];
+ this.isLoading = true;
+ this.organizations.forEach((organization: che.IOrganization) => {
+ const promiseMembers = this.chePermissions.fetchOrganizationPermissions(organization.id).then(() => {
+ this.organizationMembers.set(organization.id, this.chePermissions.getOrganizationPermissions(organization.id).length);
+ });
+ promises.push(promiseMembers);
+ let promiseTotalResource = this.cheResourcesDistribution.fetchTotalOrganizationResources(organization.id).then(() => {
+ this.processTotalResource(organization.id);
+ });
+ promises.push(promiseTotalResource);
+
+ let promiseAvailableResource = this.cheResourcesDistribution.fetchAvailableOrganizationResources(organization.id).then(() => {
+ this.processAvailableResource(organization.id);
+ });
+ promises.push(promiseAvailableResource);
+ });
+ this.$q.all(promises).finally(() => {
+ this.isLoading = false;
+ this.cheListHelper.setList(this.organizations, 'id');
+ });
+ } else {
+ this.cheListHelper.setList(this.organizations, 'id');
+ }
+ }
+
+ /**
+ * Process total organization resources.
+ *
+ * @param organizationId organization's id
+ */
+ processTotalResource(organizationId: string): void {
+ let ramLimit = this.cheResourcesDistribution.getOrganizationTotalResourceByType(organizationId, this.resourceLimits.RAM);
+ this.organizationTotalResources.set(organizationId, ramLimit ? ramLimit.amount : undefined);
+ }
+
+ /**
+ * Process available organization resources.
+ *
+ * @param organizationId organization's id
+ */
+ processAvailableResource(organizationId: string): void {
+ let ramLimit = this.cheResourcesDistribution.getOrganizationAvailableResourceByType(organizationId, this.resourceLimits.RAM);
+ this.organizationAvailableResources.set(organizationId, ramLimit ? ramLimit.amount : undefined);
+ }
+
+ /**
+ * Returns the number of organization's members.
+ *
+ * @param organizationId organization's id
+ * @returns {any} number of organization members to display
+ */
+ getMembersCount(organizationId: string): any {
+ if (this.organizationMembers && this.organizationMembers.size > 0) {
+ return this.organizationMembers.get(organizationId) || '-';
+ }
+ return '-';
+ }
+
+ /**
+ * Returns the total RAM of the organization.
+ *
+ * @param organizationId organization's id
+ * @returns {any}
+ */
+ getTotalRAM(organizationId: string): any {
+ if (this.organizationTotalResources && this.organizationTotalResources.size > 0) {
+ let ram = this.organizationTotalResources.get(organizationId);
+ return (ram && ram !== -1) ? (ram / 1024) : null;
+ }
+ return null;
+ }
+
+ /**
+ * Returns the available RAM of the organization.
+ *
+ * @param organizationId organization's id
+ * @returns {any}
+ */
+ getAvailableRAM(organizationId: string): any {
+ if (this.organizationAvailableResources && this.organizationAvailableResources.size > 0) {
+ let ram = this.organizationAvailableResources.get(organizationId);
+ return (ram && ram !== -1) ? (ram / 1024) : null;
+ }
+ return null;
+ }
+
+ /**
+ * Delete all selected organizations.
+ */
+ deleteSelectedOrganizations(): void {
+ const selectedOrganizations = this.cheListHelper.getSelectedItems(),
+ selectedOrganizationIds = selectedOrganizations.map((organization: che.IOrganization) => {
+ return organization.id;
+ });
+
+ if (!selectedOrganizationIds.length) {
+ this.cheNotification.showError('No such organization.');
+ return;
+ }
+
+ const confirmationPromise = this._showDeleteOrganizationConfirmation(selectedOrganizationIds.length);
+ confirmationPromise.then(() => {
+ let promises = [];
+
+ selectedOrganizationIds.forEach((organizationId: string) => {
+ this.cheListHelper.itemsSelectionStatus[organizationId] = false;
+
+ let promise = this.cheOrganization.deleteOrganization(organizationId).catch((error: any) => {
+ let errorMessage = 'Failed to delete organization ' + organizationId + '.';
+ this.cheNotification.showError(error && error.data && error.data.message ? error.data.message : errorMessage);
+ });
+
+ promises.push(promise);
+ });
+
+ this.$q.all(promises).finally(() => {
+ if (typeof this.onUpdate !== 'undefined') {
+ this.onUpdate();
+ }
+ });
+ });
+ }
+
+ /**
+ * Show confirmation popup before organization deletion.
+ *
+ * @param numberToDelete number of organization to be deleted
+ * @returns {ng.IPromise}
+ */
+ _showDeleteOrganizationConfirmation(numberToDelete: number): ng.IPromise {
+ let content = 'Would you like to delete ';
+ if (numberToDelete > 1) {
+ content += 'these ' + numberToDelete + ' organizations?';
+ } else {
+ content += 'this selected organization?';
+ }
+
+ return this.confirmDialogService.showConfirmDialog('Delete organizations', content, 'Delete');
+ }
+
+}
diff --git a/dashboard/src/app/organizations/list-organizations/list-organizations.directive.ts b/dashboard/src/app/organizations/list-organizations/list-organizations.directive.ts
new file mode 100644
index 0000000000..8bf33c82e0
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/list-organizations.directive.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name organizations.organizations:ListOrganizations
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
diff --git a/dashboard/src/app/organizations/list-organizations/list-organizations.styl b/dashboard/src/app/organizations/list-organizations/list-organizations.styl
new file mode 100644
index 0000000000..5ae3c0ad34
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/list-organizations.styl
@@ -0,0 +1,8 @@
+.list-organizations-content
+ margin 0
+
+ .che-list-item
+ display block !important
+
+ .list-empty .che-list-header md-item
+ border-top none
diff --git a/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.controller.ts b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.controller.ts
new file mode 100644
index 0000000000..f6134f23e7
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.controller.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {OrganizationsPermissionService} from '../../organizations-permission.service';
+
+/**
+ * @ngdoc controller
+ * @name organizations.list.Item.controller:OrganizationsItemController
+ * @description This class is handling the controller for item of organizations list
+ * @author Oleksii Orel
+ */
+export class OrganizationsItemController {
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * User service.
+ */
+ private userServices: che.IUserServices;
+ /**
+ * Organization permission service.
+ */
+ private organizationsPermissionService: OrganizationsPermissionService;
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Organization details (the value is set in directive attributes).
+ */
+ private organization: che.IOrganization;
+ /**
+ * Callback needed to react on organizations updation (the value is set in directive attributes).
+ */
+ private onUpdate: Function;
+ /**
+ * todo
+ */
+ private organizationActions: che.resource.ICheOrganizationActions;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor($location: ng.ILocationService, cheOrganization: che.api.ICheOrganization, confirmDialogService: any, cheNotification: any, organizationsPermissionService: OrganizationsPermissionService, chePermissions: che.api.IChePermissions, resourcesService: che.service.IResourcesService) {
+ this.$location = $location;
+ this.confirmDialogService = confirmDialogService;
+ this.cheOrganization = cheOrganization;
+ this.cheNotification = cheNotification;
+ this.organizationsPermissionService = organizationsPermissionService;
+ this.organizationActions = resourcesService.getOrganizationActions();
+
+ this.userServices = chePermissions.getUserServices();
+ }
+
+ /**
+ * returns true if current user has Delete permission
+ * @returns {boolean}
+ */
+ hasDeletePermission(): boolean {
+ if (!this.organization || (!this.organization.parent && !this.userServices.hasAdminUserService)) {
+ return false;
+ }
+ return this.organizationsPermissionService.isUserAllowedTo(this.organizationActions.DELETE, this.organization.id);
+ }
+
+ /**
+ * Gets all sub organizations.
+ */
+ getAllSubOrganizations(): Array {
+ let subOrganizationsTree = this.cheOrganization.getOrganizations().filter((organization: che.IOrganization) => {
+ if (!organization.parent || this.organization.id === organization.id) {
+ return false;
+ }
+ return organization.qualifiedName.indexOf(this.organization.qualifiedName + '/') === 0;
+ });
+
+ return subOrganizationsTree;
+ }
+
+ /**
+ * Redirect to factory details.
+ */
+ redirectToOrganizationDetails(tab: string) {
+ this.$location.path('/organization/' + this.organization.qualifiedName).search(!tab ? {} : {tab: tab});
+ }
+
+ /**
+ * Removes organization after confirmation.
+ */
+ removeOrganization(): void {
+ this.confirmRemoval().then(() => {
+ this.cheOrganization.deleteOrganization(this.organization.id).then(() => {
+ this.onUpdate();
+ }, (error: any) => {
+ let message = 'Failed to delete organization ' + this.organization.name;
+ this.cheNotification.showError(error && error.data && error.data.message ? error.data.message : message);
+ });
+ });
+ }
+
+ /**
+ * Shows dialog to confirm the current organization removal.
+ *
+ * @returns {angular.IPromise}
+ */
+ confirmRemoval(): ng.IPromise {
+ return this.confirmDialogService.showConfirmDialog('Delete organization',
+ 'Would you like to delete organization \'' + this.organization.name + '\'?', 'Delete');
+ }
+}
diff --git a/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.directive.ts b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.directive.ts
new file mode 100644
index 0000000000..058b9b4126
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.directive.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name organizations.list.Item.controller:WorkspaceItem
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
diff --git a/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.styl b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.styl
new file mode 100644
index 0000000000..ed905dc57c
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/organizations-item/organizations-item.styl
@@ -0,0 +1,2 @@
+.cap-value
+ color $primary-color
diff --git a/dashboard/src/app/organizations/organization-details/organization-details.controller.ts b/dashboard/src/app/organizations/organization-details/organization-details.controller.ts
new file mode 100644
index 0000000000..630eee4b25
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-details.controller.ts
@@ -0,0 +1,556 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {OrganizationsPermissionService} from '../organizations-permission.service';
+
+enum Tab {Settings, Members, Organization}
+
+/**
+ * Controller for a managing organization details.
+ *
+ * @author Oleksii Orel
+ */
+export class OrganizationDetailsController {
+ tab: Object = Tab;
+
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Organization resources API interaction.
+ */
+ private cheResourcesDistribution: che.api.ICheResourcesDistribution;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * Route service.
+ */
+ private $route: ng.route.IRouteService;
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Current organization's name. Comes from route path params.
+ */
+ private organizationName: string;
+ /**
+ * Current organization's data (injected by $routeProvider)
+ */
+ private organization: che.IOrganization;
+ /**
+ * Parent organization member's list (injected by $routeProvider)
+ */
+ private parentOrganizationMembers: Array;
+ /**
+ * The list of allowed user actions.
+ */
+ private allowedUserActions: Array;
+ /**
+ * New organization's name (for renaming widget).
+ */
+ private newName: string;
+ /**
+ * Index of the selected tab.
+ */
+ private selectedTabIndex: number;
+ /**
+ * Organization limits.
+ */
+ private limits: any;
+ /**
+ * Copy of limits before letting to modify, to be able to compare.
+ */
+ private limitsCopy: any;
+ /**
+ * Organization total resources.
+ */
+ private totalResources: any;
+ /**
+ * Copy of organization total resources before letting to modify, to be able to compare.
+ */
+ private totalResourcesCopy: any;
+ /**
+ * Page loading state.
+ */
+ private isLoading: boolean;
+
+ private organizationForm: ng.IFormController;
+
+ private subOrganizations: Array = [];
+
+ private organizationsPermissionService: OrganizationsPermissionService;
+
+ private resourceLimits: che.resource.ICheResourceLimits;
+
+ private organizationActions: che.resource.ICheOrganizationActions;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor(cheResourcesDistribution: che.api.ICheResourcesDistribution, chePermissions: che.api.IChePermissions,
+ cheUser: any, $route: ng.route.IRouteService, $location: ng.ILocationService, $rootScope: che.IRootScopeService,
+ $scope: ng.IScope, confirmDialogService: any, cheNotification: any,
+ lodash: any, cheOrganization: che.api.ICheOrganization, organizationsPermissionService: OrganizationsPermissionService, resourcesService: che.service.IResourcesService,
+ initData: any) {
+ this.cheResourcesDistribution = cheResourcesDistribution;
+ this.confirmDialogService = confirmDialogService;
+ this.cheOrganization = cheOrganization;
+ this.organizationsPermissionService = organizationsPermissionService;
+ this.chePermissions = chePermissions;
+ this.cheNotification = cheNotification;
+ this.cheUser = cheUser;
+ this.$location = $location;
+ this.$route = $route;
+ this.lodash = lodash;
+ this.resourceLimits = resourcesService.getResourceLimits();
+ this.organizationActions = resourcesService.getOrganizationActions();
+
+ // injected by router
+ this.organization = initData.organization as che.IOrganization;
+ this.parentOrganizationMembers = initData.parentOrganizationMembers as Array;
+
+ $rootScope.showIDE = false;
+
+ this.allowedUserActions = [];
+
+ this.updateData();
+
+ this.updateSelectedTab(this.$location.search().tab);
+ let deRegistrationFn = $scope.$watch(() => {
+ return $location.search().tab;
+ }, (tab: string) => {
+ if (angular.isDefined(tab)) {
+ this.updateSelectedTab(tab);
+ }
+ }, true);
+ $scope.$on('$destroy', () => {
+ deRegistrationFn();
+ });
+ }
+
+ get SET_PERMISSIONS(): string {
+ return this.organizationActions.SET_PERMISSIONS;
+ }
+
+ get DELETE(): string {
+ return this.organizationActions.DELETE;
+ }
+
+ get UPDATE(): string {
+ return this.organizationActions.UPDATE;
+ }
+
+ /**
+ * Fetch sub-organizations.
+ */
+ fetchSubOrganizations() {
+ let manageSubOrganizations = this.isUserAllowedTo(this.organizationActions.MANAGE_SUB_ORGANIZATION);
+
+ if (manageSubOrganizations) {
+ this.cheOrganization.fetchSubOrganizationsById(this.organization.id).then((data: any) => {
+ this.subOrganizations = data;
+ });
+ } else {
+ this.cheOrganization.fetchOrganizations().then(() => {
+ this.subOrganizations = this.lodash.filter(this.cheOrganization.getOrganizations(), (organization: che.IOrganization) => {
+ return organization.parent === this.organization.id;
+ });
+ });
+ }
+ }
+
+ /**
+ * Update data.
+ */
+ updateData(): void {
+ this.organizationName = this.$route.current.params.organizationName;
+ if (!this.organization) {
+ return;
+ }
+
+ this.newName = angular.copy(this.organization.name);
+
+ if (this.isRootOrganization()) {
+ this.processTotalResources();
+ } else {
+ this.processResources();
+ }
+
+ this.allowedUserActions = this.processUserPermissions();
+ this.fetchSubOrganizations();
+ }
+
+ /**
+ * Update selected tab index by search part of URL.
+ *
+ * @param {string} tab
+ */
+ updateSelectedTab(tab: string): void {
+ this.selectedTabIndex = parseInt(this.tab[tab], 10);
+ }
+
+ /**
+ * Changes search part of URL.
+ *
+ * @param {number} tabIndex
+ */
+ onSelectTab(tabIndex?: number): void {
+ let param: { tab?: string } = {};
+ if (angular.isDefined(tabIndex)) {
+ param.tab = Tab[tabIndex];
+ }
+ if (angular.isUndefined(this.$location.search().tab)) {
+ this.$location.replace().search(param);
+ } else {
+ this.$location.search(param);
+ }
+ }
+
+ /**
+ * Gets sub-organizations for current organization.
+ *
+ * @returns {Array}
+ */
+ getSubOrganizations(): Array {
+ return this.subOrganizations;
+ }
+
+ /**
+ * Process permissions to retrieve current user actions.
+ *
+ * @returns {Array} current user allowed actions
+ */
+ processUserPermissions(): Array {
+ let userId = this.cheUser.getUser().id;
+ let permissions = this.chePermissions.getOrganizationPermissions(this.organization.id);
+ let userPermissions = this.lodash.find(permissions, (permission: any) => {
+ return permission.userId === userId;
+ });
+ return userPermissions ? userPermissions.actions : [];
+ }
+
+ /**
+ * Checks whether user is allowed to perform pointed action.
+ *
+ * @param value action
+ * @returns {boolean}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+;
+ /**
+ * Parent organization ID
+ */
+ private parentOrganizationId: string;
+ /**
+ * Members list of parent organization.
+ */
+ private parentOrganizationMembers: string[];
+ /**
+ * ID of user which is owner of the team
+ */
+ private ownerId: string;
+ /**
+ *
+ */
+ private organizationRoles: che.resource.ICheOrganizationRoles;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($mdDialog: angular.material.IDialogService, lodash: any, cheUser: any, resourcesService: che.service.IResourcesService) {
+ this.$mdDialog = $mdDialog;
+ this.lodash = lodash;
+ this.organizationRoles = resourcesService.getOrganizationRoles();
+
+ this.isNoSelected = true;
+ this.isBulkChecked = false;
+ this.membersSelectedStatus = {};
+ this.membersSelectedNumber = 0;
+ this.membersOrderBy = 'email';
+
+ // add current user to members list
+ const user = cheUser.getUser();
+ const member = user as che.IMember;
+ member.role = this.organizationRoles.ADMIN.name;
+ this.members = [member];
+ this.buildMembersList();
+
+ this.ownerId = user.id;
+ }
+
+ /**
+ * Forms the list of members.
+ */
+ buildMembersList(): void {
+ this.members.forEach((member: che.IMember) => {
+ member.roles = [this.organizationRoles[member.role]];
+ });
+ }
+
+ /**
+ * Returns developer role value.
+ *
+ * @returns {string} string of the developer role value
+ */
+ getDeveloperRoleValue(): string {
+ return this.organizationRoles.MEMBER.name;
+ }
+
+ /**
+ * Returns admin role value.
+ *
+ * @returns {string} string of the admin role value
+ */
+ getAdminRoleValue(): string {
+ return this.organizationRoles.ADMIN.name;
+ }
+
+ /**
+ * Handler for member role changed in the list.
+ * @param {che.IMember} member
+ */
+ onChangeMemberRole(member: che.IMember): void {
+ member.roles[0] = this.organizationRoles[member.role];
+ }
+
+ /**
+ * Update members selected status
+ */
+ updateSelectedStatus(): void {
+ this.membersSelectedNumber = 0;
+ this.isBulkChecked = !!this.members.length;
+ this.members.forEach((member: che.IMember) => {
+ if (this.membersSelectedStatus[member.email]) {
+ this.membersSelectedNumber++;
+ } else {
+ this.isBulkChecked = false;
+ }
+ });
+ }
+
+ /**
+ * Change bulk selection value.
+ */
+ changeBulkSelection(): void {
+ if (this.isBulkChecked) {
+ this.deselectAllMembers();
+ this.isBulkChecked = false;
+ return;
+ }
+ this.selectAllMembers();
+ this.isBulkChecked = true;
+ }
+
+ /**
+ * Check all members in list.
+ */
+ selectAllMembers(): void {
+ this.membersSelectedNumber = this.members.length;
+ this.members.forEach((member: che.IMember) => {
+ if (member.id === this.ownerId) {
+ return;
+ }
+ this.membersSelectedStatus[member.email] = true;
+ });
+ }
+
+ /**
+ * Uncheck all members in list
+ */
+ deselectAllMembers(): void {
+ this.membersSelectedStatus = {};
+ this.membersSelectedNumber = 0;
+ }
+
+ /**
+ * Adds member to the list.
+ *
+ * @param members {Array}
+ * @param role {string} member role's name in organization
+ */
+ addMembers(members: Array, role: string): void {
+ members.forEach((member: any) => {
+ member.role = role;
+ this.members.push(member);
+ });
+ this.buildMembersList();
+ }
+
+ /**
+ * Selects which dialog should be shown.
+ *
+ * @param $event
+ */
+ selectAddMemberDialog($event: MouseEvent) {
+ if (this.parentOrganizationId) {
+ this.showMembersListDialog($event);
+ } else {
+ this.showMemberDialog($event);
+ }
+ }
+
+ /**
+ * Shows dialog to add new member to a root organization.
+ *
+ * @param $event
+ */
+ showMemberDialog($event: MouseEvent): void {
+ this.$mdDialog.show({
+ targetEvent: $event,
+ controller: 'OrganizationMemberDialogController',
+ controllerAs: 'organizationMemberDialogController',
+ bindToController: true,
+ clickOutsideToClose: true,
+ locals: {
+ members: this.members,
+ member: null,
+ parentOrganizationId: this.parentOrganizationId,
+ parentOrganizationMembers: this.parentOrganizationMembers,
+ callbackController: this
+ },
+ templateUrl: 'app/organizations/organization-details/organization-member-dialog/organization-member-dialog.html'
+ });
+ }
+
+ /**
+ * Shows dialog to select members from list to a sub-organization.
+ *
+ * @param $event
+ */
+ showMembersListDialog($event: MouseEvent): void {
+ this.$mdDialog.show({
+ targetEvent: $event,
+ bindToController: true,
+ clickOutsideToClose: true,
+ controller: 'OrganizationSelectMembersDialogController',
+ controllerAs: 'organizationSelectMembersDialogController',
+ locals: {
+ callbackController: this,
+ parentOrganizationMembers: this.parentOrganizationMembers,
+ members: this.members
+ },
+ templateUrl: 'app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.html'
+ });
+ }
+
+ /**
+ * Removes selected members.
+ */
+ removeSelectedMembers(): void {
+ this.lodash.remove(this.members, (member: che.IMember) => {
+ return this.membersSelectedStatus[member.email];
+ });
+ this.deselectAllMembers();
+ this.isBulkChecked = false;
+ }
+}
diff --git a/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.directive.ts b/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.directive.ts
new file mode 100644
index 0000000000..f20f420154
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.directive.ts
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name organization.details.invite-members:ListOrganizationInviteMembers
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `;
+ /**
+ * Already added emails.
+ */
+ private emails: Array;
+ /**
+ * Existing members.
+ */
+ private members: Array;
+ /**
+ *
+ */
+ private parentOrganizationId: string;
+ /**
+ *
+ */
+ private parentOrganizationMembers: string;
+ /**
+ * Entered email address.
+ */
+ private email: string;
+ /**
+ * Controller that will handle callbacks.
+ */
+ private callbackController: any;
+ /**
+ * Member to be displayed, may be , element: string) => {
+ if (array.indexOf(element) < 0 && element.length > 0) {
+ array.push(element);
+ }
+ return array;
+ }, []);
+
+ let promises = [];
+ let users = [];
+ resultEmails.forEach((email: string) => {
+ promises.push(this.processUser(email, users));
+ });
+
+ this.$q.all(promises).then(() => {
+ this.finishAdding(users, userRoleName);
+ });
+ }
+
+ processUser(email: string, users: Array): ng.IPromise {
+ let deferred = this.$q.defer();
+ let user = this.cheUser.getUserByAlias(email);
+ if (user) {
+ users.push(user);
+ deferred.resolve();
+ } else {
+ this.isProcessing = true;
+ this.cheUser.fetchUserByAlias(email).then(() => {
+ users.push(this.cheUser.getUserByAlias(email));
+ deferred.resolve();
+ }, (error: any) => {
+ users.push({email: email});
+ deferred.resolve();
+ });
+ }
+ return deferred.promise;
+ }
+
+ /**
+ * Handle edit member user's action.
+ */
+ editMember(): void {
+ this.member.permissions.actions = this.getCurrentActions();
+ this.callbackController.updateMember(this.member);
+ this.hide();
+ }
+
+ /**
+ * Returns the actions of current chosen roles.
+ */
+ getCurrentActions(): Array {
+ let userRoleName = this.role ? this.role : this.newRole;
+ let processedActions = [];
+ this.roles.forEach((roleName: string) => {
+ const role = this.organizationRoles[roleName];
+ processedActions = processedActions.concat(role.actions);
+ });
+
+ let actions = this.member ? this.member.permissions.actions : [];
+ let otherActions = this.lodash.difference(actions, processedActions);
+
+ return this.lodash.uniq(this.organizationRoles[userRoleName].actions.concat(otherActions));
+ }
+
+ /**
+ * Finish adding user state.
+ *
+ * @param {Array} users users to be added
+ * @param {sring} role user's role
+ */
+ finishAdding(users: Array, role: string): void {
+ this.isProcessing = false;
+ this.callbackController.addMembers(users, role);
+ this.hide();
+ }
+
+}
diff --git a/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.html b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.html
new file mode 100644
index 0000000000..46cba8b570
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.html
@@ -0,0 +1,48 @@
+
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.styl b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.styl
new file mode 100644
index 0000000000..60b43896e1
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.styl
@@ -0,0 +1,33 @@
+.organization-member-dialog-content
+ width 630px
+
+ button
+ margin 0 0 0 20px
+
+ input.ng-invalid.ng-pristine:focus
+ border-color $primary-color
+
+ .che-label-container div.che-label-container-label
+ width 150px
+ min-width 150px
+
+ .member-role-title
+ margin-bottom 10px
+
+ .member-role-description
+ color $disabled-color
+ font-size 10px
+ padding 0 5px
+ line-height 18pt
+
+ .member-role-warning-label
+ color $warning-color
+ height 20px
+
+ .member-role-button
+ margin-right 10px
+ width 150px
+
+ .member-role-button button
+ width 150px
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.controller.ts b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.controller.ts
new file mode 100644
index 0000000000..8ddef87809
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.controller.ts
@@ -0,0 +1,489 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {OrganizationsPermissionService} from '../../organizations-permission.service';
+
+/**
+ * @ngdoc controller
+ * @name organization.details.members:ListOrganizationMembersController
+ * @description This class is handling the controller for the list of organization's members.
+ * @author Oleksii Orel
+ */
+export class ListOrganizationMembersController {
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * User profile API interaction.
+ */
+ private cheProfile: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Confirm dialog service.
+ */
+ private confirmDialogService: any;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Organization's members list.
+ */
+ private members: Array;
+ /**
+ * Members list of parent organization (comes from directive's scope)
+ */
+ private parentOrganizationMembers: Array;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * Filter for members list.
+ */
+ private memberFilter: any;
+ /**
+ * Current organization (comes from directive's scope).
+ */
+ private organization: che.IOrganization;
+ /**
+ * Organization permission service.
+ */
+ private organizationsPermissionService: OrganizationsPermissionService;
+ /**
+ * Has update permission.
+ */
+ private hasUpdatePermission;
+ /**
+ * Selection and filtration helper
+ */
+ private cheListHelper: che.widget.ICheListHelper;
+ /**
+ * todo
+ */
+ private organizationActions: che.resource.ICheOrganizationActions;
+ /**
+ * todo
+ */
+ private organizationRoles: che.resource.ICheOrganizationRoles;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(chePermissions: che.api.IChePermissions, cheUser: any, cheProfile: any, cheOrganization: che.api.ICheOrganization,
+ confirmDialogService: any, $mdDialog: angular.material.IDialogService, $q: ng.IQService, cheNotification: any,
+ lodash: any, $location: ng.ILocationService, organizationsPermissionService: OrganizationsPermissionService,
+ $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactory, resourcesService: che.service.IResourcesService) {
+ this.chePermissions = chePermissions;
+ this.cheProfile = cheProfile;
+ this.cheUser = cheUser;
+ this.cheOrganization = cheOrganization;
+ this.$mdDialog = $mdDialog;
+ this.$q = $q;
+ this.$location = $location;
+ this.lodash = lodash;
+ this.cheNotification = cheNotification;
+ this.confirmDialogService = confirmDialogService;
+ this.organizationsPermissionService = organizationsPermissionService;
+ this.organizationActions = resourcesService.getOrganizationActions();
+ this.organizationRoles = resourcesService.getOrganizationRoles();
+
+ this.members = [];
+
+ this.memberFilter = {name: ''};
+ const helperId = 'list-organization-members';
+ this.cheListHelper = cheListHelperFactory.getHelper(helperId);
+ $scope.$on('$destroy', () => {
+ cheListHelperFactory.removeHelper(helperId);
+ });
+
+ this.formUsersList();
+ }
+
+ /**
+ * Callback when name is changed.
+ *
+ * @param str {string} a string to filter organization members.
+ */
+ onSearchChanged(str: string): void {
+ this.memberFilter.name = str;
+ this.cheListHelper.applyFilter('name', this.memberFilter);
+ }
+
+
+ /**
+ * Fetches the list of organization members.
+ */
+ fetchMembers(): void {
+ if (!this.organization || !this.organization.id) {
+ return;
+ }
+ this.isLoading = true;
+ this.chePermissions.fetchOrganizationPermissions(this.organization.id).then(() => {
+ this.formUsersList();
+ }, (error: any) => {
+ let errorMessage = error && error.data && error.data.message ? error.data.message : 'Failed to retrieve organization permissions.';
+ this.cheNotification.showError(errorMessage);
+ }).finally(() => {
+ this.isLoading = false;
+ });
+ }
+
+ /**
+ * Combines permissions and users data in one list.
+ */
+ formUsersList(): void {
+ const permissions = this.chePermissions.getOrganizationPermissions(this.organization.id);
+ this.members = [];
+
+ const promises: Array> = [];
+
+ permissions.forEach((permission: any) => {
+ let userId = permission.userId;
+ let userProfile = this.cheProfile.getProfileById(userId);
+
+ if (userProfile) {
+ this.formUserItem(userProfile, permission);
+ } else {
+ const promise = this.cheProfile.fetchProfileById(userId).then(() => {
+ this.formUserItem(this.cheProfile.getProfileById(userId), permission);
+ });
+ promises.push(promise);
+ }
+ });
+
+ this.$q.all(promises).finally(() => {
+ this.cheListHelper.setList(this.members, 'id');
+ });
+
+ this.hasUpdatePermission = this.organizationsPermissionService.isUserAllowedTo(this.organizationActions.UPDATE.toString(), this.organization.id);
+ }
+
+ /**
+ * Forms item to display with permissions and user data.
+ *
+ * @param userProfile {che.IProfile} user's profile
+ * @param permissions {che.IPermissions} data
+ */
+ formUserItem(userProfile: che.IProfile, permissions: che.IPermissions): void {
+ const member = angular.copy(userProfile);
+ member.id = userProfile.userId;
+ member.name = this.cheProfile.getFullName(userProfile.attributes);
+ member.permissions = permissions;
+ this.members.push(member);
+ }
+
+ /**
+ * Selects which dialog should be shown.
+ */
+ selectAddMemberDialog() {
+ if (this.organization.parent) {
+ this.showMembersListDialog();
+ } else {
+ this.showMemberDialog(null);
+ }
+ }
+
+ /**
+ * Shows dialog for adding new member to the organization.
+ */
+ showMemberDialog(member: che.IMember): void {
+ this.$mdDialog.show({
+ controller: 'OrganizationMemberDialogController',
+ controllerAs: 'organizationMemberDialogController',
+ bindToController: true,
+ clickOutsideToClose: true,
+ locals: {
+ members: this.members,
+ callbackController: this,
+ member: angular.copy(member),
+ parentOrganizationId: this.organization.parent,
+ parentOrganizationMembers: this.parentOrganizationMembers
+ },
+ templateUrl: 'app/organizations/organization-details/organization-member-dialog/organization-member-dialog.html'
+ });
+ }
+
+ /**
+ * Shows dialog to select members from list to a sub-organization.
+ *
+ */
+ showMembersListDialog(): void {
+ this.$mdDialog.show({
+ bindToController: true,
+ clickOutsideToClose: true,
+ controller: 'OrganizationSelectMembersDialogController',
+ controllerAs: 'organizationSelectMembersDialogController',
+ locals: {
+ callbackController: this,
+ parentOrganizationMembers: this.parentOrganizationMembers,
+ members: this.members
+ },
+ templateUrl: 'app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.html'
+ });
+ }
+
+ /**
+ * Add new members to the organization.
+ *
+ * @param {Array} members members to be added
+ * @param {string} role member role
+ */
+ addMembers(members: Array, role: string): void {
+ let promises = [];
+ let unregistered = [];
+
+ members.forEach((member: che.IMember) => {
+ if (member.id) {
+ let actions = this.organizationRoles[role].actions;
+ let permissions = {
+ instanceId: this.organization.id,
+ userId: member.id,
+ domainId: 'organization',
+ actions: actions
+ };
+ let promise = this.chePermissions.storePermissions(permissions);
+ promises.push(promise);
+ } else {
+ unregistered.push(member.email);
+ }
+ });
+
+ this.isLoading = true;
+ this.$q.all(promises).then(() => {
+ this.fetchMembers();
+ }).finally(() => {
+ this.isLoading = false;
+ if (unregistered.length > 0) {
+ this.cheNotification.showError('User' + (unregistered.length > 1 ? 's ' : ' ') + unregistered.join(', ') + (unregistered.length > 1 ? ' are' : ' is') + ' not registered in the system.');
+ }
+ });
+ }
+
+ /**
+ * Perform edit member permissions.
+ *
+ * @param member
+ */
+ editMember(member: che.IMember): void {
+ this.showMemberDialog(member);
+ }
+
+ /**
+ * Performs member's permissions update.
+ *
+ * @param member member to update permissions
+ */
+ updateMember(member: che.IMember): void {
+ if (member.permissions.actions.length > 0) {
+ this.storePermissions(member.permissions);
+ } else {
+ this.removePermissions(member);
+ }
+ }
+
+ /**
+ * Stores provided permissions.
+ *
+ * @param permissions {che.IPermissions}
+ */
+ storePermissions(permissions: che.IPermissions): void {
+ this.isLoading = true;
+ this.chePermissions.storePermissions(permissions).then(() => {
+ this.fetchMembers();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Set user permissions failed.');
+ });
+ }
+
+ /**
+ * Remove all selected members.
+ */
+ removeSelectedMembers(): void {
+ const selectedMembers = this.cheListHelper.getSelectedItems(),
+ selectedMemberIds = selectedMembers.map((member: che.IMember) => {
+ return member.id;
+ });
+
+ if (!selectedMemberIds.length) {
+ this.cheNotification.showError('No such developers.');
+ return;
+ }
+
+ const confirmationPromise = this.showDeleteMembersConfirmation(selectedMemberIds.length);
+ confirmationPromise.then(() => {
+ const removeMembersPromises = [];
+ let removalError;
+ let isCurrentUser = false;
+ for (let i = 0; i < selectedMemberIds.length; i++) {
+ const id = selectedMemberIds[i];
+ this.cheListHelper.itemsSelectionStatus[id] = false;
+ if (id === this.cheUser.getUser().id) {
+ isCurrentUser = true;
+ }
+ const promise = this.chePermissions.removeOrganizationPermissions(this.organization.id, id);
+ promise.catch((error: any) => {
+ removalError = error;
+ });
+ removeMembersPromises.push(promise);
+ }
+
+ this.$q.all(removeMembersPromises).finally(() => {
+ if (isCurrentUser) {
+ this.processCurrentUserRemoval();
+ } else {
+ this.fetchMembers();
+ }
+
+ if (removalError) {
+ this.cheNotification.showError(removalError.data && removalError.data.message ? removalError.data.message : 'User removal failed.');
+ }
+ });
+ });
+ }
+
+ /**
+ * Call user permissions removal. Show the dialog
+ * @param member
+ */
+ removeMember(member: che.IMember): void {
+ let promise = this.confirmDialogService.showConfirmDialog('Remove member', 'Would you like to remove member ' + member.email + ' ?', 'Delete');
+
+ promise.then(() => {
+ this.removePermissions(member);
+ });
+ }
+
+ /**
+ * Returns true if the member is owner for current organization.
+ * @param member
+ *
+ * @returns {boolean}
+ */
+ isOwner(member: che.IMember): boolean {
+ if (!this.organization || !member) {
+ return false;
+ }
+
+ return this.organization.qualifiedName.split('/')[0] === member.name;
+ }
+
+ /**
+ * Returns string with member roles.
+ * @param member
+ *
+ * @returns {string} string format of roles array
+ */
+ getMemberRoles(member: che.IMember): string {
+ if (!member) {
+ return '';
+ }
+ if (this.isOwner(member)) {
+ return 'Organization Owner';
+ }
+ let roles = this.cheOrganization.getRolesFromActions(member.permissions.actions);
+ let titles = [];
+ let processedActions = [];
+ roles.forEach((role: any) => {
+ titles.push(role.title);
+ processedActions = processedActions.concat(role.actions);
+ });
+
+ return titles.join(', ');
+ }
+
+ /**
+ * Returns string with member other actions.
+ * @param member
+ *
+ * @returns {string} string format of roles array
+ */
+ getOtherActions(member: che.IMember): string {
+ if (!member) {
+ return '';
+ }
+ let roles = this.cheOrganization.getRolesFromActions(member.permissions.actions);
+ let processedActions = [];
+ roles.forEach((role: any) => {
+ processedActions = processedActions.concat(role.actions);
+ });
+
+ return this.lodash.difference(member.permissions.actions, processedActions).join(', ');
+ }
+
+ /**
+ * Process the removal of current user from organization.
+ */
+ processCurrentUserRemoval(): void {
+ this.$location.path('/organizations');
+ }
+
+ /**
+ * Removes user permissions for current organization
+ *
+ * @param member {che.IMember}
+ */
+ removePermissions(member: che.IMember): void {
+ this.isLoading = true;
+ this.chePermissions.removeOrganizationPermissions(member.permissions.instanceId, member.id).then(() => {
+ if (member.id === this.cheUser.getUser().id) {
+ this.processCurrentUserRemoval();
+ } else {
+ this.fetchMembers();
+ }
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to remove user ' + member.email + ' permissions.');
+ });
+ }
+
+ /**
+ * Show confirmation popup before members removal
+ * @param numberToDelete {number}
+ * @returns {ng.IPromise}
+ */
+ showDeleteMembersConfirmation(numberToDelete: number): ng.IPromise {
+ let confirmTitle = 'Would you like to remove ';
+ if (numberToDelete > 1) {
+ confirmTitle += 'these ' + numberToDelete + ' members?';
+ } else {
+ confirmTitle += 'the selected member?';
+ }
+
+ return this.confirmDialogService.showConfirmDialog('Remove members', confirmTitle, 'Delete');
+ }
+}
diff --git a/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.directive.ts b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.directive.ts
new file mode 100644
index 0000000000..2903481857
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.directive.ts
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name organization.details.members:ListOrganizationMembers
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
+
+
+
+
+
+
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.styl b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.styl
new file mode 100644
index 0000000000..ec714e80af
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-members/list-organization-members.styl
@@ -0,0 +1,5 @@
+.organization-member-list *.che-list-item
+ display block
+
+ .user-face
+ che-developers-face()
diff --git a/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.directive.ts b/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.directive.ts
new file mode 100644
index 0000000000..b5e7ca850c
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.directive.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name organization.details:OrganizationNotFound
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.styl b/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.styl
new file mode 100644
index 0000000000..3090d0b223
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-not-found/organization-not-found.styl
@@ -0,0 +1,17 @@
+.organization-error-content
+ height 100%
+ width 100%
+ color $label-secondary-color
+
+ .error-title
+ font-size 12pt
+ font-weight bold
+
+ .error-image
+ font-size 56pt
+ margin 25px 0
+ color $label-info-color
+
+ .error-description
+ font-size 11pt
+ padding 0 20px
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.directive.ts b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.directive.ts
new file mode 100644
index 0000000000..512db8032d
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.directive.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Defines a directive for member in list.
+ *
+ * @author Oleksii Kurinnyi
+ */
+export class OrganizationMemberItem {
+ restrict: string = 'E';
+
+ templateUrl: string = 'app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.html';
+ replace: boolean = false;
+
+ scope: {[prop: string]: string} = {
+ member: '=',
+ isSelected: '=',
+ onChange: '&'
+ };
+
+}
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.html b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.html
new file mode 100644
index 0000000000..aae16243c0
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.html
@@ -0,0 +1,31 @@
+
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.styl b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.styl
new file mode 100644
index 0000000000..c619a9cbdb
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.styl
@@ -0,0 +1,12 @@
+.organization-member-item .member-list-row
+ margin 0
+
+ & > div
+ outline none
+
+ .member-bold
+ font-weight bold
+
+ .member-email
+ max-width 100%
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.controller.ts b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.controller.ts
new file mode 100644
index 0000000000..2c1b342567
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.controller.ts
@@ -0,0 +1,259 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {ListOrganizationInviteMembersController} from '../organization-invite-members/list-organization-invite-members.controller';
+
+interface IOrganizationMember extends che.IMember {
+ fullName?: string;
+}
+
+/**
+ * This class is handling the controller for the add organization's members dialog.
+ *
+ * @author Oleksii Kurinnyi
+ */
+export class OrganizationSelectMembersDialogController {
+ /**
+ * User profile API interaction.
+ */
+ private cheProfile: any;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Callback handler (is set from outside).
+ */
+ private callbackController: ListOrganizationInviteMembersController;
+ /**
+ * The list of users, that already are members of this organization (is set from outside).
+ */
+ private members: Array;
+ /**
+ * The list of users, that are members of parent organization (is set from outside).
+ */
+ private parentOrganizationMembers: Array;
+ /**
+ * The list of users, that are available to be added
+ */
+ private availableUsers: Array;
+ /**
+ * The list of users, that are going to be added
+ */
+ private usersToAdd: Array;
+ /**
+ * Current user.
+ */
+ private user: che.IUser;
+ /**
+ * Selected status of members in list.
+ */
+ private userSelectedStatus: any;
+ /**
+ * Bulk operation state.
+ */
+ private isBulkChecked: boolean;
+ /**
+ * No selected members state.
+ */
+ private isNoSelected: boolean;
+ /**
+ * All selected members state.
+ */
+ private isAllSelected: boolean;
+ /**
+ * True when loading resources.
+ */
+ private isLoading: boolean;
+ /**
+ *
+ */
+ private organizationRoles: che.resource.ICheOrganizationRoles;
+
+ /**
+ * Default constructor.
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $mdDialog: angular.material.IDialogService, lodash: any, cheProfile: any, cheUser: any, resourcesService: che.service.IResourcesService) {
+ this.$q = $q;
+ this.$mdDialog = $mdDialog;
+ this.lodash = lodash;
+ this.cheProfile = cheProfile;
+ this.cheUser = cheUser;
+ this.organizationRoles = resourcesService.getOrganizationRoles();
+
+ this.isLoading = false;
+
+ this.userSelectedStatus = {};
+ this.isBulkChecked = false;
+ this.isNoSelected = true;
+ this.isAllSelected = false;
+
+ this.user = this.cheUser.getUser();
+
+ this.formUsersAvailableList();
+ }
+
+ /**
+ * Builds list of users that are available to be added.
+ */
+ formUsersAvailableList(): void {
+ const existingMembers = this.members.reduce((map: {[id: string]: che.IMember}, member: che.IMember) => {
+ map[member.id] = member;
+ return map;
+ }, {});
+ this.availableUsers = this.parentOrganizationMembers.filter((parentOrganizationMember: che.IUser) => {
+ return !existingMembers[parentOrganizationMember.id] && parentOrganizationMember.id !== this.user.id;
+ });
+
+ if (!this.availableUsers.length) {
+ return ;
+ }
+
+ const userProfilesPromises = [];
+
+ this.isLoading = true;
+
+ this.availableUsers.forEach((user: IOrganizationMember) => {
+ const profile = this.cheProfile.getProfileById(user.id);
+ if (profile) {
+ user.fullName = this.cheProfile.getFullName(profile.attributes);
+ } else {
+ const promise = this.cheProfile.fetchProfileById(user.id).then(() => {
+ const profile = this.cheProfile.getProfileById(user.id);
+ user.fullName = this.cheProfile.getFullName(profile.attributes);
+ });
+ userProfilesPromises.push(promise);
+ }
+ });
+
+ this.$q.all(userProfilesPromises).finally(() => {
+ this.isLoading = false;
+ });
+ }
+
+ /**
+ * Callback of the cancel button of the dialog.
+ */
+ hide() {
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Callback of the "Add" button of the dialog.
+ */
+ addMembers() {
+ const checkedUsers = this.availableUsers.reduce((usersToAdd: Array, member: IOrganizationMember) => {
+ if (this.userSelectedStatus[member.id]) {
+ usersToAdd.push(member);
+ }
+ return usersToAdd;
+ }, []);
+
+ this.callbackController.addMembers(checkedUsers, this.organizationRoles.MEMBER.name);
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Return
+
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.styl b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.styl
new file mode 100644
index 0000000000..8923950092
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.styl
@@ -0,0 +1,43 @@
+.add-organization-members
+ margin-top 5px
+ width 520px
+
+ .form-input-fields
+ margin 5px 0 5px
+ min-height 55px
+
+ .members-list
+ min-height 100px
+ max-height 300px
+ overflow-y auto
+
+ .buttons-panel
+ margin-top 20px
+
+ .message-panel
+ padding-top 20px
+
+ .che-list
+ margin 0
+
+ .che-list-header-content *
+ margin 0
+
+ .che-list-header md-item
+ border-top none
+
+ .che-list-header-additional
+ display none
+
+.add-organization-members che-button-primary,
+.add-organization-members che-button-notice
+ margin-left 5px
+
+.user-exists-checked
+ color $che-green-color
+ float left
+ margin-right 3px
+
+.user-not-found
+ color $error-color
+
diff --git a/dashboard/src/app/organizations/organizations-config.service.mock.ts b/dashboard/src/app/organizations/organizations-config.service.mock.ts
new file mode 100644
index 0000000000..d21abf130d
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations-config.service.mock.ts
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheAPIBuilder} from '../../components/api/builder/che-api-builder.factory';
+import {CheHttpBackend} from '../../components/api/test/che-http-backend';
+
+type User = {
+ id: string,
+ email: string,
+ firstName: string,
+ lastName: string
+};
+
+/**
+ * This class creates mock data and sets up backend.
+ *
+ * @author Oleksii Kurinnyi
+ */
+export class OrganizationsConfigServiceMock {
+ private cheAPIBuilder;
+ private cheHttpBackend;
+
+ private users: any[] = [];
+ private orgs: any[] = [];
+ private permissions: any[] = [];
+ private usersByOrgs: Map = new Map();
+
+ /**
+ * Default constructor
+ * @ngInject for Dependency injection
+ */
+ constructor(cheAPIBuilder: CheAPIBuilder, cheHttpBackend: CheHttpBackend) {
+ this.cheAPIBuilder = cheAPIBuilder;
+ this.cheHttpBackend = cheHttpBackend;
+ this.cheAPIBuilder = cheAPIBuilder;
+ this.cheHttpBackend = cheHttpBackend;
+ }
+
+ mockData(): void {
+ // add default user
+ const user1 = this.addAndGetUser(1, true);
+ // add users
+ const user2 = this.addAndGetUser(2);
+ const user3 = this.addAndGetUser(3);
+
+ // add default profile
+ this.addProfile(1, true);
+ // add profiles
+ this.addProfile(2);
+ this.addProfile(3);
+
+ // add root organization
+ const org1 = this.addAndGetOrganization(1);
+ // add children organizations
+ const org2 = this.addAndGetOrganization(2, org1);
+ const org3 = this.addAndGetOrganization(3, org1);
+
+ // for root organization
+
+ // add permissions
+ [user1, user2, user3].forEach((user: any) => {
+ this.addPermission(org1, user);
+ });
+ // add resources
+ const totalResources = [
+ {
+ 'type': 'workspace',
+ 'amount': 30,
+ 'unit': 'item'
+ },
+ {
+ 'type': 'runtime',
+ 'amount': 10,
+ 'unit': 'item'
+ },
+ {
+ 'type': 'timeout',
+ 'amount': 240,
+ 'unit': 'minute'
+ },
+ {
+ 'type': 'RAM',
+ 'amount': 102400,
+ 'unit': 'mb'
+ }
+ ];
+ totalResources.forEach((resource: any) => {
+ this.addResource(org1, 'total', resource);
+ });
+
+ // for sub-organization
+
+ // add permissions
+ [user1, user2].forEach((user: any) => {
+ this.addPermission(org2, user);
+ });
+ // add total resources
+ totalResources.forEach((resource: any) => {
+ this.addResource(org2, 'total', resource);
+ });
+ // add distributed resources
+ totalResources.forEach((resource: any) => {
+ this.addResource(org2, 'distributed', resource);
+ });
+
+ // build all backends at once
+ this.cheHttpBackend.setup();
+ this.cheHttpBackend.usersBackendSetup();
+ this.cheHttpBackend.organizationsBackendSetup();
+ this.cheHttpBackend.permissionsBackendSetup();
+ this.cheHttpBackend.resourcesBackendSetup();
+ }
+
+ getUsers(): any[] {
+ return this.users;
+ }
+
+ getUsersByOrganizationId(id: string): any[] {
+ return this.usersByOrgs.get(id) || [];
+ }
+
+ getOrganizations(): any[] {
+ return this.orgs;
+ }
+
+ private buildUser(suffix: number|string): User {
+ return {
+ id: `testUser_${suffix}`,
+ email: `testUser_${suffix}@email.org`,
+ firstName: `FirstName_${suffix}`,
+ lastName: `LastName_${suffix}`
+ };
+ }
+
+ private addProfile(suffix: number|string, isDefault?: boolean): void {
+ const user = this.buildUser(suffix);
+ const profile = this.cheAPIBuilder.getProfileBuilder().withId(user.id).withEmail(user.email).withFirstName(user.firstName).withLastName(user.lastName).build();
+
+ if (isDefault) {
+ this.cheHttpBackend.addDefaultProfile(profile);
+ }
+
+ this.cheHttpBackend.addProfileId(profile);
+ }
+
+ private addAndGetUser(suffix: number|string, isDefault?: boolean): any {
+ const user = this.buildUser(suffix);
+ const testUser = this.cheAPIBuilder.getUserBuilder().withId(user.id).withEmail(user.email).build();
+
+ if (isDefault) {
+ this.cheHttpBackend.setDefaultUser(testUser);
+ }
+ this.cheHttpBackend.addUserById(testUser);
+
+ this.users.push(testUser);
+ return testUser;
+ }
+
+ private addAndGetOrganization(suffix: number|string, parent?: any): any {
+ const id = `testOrgId_${suffix}`;
+ const name = `testOrgName_${suffix}`;
+ const qualifiedName = (parent ? parent.qualifiedName + '/' : '') + name;
+
+ const testOrganization = parent
+ ? this.cheAPIBuilder.getOrganizationsBuilder().withId(id).withName(name).withQualifiedName(qualifiedName).withParentId(parent.id).build()
+ : this.cheAPIBuilder.getOrganizationsBuilder().withId(id).withName(name).withQualifiedName(qualifiedName).build();
+
+ this.cheHttpBackend.addOrganizationById(testOrganization);
+
+ this.orgs.push(testOrganization);
+ this.usersByOrgs.set(id, []);
+ return testOrganization;
+ }
+
+ private addPermission(organization: any, user: any): void {
+ const domainId = 'organization';
+
+ const testPermission = this.cheAPIBuilder.getPermissionsBuilder().withDomainId(domainId).withInstanceId(organization.id).withUserId(user.id).build();
+
+ this.cheHttpBackend.addPermissions(testPermission);
+
+ this.usersByOrgs.get(organization.id).push(user);
+ this.permissions.push(testPermission);
+ }
+
+ private addResource(organization: any, scope: string, resource: any): void {
+ const testResource = this.cheAPIBuilder.getResourceBuilder().withAmount(resource.amount).withType(resource.type).withUnit(resource.unit).build();
+
+ this.cheHttpBackend.addResource(organization.id, scope, testResource);
+ }
+}
diff --git a/dashboard/src/app/organizations/organizations-config.service.spec.ts b/dashboard/src/app/organizations/organizations-config.service.spec.ts
new file mode 100644
index 0000000000..804a3e6c07
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations-config.service.spec.ts
@@ -0,0 +1,401 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheAPIBuilder} from '../../components/api/builder/che-api-builder.factory';
+import {CheHttpBackend} from '../../components/api/test/che-http-backend';
+import {OrganizationsConfigServiceMock} from './organizations-config.service.mock';
+
+/* tslint:disable:no-empty */
+describe('OrganizationsConfig >', () => {
+
+ let $route;
+
+ let $injector: ng.auto.IInjectorService;
+
+ let $rootScope;
+
+ let $location;
+
+ let $httpBackend;
+
+ let mock;
+
+ /**
+ * Setup module
+ */
+
+ beforeEach(() => {
+ angular.mock.module('userDashboard');
+ });
+
+ /**
+ * Inject service and http backend
+ */
+ beforeEach(inject((
+ _$injector_: ng.auto.IInjectorService,
+ _$location_: ng.ILocationService,
+ _$route_: ng.route.IRouteService,
+ _$rootScope_: ng.IRootScopeService,
+ _cheHttpBackend_: CheHttpBackend,
+ _cheAPIBuilder_: CheAPIBuilder
+ ) => {
+ $injector = _$injector_;
+ $location = _$location_;
+ $route = _$route_;
+ $rootScope = _$rootScope_;
+ $httpBackend = _cheHttpBackend_.getHttpBackend();
+
+ mock = new OrganizationsConfigServiceMock(_cheAPIBuilder_, _cheHttpBackend_);
+ mock.mockData();
+ }));
+
+ /**
+ * Check assertion after the test
+ */
+ afterEach(() => {
+ $httpBackend.verifyNoOutstandingRequest();
+ $httpBackend.verifyNoOutstandingExpectation();
+ });
+
+ describe('create root organization "/admin/create-organization" >', () => {
+
+ it('should resolve route and return data', () => {
+
+ const route = $route.routes['/admin/create-organization'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: () => { },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve');
+ spyOn(callbacks, 'testReject');
+
+ $location.path('/admin/create-organization');
+ $rootScope.$digest();
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalledWith({
+ parentQualifiedName: '',
+ parentOrganizationId: '',
+ parentOrganizationMembers: []
+ });
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ });
+
+ describe('create sub-organization "/admin/create-organization/{parentId}" >', () => {
+
+ it('should resolve route and return data', () => {
+ const organizations = mock.getOrganizations();
+ const parentOrg = organizations[0];
+ const users = mock.getUsersByOrganizationId(parentOrg.id);
+ const buildIdsList = (res: string[], user: che.IUser) => {
+ res.push(user.id);
+ return res;
+ };
+
+ const route = $route.routes['/admin/create-organization/:parentQualifiedName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: (data: any) => {
+ expect(data.parentQualifiedName).toEqual(parentOrg.qualifiedName);
+ expect(data.parentOrganizationId).toEqual(parentOrg.id);
+ expect(data.parentOrganizationMembers.length).toEqual(users.length);
+
+ const parentMemberIds = data.parentOrganizationMembers.reduce(buildIdsList, []).sort();
+ const userIds = users.reduce(buildIdsList, []).sort();
+ expect(parentMemberIds).toEqual(userIds);
+ },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve').and.callThrough();
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/admin/create-organization/${parentOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalled();
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ it('should resolve route and return data if organizations request fails', () => {
+ const organizations = mock.getOrganizations();
+ const parentOrg = organizations[0];
+
+ const route = $route.routes['/admin/create-organization/:parentQualifiedName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: () => { },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve');
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/admin/create-organization/${parentOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ // make response for organizations list fail
+ $httpBackend.expect('GET', /\/api\/organization(\?.*$)?/).respond(500, [], {message: 'response failed'});
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalledWith({
+ parentQualifiedName: parentOrg.qualifiedName,
+ parentOrganizationId: '',
+ parentOrganizationMembers: []
+ });
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ it('should resolve route and return data if parent organization is not found', () => {
+ const fakeQualifiedName = 'fake/qualified/name';
+
+ const route = $route.routes['/admin/create-organization/:parentQualifiedName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: () => { },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve');
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/admin/create-organization/${fakeQualifiedName}`);
+ $rootScope.$digest();
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalledWith({
+ parentQualifiedName: fakeQualifiedName,
+ parentOrganizationId: '',
+ parentOrganizationMembers: []
+ });
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ });
+
+ describe('get root organization details "/organization/{rootOrganization}" >', () => {
+
+ it('should resolve route and return data', () => {
+ const organizations = mock.getOrganizations();
+ const parentOrg = organizations[0];
+
+ const route = $route.routes['/organization/:organizationName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: (initData: any) => {
+ // this is necessary because of different types
+ const equal = angular.equals(initData.organization, parentOrg);
+ expect(equal).toBeTruthy();
+
+ expect(initData.parentOrganizationMembers).toEqual([]);
+ },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve').and.callThrough();
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/organization/${parentOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalled();
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ it('should resolve route and return data if request for organizations list fails', () => {
+ const organizations = mock.getOrganizations();
+ const parentOrg = organizations[0];
+
+ const route = $route.routes['/organization/:organizationName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: (initData: any) => {
+ expect(initData.organization).toBeFalsy();
+ expect(initData.parentOrganizationMembers).toEqual([]);
+ },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve').and.callThrough();
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/organization/${parentOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ // make response for organizations list fail
+ $httpBackend.expect('GET', /\/api\/organization(\?.*$)?/).respond(500, [], {message: 'response failed'});
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalled();
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ });
+
+ describe('get sub-organization details "/organization/{rootOrganization}/{sub-organization}" >', () => {
+
+ it('should resolve route and return data', () => {
+ const organizations = mock.getOrganizations();
+ // get sub-organization
+ const subOrg = organizations[1];
+
+ // get parent organization users
+ const users = mock.getUsersByOrganizationId(subOrg.parent);
+ const buildIdsList = (res: string[], user: che.IUser) => {
+ res.push(user.id);
+ return res;
+ };
+
+ const route = $route.routes['/organization/:organizationName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: (initData: any) => {
+ // this is necessary because of different types
+ const organizationsAreEqual = angular.equals(initData.organization, subOrg);
+ expect(organizationsAreEqual).toBeTruthy();
+
+ expect(initData.parentOrganizationMembers.length).toEqual(users.length);
+
+ const parentMemberIds = initData.parentOrganizationMembers.reduce(buildIdsList, []).sort();
+ const userIds = users.reduce(buildIdsList, []).sort();
+ expect(parentMemberIds).toEqual(userIds);
+ },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve').and.callThrough();
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/organization/${subOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalled();
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ it('should resolve route and return data if request for organizations list fails', () => {
+ const organizations = mock.getOrganizations();
+ const subOrg = organizations[1];
+
+ const route = $route.routes['/organization/:organizationName*'];
+ const resolveBlock = route.resolve.initData;
+
+ // stub functions
+ const callbacks = {
+ testResolve: (initData: any) => {
+ expect(initData.organization).toBeFalsy();
+ expect(initData.parentOrganizationMembers).toEqual([]);
+ },
+ testReject: () => { }
+ };
+
+ // create spies
+ spyOn(callbacks, 'testResolve').and.callThrough();
+ spyOn(callbacks, 'testReject');
+
+ $location.path(`/organization/${subOrg.qualifiedName}`);
+ $rootScope.$digest();
+
+ // make response for organizations list fail
+ $httpBackend.expect('GET', /\/api\/organization(\?.*$)?/).respond(500, [], {message: 'response failed'});
+
+ const service = $injector.invoke(resolveBlock);
+
+ service
+ .then(callbacks.testResolve)
+ .catch(callbacks.testReject);
+
+ $httpBackend.flush();
+
+ expect(callbacks.testResolve).toHaveBeenCalled();
+ expect(callbacks.testReject).not.toHaveBeenCalled();
+ });
+
+ });
+
+});
diff --git a/dashboard/src/app/organizations/organizations-config.service.ts b/dashboard/src/app/organizations/organizations-config.service.ts
new file mode 100644
index 0000000000..1f0b72723b
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations-config.service.ts
@@ -0,0 +1,359 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+export class OrganizationsConfigService {
+ /**
+ * Log service.
+ */
+ private $log: ng.ILogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Route service.
+ */
+ private $route: ng.route.IRouteService;
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Organization resources API interaction.
+ */
+ private cheResourcesDistribution: che.api.ICheResourcesDistribution;
+ /**
+ * User profile API interaction.
+ */
+ private cheUser: any;
+
+ /** Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor($log: ng.ILogService,
+ $q: ng.IQService,
+ $route: ng.route.IRouteService,
+ cheOrganization: che.api.ICheOrganization,
+ chePermissions: che.api.IChePermissions,
+ cheResourcesDistribution: che.api.ICheResourcesDistribution,
+ cheUser: any) {
+ this.$log = $log;
+ this.$q = $q;
+ this.$route = $route;
+ this.cheOrganization = cheOrganization;
+ this.chePermissions = chePermissions;
+ this.cheResourcesDistribution = cheResourcesDistribution;
+ this.cheUser = cheUser;
+ }
+
+ /**
+ * Prints error message.
+ *
+ * @param {any} error error object or string
+ */
+ logError(error: any): void {
+ if (!error) {
+ return;
+ }
+ const message = error.data && error.data.message ? error.data.message : error;
+ this.$log.error(message);
+ }
+
+ waitAll(promises: Array>): ng.IPromise {
+ return this.$q.all(promises).then((results: any) => {
+ return results;
+ }, (error: any) => {
+ this.logError(error);
+ });
+ }
+
+ /**
+ * Fetches all organizations.
+ *
+ * @return {IPromise}
+ */
+ fetchOrganizations(): ng.IPromise {
+ const defer = this.$q.defer();
+
+ // we should resolve this promise in any case to show 'not found page' in case with error
+ this.cheOrganization.fetchOrganizations().finally(() => {
+ const organizations = this.cheOrganization.getOrganizations();
+ defer.resolve(organizations);
+ });
+
+ return defer.promise;
+ }
+
+ /**
+ * Fetches organization by its name.
+ *
+ * @param {string} name organization name
+ * @return {IPromise}
+ */
+ getOrFetchOrganizationByName(name: string): ng.IPromise {
+ const defer = this.$q.defer();
+ const organization = this.cheOrganization.getOrganizationByName(name);
+ if (organization) {
+ defer.resolve(organization);
+ } else {
+ this.cheOrganization.fetchOrganizationByName(name).then(() => {
+ const organization = this.cheOrganization.getOrganizationByName(name);
+ if (!organization) {
+ this.logError(`Organization "${name}" is not found.`);
+ }
+ defer.resolve(organization);
+ }, (error: any) => {
+ this.logError(error);
+ defer.resolve(null);
+ });
+ }
+
+ return defer.promise;
+ }
+
+ /**
+ * Fetches permissions of organization.
+ *
+ * @param {string} id organization ID
+ * @return {IPromise}
+ */
+ getOrFetchOrganizationPermissions(id: string): ng.IPromise {
+ const defer = this.$q.defer();
+
+ const permissions = this.chePermissions.getOrganizationPermissions(id);
+ if (permissions) {
+ defer.resolve(permissions);
+ } else {
+ this.chePermissions.fetchOrganizationPermissions(id).then(() => {
+ const permissions = this.chePermissions.getOrganizationPermissions(id);
+ defer.resolve(permissions);
+ }, (error: any) => {
+ this.logError(error);
+ defer.resolve(null);
+ });
+ }
+
+ return defer.promise;
+ }
+
+ /**
+ * Fetches resources of organization.
+ *
+ * @param {string} id organization ID
+ * @return {IPromise}
+ */
+ getOrFetchOrganizationResources(id: string): ng.IPromise {
+ const defer = this.$q.defer();
+
+ const resources = this.cheResourcesDistribution.getOrganizationResources(id);
+ if (resources) {
+ defer.resolve(resources);
+ } else {
+ this.cheResourcesDistribution.fetchOrganizationResources(id).then(() => {
+ const resources = this.cheResourcesDistribution.getOrganizationResources(id);
+ defer.resolve(resources);
+ }, (error: any) => {
+ this.logError(error);
+ defer.resolve(null);
+ });
+ }
+
+ return defer.promise;
+ }
+
+ /**
+ * Fetches resources of root organization.
+ *
+ * @param {string} id organization ID
+ * @return {IPromise}
+ */
+ getOrFetchTotalOrganizationResources(id: string): ng.IPromise {
+ const defer = this.$q.defer();
+
+ const resources = this.cheResourcesDistribution.getTotalOrganizationResources(id);
+ if (resources) {
+ defer.resolve(resources);
+ } else {
+ this.cheResourcesDistribution.fetchTotalOrganizationResources(id).then(() => {
+ const resources = this.cheResourcesDistribution.getTotalOrganizationResources(id);
+ defer.resolve(resources);
+ }, (error: any) => {
+ this.logError(error);
+ defer.resolve();
+ });
+ }
+
+ return defer.promise;
+ }
+
+ /**
+ * Fetches users of organization.
+ * todo: get Profiles instead of Users
+ *
+ * @param {Array} permissions
+ * @return {IPromise}
+ */
+ getOrFetchOrganizationUsers(permissions: Array): ng.IPromise {
+ const userPromises = [];
+
+ if (permissions && permissions.length) {
+ permissions.forEach((permission: any) => {
+ const userId = permission.userId;
+ const user = this.cheUser.getUserFromId(userId);
+
+ if (user) {
+ userPromises.push(this.$q.when(user));
+ } else {
+ const userPromise = this.cheUser.fetchUserId(userId).then(() => {
+ return this.cheUser.getUserFromId(userId);
+ });
+ userPromises.push(userPromise);
+ }
+ });
+ }
+
+ return this.$q.all(userPromises);
+ }
+
+ /**
+ * Returns promise to resolve route for organization details page.
+ *
+ * @returns {ng.IPromise}
+ */
+ resolveOrganizationDetailsRoute(): ng.IPromise {
+ const name = this.$route.current.params.organizationName;
+ const organizationPromise = this.getOrFetchOrganizationByName(name);
+
+ // get current organization permissions
+ const permissionsPromise = organizationPromise.then((organization: che.IOrganization) => {
+ if (organization && organization.id) {
+ return this.getOrFetchOrganizationPermissions(organization.id);
+ }
+ return this.$q.when();
+ });
+
+ // get current organization resources
+ const resourcesPromise = organizationPromise.then((organization: che.IOrganization) => {
+ if (!organization) {
+ return this.$q.when();
+ }
+ if (organization.parent) {
+ return this.getOrFetchOrganizationResources(organization.id);
+ } else {
+ return this.getOrFetchTotalOrganizationResources(organization.id);
+ }
+ });
+
+ // fetch parent organization members
+ const parentMembersDefer = this.$q.defer();
+ const parentOrgPermissionsPromise = organizationPromise.then((organization: che.IOrganization) => {
+ if (organization && organization.parent) {
+ return this.getOrFetchOrganizationPermissions(organization.parent);
+ }
+ return this.$q.reject();
+ });
+ parentOrgPermissionsPromise.then(
+ /* fetch parent organization members */
+ (permissions: Array) => {
+ return this.getOrFetchOrganizationUsers(permissions);
+ }, (error: any) => {
+ this.logError(error);
+ parentMembersDefer.resolve([]);
+ return this.$q.reject();
+ }
+ ).then(
+ /* resolve parent organization members */
+ (userResults: any[]) => {
+ parentMembersDefer.resolve(userResults);
+ }, (error: any) => {
+ this.logError(error);
+ parentMembersDefer.resolve([]);
+ }
+ );
+
+ return this.$q.all({
+ organization: organizationPromise,
+ organizationPermissions: permissionsPromise,
+ organizationResources: resourcesPromise,
+ parentOrganizationMembers: parentMembersDefer.promise
+ }).then((results: any) => {
+ return results;
+ });
+ }
+
+ /**
+ * Returns promise to resolve route for create organization page.
+ *
+ * @returns {ng.IPromise}
+ */
+ resolveCreateOrganizationRoute(): ng.IPromise {
+ const parentQualifiedNameDefer = this.$q.defer();
+ const parentIdDefer = this.$q.defer();
+ const parentMembersDefer = this.$q.defer();
+
+ parentQualifiedNameDefer.resolve(this.$route.current.params.parentQualifiedName || '');
+ parentQualifiedNameDefer.promise.then((name: string) => {
+ if (name) {
+ return this.getOrFetchOrganizationByName(name);
+ }
+ return this.$q.reject('Cannot get parent for root organization');
+ }
+ ).then(
+ /* resolve parent organization ID */
+ (organization: che.IOrganization) => {
+ const id = organization ? organization.id : '';
+ parentIdDefer.resolve(id);
+
+ if (!organization) {
+ return this.$q.reject();
+ } else {
+ return this.getOrFetchOrganizationPermissions(id);
+ }
+ }, (error: any) => {
+ this.logError(error);
+ parentIdDefer.resolve('');
+ parentMembersDefer.resolve([]);
+ return this.$q.reject(error);
+ }
+ ).then(
+ /* fetch parent organization members */
+ (permissions: Array) => {
+ return this.getOrFetchOrganizationUsers(permissions);
+ }, (error: any) => {
+ this.logError(error);
+ parentMembersDefer.resolve([]);
+ return this.$q.reject();
+ }
+ ).then(
+ /* resolve parent organization members */
+ (userResults: any[]) => {
+ parentMembersDefer.resolve(userResults);
+ }, (error: any) => {
+ this.logError(error);
+ parentMembersDefer.resolve([]);
+ }
+ );
+
+ return this.$q.all({
+ parentQualifiedName: parentQualifiedNameDefer.promise,
+ parentOrganizationId: parentIdDefer.promise,
+ parentOrganizationMembers: parentMembersDefer.promise
+ }).then((results: any) => {
+ return results;
+ });
+ }
+
+}
diff --git a/dashboard/src/app/organizations/organizations-config.ts b/dashboard/src/app/organizations/organizations-config.ts
new file mode 100644
index 0000000000..55d9f3e0c3
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations-config.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {OrganizationsItemController} from './list-organizations/organizations-item/organizations-item.controller';
+import {OrganizationsItem} from './list-organizations/organizations-item/organizations-item.directive';
+import {ListOrganizationsController} from './list-organizations/list-organizations.controller';
+import {ListOrganizations} from './list-organizations/list-organizations.directive';
+import {OrganizationsController} from './organizations.controller';
+import {CreateOrganizationController} from './create-organizations/create-organizations.controller';
+import {OrganizationDetailsController} from './organization-details/organization-details.controller';
+import {ListOrganizationMembersController} from './organization-details/organization-members/list-organization-members.controller';
+import {ListOrganizationInviteMembersController} from './organization-details/organization-invite-members/list-organization-invite-members.controller';
+import {ListOrganizationInviteMembers} from './organization-details/organization-invite-members/list-organization-invite-members.directive';
+import {ListOrganizationMembers} from './organization-details/organization-members/list-organization-members.directive';
+import {OrganizationMemberDialogController} from './organization-details/organization-member-dialog/organization-member-dialog.controller';
+import {OrganizationsPermissionService} from './organizations-permission.service';
+import {OrganizationsConfigService} from './organizations-config.service';
+import {OrganizationNotFound} from './organization-details/organization-not-found/organization-not-found.directive';
+import {OrganizationSelectMembersDialogController} from './organization-details/organization-select-members-dialog/organization-select-members-dialog.controller';
+import {OrganizationMemberItem} from './organization-details/organization-select-members-dialog/organization-member-item/organization-member-item.directive';
+
+/**
+ * The configuration of teams, defines controllers, directives and routing.
+ *
+ * @author Oleksii Orel
+ */
+export class OrganizationsConfig {
+
+ constructor(register: any) {
+ register.controller('OrganizationsController', OrganizationsController);
+
+ register.controller('OrganizationDetailsController', OrganizationDetailsController);
+
+ register.controller('OrganizationsItemController', OrganizationsItemController);
+ register.directive('organizationsItem', OrganizationsItem);
+
+ register.controller('ListOrganizationMembersController', ListOrganizationMembersController);
+ register.directive('listOrganizationMembers', ListOrganizationMembers);
+
+ register.directive('listOrganizationInviteMembers', ListOrganizationInviteMembers);
+ register.controller('ListOrganizationInviteMembersController', ListOrganizationInviteMembersController);
+
+ register.controller('OrganizationMemberDialogController', OrganizationMemberDialogController);
+
+ register.controller('CreateOrganizationController', CreateOrganizationController);
+
+ register.controller('ListOrganizationsController', ListOrganizationsController);
+ register.directive('listOrganizations', ListOrganizations);
+
+ register.service('organizationsPermissionService', OrganizationsPermissionService);
+ register.service('organizationsConfigService', OrganizationsConfigService);
+
+ register.directive('organizationNotFound', OrganizationNotFound);
+
+ register.controller('OrganizationSelectMembersDialogController', OrganizationSelectMembersDialogController);
+ register.directive('organizationMemberItem', OrganizationMemberItem);
+
+ const organizationDetailsLocationProvider = {
+ title: (params: any) => {
+ return params.organizationName;
+ },
+ reloadOnSearch: false,
+ templateUrl: 'app/organizations/organization-details/organization-details.html',
+ controller: 'OrganizationDetailsController',
+ controllerAs: 'organizationDetailsController',
+ resolve: {
+ initData: ['organizationsConfigService', (organizationConfigService: OrganizationsConfigService) => {
+ return organizationConfigService.resolveOrganizationDetailsRoute();
+ }]
+ }
+ };
+
+ const createOrganizationLocationProvider = {
+ title: 'New Organization',
+ templateUrl: 'app/organizations/create-organizations/create-organizations.html',
+ controller: 'CreateOrganizationController',
+ controllerAs: 'createOrganizationController',
+ resolve: {
+ initData: ['organizationsConfigService', (organizationsConfigService: OrganizationsConfigService) => {
+ return organizationsConfigService.resolveCreateOrganizationRoute();
+ }]
+ }
+ };
+
+ // config routes
+ register.app.config(($routeProvider: che.route.IRouteProvider) => {
+ $routeProvider.accessWhen('/organizations', {
+ title: 'organizations',
+ templateUrl: 'app/organizations/organizations.html',
+ controller: 'OrganizationsController',
+ controllerAs: 'organizationsController'
+ })
+ .accessWhen('/admin/create-organization', createOrganizationLocationProvider)
+ .accessWhen('/admin/create-organization/:parentQualifiedName*', createOrganizationLocationProvider)
+ .accessWhen('/organization/:organizationName*', organizationDetailsLocationProvider);
+ });
+ }
+}
diff --git a/dashboard/src/app/organizations/organizations-permission.service.ts b/dashboard/src/app/organizations/organizations-permission.service.ts
new file mode 100644
index 0000000000..8938494293
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations-permission.service.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * This class is fetch and handling the user permission data for organizations
+ *
+ * @author Oleksii Orel
+ */
+export class OrganizationsPermissionService {
+
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * User id.
+ */
+ private userId: string;
+
+ private fetchingMap: Map> = new Map();
+
+ /**
+ * @ngInject for Dependency injection
+ */
+ constructor(chePermissions: che.api.IChePermissions, cheUser: any) {
+ this.chePermissions = chePermissions;
+ this.cheUser = cheUser;
+
+ let user = this.cheUser.getUser();
+ if (user) {
+ this.userId = user.id;
+ } else {
+ this.cheUser.fetchUser().then((user: che.IUser) => {
+ this.userId = user.id;
+ });
+ }
+ }
+
+ fetchPermissions(organizationId: string): ng.IPromise {
+ if (this.fetchingMap.get(organizationId)) {
+ return this.fetchingMap.get(organizationId);
+ }
+ let promise = this.chePermissions.fetchOrganizationPermissions(organizationId);
+ this.fetchingMap.set(organizationId, promise);
+ promise.finally(() => {
+ this.fetchingMap.delete(organizationId);
+ });
+ }
+
+ /**
+ * Checks whether user is allowed to perform pointed action.
+ *
+ * @param action {string} action
+ * @param organizationId {string} organization id
+ * @returns {boolean} = [];
+ /**
+ * Page info object.
+ */
+ private pageInfo: che.IPageInfo;
+ /**
+ * Has admin user service.
+ */
+ private hasAdminUserService: boolean;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheOrganization: che.api.ICheOrganization, cheNotification: any,
+ cheTeamEventsManager: che.api.ICheTeamEventsManager, $scope: ng.IScope,
+ $q: ng.IQService, chePermissions: che.api.IChePermissions, $rootScope: che.IRootScopeService) {
+ this.cheOrganization = cheOrganization;
+ this.cheNotification = cheNotification;
+ this.$q = $q;
+
+ ($rootScope).showIDE = false;
+
+ this.hasAdminUserService = chePermissions.getUserServices().hasAdminUserService;
+ let refreshHandler = () => {
+ this.fetchOrganizations();
+ };
+ cheTeamEventsManager.addDeleteHandler(refreshHandler);
+ cheTeamEventsManager.addRenameHandler(refreshHandler);
+
+ $scope.$on('$destroy', () => {
+ cheTeamEventsManager.removeRenameHandler(refreshHandler);
+ cheTeamEventsManager.removeDeleteHandler(refreshHandler);
+ });
+ this.fetchOrganizations();
+ }
+
+ /**
+ * Fetches the list of root organizations.
+ * @param pageKey {string}
+ */
+ fetchOrganizations(pageKey?: string): void {
+ this.isInfoLoading = true;
+ let promise: ng.IPromise>;
+ if (angular.isDefined(pageKey)) {
+ promise = this.cheOrganization.fetchOrganizationPageObjects(pageKey);
+ } else {
+ // todo remove admin's condition after adding query search to server side
+ promise = this.cheOrganization.fetchOrganizations(!this.hasAdminUserService ? MAX_ITEMS : 30);
+ }
+
+ promise.then((userOrganizations: Array) => {
+ this.pageInfo = angular.copy(this.cheOrganization.getPageInfo());
+ this._updateOrganizationList(userOrganizations);
+ }, (error: any) => {
+ let message = error.data && error.data.message ? error.data.message : 'Failed to retrieve organizations.';
+ this.cheNotification.showError(message);
+ }).finally(() => {
+ this.isInfoLoading = false;
+ });
+ }
+
+ _updateOrganizationList(organizations: Array): void {
+ // todo remove this admin's condition after adding query search to server side
+ if (this.hasAdminUserService) {
+ this.organizations = organizations.filter((organization: che.IOrganization) => {
+ return !organization.parent;
+ });
+ return;
+ }
+ this.organizations = organizations;
+ }
+
+ /**
+ * Gets the list of organizations.
+ *
+ * @returns {Array}
+ */
+ getOrganizations(): Array {
+ return this.organizations;
+ }
+}
diff --git a/dashboard/src/app/organizations/organizations.html b/dashboard/src/app/organizations/organizations.html
new file mode 100644
index 0000000000..902ea8ea27
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations.html
@@ -0,0 +1,16 @@
+Organizations allow
+ groups of developers to collaborate with private and shared workspaces. Resources and permissions are controlled and
+ allocated within the organization by administrator.
+
+
+
+
+
diff --git a/dashboard/src/app/organizations/organizations.styl b/dashboard/src/app/organizations/organizations.styl
new file mode 100644
index 0000000000..2a9f93d29a
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations.styl
@@ -0,0 +1,2 @@
+.organizations-content
+ margin 0
diff --git a/dashboard/src/app/teams/create-team/create-team.controller.ts b/dashboard/src/app/teams/create-team/create-team.controller.ts
new file mode 100644
index 0000000000..13910dea96
--- /dev/null
+++ b/dashboard/src/app/teams/create-team/create-team.controller.ts
@@ -0,0 +1,170 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc controller
+ * @name teams.create.controller:CreateTeamController
+ * @description This class is handling the controller for the new team creation.
+ * @author Ann Shumilova
+ */
+export class CreateTeamController {
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Invite API interaction.
+ */
+ private cheInvite: che.api.ICheInvite;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * Log service.
+ */
+ private $log: ng.ILogService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Current team's name.
+ */
+ private teamName: string;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * The list of users to invite.
+ */
+ private members: Array;
+ /**
+ * Owner'e email.
+ */
+ private owner: string;
+ /**
+ * Account name.
+ */
+ private accountName: string;
+
+ /**
+ * Default constructor
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, cheInvite: che.api.ICheInvite, cheUser: any, chePermissions: che.api.IChePermissions, cheNotification: any,
+ $location: ng.ILocationService, $q: ng.IQService, lodash: any, $log: ng.ILogService, $rootScope: che.IRootScopeService) {
+ this.cheTeam = cheTeam;
+ this.cheInvite = cheInvite;
+ this.cheUser = cheUser;
+ this.chePermissions = chePermissions;
+ this.cheNotification = cheNotification;
+ this.$location = $location;
+ this.$q = $q;
+ this.lodash = lodash;
+ this.$log = $log;
+
+ $rootScope.showIDE = false;
+
+ this.teamName = '';
+ this.isLoading = true;
+ this.members = [];
+
+ if (cheUser.getUser()) {
+ this.owner = cheUser.getUser().email;
+ this.accountName = cheUser.getUser().name;
+ this.isLoading = false;
+ } else {
+ cheUser.fetchUser().then(() => {
+ this.owner = cheUser.getUser().email;
+ this.accountName = cheUser.getUser().name;
+ this.isLoading = false;
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.owner = cheUser.getUser().email;
+ this.accountName = cheUser.getUser().name;
+ this.isLoading = false;
+ } else {
+ this.$log.error('Failed to retrieve current user:', error);
+ }
+ });
+ }
+ }
+
+ /**
+ * Performs new team creation.
+ */
+ createTeam(): void {
+ this.isLoading = true;
+ this.cheTeam.createTeam(this.teamName).then((data: any) => {
+ this.addPermissions(data, this.members);
+ this.cheTeam.fetchTeams();
+ }, (error: any) => {
+ this.isLoading = false;
+ let message = error.data && error.data.message ? error.data.message : 'Failed to create team ' + this.teamName + '.';
+ this.cheNotification.showError(message);
+ });
+ }
+
+ /**
+ * Add permissions for members in pointed team.
+ *
+ * @param team team
+ * @param members members to be added to team
+ */
+ addPermissions(team: any, members: Array) {
+ let promises = [];
+ members.forEach((member: any) => {
+ let actions = this.cheTeam.getActionsFromRoles(member.roles);
+ if (member.id) {
+ let permissions = {
+ instanceId: team.id,
+ userId: member.id,
+ domainId: 'organization',
+ actions: actions
+ };
+
+ let promise = this.chePermissions.storePermissions(permissions);
+ promises.push(promise);
+ } else {
+ let promise = this.cheInvite.inviteToTeam(team.id, member.email, actions);
+ promises.push(promise);
+ }
+ });
+
+ this.$q.all(promises).then(() => {
+ this.isLoading = false;
+ this.$location.path('/team/' + team.qualifiedName);
+ }, (error: any) => {
+ this.isLoading = false;
+ let message = error.data && error.data.message ? error.data.message : 'Failed to create team ' + this.teamName + '.';
+ this.cheNotification.showError(message);
+ });
+ }
+}
diff --git a/dashboard/src/app/teams/create-team/create-team.html b/dashboard/src/app/teams/create-team/create-team.html
new file mode 100644
index 0000000000..97788d213c
--- /dev/null
+++ b/dashboard/src/app/teams/create-team/create-team.html
@@ -0,0 +1,65 @@
+
+ Create a team to share workspaces securely with others.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dashboard/src/app/teams/create-team/create-team.styl b/dashboard/src/app/teams/create-team/create-team.styl
new file mode 100644
index 0000000000..cf040bb48c
--- /dev/null
+++ b/dashboard/src/app/teams/create-team/create-team.styl
@@ -0,0 +1,12 @@
+.create-team
+ padding 0 52px
+
+ .che-label-container .che-label-container-content
+ width 100%
+
+ input.ng-invalid.ng-pristine:focus
+ border-color $primary-color
+
+.create-team-progress
+ height 5px
+ background-color $white-color
diff --git a/dashboard/src/app/teams/invite-members/list-members.controller.ts b/dashboard/src/app/teams/invite-members/list-members.controller.ts
new file mode 100644
index 0000000000..b7a143c1de
--- /dev/null
+++ b/dashboard/src/app/teams/invite-members/list-members.controller.ts
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheTeamRoles} from '../../../components/api/che-team-roles';
+
+/**
+ * @ngdoc controller
+ * @name teams.invite.members:ListMembersController
+ * @description This class is handling the controller for the list of invited members.
+ * @author Ann Shumilova
+ */
+export class ListMembersController {
+
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * No members selected.
+ */
+ private isNoSelected: boolean;
+ /**
+ * Bulk operation checked state.
+ */
+ private isBulkChecked: boolean;
+ /**
+ * Status of selected members.
+ */
+ private membersSelectedStatus: any;
+ /**
+ * Number of selected members.
+ */
+ private membersSelectedNumber: number;
+ /**
+ * Members order by value.
+ */
+ private membersOrderBy: string;
+ /**
+ * List of members to be invited.
+ */
+ private members: Array;
+ /**
+ * Owner of the team (comes from scope).
+ */
+ private owner: string;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($mdDialog: angular.material.IDialogService, lodash: any, cheTeam: che.api.ICheTeam) {
+ this.$mdDialog = $mdDialog;
+ this.lodash = lodash;
+ this.cheTeam = cheTeam;
+
+ this.isNoSelected = true;
+ this.isBulkChecked = false;
+ this.membersSelectedStatus = {};
+ this.membersSelectedNumber = 0;
+ this.membersOrderBy = 'email';
+ }
+
+ /**
+ * Forms the list of members.
+ */
+ buildMembersList(): void {
+ this.members.forEach((member: any) => {
+ member.role = member.roles ? angular.toJson(member.roles[0]) : angular.toJson(CheTeamRoles.TEAM_MEMBER);
+ });
+ }
+
+ /**
+ * Returns developer role value.
+ *
+ * @returns {string} string of the developer role value
+ */
+ getDeveloperRoleValue(): string {
+ return angular.toJson(CheTeamRoles.TEAM_MEMBER);
+ }
+
+ /**
+ * Returns admin role value.
+ *
+ * @returns {string} string of the admin role value
+ */
+ getAdminRoleValue(): string {
+ return angular.toJson(CheTeamRoles.TEAM_ADMIN);
+ }
+
+ /**
+ * Handler for value changed in the list.
+ * @param member
+ */
+ onValueChanged(member): void {
+ member.roles = [angular.fromJson(member.role)];
+ }
+
+ /**
+ * Update members selected status
+ */
+ updateSelectedStatus(): void {
+ this.membersSelectedNumber = 0;
+ this.isBulkChecked = !!this.members.length;
+ this.members.forEach((member: any) => {
+ if (this.membersSelectedStatus[member.email]) {
+ this.membersSelectedNumber++;
+ } else {
+ this.isBulkChecked = false;
+ }
+ });
+ }
+
+ /**
+ * Change bulk selection value.
+ */
+ changeBulkSelection(): void {
+ if (this.isBulkChecked) {
+ this.deselectAllMembers();
+ this.isBulkChecked = false;
+ return;
+ }
+ this.selectAllMembers();
+ this.isBulkChecked = true;
+ }
+
+ /**
+ * Check all members in list.
+ */
+ selectAllMembers(): void {
+ this.membersSelectedNumber = this.members.length;
+ this.members.forEach((member: any) => {
+ this.membersSelectedStatus[member.email] = true;
+ });
+ }
+
+ /**
+ * Uncheck all members in list
+ */
+ deselectAllMembers(): void {
+ this.membersSelectedStatus = {};
+ this.membersSelectedNumber = 0;
+ }
+
+ /**
+ * Adds member to the list.
+ *
+ * @param user
+ * @param roles
+ */
+ addMembers(users: Array, roles: Array): void {
+ users.forEach((user: any) => {
+ user.roles = roles;
+ this.members.push(user);
+ });
+ this.buildMembersList();
+ }
+
+ /**
+ * Shows dialog to add new member.
+ *
+ * @param $event
+ */
+ showAddDialog($event: MouseEvent): void {
+ let members = this.members.concat([{email: this.owner}]);
+ this.$mdDialog.show({
+ targetEvent: $event,
+ controller: 'MemberDialogController',
+ controllerAs: 'memberDialogController',
+ bindToController: true,
+ clickOutsideToClose: true,
+ locals: {
+ members: members,
+ member: null,
+ callbackController: this
+ },
+ templateUrl: 'app/teams/member-dialog/member-dialog.html'
+ });
+ }
+
+ /**
+ * Removes selected members.
+ */
+ removeSelectedMembers(): void {
+ this.lodash.remove(this.members, (member: any) => {
+ return this.membersSelectedStatus[member.email];
+ });
+ this.buildMembersList();
+ this.deselectAllMembers();
+ this.isBulkChecked = false;
+ }
+}
diff --git a/dashboard/src/app/teams/invite-members/list-members.directive.ts b/dashboard/src/app/teams/invite-members/list-members.directive.ts
new file mode 100644
index 0000000000..5c49a8eb97
--- /dev/null
+++ b/dashboard/src/app/teams/invite-members/list-members.directive.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name teams.invite.members:ListMembers
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `;
+ /**
+ * Map of team members.
+ */
+ private teamMembers: Map;
+ /**
+ * Map of team resources.
+ */
+ private teamResources: Map;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * Selected status of teams in the list.
+ */
+ private teamsSelectedStatus: any;
+ /**
+ * Bulk operation checked state.
+ */
+ private isBulkChecked: boolean;
+ /**
+ * No selected workspace state.
+ */
+ private isNoSelected: boolean;
+ /**
+ * All selected workspace state.
+ */
+ private isAllSelected: boolean;
+ /**
+ * todo
+ */
+ private resourceLimits: che.resource.ICheResourceLimits;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, chePermissions: che.api.IChePermissions, cheResourcesDistribution: che.api.ICheResourcesDistribution,
+ cheNotification: any, cheTeamEventsManager: che.api.ICheTeamEventsManager, confirmDialogService: any, $scope: ng.IScope,
+ $q: ng.IQService, $location: ng.ILocationService, resourcesService: che.service.IResourcesService) {
+ this.cheTeam = cheTeam;
+ this.chePermissions = chePermissions;
+ this.cheResourcesDistribution = cheResourcesDistribution;
+ this.resourceLimits = resourcesService.getResourceLimits();
+
+ this.cheNotification = cheNotification;
+ this.confirmDialogService = confirmDialogService;
+ this.$q = $q;
+ this.$location = $location;
+
+ this.teams = [];
+ this.isLoading = true;
+
+ this.teamsSelectedStatus = {};
+ this.isBulkChecked = false;
+ this.isNoSelected = true;
+ this.fetchTeams();
+
+
+ let refreshHandler = () => {
+ this.fetchTeams();
+ };
+
+ cheTeamEventsManager.addDeleteHandler(refreshHandler);
+ cheTeamEventsManager.addRenameHandler(refreshHandler);
+
+ $scope.$on('$destroy', () => {
+ cheTeamEventsManager.removeRenameHandler(refreshHandler);
+ cheTeamEventsManager.removeDeleteHandler(refreshHandler);
+ });
+ }
+
+ /**
+ * Fetches the list of teams.
+ */
+ fetchTeams(): void {
+ this.isLoading = true;
+ this.cheTeam.fetchTeams().then(() => {
+ this.isLoading = false;
+ this.processTeams();
+ }, (error: any) => {
+ this.isLoading = false;
+ let message = error.data && error.data.message ? error.data.message : 'Failed to retrieve teams.';
+ this.cheNotification.showError(message);
+ });
+ }
+
+ /**
+ * Process team - retrieving additional data.
+ */
+ processTeams(): void {
+ this.teams = this.cheTeam.getTeams();
+ this.teamMembers = new Map();
+ this.teamResources = new Map();
+
+ let promises = [];
+ this.teams.forEach((team: any) => {
+ let promiseMembers = this.chePermissions.fetchOrganizationPermissions(team.id).then(() => {
+ this.teamMembers.set(team.id, this.chePermissions.getOrganizationPermissions(team.id).length);
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.teamMembers.set(team.id, this.chePermissions.getOrganizationPermissions(team.id).length);
+ }
+ });
+ promises.push(promiseMembers);
+
+ let promiseResource = this.cheResourcesDistribution.fetchOrganizationResources(team.id).then(() => {
+ this.processResource(team.id);
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.processResource(team.id);
+ }
+ });
+
+ promises.push(promiseResource);
+ });
+
+ this.$q.all(promises).finally(() => {
+ this.isLoading = false;
+ });
+ }
+
+ /**
+ * Process team resources.
+ *
+ * @param teamId team's id
+ */
+ processResource(teamId: string): void {
+ let ramLimit = this.cheResourcesDistribution.getOrganizationResourceByType(teamId, this.resourceLimits.RAM);
+ this.teamResources.set(teamId, ramLimit ? ramLimit.amount : undefined);
+ }
+
+ /**
+ * Returns the number of team's members.
+ *
+ * @param teamId team's id
+ * @returns {any} number of team members to display
+ */
+ getMembersCount(teamId: string): any {
+ if (this.teamMembers && this.teamMembers.size > 0) {
+ return this.teamMembers.get(teamId) || '-';
+ }
+ return '-';
+ }
+
+ /**
+ * Returns the RAM limit value.
+ *
+ * @param teamId team's id
+ * @returns {any}
+ */
+ getRamCap(teamId: string): any {
+ if (this.teamResources && this.teamResources.size > 0) {
+ let ram = this.teamResources.get(teamId);
+ return ram ? (ram / 1024) : null;
+ }
+ return null;
+ }
+
+ /**
+ * Returns {
+ let content = 'Would you like to delete ';
+ if (numberToDelete > 1) {
+ content += 'these ' + numberToDelete + ' teams?';
+ } else {
+ content += 'this selected team?';
+ }
+
+ return this.confirmDialogService.showConfirmDialog('Delete teams', content, 'Delete');
+ }
+}
diff --git a/dashboard/src/app/teams/list/list-teams.directive.ts b/dashboard/src/app/teams/list/list-teams.directive.ts
new file mode 100644
index 0000000000..9b02e6576d
--- /dev/null
+++ b/dashboard/src/app/teams/list/list-teams.directive.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name list.teams:ListTeams
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
diff --git a/dashboard/src/app/teams/list/list-teams.styl b/dashboard/src/app/teams/list/list-teams.styl
new file mode 100644
index 0000000000..8cb1363f5e
--- /dev/null
+++ b/dashboard/src/app/teams/list/list-teams.styl
@@ -0,0 +1,24 @@
+.list-teams-content
+ margin-top 5px
+
+ button
+ margin 0px !important
+
+.list-teams
+ margin-bottom 20px
+
+ .che-list
+ margin 0px
+
+ .che-list-header-content *
+ margin 0px
+
+ .che-list-header md-item
+ border-top none
+
+ .che-list-header-additional
+ display none
+
+.list-teams-progress
+ height 5px
+ margin-top 20px
diff --git a/dashboard/src/app/teams/list/team-item/team-item.controller.ts b/dashboard/src/app/teams/list/team-item/team-item.controller.ts
new file mode 100644
index 0000000000..9fa0000fd0
--- /dev/null
+++ b/dashboard/src/app/teams/list/team-item/team-item.controller.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Controller for a team item.
+ *
+ * @author Ann Shumilova
+ */
+export class TeamItemController {
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Team details (the value is set in directive attributes).
+ */
+ private team: any;
+ /**
+ * Callback needed to react on teams updation (the value is set in directive attributes).
+ */
+ private onUpdate: Function;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor($location: ng.ILocationService, cheTeam: che.api.ICheTeam, confirmDialogService: any, cheNotification: any) {
+ this.$location = $location;
+ this.confirmDialogService = confirmDialogService;
+ this.cheTeam = cheTeam;
+ this.cheNotification = cheNotification;
+ }
+
+ /**
+ * Redirect to team details.
+ */
+ redirectToTeamDetails(tab: string) {
+ this.$location.path('/team/' + this.team.qualifiedName).search(!tab ? {} : {tab: tab});
+ }
+
+ /**
+ * Removes team after confirmation.
+ */
+ removeTeam(): void {
+ this.confirmRemoval().then(() => {
+ this.cheTeam.deleteTeam(this.team.id).then(() => {
+ this.onUpdate();
+ }, (error: any) => {
+ this.cheNotification.showError(error && error.data && error.data.message ? error.data.message : 'Failed to delete team ' + this.team.name);
+ });
+ });
+ }
+
+ /**
+ * Get team display name.
+ *
+ * @param team
+ * @returns {string}
+ */
+ getTeamDisplayName(team: any): string {
+ return this.cheTeam.getTeamDisplayName(team);
+ }
+
+ /**
+ * Shows dialog to confirm the current team removal.
+ *
+ * @returns {angular.IPromise}
+ */
+ confirmRemoval(): ng.IPromise {
+ let promise = this.confirmDialogService.showConfirmDialog('Delete team',
+ 'Would you like to delete team \'' + this.team.name + '\'?', 'Delete');
+ return promise;
+ }
+}
+
diff --git a/dashboard/src/app/teams/list/team-item/team-item.directive.ts b/dashboard/src/app/teams/list/team-item/team-item.directive.ts
new file mode 100644
index 0000000000..ad4ebb3a80
--- /dev/null
+++ b/dashboard/src/app/teams/list/team-item/team-item.directive.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Defines a directive for team item in list.
+ *
+ * @author Ann Shumilova
+ */
+export class TeamItem {
+ restrict: string = 'E';
+ templateUrl: string = 'app/teams/list/team-item/team-item.html';
+ replace: boolean = false;
+
+ controller: string = 'TeamItemController';
+ controllerAs: string = 'teamItemController';
+ bindToController: boolean = true;
+ require: Array = ['ngModel'];
+ scope: {
+ [propName: string]: string
+ };
+
+ constructor() {
+ this.scope = {
+ team: '=team',
+ members: '=',
+ ramCap: '=',
+ isChecked: '=cdvyChecked',
+ isSelect: '=?ngModel',
+ onCheckboxClick: '&?cdvyOnCheckboxClick',
+ selectable: '=cdvyIsSelectable',
+ onUpdate: '&?onUpdate'
+ };
+ }
+}
diff --git a/dashboard/src/app/teams/list/team-item/team-item.html b/dashboard/src/app/teams/list/team-item/team-item.html
new file mode 100644
index 0000000000..ba5a6fc4df
--- /dev/null
+++ b/dashboard/src/app/teams/list/team-item/team-item.html
@@ -0,0 +1,43 @@
+
+
diff --git a/dashboard/src/app/teams/list/team-item/team-item.styl b/dashboard/src/app/teams/list/team-item/team-item.styl
new file mode 100644
index 0000000000..3026037c8a
--- /dev/null
+++ b/dashboard/src/app/teams/list/team-item/team-item.styl
@@ -0,0 +1,3 @@
+.cap-value
+ color $primary-color
+
diff --git a/dashboard/src/app/teams/member-dialog/member-dialog.controller.ts b/dashboard/src/app/teams/member-dialog/member-dialog.controller.ts
new file mode 100644
index 0000000000..9b33a3b2aa
--- /dev/null
+++ b/dashboard/src/app/teams/member-dialog/member-dialog.controller.ts
@@ -0,0 +1,250 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheTeamRoles} from '../../../components/api/che-team-roles';
+
+/**
+ * @ngdoc controller
+ * @name teams.member:MemberDialogController
+ * @description This class is handling the controller for adding/editing members dialog.
+ * @author Ann Shumilova
+ */
+export class MemberDialogController {
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Processing state of adding member.
+ */
+ private isProcessing: boolean;
+ /**
+ * Set of user roles info.
+ */
+ private roles: Array;
+ /**
+ * Already added emails.
+ */
+ private emails: Array;
+ /**
+ * Existing members.
+ */
+ private members: Array;
+ /**
+ * Entered email address.
+ */
+ private email: string;
+ /**
+ * Controller that will handle callbacks.
+ */
+ private callbackController: any;
+
+ /**
+ * Member to be displayed, may be , element: string) => {
+ if (array.indexOf(element) < 0 && element.length > 0) {
+ array.push(element);
+ }
+ return array;
+ }, []);
+
+ let promises = [];
+ let users = [];
+ resultEmails.forEach((email: string) => {
+ promises.push(this.processUser(email, users));
+ });
+
+ this.$q.all(promises).then(() => {
+ this.finishAdding(users, userRoles);
+ });
+ }
+
+ processUser(email: string, users : Array): ng.IPromise {
+ let deferred = this.$q.defer();
+ let user = this.cheUser.getUserByAlias(email);
+ if (user) {
+ users.push(user);
+ deferred.resolve();
+ } else {
+ user = {};
+ user.email = email;
+ this.isProcessing = true;
+ this.cheUser.fetchUserByAlias(email).then(() => {
+ users.push(this.cheUser.getUserByAlias(email));
+ deferred.resolve();
+ }, (error: any) => {
+ users.push(user);
+ deferred.resolve();
+ });
+ }
+ return deferred.promise;
+ }
+
+ /**
+ * Handle edit member user's action.
+ */
+ editMember(): void {
+ this.member.permissions.actions = this.getCurrentActions();
+ this.callbackController.updateMember(this.member);
+ this.hide();
+ }
+
+ /**
+ * Returns the actions of current chosen roles.
+ */
+ getCurrentActions(): Array {
+ let userRoles = this.role ? [this.role] : [angular.fromJson(this.newRole)];
+ let processedActions = [];
+ this.roles.forEach((role: any) => {
+ processedActions = processedActions.concat(role.actions);
+ });
+
+
+ let actions = this.member ? this.member.permissions.actions : [];
+ let otherActions = this.lodash.difference(actions, processedActions);
+
+ return this.lodash.uniq(this.cheTeam.getActionsFromRoles(userRoles).concat(otherActions));
+ }
+
+ /**
+ * Finish adding user state.
+ *
+ * @param users users to be added
+ * @param roles user's roles
+ */
+ finishAdding(users: Array, roles: any): void {
+ this.isProcessing = false;
+ this.callbackController.addMembers(users, roles);
+ this.hide();
+ }
+
+}
diff --git a/dashboard/src/app/teams/member-dialog/member-dialog.html b/dashboard/src/app/teams/member-dialog/member-dialog.html
new file mode 100644
index 0000000000..13693a0e8a
--- /dev/null
+++ b/dashboard/src/app/teams/member-dialog/member-dialog.html
@@ -0,0 +1,46 @@
+
+
diff --git a/dashboard/src/app/teams/member-dialog/member-dialog.styl b/dashboard/src/app/teams/member-dialog/member-dialog.styl
new file mode 100644
index 0000000000..41996ef537
--- /dev/null
+++ b/dashboard/src/app/teams/member-dialog/member-dialog.styl
@@ -0,0 +1,33 @@
+.member-dialog-content
+ width 630px
+
+ button
+ margin 0 0 0 20px
+
+ input.ng-invalid.ng-pristine:focus
+ border-color $primary-color
+
+.member-dialog-content .che-label-container .che-label-container-label
+ width 150px
+ min-width 150px
+
+.member-role-title
+ margin-bottom 10px
+
+.member-role-description
+ color $disabled-color
+ font-size 10px
+ padding 0px 5px
+ line-height 18pt
+
+.member-role-warning-label
+ color $warning-color
+ height 20px
+
+.member-role-button
+ margin-right 10px
+ width 150px
+
+.member-role-button button
+ width 150px
+
diff --git a/dashboard/src/app/teams/navbar-teams/navbar-teams.controller.ts b/dashboard/src/app/teams/navbar-teams/navbar-teams.controller.ts
new file mode 100644
index 0000000000..dcabc0f6be
--- /dev/null
+++ b/dashboard/src/app/teams/navbar-teams/navbar-teams.controller.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc controller
+ * @name teams.navbar.controller:NavbarTeamsController
+ * @description This class is handling the controller for the teams section in navbar
+ * @author Ann Shumilova
+ */
+export class NavbarTeamsController {
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+
+ /**
+ * Default constructor
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam) {
+ this.cheTeam = cheTeam;
+ this.fetchTeams();
+ }
+
+ /**
+ * Fetch the list of available teams.
+ */
+ fetchTeams(): void {
+ this.cheTeam.fetchTeams();
+ }
+
+ getTeamDisplayName(team: any): string {
+ return this.cheTeam.getTeamDisplayName(team);
+ }
+
+ /**
+ * Get the list of available teams.
+ *
+ * @returns {Array} teams array
+ */
+ getTeams(): Array {
+ return this.cheTeam.getTeams();
+ }
+
+ /**
+ * Returns personal account of current user.
+ *
+ * @returns {any} personal account
+ */
+ getPersonalAccount(): any {
+ return this.cheTeam.getPersonalAccount();
+ }
+}
diff --git a/dashboard/src/app/teams/navbar-teams/navbar-teams.directive.ts b/dashboard/src/app/teams/navbar-teams/navbar-teams.directive.ts
new file mode 100644
index 0000000000..31466ae650
--- /dev/null
+++ b/dashboard/src/app/teams/navbar-teams/navbar-teams.directive.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name teams.directive:NavbarTeams
+ * @description This class is handling the directive of for listing teams in navbar.
+ * @author Ann Shumilova
+ */
+export class NavbarTeams implements ng.IDirective {
+
+ restrict: string = 'E';
+ templateUrl: string = 'app/teams/navbar-teams/navbar-teams.html';
+
+ controller: string = 'NavbarTeamsController';
+ controllerAs: string = 'navbarTeamsController';
+ bindToController: boolean = true;
+
+}
diff --git a/dashboard/src/app/teams/navbar-teams/navbar-teams.html b/dashboard/src/app/teams/navbar-teams/navbar-teams.html
new file mode 100644
index 0000000000..a425cdc22b
--- /dev/null
+++ b/dashboard/src/app/teams/navbar-teams/navbar-teams.html
@@ -0,0 +1,43 @@
+
diff --git a/dashboard/src/app/teams/navbar-teams/navbar-teams.styl b/dashboard/src/app/teams/navbar-teams/navbar-teams.styl
new file mode 100644
index 0000000000..80e186988e
--- /dev/null
+++ b/dashboard/src/app/teams/navbar-teams/navbar-teams.styl
@@ -0,0 +1,25 @@
+.navbar-teams
+ .navbar-subsection-item
+ height 19px
+ min-height 19px
+ line-height 19px
+
+ .md-button
+ height 19px !important
+ min-height 19px !important
+
+ .navbar-item
+ line-height 19px !important
+
+ .navbar-icon
+ height 19px !important
+ line-height 19px !important
+
+ .navbar-teams-list
+ overflow auto
+
+ ::-webkit-scrollbar-thumb
+ background-color rgba(255,255,255,.1)
+
+ ::-webkit-scrollbar-thumb:hover
+ background-color rgba(255,255,255,.2)
diff --git a/dashboard/src/app/teams/team-details/team-details.controller.ts b/dashboard/src/app/teams/team-details/team-details.controller.ts
new file mode 100644
index 0000000000..aa147bfceb
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-details.controller.ts
@@ -0,0 +1,435 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {TeamDetailsService} from './team-details.service';
+
+enum Tab {Settings, Members, Workspaces}
+
+/**
+ * Controller for a managing team details.
+ *
+ * @author Ann Shumilova
+ */
+export class TeamDetailsController {
+ tab: Object = Tab;
+
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Team events manager.
+ */
+ private cheTeamEventsManager: che.api.ICheTeamEventsManager;
+ /**
+ * Team resources API interaction.
+ */
+ private cheResourcesDistribution: che.api.ICheResourcesDistribution;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Current team's name. Comes from route path params.
+ */
+ private teamName: string;
+ /**
+ * Current team's data.
+ */
+ private team: any;
+ /**
+ * Current team's owner.
+ */
+ private owner: any;
+ /**
+ * The list of allowed user actions.
+ */
+ private allowedUserActions: Array;
+ /**
+ * New team's name (for renaming widget).
+ */
+ private newName: string;
+ /**
+ * Index of the selected tab.
+ */
+ private selectedTabIndex: number;
+ /**
+ * Team limits.
+ */
+ private limits: any;
+ /**
+ * Copy of limits before letting to modify, to be able to compare.
+ */
+ private limitsCopy: any;
+ /**
+ * Page loading state.
+ */
+ private isLoading: boolean;
+
+ private teamForm: ng.IFormController;
+
+ private hasTeamAccess: boolean;
+
+ private resourceLimits: che.resource.ICheResourceLimits;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, cheResourcesDistribution: che.api.ICheResourcesDistribution, chePermissions: che.api.IChePermissions,
+ cheUser: any, $route: ng.route.IRouteService, $location: ng.ILocationService, $rootScope: che.IRootScopeService,
+ $scope: ng.IScope, confirmDialogService: any, cheTeamEventsManager: che.api.ICheTeamEventsManager, cheNotification: any,
+ lodash: any, teamDetailsService: TeamDetailsService, resourcesService: che.service.IResourcesService) {
+ this.cheTeam = cheTeam;
+ this.cheResourcesDistribution = cheResourcesDistribution;
+ this.chePermissions = chePermissions;
+ this.cheTeamEventsManager = cheTeamEventsManager;
+ this.cheUser = cheUser;
+ this.teamName = $route.current.params.teamName;
+ this.$location = $location;
+ this.confirmDialogService = confirmDialogService;
+ this.cheNotification = cheNotification;
+ this.lodash = lodash;
+ this.resourceLimits = resourcesService.getResourceLimits();
+
+ $rootScope.showIDE = false;
+
+ this.allowedUserActions = [];
+
+ let deleteHandler = (info: any) => {
+ if (this.team && (this.team.id === info.organization.id)) {
+ this.$location.path('/workspaces');
+ }
+ };
+ this.cheTeamEventsManager.addDeleteHandler(deleteHandler);
+
+ let renameHandler = (info: any) => {
+ if (this.team && (this.team.id === info.organization.id)) {
+ this.$location.path('/team/' + info.organization.qualifiedName);
+ }
+ };
+ this.cheTeamEventsManager.addRenameHandler(renameHandler);
+
+ this.updateSelectedTab(this.$location.search().tab);
+ let deRegistrationFn = $scope.$watch(() => {
+ return $location.search().tab;
+ }, (tab: string) => {
+ if (angular.isDefined(tab)) {
+ this.updateSelectedTab(tab);
+ }
+ }, true);
+ $scope.$on('$destroy', () => {
+ this.cheTeamEventsManager.removeRenameHandler(renameHandler);
+ this.cheTeamEventsManager.removeDeleteHandler(deleteHandler);
+ deRegistrationFn();
+ });
+
+ this.isLoading = true;
+ this.hasTeamAccess = true;
+ this.team = teamDetailsService.getTeam();
+ this.owner = teamDetailsService.getOwner();
+
+ if (this.team) {
+ this.newName = angular.copy(this.team.name);
+ if (this.owner) {
+ this.fetchUserPermissions();
+ } else {
+ teamDetailsService.fetchOwnerByTeamName(this.teamName).then((owner: any) => {
+ this.owner = owner;
+ }, (error: any) => {
+ this.isLoading = false;
+ cheNotification.showError(error && error.data && error.data.message !== null ? error.data.message : 'Failed to find team owner.');
+ }).finally(() => {
+ this.fetchUserPermissions();
+ });
+ }
+ }
+ }
+
+ /**
+ * Update selected tab index by search part of URL.
+ *
+ * @param {string} tab
+ */
+ updateSelectedTab(tab: string): void {
+ this.selectedTabIndex = parseInt(this.tab[tab], 10);
+ }
+
+ /**
+ * Changes search part of URL.
+ *
+ * @param {number} tabIndex
+ */
+ onSelectTab(tabIndex?: number): void {
+ let param: { tab?: string } = {};
+ if (angular.isDefined(tabIndex)) {
+ param.tab = Tab[tabIndex];
+ }
+ if (angular.isUndefined(this.$location.search().tab)) {
+ this.$location.replace().search(param);
+ } else {
+ this.$location.search(param);
+ }
+ }
+
+ /**
+ * Fetches permission of user in current team.
+ */
+ fetchUserPermissions(): void {
+ this.chePermissions.fetchOrganizationPermissions(this.team.id).then(() => {
+ this.allowedUserActions = this.processUserPermissions();
+ this.hasTeamAccess = this.allowedUserActions.length > 0;
+ this.fetchLimits();
+ }, (error: any) => {
+ this.isLoading = false;
+ if (error.status === 304) {
+ this.allowedUserActions = this.processUserPermissions();
+ this.fetchLimits();
+ } else if (error.status === 403) {
+ this.allowedUserActions = [];
+ this.hasTeamAccess = false;
+ }
+ this.isLoading = false;
+ });
+ }
+
+ /**
+ * Process permissions to retrieve current user actions.
+ *
+ * @returns {Array} current user allowed actions
+ */
+ processUserPermissions(): Array {
+ let userId = this.cheUser.getUser().id;
+ let permissions = this.chePermissions.getOrganizationPermissions(this.team.id);
+ let userPermissions = this.lodash.find(permissions, (permission: any) => {
+ return permission.userId === userId;
+ });
+ return userPermissions ? userPermissions.actions : [];
+ }
+
+ /**
+ * Checks whether user is allowed to perform pointed action.
+ *
+ * @param value action
+ * @returns {boolean}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+}
+ */
+ fetchTeamDetailsByName(teamName: string): ng.IPromise {
+ if (!teamName) {
+ return;
+ }
+ let deferred = this.$q.defer();
+ this.cheTeam.fetchTeamByName(teamName).then((team: any) => {
+ this.team = team;
+ deferred.resolve(team);
+ }, (error: any) => {
+ this.team = null;
+ deferred.reject(error);
+ });
+
+ return deferred.promise;
+ }
+
+ /**
+ * Fetches the team's owner by team's name.
+ * @param teamName {string}
+ *
+ * @return {ng.IPromise}
+ */
+ fetchOwnerByTeamName(teamName: string): ng.IPromise {
+ let deferred = this.$q.defer();
+ let parts = teamName.split('/');
+ let accountName = (parts && parts.length > 0) ? parts[0] : '';
+
+ this.cheUser.fetchUserByName(accountName).then((owner: any) => {
+ this.owner = owner;
+ deferred.resolve(owner);
+ }, (error: any) => {
+ this.owner = null;
+ deferred.reject(error);
+ });
+
+ return deferred.promise;
+ }
+
+ /**
+ * Gets the team.
+ *
+ * @return {any}
+ */
+ getTeam(): any {
+ return this.team;
+ }
+
+ /**
+ * Gets the owner.
+ *
+ * @return {any}
+ */
+ getOwner(): any {
+ return this.owner;
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-details.styl b/dashboard/src/app/teams/team-details/team-details.styl
new file mode 100644
index 0000000000..3c84248600
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-details.styl
@@ -0,0 +1,45 @@
+.team-details-content
+ padding 0 14px
+
+ .che-input-box
+ padding 25px 0
+ border-bottom 1px solid $list-separator-color
+
+.team-ram-cap .che-input-box-desktop-value-column:after
+ color $label-secondary-color
+ content "GB"
+ position absolute
+ right 7px
+ top 0
+ line-height 40px
+
+.team-details-delete-label label
+ color $che-delete-label-color !important
+
+.che-label-container-content button
+ margin-left 0px
+ margin-top 0px
+
+.team-details-progress
+ height 5px
+
+.team-error-content
+ height 100%
+ width 100%
+ color $label-secondary-color
+
+ .error-title
+ font-size 12pt
+ font-weight bold
+
+ .error-image
+ font-size 56pt
+ margin 25px 0px
+ color $label-info-color
+
+ .error-description
+ font-size 11pt
+ padding 0px 20px
+
+.save-button-placeholder
+ width 89px
diff --git a/dashboard/src/app/teams/team-details/team-members/list-team-members.controller.ts b/dashboard/src/app/teams/team-details/team-members/list-team-members.controller.ts
new file mode 100644
index 0000000000..5e6ed2c3e0
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/list-team-members.controller.ts
@@ -0,0 +1,534 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {TeamDetailsService} from '../team-details.service';
+
+/**
+ * @ngdoc controller
+ * @name teams.members:ListTeamMembersController
+ * @description This class is handling the controller for the list of team's members.
+ * @author Ann Shumilova
+ */
+export class ListTeamMembersController {
+ /**
+ * Location service.
+ */
+ $location: ng.ILocationService;
+
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Invite API interaction.
+ */
+ private cheInvite: che.api.ICheInvite;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * User profile API interaction.
+ */
+ private cheProfile: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Confirm dialog service.
+ */
+ private confirmDialogService: any;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Team's members list.
+ */
+ private members: Array;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * Filter for members list.
+ */
+ private memberFilter: any;
+ /**
+ * Current team (comes from directive's scope).
+ */
+ private team: any;
+ /**
+ * Current team's owner (comes from directive's scope).
+ */
+ private owner: any;
+ /**
+ * The editable (whether current user can edit members list and see invitations) state of the members (comes from outside).
+ */
+ private editable: any;
+ /**
+ * Selection and filtration helper
+ */
+ cheListHelper: che.widget.ICheListHelper;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, chePermissions: che.api.IChePermissions, cheInvite: che.api.ICheInvite, cheUser: any, cheProfile: any,
+ confirmDialogService: any, $mdDialog: angular.material.IDialogService, $q: ng.IQService, cheNotification: any,
+ lodash: any, $location: ng.ILocationService, teamDetailsService: TeamDetailsService,
+ $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactory) {
+ this.cheTeam = cheTeam;
+ this.cheInvite = cheInvite;
+ this.chePermissions = chePermissions;
+ this.cheProfile = cheProfile;
+ this.cheUser = cheUser;
+ this.$mdDialog = $mdDialog;
+ this.$q = $q;
+ this.$location = $location;
+ this.lodash = lodash;
+ this.cheNotification = cheNotification;
+ this.confirmDialogService = confirmDialogService;
+
+ this.members = [];
+ this.isLoading = true;
+
+ this.memberFilter = {name: ''};
+ const helperId = 'list-team-members';
+ this.cheListHelper = cheListHelperFactory.getHelper(helperId);
+ $scope.$on('$destroy', () => {
+ cheListHelperFactory.removeHelper(helperId);
+ });
+
+ this.owner = teamDetailsService.getOwner();
+ this.team = teamDetailsService.getTeam();
+
+ this.refreshData(true, true);
+ }
+
+ /**
+ * Callback when name is changed.
+ *
+ * @param str {string} a string to filter team members.
+ */
+ onSearchChanged(str: string): void {
+ this.memberFilter.name = str;
+ this.cheListHelper.applyFilter('name', this.memberFilter);
+ }
+
+ /**
+ * Refreshes both list of members and invitations based on provided parameters.
+ *
+ * @param fetchMembers if }
+ */
+ refreshData(fetchMembers: boolean, fetchInvitations: boolean): ng.IPromise {
+ this.members = [];
+ if (!this.team || !this.owner) {
+ return;
+ }
+
+ const promises: Array> = [];
+
+ if (fetchMembers) {
+ promises.push(this.fetchMembers());
+ } else {
+ this.formUserList();
+ }
+
+ // can fetch invites only admin or owner of the team:
+ if (this.editable) {
+ if (fetchInvitations) {
+ promises.push(this.fetchInvitations());
+ } else {
+ this.formInvitationList();
+ }
+ }
+
+ return this.$q.all(promises).finally(() => {
+ const isMemberSelectable = (member: che.IMember) => {
+ return !this.memberIsOwner(member);
+ };
+ this.cheListHelper.setList(this.members, 'userId', isMemberSelectable);
+ });
+ }
+
+ /**
+ * Returns }
+ */
+ fetchMembers(): ng.IPromise {
+ return this.chePermissions.fetchOrganizationPermissions(this.team.id).then(() => {
+ this.isLoading = false;
+ return this.formUserList();
+ }, (error: any) => {
+ this.isLoading = false;
+ if (error && error.status !== 304) {
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to retrieve team permissions.');
+ return this.$q.reject(error);
+ } else {
+ return this.formUserList();
+ }
+ });
+ }
+
+ /**
+ * Combines permissions and users data in one list.
+ *
+ * @return {ng.IPromise}
+ */
+ formUserList(): ng.IPromise {
+ let noOwnerPermissions = true;
+
+ const promises: Array> = [];
+
+ const permissions = this.chePermissions.getOrganizationPermissions(this.team.id);
+ permissions.forEach((permission: any) => {
+ const userId = permission.userId;
+ const user = this.cheProfile.getProfileById(userId);
+
+ if (userId === this.owner.id) {
+ noOwnerPermissions = false;
+ }
+
+ if (user) {
+ this.formUserItem(user, permission);
+ } else {
+ const promise = this.cheProfile.fetchProfileById(userId).then(() => {
+ this.formUserItem(this.cheProfile.getProfileById(userId), permission);
+ });
+ promises.push(promise);
+ }
+ });
+
+ if (noOwnerPermissions) {
+ const user = this.cheProfile.getProfileById(this.owner.id);
+
+ if (user) {
+ this.formUserItem(user, null);
+ } else {
+ const promise = this.cheProfile.fetchProfileById(this.owner.id).then(() => {
+ this.formUserItem(this.cheProfile.getProfileById(this.owner.id), null);
+ });
+ promises.push(promise);
+ }
+ }
+
+ return this.$q.all(promises);
+ }
+
+ /**
+ * Forms item to display with permissions and user data.
+ *
+ * @param user user data
+ * @param permissions permissions data
+ */
+ formUserItem(user: any, permissions: any): void {
+ user.name = this.cheProfile.getFullName(user.attributes);
+ let userItem = angular.copy(user);
+ userItem.permissions = permissions;
+ this.members.push(userItem);
+ }
+
+ /**
+ * Fetches the list of team's invitations.
+ *
+ * @return {IPromise}
+ */
+ fetchInvitations(): ng.IPromise {
+ return this.cheInvite.fetchTeamInvitations(this.team.id).then((data: any) => {
+ this.isLoading = false;
+ this.formInvitationList();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to retrieve team invitations.');
+ });
+ }
+
+ /**
+ * Prepares invitations list to be displayed.
+ */
+ formInvitationList(): void {
+ let invites = this.cheInvite.getTeamInvitations(this.team.id);
+
+ invites.forEach((invite: any) => {
+ let user = {userId: invite.email, name: 'Pending invitation', email: invite.email, permissions: invite, isPending: true};
+ this.members.push(user);
+ });
+ }
+
+ /**
+ * Shows dialog for adding new member to the team.
+ */
+ showMemberDialog(member: any): void {
+ this.$mdDialog.show({
+ controller: 'MemberDialogController',
+ controllerAs: 'memberDialogController',
+ bindToController: true,
+ clickOutsideToClose: true,
+ locals: {
+ members: this.members,
+ callbackController: this,
+ member: member
+ },
+ templateUrl: 'app/teams/member-dialog/member-dialog.html'
+ });
+ }
+
+ /**
+ * Add new members to the team.
+ *
+ * @param members members to be added
+ * @param roles member roles
+ */
+ addMembers(members: Array, roles: Array): void {
+ let promises = [];
+ let unregistered = [];
+ let isInvite = false;
+ let isAddMember = false;
+
+ members.forEach((member: any) => {
+ let actions = this.cheTeam.getActionsFromRoles(roles);
+ if (member.id) {
+ isAddMember = true;
+ let permissions = {
+ instanceId: this.team.id,
+ userId: member.id,
+ domainId: 'organization',
+ actions: actions
+ };
+ let promise = this.chePermissions.storePermissions(permissions).catch((error: any) => {
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Add member to team failed.');
+ });
+ promises.push(promise);
+ } else {
+ isInvite = true;
+ let promise = this.cheInvite.inviteToTeam(this.team.id, member.email, actions);
+ promises.push(promise);
+ unregistered.push(member.email);
+ }
+ });
+
+ this.isLoading = true;
+ this.$q.all(promises).then(() => {
+ return this.refreshData(isAddMember, isInvite);
+ }).finally(() => {
+ this.isLoading = false;
+ if (unregistered.length > 0) {
+ this.cheNotification.showInfo('User' + (unregistered.length > 1 ? 's ' : ' ') + unregistered.join(', ')
+ + (unregistered.length > 1 ? ' are' : ' is') + ' not registered in the system. The email invitations were sent.');
+ }
+ });
+ }
+
+ /**
+ * Perform edit member permissions.
+ *
+ * @param member
+ */
+ editMember(member: any): void {
+ this.showMemberDialog(member);
+ }
+
+ /**
+ * Performs member's permissions update.
+ *
+ * @param member member to update permissions
+ */
+ updateMember(member: any): void {
+ if (member.isPending) {
+ if (member.permissions.actions.length > 0) {
+ this.updateInvitation(member.permissions);
+ } else {
+ this.deleteInvitation(member);
+ }
+ } else {
+ if (member.permissions.actions.length > 0) {
+ this.storePermissions(member.permissions);
+ } else {
+ this.removePermissions(member);
+ }
+ }
+ }
+
+ /**
+ * Stores provided permissions.
+ *
+ * @param permissions
+ */
+ storePermissions(permissions: any): void {
+ this.isLoading = true;
+ this.chePermissions.storePermissions(permissions).then(() => {
+ this.refreshData(true, false);
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Set user permissions failed.');
+ });
+ }
+
+ /**
+ * Updates the team's invitaion.
+ *
+ * @param member member's invitation to be updated
+ */
+ updateInvitation(member: any): void {
+ this.cheInvite.inviteToTeam(this.team.id, member.email, member.actions);
+ }
+
+ /**
+ * Deletes send invitation to the team.
+ *
+ * @param member member to delete invitation
+ */
+ deleteInvitation(member: any): void {
+ this.isLoading = true;
+ this.cheInvite.deleteTeamInvitation(this.team.id, member.email).then(() => {
+ this.refreshData(false, true);
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to remove invite send to ' + member.email + '.');
+ });
+ }
+
+ /**
+ * Remove all selected members.
+ */
+ removeSelectedMembers(): void {
+ const selectedMembers = this.cheListHelper.getSelectedItems();
+
+ if (!selectedMembers.length) {
+ this.cheNotification.showError('No such members.');
+ return;
+ }
+
+ const confirmationPromise = this.showDeleteMembersConfirmation(selectedMembers.length);
+ confirmationPromise.then(() => {
+ const removeMembersPromises = [];
+ let removalError;
+ let deleteInvite = false;
+ let deleteMember = false;
+ let deleteCurrentUser = false;
+
+ selectedMembers.forEach((member: che.IMember) => {
+ this.cheListHelper.itemsSelectionStatus[member.userId] = false;
+ if (member && member.isPending) {
+ deleteInvite = true;
+ const promise = this.cheInvite.deleteTeamInvitation(this.team.id, member.email);
+ removeMembersPromises.push(promise);
+ return;
+ }
+
+ deleteMember = true;
+ if (member.userId === this.cheUser.getUser().id) {
+ deleteCurrentUser = true;
+ }
+
+ const promise = this.chePermissions.removeOrganizationPermissions(this.team.id, member.userId).catch((error: any) => {
+ removalError = error;
+ });
+ removeMembersPromises.push(promise);
+ });
+
+ this.$q.all(removeMembersPromises).finally(() => {
+ if (deleteCurrentUser) {
+ this.processCurrentUserRemoval();
+ } else {
+ this.refreshData(deleteMember, deleteInvite);
+ }
+
+ if (removalError) {
+ this.cheNotification.showError(removalError.data && removalError.data.message ? removalError.data.message : 'User removal failed.');
+ }
+ });
+ });
+ }
+
+ /**
+ * Finds member by it's id.
+ *
+ * @param id
+ * @returns {any}
+ */
+ getMemberById(id: string): any {
+ return this.lodash.find(this.members, (member: any) => {
+ return member.userId === id;
+ });
+ }
+
+ /**
+ * Process the removal of current user from team.
+ */
+ processCurrentUserRemoval(): void {
+ this.$location.path('/workspaces');
+ this.cheTeam.fetchTeams();
+ }
+
+ /**
+ * Removes user permissions for current team
+ *
+ * @param user user
+ */
+ removePermissions(user: any) {
+ this.isLoading = true;
+ this.chePermissions.removeOrganizationPermissions(user.permissions.instanceId, user.userId).then(() => {
+ if (user.userId === this.cheUser.getUser().id) {
+ this.processCurrentUserRemoval();
+ } else {
+ this.refreshData(true, false);
+ }
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to remove user ' + user.email + ' permissions.');
+ });
+ }
+
+ /**
+ * Show confirmation popup before members removal
+ * @param numberToDelete
+ * @returns {*}
+ */
+ showDeleteMembersConfirmation(numberToDelete: number): any {
+ let confirmTitle = 'Would you like to remove ';
+ if (numberToDelete > 1) {
+ confirmTitle += 'these ' + numberToDelete + ' members?';
+ } else {
+ confirmTitle += 'the selected member?';
+ }
+
+ return this.confirmDialogService.showConfirmDialog('Remove members', confirmTitle, 'Delete');
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-members/list-team-members.directive.ts b/dashboard/src/app/teams/team-details/team-members/list-team-members.directive.ts
new file mode 100644
index 0000000000..ad0d762b5e
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/list-team-members.directive.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name teams.members:ListTeamMembers
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
+
+
+
+
diff --git a/dashboard/src/app/teams/team-details/team-members/list-team-members.styl b/dashboard/src/app/teams/team-details/team-members/list-team-members.styl
new file mode 100644
index 0000000000..a5ee9dc271
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/list-team-members.styl
@@ -0,0 +1,2 @@
+.create-team-progress
+ height 5px
diff --git a/dashboard/src/app/teams/team-details/team-members/member-item/member-item.controller.ts b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.controller.ts
new file mode 100644
index 0000000000..9b68dca61b
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.controller.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Controller for team member item..
+ *
+ * @author Ann Shumilova
+ */
+export class MemberItemController {
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Controller for handling callback events. (Comes from directive's scope).
+ */
+ private callback: any;
+ /**
+ * Member to be displayed. (Comes from directive's scope).
+ */
+ private member: any;
+ /**
+ * Whether current member is owner of the team. (Comes from directive's scope).
+ */
+ private isOwner: boolean;
+
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Actions that are not part of any role.
+ */
+ private otherActions: Array;
+ /**
+ * Confirm dialog service.
+ */
+ private confirmDialogService: any;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor($mdDialog: angular.material.IDialogService, cheTeam: che.api.ICheTeam, lodash: any, confirmDialogService: any) {
+ this.$mdDialog = $mdDialog;
+ this.cheTeam = cheTeam;
+ this.lodash = lodash;
+ this.confirmDialogService = confirmDialogService;
+
+ this.otherActions = [];
+ }
+
+ /**
+ * Call user permissions removal. Show the dialog
+ * @param event - the $event
+ */
+ removeMember(event: MouseEvent): void {
+ let promise = this.confirmDialogService.showConfirmDialog('Remove member', 'Would you like to remove member ' + this.member.email + ' ?', 'Delete');
+
+ promise.then(() => {
+ if (this.member.isPending) {
+ this.callback.deleteInvitation(this.member);
+ } else {
+ this.callback.removePermissions(this.member);
+ }
+ });
+ }
+
+ /**
+ * Handler edit member user's request.
+ */
+ editMember(): void {
+ this.callback.editMember(this.member);
+ }
+
+ /**
+ * Returns string with member roles.
+ *
+ * @returns {string} string format of roles array
+ */
+ getMemberRoles(): string {
+ if (this.isOwner) {
+ return 'Team Owner';
+ }
+
+ let roles = this.cheTeam.getRolesFromActions(this.member.permissions.actions);
+ let titles = [];
+ let processedActions = []
+ roles.forEach((role: any) => {
+ titles.push(role.title);
+ processedActions = processedActions.concat(role.actions);
+ });
+
+ this.otherActions = this.lodash.difference(this.member.permissions.actions, processedActions);
+ return titles.join(', ');
+ }
+
+}
+
diff --git a/dashboard/src/app/teams/team-details/team-members/member-item/member-item.directive.ts b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.directive.ts
new file mode 100644
index 0000000000..1b60617291
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.directive.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Defines a directive for user item in permissions list.
+ *
+ * @author Ann Shumilova
+ */
+export class MemberItem implements ng.IDirective {
+
+ restrict: string = 'E';
+ templateUrl: string = 'app/teams/team-details/team-members/member-item/member-item.html';
+ replace: boolean = false;
+
+ controller: string = 'MemberItemController';
+ controllerAs: string = 'memberItemController';
+
+ bindToController: boolean = true;
+
+ scope: any = {
+ member: '=member',
+ callback: '=callback',
+ hideDetails: '=hideDetails',
+ editable: '=editable',
+ isOwner: '=isOwner'
+ };
+
+ constructor() {
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-members/member-item/member-item.html b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.html
new file mode 100644
index 0000000000..52cfe584bd
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.html
@@ -0,0 +1,63 @@
+
+
+
diff --git a/dashboard/src/app/teams/team-details/team-members/member-item/member-item.styl b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.styl
new file mode 100644
index 0000000000..9322f3aa75
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-members/member-item/member-item.styl
@@ -0,0 +1,22 @@
+.member-list-row
+ margin 0
+
+ .che-list-actions a[disabled]
+ pointer-events none
+ opacity 0.5
+
+.member-list-permissions
+ overflow inherit !important
+ text-overflow ellipsis
+ white-space normal !important
+
+.member-bold
+ font-weight bold
+
+.member-pending-icon
+ height 16px
+ margin-right 5px
+ font-size 11pt
+ opacity 0.6
+ box-sizing content-box
+ padding 1px
diff --git a/dashboard/src/app/teams/team-details/team-owners/list-team-owners.controller.ts b/dashboard/src/app/teams/team-details/team-owners/list-team-owners.controller.ts
new file mode 100644
index 0000000000..9feb4e5d92
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-owners/list-team-owners.controller.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {TeamDetailsService} from '../team-details.service';
+
+/**
+ * @ngdoc controller
+ * @name teams.members:ListTeamOwnersController
+ * @description This class is handling the controller for the list of team's owners.
+ * @author Ann Shumilova
+ */
+export class ListTeamOwnersController {
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * User profile API interaction.
+ */
+ private cheProfile: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Notifications service.
+ */
+ private cheNotification: any;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Team's owners string.
+ */
+ private owners: string;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * Current team's owner (comes from directive's scope).
+ */
+ private owner: any;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, cheUser: any, chePermissions: che.api.IChePermissions, cheProfile: any, cheNotification: any,
+ lodash: any, teamDetailsService: TeamDetailsService) {
+ this.cheTeam = cheTeam;
+ this.cheUser = cheUser;
+ this.chePermissions = chePermissions;
+ this.cheProfile = cheProfile;
+ this.cheNotification = cheNotification;
+ this.lodash = lodash;
+
+ this.isLoading = true;
+ this.owner = teamDetailsService.getOwner();
+ this.processOwner();
+ }
+
+ /**
+ * Process owner.
+ */
+ processOwner(): void {
+ if (!this.owner) {
+ return;
+ }
+ let profile = this.cheProfile.getProfileById(this.owner.id);
+ if (profile) {
+ this.formUserItem(profile);
+ } else {
+ this.cheProfile.fetchProfileById(this.owner.id).then(() => {
+ this.formUserItem(this.cheProfile.getProfileById(this.owner.id));
+ });
+ }
+ }
+
+ /**
+ * Forms item to display with permissions and user data.
+ *
+ * @param user user data
+ * @param permissions permissions data
+ */
+ formUserItem(user: any): void {
+ let name = this.cheProfile.getFullName(user.attributes) + ' (' + user.email + ')';
+ this.owners = name;
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-owners/list-team-owners.directive.ts b/dashboard/src/app/teams/team-details/team-owners/list-team-owners.directive.ts
new file mode 100644
index 0000000000..4a6c710eaf
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-owners/list-team-owners.directive.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name teams.owners:ListTeamMembers
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
diff --git a/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.controller.ts b/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.controller.ts
new file mode 100644
index 0000000000..a54f2eed5a
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.controller.ts
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {TeamDetailsService} from '../team-details.service';
+/**
+ * @ngdoc controller
+ * @name teams.workspaces:ListTeamWorkspacesController
+ * @description This class is handling the controller for the list of team's workspaces.
+ * @author Ann Shumilova
+ */
+export class ListTeamWorkspacesController {
+
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Workspace API interaction.
+ */
+ private cheWorkspace: any;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+
+ private lodash: any;
+ /**
+ * List of team's workspaces
+ */
+ private workspaces: Array;
+ /**
+ * Loading state of the page.
+ */
+ private isLoading: boolean;
+ /**
+ * Filter for workspace list.
+ */
+ private workspaceFilter: any;
+ /**
+ * Current team data (comes from directive's scope).
+ */
+ private team: any;
+ /**
+ * Selection and filtration helper.
+ */
+ private cheListHelper: che.widget.ICheListHelper;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheTeam: che.api.ICheTeam, chePermissions: che.api.IChePermissions, cheUser: any, cheWorkspace: any,
+ cheNotification: any, lodash: any, $mdDialog: angular.material.IDialogService, $q: ng.IQService,
+ teamDetailsService: TeamDetailsService, $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactory) {
+ this.cheTeam = cheTeam;
+ this.cheWorkspace = cheWorkspace;
+ this.cheNotification = cheNotification;
+ this.chePermissions = chePermissions;
+ this.cheUser = cheUser;
+ this.$mdDialog = $mdDialog;
+ this.$q = $q;
+ this.lodash = lodash;
+
+ this.workspaces = [];
+ this.isLoading = true;
+
+ this.workspaceFilter = {config: {name: ''}};
+ const helperId = 'list-team-workspaces';
+ this.cheListHelper = cheListHelperFactory.getHelper(helperId);
+ $scope.$on('$destroy', () => {
+ cheListHelperFactory.removeHelper(helperId);
+ });
+
+ this.team = teamDetailsService.getTeam();
+
+ this.fetchPermissions();
+ }
+
+ /**
+ * Callback when name is changed.
+ *
+ * @param str {string} a string to filter team workspaces.
+ */
+ onSearchChanged(str: string): void {
+ this.workspaceFilter.config.name = str;
+ this.cheListHelper.applyFilter('name', this.workspaceFilter);
+ }
+
+ fetchPermissions(): void {
+ if (!this.team) {
+ return;
+ }
+ this.chePermissions.fetchOrganizationPermissions(this.team.id).then(() => {
+ this.processPermissions();
+ }, (error: any) => {
+ if (error && error.status === 304) {
+ this.processPermissions();
+ } else {
+ this.cheNotification.showError('Failed to access workspaces of the ' + this.team.name + ' team.');
+ }
+ });
+ }
+
+ processPermissions(): void {
+ let permissions = this.chePermissions.getOrganizationPermissions(this.team.id);
+ let currentUserPermissions = this.lodash.find(permissions, (permission: any) => {
+ return permission.userId === this.cheUser.getUser().id;
+ });
+
+ if (currentUserPermissions && currentUserPermissions.actions.indexOf('manageWorkspaces') >= 0) {
+ this.fetchWorkspacesByNamespace();
+ } else {
+ this.fetchWorkspaces();
+ }
+ }
+
+ fetchWorkspacesByNamespace(): void {
+ this.cheWorkspace.fetchWorkspacesByNamespace(this.team.qualifiedName).then(() => {
+ this.isLoading = false;
+ this.workspaces = this.cheWorkspace.getWorkspacesByNamespace(this.team.qualifiedName);
+ }, (error: any) => {
+ this.isLoading = false;
+ if (error.status === 304) {
+ this.workspaces = this.cheWorkspace.getWorkspacesByNamespace(this.team.qualifiedName);
+ }
+ // todo
+ }).finally(() => {
+ this.cheListHelper.setList(this.workspaces, 'id');
+ });
+ }
+
+ /**
+ * Fetches the list of teams workspaces.
+ */
+ fetchWorkspaces(): void {
+ let promise = this.cheWorkspace.fetchWorkspaces();
+
+ promise.then(() => {
+ this.isLoading = false;
+ this.workspaces = this.filterWorkspacesByNamespace();
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.workspaces = this.filterWorkspacesByNamespace();
+ }
+ this.isLoading = false;
+ }).finally(() => {
+ this.cheListHelper.setList(this.workspaces, 'id');
+ });
+ }
+
+ /**
+ * Filter workspaces by namespace.
+ *
+ * @returns {any}
+ */
+ filterWorkspacesByNamespace(): Array {
+ let workspaces = this.cheWorkspace.getWorkspaces();
+ return this.lodash.filter(workspaces, (workspace: che.IWorkspace) => {
+ return workspace.namespace === this.team.qualifiedName;
+ });
+ }
+
+ /**
+ * Delete all selected workspaces.
+ */
+ deleteSelectedWorkspaces(): void {
+ const selectedWorkspaces = this.cheListHelper.getSelectedItems(),
+ selectedWorkspaceIds = selectedWorkspaces.map((workspace: che.IWorkspace) => {
+ return workspace.id;
+ });
+
+ const queueLength = selectedWorkspaceIds.length;
+ if (!queueLength) {
+ this.cheNotification.showError('No such workspace.');
+ return;
+ }
+
+ const confirmationPromise = this.showDeleteWorkspacesConfirmation(queueLength);
+ confirmationPromise.then(() => {
+ const numberToDelete = queueLength;
+ const deleteWorkspacePromises = [];
+ let isError = false;
+ let workspaceName;
+
+ selectedWorkspaceIds.forEach((workspaceId: string) => {
+ this.cheListHelper.itemsSelectionStatus[workspaceId] = false;
+
+ let workspace = this.cheWorkspace.getWorkspaceById(workspaceId);
+ workspaceName = workspace.config.name;
+ let stoppedStatusPromise = this.cheWorkspace.fetchStatusChange(workspaceId, 'STOPPED');
+
+ // stop workspace if it's status is RUNNING
+ if (workspace.status === 'RUNNING') {
+ this.cheWorkspace.stopWorkspace(workspaceId);
+ }
+
+ // delete stopped workspace
+ let promise = stoppedStatusPromise.then(() => {
+ return this.cheWorkspace.deleteWorkspaceConfig(workspaceId);
+ }).catch((error: any) => {
+ isError = true;
+ });
+ deleteWorkspacePromises.push(promise);
+ });
+
+ this.$q.all(deleteWorkspacePromises).finally(() => {
+ this.processPermissions();
+ if (isError) {
+ this.cheNotification.showError('Delete failed.');
+ } else {
+ if (numberToDelete === 1) {
+ this.cheNotification.showInfo(workspaceName + ' has been removed.');
+ } else {
+ this.cheNotification.showInfo('Selected workspaces have been removed.');
+ }
+ }
+ });
+ });
+ }
+
+ /**
+ * Show confirmation popup before workspaces to delete
+ * @param numberToDelete
+ * @returns {*}
+ */
+ showDeleteWorkspacesConfirmation(numberToDelete: number): ng.IPromise {
+ let confirmTitle = 'Would you like to delete ';
+ if (numberToDelete > 1) {
+ confirmTitle += 'these ' + numberToDelete + ' workspaces?';
+ } else {
+ confirmTitle += 'this selected workspace?';
+ }
+ let confirm = this.$mdDialog.confirm()
+ .title(confirmTitle)
+ .ariaLabel('Remove workspaces')
+ .ok('Delete!')
+ .cancel('Cancel')
+ .clickOutsideToClose(true);
+
+ return this.$mdDialog.show(confirm);
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.directive.ts b/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.directive.ts
new file mode 100644
index 0000000000..57c4a3bfbf
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-workspaces/list-team-workspaces.directive.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name teams.workspaces:ListTeamWorkspaces
+ * @restrict E
+ * @element
+ *
+ * @description
+ * `
+
+
+
+
+
diff --git a/dashboard/src/app/teams/teams-config.ts b/dashboard/src/app/teams/teams-config.ts
new file mode 100644
index 0000000000..6cc2de1946
--- /dev/null
+++ b/dashboard/src/app/teams/teams-config.ts
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+import {NavbarTeamsController} from './navbar-teams/navbar-teams.controller';
+import {NavbarTeams} from './navbar-teams/navbar-teams.directive';
+
+import {CreateTeamController} from './create-team/create-team.controller';
+import {MemberDialogController} from './member-dialog/member-dialog.controller';
+// import {MoreDevsDialogController} from './more-devs-dialog/more-devs-dialog.controller';
+import {ListMembersController} from './invite-members/list-members.controller';
+import {ListMembers} from './invite-members/list-members.directive';
+
+import {ListTeamWorkspaces} from './team-details/team-workspaces/list-team-workspaces.directive';
+import {ListTeamWorkspacesController} from './team-details/team-workspaces/list-team-workspaces.controller';
+
+import {ListTeamMembers} from './team-details/team-members/list-team-members.directive';
+import {ListTeamMembersController} from './team-details/team-members/list-team-members.controller';
+import {ListTeamOwners} from './team-details/team-owners/list-team-owners.directive';
+import {ListTeamOwnersController} from './team-details/team-owners/list-team-owners.controller';
+import {MemberItem} from './team-details/team-members/member-item/member-item.directive';
+import {MemberItemController} from './team-details/team-members/member-item/member-item.controller';
+
+import {TeamDetailsController} from './team-details/team-details.controller';
+import {TeamDetailsService} from './team-details/team-details.service';
+import {ListTeams} from './list/list-teams.directive';
+import {ListTeamsController} from './list/list-teams.controller';
+import {TeamItem} from './list/team-item/team-item.directive';
+import {TeamItemController} from './list/team-item/team-item.controller';
+
+/**
+ * The configuration of teams, defines controllers, directives and routing.
+ *
+ * @author Ann Shumilova
+ */
+export class TeamsConfig {
+
+ constructor(register: che.IRegisterService) {
+ register.controller('NavbarTeamsController', NavbarTeamsController);
+ register.directive('navbarTeams', NavbarTeams);
+ register.controller('CreateTeamController', CreateTeamController);
+
+ register.controller('ListTeamsController', ListTeamsController);
+ register.directive('listTeams', ListTeams);
+
+ register.controller('TeamItemController', TeamItemController);
+ register.directive('teamItem', TeamItem);
+
+ register.controller('MemberDialogController', MemberDialogController);
+ // register.controller('MoreDevsDialogController', MoreDevsDialogController);
+ register.controller('ListMembersController', ListMembersController);
+ register.directive('listMembers', ListMembers);
+
+ register.controller('ListTeamWorkspacesController', ListTeamWorkspacesController);
+ register.directive('listTeamWorkspaces', ListTeamWorkspaces);
+
+ register.controller('ListTeamMembersController', ListTeamMembersController);
+ register.directive('listTeamMembers', ListTeamMembers);
+
+ register.controller('ListTeamOwnersController', ListTeamOwnersController);
+ register.directive('listTeamOwners', ListTeamOwners);
+
+ register.controller('MemberItemController', MemberItemController);
+ register.directive('memberItem', MemberItem);
+
+ register.controller('TeamDetailsController', TeamDetailsController);
+ register.service('teamDetailsService', TeamDetailsService);
+
+ let checkPersonalTeam = ($q: ng.IQService, cheTeam: che.api.ICheTeam) => {
+ var defer = $q.defer();
+ cheTeam.fetchTeams().then(() => {
+ if (cheTeam.getPersonalAccount()) {
+ defer.resolve();
+ } else {
+ defer.reject();
+ }
+ }, (error: any) => {
+ if (error.status === 304) {
+ if (cheTeam.getPersonalAccount()) {
+ defer.resolve();
+ } else {
+ defer.reject();
+ }
+ }
+ });
+ return defer.promise;
+ };
+
+ let checkTeamDetails = ($q: ng.IQService, teamDetailsService: TeamDetailsService, $route: ng.route.IRouteService) => {
+ let defer = $q.defer();
+ let teamName = $route.current.params.teamName;
+ teamDetailsService.fetchTeamDetailsByName(teamName).then(() => {
+ teamDetailsService.fetchOwnerByTeamName(teamName).finally(() => {
+ defer.resolve();
+ });
+ }, (error: any) => {
+ // resolve it to show 'team not found page' in case with error
+ defer.resolve();
+ });
+
+ return defer.promise;
+ };
+
+ let locationProvider = {
+ title: (params: any) => {
+ return params.teamName;
+ },
+ reloadOnSearch: false,
+ templateUrl: 'app/teams/team-details/team-details.html',
+ controller: 'TeamDetailsController',
+ controllerAs: 'teamDetailsController',
+ resolve: {
+ checkPersonal: ['$q', 'cheTeam', checkPersonalTeam],
+ checkTeamDetails: ['$q', 'teamDetailsService', '$route', checkTeamDetails]
+ }
+ };
+
+ // config routes
+ register.app.config(function ($routeProvider: che.route.IRouteProvider) {
+ $routeProvider.accessWhen('/team/create', {
+ title: 'New Team',
+ templateUrl: 'app/teams/create-team/create-team.html',
+ controller: 'CreateTeamController',
+ controllerAs: 'createTeamController',
+ resolve: {
+ check: ['$q', 'cheTeam', checkPersonalTeam]
+ }
+ }).accessWhen('/team/:teamName*', locationProvider);
+ });
+ }
+}
diff --git a/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts b/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts
index a6ed73f8b2..490d680308 100644
--- a/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts
+++ b/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts
@@ -98,6 +98,9 @@ export class NamespaceSelectorSvc {
return namespace.label;
});
return this.fetchNamespaceInfoById(this.namespaceId);
+ }).catch((error: any) => {
+ this.$log.error(`Cannot fetch namespaces: ${error}`);
+ return this.$q.when(null);
}).then(() => {
if (this.namespaceId) {
return this.$q.when();
@@ -113,9 +116,6 @@ export class NamespaceSelectorSvc {
const user = this.cheUser.getUser();
this.namespaceId = user.name;
});
- }).catch((error: any) => {
- // this.$log.error(`Cannot fetch namespaces: ${error}`);
- return this.$q.reject(`Cannot fetch namespaces: ${error}`);
}).then(() => {
return this.$q.when(this.namespaceId);
});
diff --git a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html
index 0a0fe6dc54..8557524d7b 100644
--- a/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html
+++ b/dashboard/src/app/workspaces/create-workspace/stack-selector/stack-selector-item/stack-selector-item.html
@@ -20,7 +20,7 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ![]()
+
+ {{navbarController.userInfo.name}}
+
+
+
+
+ Create {{createOrganizationController.parentOrganizationId ? 'a sub-organization' : 'an organization'}} to share resources.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dashboard/src/app/organizations/create-organizations/create-organizations.styl b/dashboard/src/app/organizations/create-organizations/create-organizations.styl
new file mode 100644
index 0000000000..4285b7f7b6
--- /dev/null
+++ b/dashboard/src/app/organizations/create-organizations/create-organizations.styl
@@ -0,0 +1,8 @@
+.create-organization
+ padding 0 52px
+
+ .che-label-container .che-label-container-content
+ width 100%
+
+ input.ng-invalid.ng-pristine:focus
+ border-color $primary-color
diff --git a/dashboard/src/app/organizations/list-organizations/list-organizations.controller.ts b/dashboard/src/app/organizations/list-organizations/list-organizations.controller.ts
new file mode 100644
index 0000000000..071714e42c
--- /dev/null
+++ b/dashboard/src/app/organizations/list-organizations/list-organizations.controller.ts
@@ -0,0 +1,322 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {OrganizationsPermissionService} from '../organizations-permission.service';
+
+/**
+ * @ngdoc controller
+ * @name organizations.list.controller:ListOrganizationsController
+ * @description This class is handling the controller for listing the organizations
+ * @author Oleksii Orel
+ */
+export class ListOrganizationsController {
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Permissions service.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Resources distribution service.
+ */
+ private cheResourcesDistribution: che.api.ICheResourcesDistribution;
+ /**
+ * Organization permission service.
+ */
+ private organizationsPermissionService: OrganizationsPermissionService;
+ /**
+ * List of organizations.
+ */
+ private organizations: Array
+
+
+
+
+
+ The name can contain alphanumeric characters or single '-' inside.
+
+ The name has to be more than 1 character long.
+ The name has to be less than 20 characters long.
+ This organization name is already used.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ There are no {{listOrganizationsController.parentName ? 'sub-organizations' : 'organizations'}}.
+
+
+
+
+
+
+
+
+ Name
+ {{organizationsItemController.organization.qualifiedName}}
+
+
+ Members
+ {{organizationsItemController.members}}
+
+
+ Total RAM
+ {{organizationsItemController.totalRam ? organizationsItemController.totalRam + 'GB' : 'not limited'}}
+
+
+ Available RAM
+ {{organizationsItemController.availableRam ? organizationsItemController.availableRam + 'GB' : 'not limited'}}
+
+
+ Sub-Organizations
+
+ {{organizationsItemController.getAllSubOrganizations().length ? organizationsItemController.getAllSubOrganizations().length : 'none'}}
+
+
+
+ Actions
+
+
+
+
+
+
+ true if allowed
+ */
+ isUserAllowedTo(value: string): boolean {
+ if (value === this.organizationActions.UPDATE && this.isPersonalOrganization()) {
+ return false;
+ }
+ return this.allowedUserActions ? this.allowedUserActions.indexOf(value) >= 0 : false;
+ }
+
+ /**
+ * Checks for personal.
+ *
+ * @returns {boolean} true if personal
+ */
+ isPersonalOrganization(): boolean {
+ let user = this.cheUser.getUser();
+ return this.organization && user && this.organization.qualifiedName === user.name;
+ }
+
+ /**
+ * Checks for root.
+ *
+ * @returns {boolean} true if root
+ */
+ isRootOrganization(): boolean {
+ return this.organization && !this.organization.parent;
+ }
+
+ /**
+ * Returns whether current user can change organization resource limits.
+ *
+ * @returns {boolean} true if can change resource limits
+ */
+ canChangeResourceLimits(): boolean {
+ if (this.isRootOrganization()) {
+ return this.chePermissions.getUserServices().hasAdminUserService;
+ }
+ return this.organizationsPermissionService.isUserAllowedTo(this.organizationActions.MANAGE_RESOURCES, this.organization.parent);
+ }
+
+ /**
+ * Check if the name is unique.
+ * @param name
+ * @returns {boolean}
+ */
+ isUniqueName(name: string): boolean {
+ let currentOrganizationName = this.organization.name;
+ let organizations = this.cheOrganization.getOrganizations();
+ let account = '';
+ let parentId = this.organization.parent;
+ if (parentId) {
+ let parent = this.cheOrganization.getOrganizationById(parentId);
+ if (parent && parent.qualifiedName) {
+ account = parent.qualifiedName + '/';
+ }
+ }
+ if (organizations.length && currentOrganizationName !== name) {
+ for (let i = 0; i < organizations.length; i++) {
+ if (organizations[i].qualifiedName === account + name) {
+ return false;
+ }
+ }
+ return true;
+ } else {
+ return true;
+ }
+ }
+
+ /**
+ * Fetches defined organization's limits (workspace, runtime, RAM caps, etc).
+ */
+ fetchLimits(): void {
+ this.isLoading = true;
+ this.cheResourcesDistribution.fetchOrganizationResources(this.organization.id).then(() => {
+ this.isLoading = false;
+ this.processResources();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.limits = {};
+ this.limitsCopy = angular.copy(this.limits);
+ });
+ }
+
+ /**
+ * Process resources limits.
+ */
+ processResources(): void {
+ let ramLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.organization.id, this.resourceLimits.RAM);
+ let workspaceLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.organization.id, this.resourceLimits.WORKSPACE);
+ let runtimeLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.organization.id, this.resourceLimits.RUNTIME);
+
+ this.limits = {};
+ this.limits.workspaceCap = workspaceLimit ? workspaceLimit.amount : undefined;
+ this.limits.runtimeCap = runtimeLimit ? runtimeLimit.amount : undefined;
+ this.limits.ramCap = ramLimit ? ramLimit.amount / 1024 : undefined;
+ this.limitsCopy = angular.copy(this.limits);
+ }
+
+
+ /**
+ * Fetches total resources of the organization (workspace, runtime, RAM caps, etc).
+ */
+ fetchTotalResources(): void {
+ this.isLoading = true;
+ this.cheResourcesDistribution.fetchTotalOrganizationResources(this.organization.id).then(() => {
+ this.isLoading = false;
+ this.processTotalResources();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.limits = {};
+ this.limitsCopy = angular.copy(this.limits);
+ });
+ }
+
+ /**
+ * Process organization's total resources.
+ */
+ processTotalResources(): void {
+ let ram = this.cheResourcesDistribution.getOrganizationTotalResourceByType(this.organization.id, this.resourceLimits.RAM);
+ let workspace = this.cheResourcesDistribution.getOrganizationTotalResourceByType(this.organization.id, this.resourceLimits.WORKSPACE);
+ let runtime = this.cheResourcesDistribution.getOrganizationTotalResourceByType(this.organization.id, this.resourceLimits.RUNTIME);
+
+ this.totalResources = {};
+ this.totalResources.workspaceCap = (workspace && workspace.amount !== -1) ? workspace.amount : undefined;
+ this.totalResources.runtimeCap = (runtime && runtime.amount !== -1) ? runtime.amount : undefined;
+ this.totalResources.ramCap = (ram && ram.amount !== -1) ? ram.amount / 1024 : undefined;
+ this.totalResourcesCopy = angular.copy(this.totalResources);
+ }
+
+ /**
+ * Confirms and performs organization's deletion.
+ */
+ deleteOrganization(): void {
+ let promise = this.confirmDialogService.showConfirmDialog('Delete organization',
+ 'Would you like to delete organization \'' + this.organization.name + '\'?', 'Delete');
+
+ promise.then(() => {
+ let promise = this.cheOrganization.deleteOrganization(this.organization.id);
+ promise.then(() => {
+ this.$location.path('/organizations');
+
+ }, (error: any) => {
+ this.cheNotification.showError(error.data.message !== null ? error.data.message : 'Team deletion failed.');
+ });
+ });
+ }
+
+ /**
+ * Update organization's details.
+ *
+ */
+ updateOrganizationName(): void {
+ if (this.newName && this.organization && this.newName !== this.organization.name) {
+ this.organization.name = this.newName;
+ this.cheOrganization.updateOrganization(this.organization).then((organization: che.IOrganization) => {
+ this.cheOrganization.fetchOrganizations().then(() => {
+ this.$location.path('/organization/' + organization.qualifiedName);
+ });
+ }, (error: any) => {
+ this.cheNotification.showError((error.data && error.data.message !== null) ? error.data.message : 'Rename organization failed.');
+ });
+ }
+ }
+
+ /**
+ * Update resource limits.
+ */
+ updateLimits(): void {
+ if (!this.organization || !this.limits || angular.equals(this.limits, this.limitsCopy)) {
+ return;
+ }
+ let resources = angular.copy(this.cheResourcesDistribution.getOrganizationResources(this.organization.id));
+
+ let resourcesToRemove = [this.resourceLimits.TIMEOUT];
+ if (this.limits.ramCap !== null && this.limits.ramCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RAM, (this.limits.ramCap * 1024).toString());
+ } else {
+ resourcesToRemove.push(this.resourceLimits.RAM);
+ }
+ if (this.limits.workspaceCap !== null && this.limits.workspaceCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.WORKSPACE, this.limits.workspaceCap);
+ } else {
+ resourcesToRemove.push(this.resourceLimits.WORKSPACE);
+ }
+ if (this.limits.runtimeCap !== null && this.limits.runtimeCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RUNTIME, this.limits.runtimeCap);
+ } else {
+ resourcesToRemove.push(this.resourceLimits.RUNTIME);
+ }
+ // if the timeout resource will be send in this case - it will set the timeout for the current organization, and the updating timeout of
+ // parent organization will not affect the current organization, so to avoid this - remove timeout resource if present:
+ this.lodash.remove(resources, (resource: any) => {
+ return resourcesToRemove.indexOf(resource.type) >= 0;
+ });
+
+ this.isLoading = true;
+ this.cheResourcesDistribution.distributeResources(this.organization.id, resources).then(() => {
+ this.fetchLimits();
+ }, (error: any) => {
+ let errorMessage = 'Failed to set update organization CAPs.';
+ this.cheNotification.showError((error.data && error.data.message !== null) ? errorMessage + 'Reason: ' + error.data.message : errorMessage);
+ this.fetchLimits();
+ });
+ }
+
+ /**
+ * Update resource limits.
+ */
+ updateTotalResources(): void {
+ if (!this.organization || !this.totalResources || angular.equals(this.totalResources, this.totalResourcesCopy)) {
+ return;
+ }
+ let resources = angular.copy(this.cheResourcesDistribution.getTotalOrganizationResources(this.organization.id));
+
+ let resourcesToRemove = [this.resourceLimits.TIMEOUT];
+ if (this.totalResources.ramCap !== null && this.totalResources.ramCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RAM, (this.totalResources.ramCap * 1024).toString());
+ } else {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RAM, '-1');
+ }
+ if (this.totalResources.workspaceCap !== null && this.totalResources.workspaceCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.WORKSPACE, this.totalResources.workspaceCap);
+ } else {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.WORKSPACE, '-1');
+ }
+ if (this.totalResources.runtimeCap !== null && this.totalResources.runtimeCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RUNTIME, this.totalResources.runtimeCap);
+ } else {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RUNTIME, '-1');
+ }
+ // if the timeout resource will be send in this case - it will set the timeout for the current organization, and the updating timeout of
+ // parent organization will not affect the current organization, so to avoid this - remove timeout resource if present:
+ this.lodash.remove(resources, (resource: any) => {
+ return resourcesToRemove.indexOf(resource.type) >= 0;
+ });
+
+ this.isLoading = true;
+
+ this.cheResourcesDistribution.updateTotalResources(this.organization.id, resources).then(() => {
+ this.fetchTotalResources();
+ }, (error: any) => {
+ let errorMessage = 'Failed to update organization CAPs.';
+ this.cheNotification.showError((error.data && error.data.message !== null) ? errorMessage + 'Reason: ' + error.data.message : errorMessage);
+ this.fetchTotalResources();
+ });
+ }
+
+ /**
+ * Returns whether save button is disabled.
+ *
+ * @return {boolean}
+ */
+ isSaveButtonDisabled(): boolean {
+ return !this.organizationForm || this.organizationForm.$invalid;
+ }
+
+ /**
+ * Returns true if "Save" button should be visible
+ *
+ * @return {boolean}
+ */
+ isSaveButtonVisible(): boolean {
+ return (this.selectedTabIndex === Tab.Settings && !this.isLoading) && (!angular.equals(this.organization.name, this.newName) ||
+ !angular.equals(this.limits, this.limitsCopy) || !angular.equals(this.totalResources, this.totalResourcesCopy));
+ }
+
+ /**
+ * Returns back button link and title.
+ *
+ * @returns {any} back button link
+ */
+ getBackButtonLink(): any {
+ if (this.organization && this.organization.parent) {
+ let parent = this.organization.qualifiedName.replace(/\/[^\/]+$/, '');
+ return {link: '#/organization/' + parent, title: parent};
+ } else {
+ return {link: '#/organizations', title: 'Organizations'};
+ }
+ }
+
+ updateOrganization(): void {
+ this.updateOrganizationName();
+ this.updateLimits();
+ this.updateTotalResources();
+ }
+
+ cancelChanges(): void {
+ this.newName = angular.copy(this.organization.name);
+ this.limits = angular.copy(this.limitsCopy);
+ this.totalResources = angular.copy(this.totalResourcesCopy);
+ }
+}
diff --git a/dashboard/src/app/organizations/organization-details/organization-details.html b/dashboard/src/app/organizations/organization-details/organization-details.html
new file mode 100644
index 0000000000..0de6b14ef2
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-details.html
@@ -0,0 +1,201 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The name can contain alphanumeric characters or single '-' inside.
+
+ The name has to be less than 20 characters long.
+ The name has to be less than 20 characters long.
+ This organization name is already used.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A workspace cap should be greater than 0.
+ A running workspace cap should be greater than 0.
+ A workspace RAM cap should be greater than 0.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ A workspace cap should be greater than 0.
+ A running workspace cap should be greater than 0.
+ A workspace RAM cap should be greater than 0.
+
+
+
+
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.styl b/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.styl
new file mode 100644
index 0000000000..5e62f97229
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-invite-members/list-organization-invite-members.styl
@@ -0,0 +1,33 @@
+.list-organization-invite-members
+ *
+ outline none !important
+
+ md-radio-button
+ margin-bottom 0 !important
+
+ .che-list
+ margin-bottom 12px
+ background-color inherit
+
+ .che-list-item-checkbox-main
+ padding-left 0
+
+ .md-button
+ margin 0
+ filter none !important
+
+ .member-item-row
+ min-height 33px
+
+ .che-list-header-content > *, .che-list
+ margin 0
+
+ .che-list-header md-item
+ border-top none
+
+.list-organization-invite-members .permission-switcher
+ overflow visible
+ margin 0
+
+.list-organization-invite-members-spacing
+ margin-bottom 20px
diff --git a/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.controller.ts b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.controller.ts
new file mode 100644
index 0000000000..dd6651110b
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-member-dialog/organization-member-dialog.controller.ts
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc controller
+ * @name organization.details.member:MemberDialogController
+ * @description This class is handling the controller for adding/editing organization member dialog.
+ * @author Oleksii Orel
+ */
+export class OrganizationMemberDialogController {
+ /**
+ * User API interaction.
+ */
+ private cheUser: any;
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: angular.material.IDialogService;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Processing state of adding member.
+ */
+ private isProcessing: boolean;
+ /**
+ * Set of user roles info.
+ */
+ private roles: Array
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{member.email}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ null if add new member is needed. (Comes from outside)
+ */
+ private member: che.IMember;
+ /**
+ * Role to be used, may be null if role is needed to be set. (Comes from outside)
+ */
+ private role: string;
+ /**
+ * Choosen role for user.
+ */
+ private newRole: string;
+ /**
+ * Dialog window title.
+ */
+ private title: string;
+ /**
+ * Title of operation button (Save or Add)
+ */
+ private buttonTitle: string;
+ /**
+ * Email validation error message.
+ */
+ private emailError: string;
+ /**
+ * todo
+ */
+ private organizationRoles: che.resource.ICheOrganizationRoles;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $mdDialog: angular.material.IDialogService, cheUser: any, cheOrganization: che.api.ICheOrganization, lodash: any, resourcesService: che.service.IResourcesService) {
+ this.$mdDialog = $mdDialog;
+ this.cheUser = cheUser;
+ this.cheOrganization = cheOrganization;
+ this.$q = $q;
+ this.lodash = lodash;
+ this.organizationRoles = resourcesService.getOrganizationRoles();
+
+ this.isProcessing = false;
+
+ this.emails = [];
+ this.members.forEach((member: che.IMember) => {
+ this.emails.push(member.email);
+ });
+
+ // role is set, need to add only user with this role:
+ if (this.role) {
+ this.email = '';
+ this.title = 'Add new ' + this.organizationRoles[this.role].title.toLowerCase();
+ this.buttonTitle = 'Add';
+ return;
+ }
+
+ this.roles = this.organizationRoles.getRoles();
+ if (this.member) {
+ this.title = 'Edit ' + this.member.name + ' roles';
+ this.buttonTitle = 'Save';
+ this.email = this.member.email;
+ let roles = cheOrganization.getRolesFromActions(this.member.permissions.actions);
+ this.newRole = (roles && roles.length > 0) ? roles[0].name : this.organizationRoles.MEMBER.name;
+ } else {
+ this.email = '';
+ this.title = 'Invite member to collaborate';
+ this.buttonTitle = 'Add';
+ this.newRole = this.organizationRoles.MEMBER.name;
+ }
+ }
+
+ /**
+ * Returns title of specified role.
+ *
+ * @param {string} roleName
+ * @returns {string}
+ */
+ getRoleTitle(roleName: string): string {
+ return this.organizationRoles[roleName].title;
+ }
+
+ /**
+ * Returns description of specified role.
+ *
+ * @param {string} roleName
+ * @returns {string}
+ */
+ getRoleDescription(roleName: string): string {
+ return this.organizationRoles[roleName].description;
+ }
+
+ /**
+ * Hides the add member dialog.
+ */
+ hide(): void {
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Checks whether entered email valid and is unique.
+ *
+ * @param value value with email(s) to check
+ * @returns {boolean} true if pointed email(s) are valid and not in the list yet
+ */
+ isValidEmail(value: string): boolean {
+ let emails = value.replace(/\s*,?\s+/g, ',').split(',');
+ for (let i = 0; i < emails.length; i++) {
+ // email is valid
+ let email = emails[i];
+ let emailRe = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
+ if (!emailRe.test(email)) {
+ this.emailError = `"${email}" is invalid email address.`;
+ return false;
+ }
+
+ // user has not been invited yet
+ if (this.emails.indexOf(email) >= 0) {
+ this.emailError = `User with email ${email} is already invited.`;
+ return false;
+ }
+
+ // user is a member of parent organization
+ if (this.parentOrganizationId && this.parentOrganizationMembers.indexOf(email) === -1) {
+ this.emailError = 'User with this email is not a member of parent organization.';
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Adds new member.
+ */
+ addMembers(): void {
+ let userRoleName = this.role ? this.role : this.newRole;
+ let emails = this.email.replace(/\s*,?\s+/g, ',').split(',');
+ // form the list of emails without duplicates and empty values:
+ let resultEmails = emails.reduce((array: Array
+
+
+
+
+
+
+
+
+
+
+{{organizationMemberDialogController.emailError}}
+
+
+
+
+
+ {{organizationMemberDialogController.getRoleTitle(roleName)}}
+ ({{organizationMemberDialogController.getRoleDescription(roleName)}})
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No members found.
+
+ There are no members.
+
+Organization {{organizationName}} not found.
+
+
+ The organization could be deleted by its owner or you do not have permissions to access the organization.
+
+
+
+
+
+
+
+
+ Name
+ {{member.fullName}}
+
+
+ Email
+ {{member.email}}
+
+ true if all users in list are checked.
+ * @returns {boolean}
+ */
+ isAllUsersSelected(): boolean {
+ return this.isAllSelected;
+ }
+
+ /**
+ * Returns true if all users in list are not checked.
+ * @returns {boolean}
+ */
+ isNoUsersSelected(): boolean {
+ return this.isNoSelected;
+ }
+
+ /**
+ * Make all users in list selected.
+ */
+ selectAllUsers(): void {
+ this.availableUsers.forEach((user: IOrganizationMember) => {
+ this.userSelectedStatus[user.id] = true;
+ });
+ }
+
+ /**
+ * Make all users in list deselected.
+ */
+ deselectAllUsers(): void {
+ this.availableUsers.forEach((user: IOrganizationMember) => {
+ this.userSelectedStatus[user.id] = false;
+ });
+ }
+
+ /**
+ * Change bulk selection value.
+ */
+ changeBulkSelection(): void {
+ if (this.isBulkChecked) {
+ this.deselectAllUsers();
+ this.isBulkChecked = false;
+ } else {
+ this.selectAllUsers();
+ this.isBulkChecked = true;
+ }
+ this.updateSelectedStatus();
+ }
+
+ /**
+ * Set selected status for user.
+ *
+ * @param {string} id user ID
+ * @param {boolean} isSelected
+ */
+ setSelectedStatus(id: string, isSelected: boolean) {
+ this.userSelectedStatus[id] = isSelected;
+ this.updateSelectedStatus();
+ }
+
+ /**
+ * Update members selected status.
+ */
+ updateSelectedStatus(): void {
+ this.isNoSelected = true;
+ this.isAllSelected = true;
+
+ Object.keys(this.userSelectedStatus).forEach((key: string) => {
+ if (this.userSelectedStatus[key]) {
+ this.isNoSelected = false;
+ } else {
+ this.isAllSelected = false;
+ }
+ });
+
+ if (this.isNoSelected) {
+ this.isBulkChecked = false;
+ return;
+ }
+
+ this.isBulkChecked = (this.isAllSelected && Object.keys(this.userSelectedStatus).length === this.availableUsers.length);
+ }
+}
+
diff --git a/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.html b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.html
new file mode 100644
index 0000000000..ffc78fd65d
--- /dev/null
+++ b/dashboard/src/app/organizations/organization-details/organization-select-members-dialog/organization-select-members-dialog.html
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true if allowed
+ */
+ isUserAllowedTo(action: string, organizationId: string): boolean {
+ if (!organizationId || !action) {
+ return false;
+ }
+ let permissions = this.chePermissions.getOrganizationPermissions(organizationId);
+ if (!permissions) {
+ this.fetchPermissions(organizationId);
+ return false;
+ }
+ return !angular.isUndefined(permissions.find((permission: che.IPermissions) => {
+ return permission.userId === this.userId && permission.actions.indexOf(action.toString()) !== -1;
+ }));
+ }
+}
diff --git a/dashboard/src/app/organizations/organizations.controller.ts b/dashboard/src/app/organizations/organizations.controller.ts
new file mode 100644
index 0000000000..5d37710d5a
--- /dev/null
+++ b/dashboard/src/app/organizations/organizations.controller.ts
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+const MAX_ITEMS = 12;
+
+/**
+ * @ngdoc controller
+ * @name organizations.controller:OrganizationsController
+ * @description This class is handling the controller for organizations
+ * @author Oleksii Orel
+ */
+export class OrganizationsController {
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Organization API interaction.
+ */
+ private cheOrganization: che.api.ICheOrganization;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Loading state of the page.
+ */
+ private isInfoLoading: boolean;
+ /**
+ * List of organizations.
+ */
+ private organizations: Array
+
+
+
+
+
+ The name can contain alphanumeric characters or single '-' inside.
+
+ The name has to be more than 1 character long.
+ The name has to be less than 20 characters long.
+ This team name is already used.
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dashboard/src/app/teams/invite-members/list-members.styl b/dashboard/src/app/teams/invite-members/list-members.styl
new file mode 100644
index 0000000000..4f69edf2ae
--- /dev/null
+++ b/dashboard/src/app/teams/invite-members/list-members.styl
@@ -0,0 +1,30 @@
+.list-members
+ *
+ outline none !important
+
+ .che-list
+ margin-bottom 12px
+ background-color inherit
+
+ .che-list-item-checkbox-main
+ padding-left 0
+
+ .md-button
+ margin 0
+ filter none !important
+
+ .member-item-row
+ min-height 33px
+
+ .che-list-header-content > *, .che-list
+ margin 0
+
+ .che-list-header md-item
+ border-top none
+
+.list-members .permission-switcher
+ overflow visible
+ margin 0px
+
+.list-members-spacing
+ margin-bottom 20px
diff --git a/dashboard/src/app/teams/list/list-teams.controller.ts b/dashboard/src/app/teams/list/list-teams.controller.ts
new file mode 100644
index 0000000000..5193db8c6d
--- /dev/null
+++ b/dashboard/src/app/teams/list/list-teams.controller.ts
@@ -0,0 +1,357 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc controller
+ * @name list.teams:ListTeamsController
+ * @description This class is handling the controller for the list of teams
+ * @author Ann Shumilova
+ */
+export class ListTeamsController {
+
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Team resources API interaction.
+ */
+ private cheResourcesDistribution: che.api.ICheResourcesDistribution;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: any;
+ /**
+ * Service for displaying dialogs.
+ */
+ private confirmDialogService: any;
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Location service.
+ */
+ private $location: ng.ILocationService;
+ /**
+ * List of teams.
+ */
+ private teams: Array
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{member.email}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true if all teams in list are checked.
+ *
+ * @returns {boolean}
+ */
+ isAllTeamsSelected(): boolean {
+ return this.isAllSelected;
+ }
+
+ /**
+ * Returns true if all teams in list are not checked.
+ *
+ * @returns {boolean}
+ */
+ isNoTeamsSelected(): boolean {
+ return this.isNoSelected;
+ }
+
+ /**
+ * Make all teams in list selected.
+ */
+ selectAllTeams(): void {
+ this.teams.forEach((team: any) => {
+ this.teamsSelectedStatus[team.id] = true;
+ });
+ }
+
+ /**
+ * Make all teams in list deselected.
+ */
+ deselectAllTeams(): void {
+ this.teams.forEach((team: any) => {
+ this.teamsSelectedStatus[team.id] = false;
+ });
+ }
+
+ /**
+ * Change bulk selection value.
+ */
+ changeBulkSelection(): void {
+ if (this.isBulkChecked) {
+ this.deselectAllTeams();
+ this.isBulkChecked = false;
+ } else {
+ this.selectAllTeams();
+ this.isBulkChecked = true;
+ }
+ this.updateSelectedStatus();
+ }
+
+ /**
+ * Update teams selected status.
+ */
+ updateSelectedStatus(): void {
+ this.isNoSelected = true;
+ this.isAllSelected = true;
+
+ Object.keys(this.teamsSelectedStatus).forEach((key: string) => {
+ if (this.teamsSelectedStatus[key]) {
+ this.isNoSelected = false;
+ } else {
+ this.isAllSelected = false;
+ }
+ });
+
+ if (this.isNoSelected) {
+ this.isBulkChecked = false;
+ return;
+ }
+
+ if (this.isAllSelected) {
+ this.isBulkChecked = true;
+ }
+ }
+
+ /**
+ * Redirects to new team creation page.
+ */
+ createNewTeam(): void {
+ this.$location.path('/team/create');
+ }
+
+ /**
+ * Delete all selected teams.
+ */
+ removeTeams(): void {
+ let teamsSelectedStatusKeys = Object.keys(this.teamsSelectedStatus);
+ let checkedTeamsKeys = [];
+
+ if (!teamsSelectedStatusKeys.length) {
+ this.cheNotification.showError('No such team.');
+ return;
+ }
+
+ teamsSelectedStatusKeys.forEach((key: any) => {
+ if (this.teamsSelectedStatus[key] === true) {
+ checkedTeamsKeys.push(key);
+ }
+ });
+
+ if (!checkedTeamsKeys.length) {
+ this.cheNotification.showError('No such team.');
+ return;
+ }
+
+ let confirmationPromise = this.showDeleteTeamsConfirmation(checkedTeamsKeys.length);
+ confirmationPromise.then(() => {
+ this.isLoading = true;
+ let promises = [];
+
+ checkedTeamsKeys.forEach((teamId: string) => {
+ this.teamsSelectedStatus[teamId] = false;
+
+ let promise = this.cheTeam.deleteTeam(teamId).then(() => {
+ //
+ }, (error: any) => {
+ this.cheNotification.showError(error && error.data && error.data.message ? error.data.message : 'Failed to delete team ' + teamId + '.');
+ });
+
+ promises.push(promise);
+ });
+
+ this.$q.all(promises).finally(() => {
+ this.fetchTeams();
+ this.updateSelectedStatus();
+ });
+ });
+ }
+
+ /**
+ * Show confirmation popup before teams deletion.
+ *
+ * @param numberToDelete number of teams to be deleted
+ * @returns {*}
+ */
+ showDeleteTeamsConfirmation(numberToDelete: number): ng.IPromise
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Name
+ {{teamItemController.getTeamDisplayName(teamItemController.team)}}
+
+
+ Members
+ {{teamItemController.members}}
+
+
+ RAM Cap
+ {{teamItemController.ramCap ? teamItemController.ramCap + 'GB' : 'not set'}}
+
+
+ Actions
+
+
+
+
+
+
+ null if add new member is needed. (Comes from outside)
+ */
+ private member: any;
+ /**
+ * Role to be used, may be null if role is needed to be set. (Comes from outside)
+ */
+ private role: any;
+ /**
+ * Choosen role for user.
+ */
+ private newRole: any;
+ /**
+ * Dialog window title.
+ */
+ private title: string;
+ /**
+ * Title of operation button (Save or Add)
+ */
+ private buttonTitle: string;
+ /**
+ * Email validation error message.
+ */
+ private emailError: string;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($mdDialog: angular.material.IDialogService, cheTeam: che.api.ICheTeam, cheUser: any, $q: ng.IQService, lodash: any) {
+ this.$mdDialog = $mdDialog;
+ this.cheTeam = cheTeam;
+ this.cheUser = cheUser;
+ this.$q = $q;
+ this.lodash = lodash;
+
+ this.isProcessing = false;
+
+ this.emails = [];
+ this.members.forEach((member: any) => {
+ this.emails.push(member.email);
+ });
+
+ // role is set, need to add only user with this role:
+ if (this.role) {
+ this.email = '';
+ this.title = 'Add new ' + this.role.title.toLowerCase();
+ this.buttonTitle = 'Add';
+ return;
+ }
+
+ this.roles = CheTeamRoles.getValues();
+ if (this.member) {
+ this.title = 'Edit ' + this.member.name + ' roles';
+ this.buttonTitle = 'Save';
+ this.email = this.member.email;
+ let roles = this.cheTeam.getRolesFromActions(this.member.permissions.actions);
+ this.newRole = (roles && roles.length > 0) ? angular.toJson(roles[0]) : angular.toJson(CheTeamRoles.TEAM_MEMBER);
+ } else {
+ this.email = '';
+ this.title = 'Invite member to collaborate';
+ this.buttonTitle = 'Add';
+ this.newRole = angular.toJson(CheTeamRoles.TEAM_MEMBER);
+ }
+ }
+
+ /**
+ * Hides the add member dialog.
+ */
+ hide(): void {
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Checks whether entered email valid and is unique.
+ *
+ * @param value value with email(s) to check
+ * @returns {boolean} true if pointed email(s) are valid and not in the list yet
+ */
+ isValidEmail(value: string): boolean {
+ // return this.emails.indexOf(email) < 0;
+ let emails = value.replace(/ /g, ',').split(',');
+ for (let i = 0; i < emails.length; i++) {
+ let email = emails[i];
+ let emailRe = /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i;
+ if (!emailRe.test(email)) {
+ this.emailError = email + ' is invalid email address.';
+ return false;
+ }
+
+ if (this.emails.indexOf(email) >= 0) {
+ this.emailError = 'User with email ' + email + ' is already invited.';
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Adds new member.
+ */
+ addMembers(): void {
+ let userRoles = this.role ? [this.role] : [angular.fromJson(this.newRole)];
+
+
+ let emails = this.email.replace(/ /g, ',').split(',');
+ // form the list of emails without duplicates and empty values:
+ let resultEmails = emails.reduce((array: Array
+
+
+
+
+
+
+
+
+
+
+{{memberDialogController.emailError}}
+
+
+
+
+
+ {{roleInfo.title}}
+ ({{roleInfo.description}})
+
+
+
+ true if allowed
+ */
+ isUserAllowedTo(value: string): boolean {
+ return this.allowedUserActions ? this.allowedUserActions.indexOf(value) >= 0 : false;
+ }
+
+ /**
+ * Returns whether current user can change team resource limits.
+ *
+ * @returns {boolean} true if can change resource limits
+ */
+ canChangeResourceLimits(): boolean {
+ return (this.cheTeam.getPersonalAccount() && this.team) ? this.cheTeam.getPersonalAccount().id === this.team.parent : false;
+ }
+
+ /**
+ * Returns whether current user can leave team (owner of the team is not allowed to leave it).
+ *
+ * @returns {boolean} true if can leave team
+ */
+ canLeaveTeam(): boolean {
+ return (this.cheTeam.getPersonalAccount() && this.team) ? this.cheTeam.getPersonalAccount().id !== this.team.parent : false;
+ }
+
+ /**
+ * Fetches defined team's limits (workspace, runtime, RAM caps, etc).
+ */
+ fetchLimits(): void {
+ this.isLoading = true;
+ this.cheResourcesDistribution.fetchOrganizationResources(this.team.id).then(() => {
+ this.isLoading = false;
+ this.processResources();
+ }, (error: any) => {
+ this.isLoading = false;
+ if (!error) {
+ return;
+ }
+ if (error.status === 304) {
+ this.processResources();
+ } else if (error.status === 404) {
+ this.limits = {};
+ this.limitsCopy = angular.copy(this.limits);
+ }
+ });
+ }
+
+ /**
+ * Process resources limits.
+ */
+ processResources(): void {
+ let ramLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.team.id, this.resourceLimits.RAM);
+ let workspaceLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.team.id, this.resourceLimits.WORKSPACE);
+ let runtimeLimit = this.cheResourcesDistribution.getOrganizationResourceByType(this.team.id, this.resourceLimits.RUNTIME);
+
+ this.limits = {};
+ this.limits.workspaceCap = workspaceLimit ? workspaceLimit.amount : undefined;
+ this.limits.runtimeCap = runtimeLimit ? runtimeLimit.amount : undefined;
+ this.limits.ramCap = ramLimit ? ramLimit.amount / 1024 : undefined;
+ this.limitsCopy = angular.copy(this.limits);
+ }
+
+ /**
+ * Confirms and performs team's deletion.
+ *
+ * @param event
+ */
+ deleteTeam(event: MouseEvent): void {
+ let promise = this.confirmDialogService.showConfirmDialog('Delete team',
+ 'Would you like to delete team \'' + this.team.name + '\'?', 'Delete');
+
+ promise.then(() => {
+ let promise = this.cheTeam.deleteTeam(this.team.id);
+ promise.then(() => {
+ this.$location.path('/');
+ this.cheTeam.fetchTeams();
+ }, (error: any) => {
+ this.cheNotification.showError(error.data.message !== null ? error.data.message : 'Team deletion failed.');
+ });
+ });
+ }
+
+ /**
+ * Confirms and performs removing user from current team.
+ *
+ */
+ leaveTeam(): void {
+ let promise = this.confirmDialogService.showConfirmDialog('Leave team',
+ 'Would you like to leave team \'' + this.team.name + '\'?', 'Leave');
+
+ promise.then(() => {
+ let promise = this.chePermissions.removeOrganizationPermissions(this.team.id, this.cheUser.getUser().id);
+ promise.then(() => {
+ this.$location.path('/');
+ this.cheTeam.fetchTeams();
+ }, (error: any) => {
+ this.cheNotification.showError(error.data.message !== null ? error.data.message : 'Leave team failed.');
+ });
+ });
+ }
+
+ /**
+ * Update team's details.
+ *
+ */
+ updateTeamName(): void {
+ if (this.newName && this.team && this.newName !== this.team.name) {
+ this.team.name = this.newName;
+ this.cheTeam.updateTeam(this.team).then((team: any) => {
+ this.cheTeam.fetchTeams().then(() => {
+ this.$location.path('/team/' + team.qualifiedName);
+ });
+ }, (error: any) => {
+ this.cheNotification.showError((error.data && error.data.message !== null) ? error.data.message : 'Rename team failed.');
+ });
+ }
+ }
+
+ /**
+ * Update resource limits.
+ *
+ */
+ updateLimits(): void {
+ if (!this.team || !this.limits || angular.equals(this.limits, this.limitsCopy)) {
+ return;
+ }
+
+ let resources = angular.copy(this.cheResourcesDistribution.getOrganizationResources(this.team.id));
+
+ let resourcesToRemove = [this.resourceLimits.TIMEOUT];
+
+ if (this.limits.ramCap !== null && this.limits.ramCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RAM, (this.limits.ramCap * 1024).toString());
+ } else {
+ resourcesToRemove.push(this.resourceLimits.RAM);
+ }
+
+ if (this.limits.workspaceCap !== null && this.limits.workspaceCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.WORKSPACE, this.limits.workspaceCap);
+ } else {
+ resourcesToRemove.push(this.resourceLimits.WORKSPACE);
+ }
+
+ if (this.limits.runtimeCap !== null && this.limits.runtimeCap !== undefined) {
+ resources = this.cheResourcesDistribution.setOrganizationResourceLimitByType(resources, this.resourceLimits.RUNTIME, this.limits.runtimeCap);
+ } else {
+ resourcesToRemove.push(this.resourceLimits.RUNTIME);
+ }
+
+ // if the timeout resource will be send in this case - it will set the timeout for the current team, and the updating timeout of
+ // parent team will not affect the current team, so to avoid this - remove timeout resource if present:
+ this.lodash.remove(resources, (resource: any) => {
+ return resourcesToRemove.indexOf(resource.type) >= 0;
+ });
+
+
+ this.isLoading = true;
+ this.cheResourcesDistribution.distributeResources(this.team.id, resources).then(() => {
+ this.fetchLimits();
+ }, (error: any) => {
+ let errorMessage = 'Failed to set update team CAPs.';
+ this.cheNotification.showError((error.data && error.data.message !== null) ? errorMessage + 'Reason: ' + error.data.message : errorMessage);
+ this.fetchLimits();
+ });
+ }
+
+ /**
+ * Returns whether save button is disabled.
+ *
+ * @return {boolean}
+ */
+ isSaveButtonDisabled(): boolean {
+ return this.teamForm && this.teamForm.$invalid;
+ }
+
+ /**
+ * Returns true if "Save" button should be visible
+ *
+ * @return {boolean}
+ */
+ isSaveButtonVisible(): boolean {
+ return (this.selectedTabIndex === Tab.Settings && !this.isLoading) && (!angular.equals(this.team.name, this.newName) ||
+ !angular.equals(this.limits, this.limitsCopy));
+ }
+
+ updateTeam(): void {
+ this.updateTeamName();
+ this.updateLimits();
+ }
+
+ cancelChanges(): void {
+ this.newName = angular.copy(this.team.name);
+ this.limits = angular.copy(this.limitsCopy);
+ }
+}
diff --git a/dashboard/src/app/teams/team-details/team-details.html b/dashboard/src/app/teams/team-details/team-details.html
new file mode 100644
index 0000000000..cb12dd07a3
--- /dev/null
+++ b/dashboard/src/app/teams/team-details/team-details.html
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ The name can contain alphanumeric characters or single '-' inside.
+ The name has to be less than 20 characters long.
+ This team name is already used.
+ A workspace cap should be greater than 0.
+ A running workspace cap should be greater than 0.
+ A workspace RAM cap should be greater than 0.
+ Team {{teamDetailsController.teamName}} not found.
+
+
+ The team could be deleted by its owner or you do not have permissions to access the team.
+
+
+Access to team {{teamDetailsController.teamName}} denied.
+
+
+ You do not have permissions to access the team.
+
+
+true need to refresh members
+ * @param fetchInvitations if true need to refresh invitations
+ * @return {IPromisetrue if specified member is team owner.
+ *
+ * @param {che.IMember> member a team member
+ * @return {boolean}
+ */
+ memberIsOwner(member: che.IMember): boolean {
+ return member.userId === this.owner.id;
+ }
+
+ /**
+ * Fetches the list of team members.
+ *
+ * @return {IPromise
+
+
+
+
+
+
+
+
+
+
+
+ No members found.
+
+ There are no members.
+
+
+
+
+
+
+
+
+
+
+
+ No workspaces found.
+
+ There are no workspaces.
+
+
- ![]()
+ ![]()
diff --git a/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.controller.ts b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.controller.ts
new file mode 100644
index 0000000000..62b74e64c6
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.controller.ts
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {ShareWorkspaceController} from '../share-workspace.controller';
+
+/**
+ * This class is handling the controller for sharing a private workspace with developers.
+ * @author Oleksii Kurinnyi
+ */
+export class AddDeveloperController {
+ /**
+ * Promises service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: ng.material.IDialogService;
+ /**
+ * true if user owns the workspace.
+ */
+ private canShare: boolean;
+ /**
+ * List of users to share the workspace.
+ */
+ private existingUsers: string[];
+ /**
+ * Parent controller.
+ */
+ private callbackController: ShareWorkspaceController;
+
+ /**
+ * Default constructor.
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $mdDialog: ng.material.IDialogService) {
+ this.$q = $q;
+ this.$mdDialog = $mdDialog;
+ }
+
+ /**
+ * Callback of the cancel button of the dialog.
+ */
+ abort() {
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Callback of the share button of the dialog.
+ */
+ shareWorkspace() {
+ let users = [];
+ this.existingUsers.forEach((userId: string) => {
+ users.push({userId: userId, isTeamAdmin: false});
+ });
+
+ let permissionPromises = this.callbackController.shareWorkspace(users);
+
+ this.$q.all(permissionPromises).then(() => {
+ this.$mdDialog.hide();
+ });
+ }
+}
diff --git a/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.html b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.html
new file mode 100644
index 0000000000..a625626e0f
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.html
@@ -0,0 +1,39 @@
+
+
+
+
diff --git a/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.styl b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.styl
new file mode 100644
index 0000000000..eed6efe2f6
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-developers/add-developers.styl
@@ -0,0 +1,62 @@
+.add-workspace-developers
+ margin-top 5px
+ width 520px
+
+ .form-input-fields
+ margin 5px 0 5px
+ min-height 55px
+
+ .message-panel
+ margin 20px 0
+
+ .buttons-panel
+ margin-left 5px
+
+.user-exists-checked
+ color $che-green-color
+ float left
+ margin-right 3px
+
+.user-not-found
+ color $error-color
+
+.share-user-input
+ .md-chips
+ padding-left 0
+
+ .md-chips:not(.md-focused)
+ box-shadow 0 1px $default-border-color !important
+
+ .md-chips.md-focused
+ box-shadow 0 1px $primary-color !important
+
+ .md-chips .md-chip
+ margin 0
+ height 18px
+ font-size 13px
+ line-height 18px
+ margin-right 5px
+ border-radius 4px
+
+ .md-chips .md-chip.md-focused
+ background-color alpha($che-medium-blue-color, 0.8)
+
+ .md-chips .md-chip .md-chip-remove-container, .md-chips .md-chip .md-chip-remove
+ line-height 18px
+ height 18px
+
+ .md-chips .md-chip .md-chip-remove md-icon
+ width 12px
+ height 12px
+
+ .md-chips .md-chip-input-container
+ line-height 18px
+ height 18px
+ padding 0
+ margin 0
+
+ input
+ font-size 13px
+ line-height 18px
+ height 18px
+ min-width 420px
diff --git a/dashboard/src/app/workspaces/share-workspace/add-members/add-members.controller.ts b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.controller.ts
new file mode 100644
index 0000000000..6445e61788
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.controller.ts
@@ -0,0 +1,267 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheProfile} from '../../../../components/api/che-profile.factory';
+
+/**
+ * This class is handling the controller for the add members popup
+ * @author Oleksii Orel
+ * @author Ann Shumilova
+ */
+export class AddMemberController {
+
+ private $mdDialog: angular.material.IDialogService;
+ private $q: ng.IQService;
+ private lodash: any;
+ private chePermissions: che.api.IChePermissions;
+ private cheProfile: CheProfile;
+ /**
+ * Workspace namespace (is set from outside).
+ */
+ private namespace: string;
+ /**
+ * Callback handler (is set from outside).
+ */
+ private callbackController: any;
+ /**
+ * The list of users, that already have permissions in the workspace (is set from outside).
+ */
+ private users: Array;
+ private team: any;
+ private isLoading: boolean;
+ private members: Array;
+
+ /**
+ * Selected status of members in list.
+ */
+ private membersSelectedStatus: any;
+ /**
+ * Bulk operation state.
+ */
+ private isBulkChecked: boolean;
+ /**
+ * No selected members state.
+ */
+ private isNoSelected: boolean;
+ /**
+ * All selected members state.
+ */
+ private isAllSelected: boolean;
+
+ private cheTeam: che.api.ICheTeam;
+
+ /**
+ * Default constructor.
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $mdDialog: angular.material.IDialogService, lodash: any, cheTeam: che.api.ICheTeam,
+ chePermissions: che.api.IChePermissions, cheProfile: CheProfile) {
+ this.$q = $q;
+ this.$mdDialog = $mdDialog;
+ this.lodash = lodash;
+ this.cheTeam = cheTeam;
+
+ this.chePermissions = chePermissions;
+ this.cheProfile = cheProfile;
+
+ this.team = cheTeam.getTeamByName(this.namespace);
+ this.membersSelectedStatus = {};
+ this.isBulkChecked = false;
+ this.isNoSelected = true;
+ this.isAllSelected = true;
+
+ if (this.team) {
+ this.fetchTeamMembers();
+ }
+ }
+
+ fetchTeamMembers(): void {
+ this.isLoading = true;
+ this.chePermissions.fetchOrganizationPermissions(this.team.id).then(() => {
+ this.formMemberList();
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.formMemberList();
+ } else {
+ this.isLoading = false;
+ }
+ });
+ }
+
+ /**
+ * Combines permissions and users data in one list.
+ */
+ formMemberList(): void {
+ let permissions = this.chePermissions.getOrganizationPermissions(this.team.id);
+ let existingMembers = this.lodash.pluck(this.users, 'id');
+ this.members = [];
+ let promises = [];
+
+ for (let i = 0; i < permissions.length; i++) {
+ let permission = permissions[i];
+ let userId = permission.userId;
+ if (existingMembers.indexOf(userId) >= 0) {
+ continue;
+ }
+
+ let user = this.cheProfile.getProfileById(userId);
+
+ if (user) {
+ this.formUserItem(user, permission);
+ } else {
+ let promise = this.cheProfile.fetchProfileById(userId).then(() => {
+ this.formUserItem(this.cheProfile.getProfileById(userId), permission);
+ });
+ promises.push(promise);
+ }
+ }
+
+ this.$q.all(promises).finally(() => {
+ this.isLoading = false;
+ });
+ }
+
+ /**
+ * Forms item to display with permissions and user data.
+ *
+ * @param user user data
+ * @param permissions permissions data
+ */
+ formUserItem(user: any, permissions: any): void {
+ user.name = this.cheProfile.getFullName(user.attributes);
+ let userItem = angular.copy(user);
+ userItem.permissions = permissions;
+ this.members.push(userItem);
+ }
+
+
+ /**
+ * Callback of the cancel button of the dialog.
+ */
+ abort() {
+ this.$mdDialog.hide();
+ }
+
+ /**
+ * Callback of the share button of the dialog.
+ */
+ shareWorkspace() {
+ let checkedUsers = [];
+
+ Object.keys(this.membersSelectedStatus).forEach((key: string) => {
+ if (this.membersSelectedStatus[key] === true) {
+ checkedUsers.push({userId: key, isTeamAdmin: this.isTeamAdmin(key)});
+ }
+ });
+
+ let permissionPromises = this.callbackController.shareWorkspace(checkedUsers);
+
+ this.$q.all(permissionPromises).then(() => {
+ this.$mdDialog.hide();
+ });
+ }
+
+ /**
+ * Returns true if user is team administrator.
+ *
+ * @param {string} userId user ID
+ * @return {boolean}
+ */
+ isTeamAdmin(userId: string): boolean {
+ let member = this.members.find((_member: any) => {
+ return _member.userId === userId;
+ });
+
+ if (!member || !member.permissions) {
+ return false;
+ }
+
+ let roles = this.cheTeam.getRolesFromActions(member.permissions.actions);
+ if (!roles || roles.length === 0) {
+ return false;
+ }
+
+ return roles.some((role: any) => {
+ return /admin/i.test(role.title);
+ });
+ }
+
+ /**
+ * Return
+
diff --git a/dashboard/src/app/workspaces/share-workspace/add-members/add-members.styl b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.styl
new file mode 100644
index 0000000000..3fd9614126
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.styl
@@ -0,0 +1,43 @@
+.add-workspace-members
+ margin-top 5px
+ width 520px
+
+ .form-input-fields
+ margin 5px 0 5px
+ min-height 55px
+
+ .members-list
+ min-height 100px
+ max-height 300px
+ overflow-y auto
+
+ .buttons-panel
+ margin-top 20px
+
+ .message-panel
+ padding-top 20px
+
+ .che-list
+ margin 0
+
+ .che-list-header-content *
+ margin 0
+
+ .che-list-header md-item
+ border-top none
+
+ .che-list-header-additional
+ display none
+
+.add-workspace-members che-button-primary,
+.add-workspace-members che-button-notice
+ margin-left 5px
+
+.user-exists-checked
+ color $che-green-color
+ float left
+ margin-right 3px
+
+.user-not-found
+ color $error-color
+
diff --git a/dashboard/src/app/workspaces/share-workspace/share-workspace.controller.ts b/dashboard/src/app/workspaces/share-workspace/share-workspace.controller.ts
new file mode 100644
index 0000000000..8ba21476d6
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/share-workspace.controller.ts
@@ -0,0 +1,515 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheUser} from '../../../components/api/che-user.factory';
+import {CheWorkspace} from '../../../components/api/workspace/che-workspace.factory';
+import {CheNotification} from '../../../components/notification/che-notification.factory';
+import {ConfirmDialogService} from '../../../components/service/confirm-dialog/confirm-dialog.service';
+
+interface ISharedWorkspaceUser extends che.IUser {
+ permissions: any;
+}
+
+/**
+ * Controller for workspace sharing with other users.
+ *
+ * @ngdoc controller
+ * @name workspace.details.controller:ShareWorkspaceController
+ * @description This class is handling the controller sharing workspace
+ * @author Ann Shumilova
+ */
+export class ShareWorkspaceController {
+ /**
+ * Workspace API interaction.
+ */
+ private cheWorkspace: any;
+ /**
+ * User API interaction.
+ */
+ private cheUser: CheUser;
+ /**
+ * Permissions API interaction.
+ */
+ private chePermissions: che.api.IChePermissions;
+ /**
+ * Service for displaying notifications.
+ */
+ private cheNotification: CheNotification;
+ /**
+ * Service for displaying dialogs.
+ */
+ private $mdDialog: ng.material.IDialogService;
+ /**
+ * Wrapper for browser's window.document object
+ */
+ private $document: ng.IDocumentService;
+ /**
+ * Angular promise service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Lodash library.
+ */
+ private lodash: any;
+ /**
+ * Confirm dialog service.
+ */
+ private confirmDialogService: ConfirmDialogService;
+ /**
+ * Team API interaction.
+ */
+ private cheTeam: che.api.ICheTeam;
+ /**
+ * Log service.
+ */
+ private $log: ng.ILogService;
+
+ private personalAccount: any;
+ private separators: number[];
+ private users: Array;
+ private emails: string[];
+ private existingUsers: Map;
+ private notExistingUsers: string[];
+ private isLoading: boolean;
+ private actions: string[];
+ private workspaceDomain: string;
+ private namespace: string;
+ private workspaceName: string;
+ private workspace: che.IWorkspace;
+ private userOrderBy: string;
+ private userFilter: {
+ email: string;
+ };
+ private noPermissionsError: boolean;
+ private cheListHelper: che.widget.ICheListHelper;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor(cheWorkspace: CheWorkspace, cheUser: CheUser, chePermissions: che.api.IChePermissions, cheNotification: CheNotification, $mdDialog: ng.material.IDialogService, $document: ng.IDocumentService, $mdConstant: any, $route: ng.route.IRouteService, $q: ng.IQService, lodash: any, confirmDialogService: ConfirmDialogService, cheTeam: che.api.ICheTeam, $log: ng.ILogService, $scope: ng.IScope, cheListHelperFactory: che.widget.ICheListHelperFactory) {
+ 'ngInject';
+
+ this.cheWorkspace = cheWorkspace;
+ this.cheUser = cheUser;
+ this.chePermissions = chePermissions;
+ this.cheNotification = cheNotification;
+ this.$mdDialog = $mdDialog;
+ this.$document = $document;
+ this.$q = $q;
+ this.lodash = lodash;
+ this.confirmDialogService = confirmDialogService;
+ this.cheTeam = cheTeam;
+ this.$log = $log;
+
+ // email values separators:
+ this.separators = [$mdConstant.KEY_CODE.ENTER, $mdConstant.KEY_CODE.COMMA, $mdConstant.KEY_CODE.SPACE];
+ // users that have permissions in current workspace:
+ this.users = [];
+ // entered emails to share workspace with:
+ this.emails = [];
+ // filtered entered emails - users that really are registered
+ this.existingUsers = new Map();
+ // filtered entered emails - users that are not registered
+ this.notExistingUsers = [];
+
+ this.isLoading = false;
+ // temp solution with defined actions, better to provide list of available for user to choose:
+ this.actions = ['read', 'use', 'run', 'configure'];
+ this.workspaceDomain = 'workspace';
+
+ this.namespace = $route.current.params.namespace;
+ this.workspaceName = $route.current.params.workspaceName;
+
+ this.workspace = this.cheWorkspace.getWorkspaceByName(this.namespace, this.workspaceName);
+ if (this.workspace) {
+ this.refreshWorkspacePermissions();
+ } else {
+ this.isLoading = true;
+ let promise = this.cheWorkspace.fetchWorkspaces();
+
+ promise.then(() => {
+ this.isLoading = false;
+ this.workspace = this.cheWorkspace.getWorkspaceByName(this.namespace, this.workspaceName);
+ this.refreshWorkspacePermissions();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to update workspace data.');
+ });
+ }
+
+ this.userOrderBy = 'email';
+ this.userFilter = {email: ''};
+
+ const helperId = 'share-workspace';
+ this.cheListHelper = cheListHelperFactory.getHelper(helperId);
+ $scope.$on('$destroy', () => {
+ cheListHelperFactory.removeHelper(helperId);
+ });
+
+ this.fetchPersonalAccount();
+ }
+
+ /**
+ * Callback when name is changed.
+ *
+ * @param str {string} a string to filter user emails.
+ */
+ onSearchChanged(str: string): void {
+ this.userFilter.email = str;
+ this.cheListHelper.applyFilter('email', this.userFilter);
+ }
+
+
+ /**
+ * Fetches account ID.
+ *
+ * @return {IPromise}
+ */
+ fetchPersonalAccount(): ng.IPromise {
+ return this.cheTeam.fetchTeams().then(() => {
+ this.personalAccount = this.cheTeam.getPersonalAccount();
+ }, (error: any) => {
+ if (error.status === 304) {
+ this.personalAccount = this.cheTeam.getPersonalAccount();
+ }
+ });
+ }
+
+ /**
+ * Refresh the workspace permissions list.
+ */
+ refreshWorkspacePermissions(): void {
+ this.isLoading = true;
+ this.noPermissionsError = true;
+
+ this.chePermissions.fetchWorkspacePermissions(this.workspace.id).then(() => {
+ this.isLoading = false;
+ this.formUserList();
+ }, (error: any) => {
+ this.isLoading = false;
+ if (error.status === 304) {
+ this.formUserList();
+ } else if (error.status === 403) {
+ this.noPermissionsError = false;
+ } else {
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to retrieve workspace permissions.');
+ }
+ });
+ }
+
+ /**
+ * Combines permissions and users data in one list.
+ */
+ formUserList(): void {
+ const permissions = this.chePermissions.getWorkspacePermissions(this.workspace.id);
+ this.users = [];
+
+ const promises: Array> = [];
+
+ permissions.forEach((permission: any) => {
+ const userId = permission.userId;
+ const user = this.cheUser.getUserFromId(userId);
+ if (user) {
+ this.formUserItem(user, permission);
+ } else {
+ const promise = this.cheUser.fetchUserId(userId).then(() => {
+ this.formUserItem(this.cheUser.getUserFromId(userId), permission);
+ });
+ promises.push(promise);
+ }
+ });
+
+ this.$q.all(promises).finally(() => {
+ this.cheListHelper.setList(this.users, 'id');
+ });
+ }
+
+ /**
+ * Forms item to display with permissions and user data.
+ *
+ * @param user user data
+ * @param permissions permissions data
+ */
+ formUserItem(user: any, permissions: any): void {
+ let userItem = angular.copy(user);
+ userItem.permissions = permissions;
+ this.users.push(userItem);
+ }
+
+ shareWorkspace(users: Array<{userId: string, isTeamAdmin: boolean}>): Array> {
+ let permissionPromises = [];
+
+ users.forEach((user: {userId: string, isTeamAdmin: boolean}) => {
+ permissionPromises.push(this.storeWorkspacePermissions(user.userId, user.isTeamAdmin));
+ });
+
+ this.$q.all(permissionPromises).then(() => {
+ this.refreshWorkspacePermissions();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to share workspace.');
+ });
+
+ return permissionPromises;
+ }
+
+ /**
+ * Removes all selected users permissions for current workspace
+ */
+ deleteSelectedWorkspaceMembers(): void {
+ const selectedUsers: Array = this.cheListHelper.getSelectedItems();
+
+ const queueLength = selectedUsers.length;
+ if (!queueLength) {
+ this.cheNotification.showError('No such workspace member.');
+ return;
+ }
+
+ let confirmationPromise = this.showDeleteConfirmation(queueLength);
+ confirmationPromise.then(() => {
+ const numberToDelete = queueLength;
+ const deleteUserPromises = [];
+ let isError = false;
+ let currentUserEmail;
+
+ selectedUsers.forEach((user: ISharedWorkspaceUser) => {
+ currentUserEmail = user.email;
+ this.cheListHelper.itemsSelectionStatus[user.id] = false;
+
+ const promise = this.chePermissions.removeWorkspacePermissions(user.permissions.instanceId, user.id);
+ promise.catch((error: any) => {
+ isError = true;
+ this.$log.error('Cannot delete permissions: ', error);
+ });
+ deleteUserPromises.push(promise);
+ });
+
+ this.$q.all(deleteUserPromises).finally(() => {
+ this.refreshWorkspacePermissions();
+ if (isError) {
+ this.cheNotification.showError('Delete failed.');
+ } else {
+ if (numberToDelete === 1) {
+ this.cheNotification.showInfo(currentUserEmail + 'has been removed.');
+ } else {
+ this.cheNotification.showInfo('Selected numbers have been removed.');
+ }
+ }
+ });
+ });
+ }
+
+ /**
+ * Show confirmation popup before delete
+ * @param numberToDelete {number}
+ * @returns {ng.IPromise}
+ */
+ showDeleteConfirmation(numberToDelete: number): ng.IPromise {
+ let content = 'Would you like to delete ';
+ if (numberToDelete > 1) {
+ content += 'these ' + numberToDelete + ' members?';
+ } else {
+ content += 'this selected member?';
+ }
+
+ return this.confirmDialogService.showConfirmDialog('Remove members', content, 'Delete');
+ }
+
+ /**
+ * Show workspace sharing dialog.
+ *
+ * @param {MouseEvent} $event the event
+ */
+ showShareWorkspaceDialog($event: MouseEvent): void {
+ if (this.isPersonalTeam()) {
+ let canShare = (this.personalAccount.qualifiedName === this.namespace);
+ this.showAddDevelopersDialog($event, canShare);
+ } else {
+ if (this.cheUser.getUser().name === this.namespace) {
+ this.showAddDevelopersDialog($event, true);
+ } else {
+ this.showAddMembersDialog($event);
+ }
+ }
+ }
+
+ /**
+ * Returns true if team is personal.
+ *
+ * @return {boolean}
+ */
+ isPersonalTeam(): boolean {
+ if (!this.personalAccount) {
+ return false;
+ }
+
+ return this.users.some((user: any) => {
+ return user.name === this.namespace;
+ });
+ }
+
+ /**
+ * Add new workspace member to share a personal workspace. Show the dialog
+ * @param {MouseEvent} $event - the $event
+ * @param {boolean} canShare - true if user can share this workspace
+ */
+ showAddDevelopersDialog($event: MouseEvent, canShare: boolean): void {
+ let parentEl = angular.element(this.$document.find('body'));
+
+ this.$mdDialog.show({
+ targetEvent: $event,
+ bindToController: true,
+ clickOutsideToClose: true,
+ controller: 'AddDeveloperController',
+ controllerAs: 'addDeveloperController',
+ locals: {
+ callbackController: this,
+ canShare: canShare,
+ existingUsers: this.existingUsers
+ },
+ parent: parentEl,
+ templateUrl: 'app/workspace/share-workspace/add-developers/add-developers.html'
+ });
+ }
+
+ /**
+ * Add new workspace member. Show the dialog
+ * @param {MouseEvent} $event - the $event
+ */
+ showAddMembersDialog($event: MouseEvent): void {
+ let parentEl = angular.element(this.$document.find('body'));
+
+ this.$mdDialog.show({
+ targetEvent: $event,
+ bindToController: true,
+ clickOutsideToClose: true,
+ controller: 'AddMemberController',
+ controllerAs: 'addMemberController',
+ locals: {
+ callbackController: this,
+ namespace: this.namespace,
+ users: this.users
+ },
+ parent: parentEl,
+ templateUrl: 'app/workspace/share-workspace/add-members/add-members.html'
+ });
+ }
+
+ /**
+ * Returns the list of the not registered users emails as string.
+ *
+ * @returns {string} string with wrong emails coma separated
+ */
+ getNotExistingEmails(): string {
+ return this.notExistingUsers.join(', ');
+ }
+
+ /**
+ * Stores user permissions of the current workspace.
+ *
+ * @param {string} userId user ID
+ * @param {boolean} isTeamAdmin
+ * @returns {ng.IPromise} promise with store permissions request
+ */
+ storeWorkspacePermissions(userId: string, isTeamAdmin: boolean): ng.IPromise {
+
+ let permission: any = {};
+ permission.userId = userId;
+ permission.domainId = this.workspaceDomain;
+ permission.instanceId = this.workspace.id;
+ permission.actions = this.actions;
+ if (isTeamAdmin) {
+ permission.actions.push('setPermissions');
+ }
+
+ return this.chePermissions.storePermissions(permission);
+ }
+
+ /**
+ * Removes user permissions for current workspace
+ *
+ * @param {Object} user user
+ */
+ removePermissions(user: any): void {
+ this.isLoading = true;
+ this.chePermissions.removeWorkspacePermissions(user.permissions.instanceId, user.id).then(() => {
+ this.refreshWorkspacePermissions();
+ }, (error: any) => {
+ this.isLoading = false;
+ this.cheNotification.showError(error.data && error.data.message ? error.data.message : 'Failed to remove user ' + user.email + ' permissions.');
+ });
+ }
+
+ /**
+ * Handle user email adding.
+ *
+ * @param {string} email user's email
+ * @returns {string|null}
+ */
+ handleUserAdding(email: string): string {
+ // prevents mentioning same users twice:
+ if (this.existingUsers.has(email)) {
+ return null;
+ }
+
+ // displays user name instead of email
+ if (this.cheUser.getUserByAlias(email)) {
+ let user = this.cheUser.getUserByAlias(email);
+ this.existingUsers.set(email, user.id);
+ return email;
+ }
+
+ this.cheUser.fetchUserByAlias(email).then(() => {
+ let user = this.cheUser.getUserByAlias(email);
+ this.existingUsers.set(email, user.id);
+ }, (error: any) => {
+ this.notExistingUsers.push(email);
+ });
+
+ return email;
+ }
+
+ /**
+ * Removes removed email from the list of registered users.
+ *
+ * @param {string} email email to remove
+ */
+ onRemoveEmail(email: string): void {
+ this.existingUsers.delete(email);
+
+ this.lodash.remove(this.notExistingUsers, (data: any) => {
+ return email === data;
+ });
+ }
+
+ /**
+ * Returns user's name by email
+ *
+ * @param {string} email user email
+ * @returns {user.name|*} user's name
+ */
+ getUserName(email: string): string {
+ let user = this.cheUser.getUserByAlias(email);
+ return user ? user.name : email;
+ }
+
+ /**
+ * Checks user exists in the system (is reqistered).
+ *
+ * @param {string} email user's email to be checked
+ * @returns {boolean}
+ */
+ isUserExists(email: string): boolean {
+ return (this.cheUser.getUserByAlias(email) !== undefined);
+ }
+
+}
diff --git a/dashboard/src/app/workspaces/share-workspace/share-workspace.directive.ts b/dashboard/src/app/workspaces/share-workspace/share-workspace.directive.ts
new file mode 100644
index 0000000000..39c67517e7
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/share-workspace.directive.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * @ngdoc directive
+ * @name workspaces.details.directive:shareWorkspace
+ * @restrict E
+ * @element
+ *
+ * @description
+ *
+
+
diff --git a/dashboard/src/app/workspaces/share-workspace/share-workspace.styl b/dashboard/src/app/workspaces/share-workspace/share-workspace.styl
new file mode 100644
index 0000000000..c98a6fd130
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/share-workspace.styl
@@ -0,0 +1,18 @@
+.workspace-members-panel
+ min-height 70px
+
+ .che-panel-titlebox
+ margin-bottom 0
+
+.workspace-users-content
+ padding 15px
+
+.workspace-users-list
+ margin 0
+
+.no-permissions-error
+ padding 20px
+ font-size 10pt
+
+.no-permissions-error span
+ margin-right 10px
diff --git a/dashboard/src/app/workspaces/share-workspace/user-item/user-item.controller.ts b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.controller.ts
new file mode 100644
index 0000000000..42f85e50b5
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.controller.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {ShareWorkspaceController} from '../share-workspace.controller';
+
+/**
+ * Controller for a permission user item.
+ *
+ * @author Ann Shumilova
+ */
+export class UserItemController {
+
+ user: { id: string; email: string; permissions: { actions: Array } };
+
+ private confirmDialogService: any;
+ private chePermissions: che.api.IChePermissions;
+ private $mdDialog: ng.material.IDialogService;
+ private callback: ShareWorkspaceController;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor(confirmDialogService: any, chePermissions: che.api.IChePermissions, $mdDialog: ng.material.IDialogService) {
+ this.confirmDialogService = confirmDialogService;
+ this.chePermissions = chePermissions;
+ this.$mdDialog = $mdDialog;
+ }
+
+ /**
+ * Call user permissions removal. Show the dialog.
+ */
+ removeUser(): void {
+ let content = 'Please confirm removal for the member \'' + this.user.email + '\'.';
+ let promise = this.confirmDialogService.showConfirmDialog('Remove the member', content, 'Delete');
+
+ promise.then(() => {
+ // callback is set in scope definition:
+ this.callback.removePermissions(this.user);
+ });
+ }
+
+ /**
+ * Returns string with user actions.
+ *
+ * @returns {string} string format of actions array
+ */
+ getUserActions(): string {
+ // user is set in scope definition:
+ return this.user.permissions.actions.join(', ');
+ }
+}
+
diff --git a/dashboard/src/app/workspaces/share-workspace/user-item/user-item.directive.ts b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.directive.ts
new file mode 100644
index 0000000000..39005de53b
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.directive.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * Defines a directive for user item in permissions list.
+ *
+ * @author Ann Shumilova
+ */
+export class UserItem implements ng.IDirective {
+ restrict = 'E';
+
+ templateUrl = 'app/workspaces/share-workspace/user-item/user-item.html';
+ replace = false;
+
+ controller = 'UserItemController';
+ controllerAs = 'userItemController';
+
+ bindToController = true;
+
+ scope: {
+ [propName: string]: string;
+ };
+
+ /**
+ * Default constructor.
+ */
+ constructor() {
+ // scope values
+ this.scope = {
+ user: '=cheUser',
+ callback: '=callback'
+ };
+ }
+}
diff --git a/dashboard/src/app/workspaces/share-workspace/user-item/user-item.html b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.html
new file mode 100644
index 0000000000..51361558cd
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.html
@@ -0,0 +1,38 @@
+
+
diff --git a/dashboard/src/app/workspaces/share-workspace/user-item/user-item.styl b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.styl
new file mode 100644
index 0000000000..ddbdaafa13
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/user-item/user-item.styl
@@ -0,0 +1,18 @@
+.user-list-row
+ margin 0
+
+ & > div
+ outline none
+
+ .user-email,
+ .user-permissions
+ max-width 100%
+
+ .user-permissions
+ color $label-info-color
+
+ .user-face
+ che-developers-face()
+ height 16px
+ width 16px
+ margin-right 5px
diff --git a/dashboard/src/app/workspaces/workspace-details/workspace-details.html b/dashboard/src/app/workspaces/workspace-details/workspace-details.html
index 00e664266e..d3d4cf100c 100644
--- a/dashboard/src/app/workspaces/workspace-details/workspace-details.html
+++ b/dashboard/src/app/workspaces/workspace-details/workspace-details.html
@@ -130,6 +130,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
- source: {
- origin: '',
- type: '',
- },
- components: [],
- tags: [],
- workspaceConfig: {}
+ this.stack = {} as che.IStack;
+ this.stack.source = {
+ origin: '',
+ type: ''
};
+ this.stack.components = [];
+ this.stack.tags = [];
+ this.stack.workspaceConfig = {} as che.IWorkspaceConfig;
}
/**
* Sets the id of the stack
- * @param id the id to use
+ * @param {string} id the id to use
* @returns {CheStackBuilder}
*/
- withId(id) {
+ withId(id: string): CheStackBuilder {
this.stack.id = id;
return this;
}
/**
* Sets the name of the stack
- * @param name the name to use
+ * @param {string} name the name to use
* @returns {CheStackBuilder}
*/
- withName(name) {
+ withName(name: string): CheStackBuilder {
this.stack.name = name;
return this;
}
/**
* Sets the description of the stack
- * @param description the description to use
+ * @param {string} description the description to use
* @returns {CheStackBuilder}
*/
- withDescription(description) {
+ withDescription(description: string): CheStackBuilder {
this.stack.description = description;
return this;
}
/**
* Sets the tags of the stack
- * @param tags the tags to use
+ * @param {string[]} tags the tags to use
* @returns {CheStackBuilder}
*/
- withTags(tags) {
+ withTags(tags: string[]): CheStackBuilder {
this.stack.tags = tags;
return this;
}
/**
* Sets the components of the stack
- * @param components the components to use
+ * @param {any[]} components the components to use
* @returns {CheStackBuilder}
*/
- withComponents(components) {
+ withComponents(components: any[]): CheStackBuilder {
this.stack.components = components;
return this;
}
/**
* Sets the workspace config of the stack
- * @param workspaceConfig the workspace config to use
+ * @param {che.IWorkspaceConfig} workspaceConfig the workspace config to use
* @returns {CheStackBuilder}
*/
- withWorkspaceConfig(workspaceConfig) {
+ withWorkspaceConfig(workspaceConfig: che.IWorkspaceConfig): CheStackBuilder {
this.stack.workspaceConfig = workspaceConfig;
return this;
}
/**
* Build the stack
- * @returns {CheStackBuilder.stack|*}
+ * @return {che.IStack}
*/
- build() {
+ build(): che.IStack {
return this.stack;
}
diff --git a/dashboard/src/components/api/builder/che-team-builder.ts b/dashboard/src/components/api/builder/che-team-builder.ts
new file mode 100644
index 0000000000..190a22b408
--- /dev/null
+++ b/dashboard/src/components/api/builder/che-team-builder.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+
+/**
+ * This class is providing a builder for Team
+ * @author Oleksii Kurinnyi
+ */
+export class CheTeamBuilder {
+ private team: che.ITeam;
+
+ /**
+ * Default constructor.
+ */
+ constructor() {
+ this.team = {};
+ }
+
+
+ /**
+ * Sets the name of the team
+ * @param name the name to use
+ * @returns {CheTeamBuilder}
+ */
+ withName(name: string) {
+ this.team.name = name;
+ return this;
+ }
+
+ /**
+ * Sets the id of the team
+ * @param id the id to use
+ * @returns {CheTeamBuilder}
+ */
+ withId(id: string) {
+ this.team.id = id;
+ return this;
+ }
+
+ /**
+ * Build the team
+ * @return {CheTeamBuilder}
+ */
+ build() {
+ return this.team;
+ }
+
+}
diff --git a/dashboard/src/components/api/builder/che-user-builder.ts b/dashboard/src/components/api/builder/che-user-builder.ts
index 9a0c2f913c..78cec84102 100644
--- a/dashboard/src/components/api/builder/che-user-builder.ts
+++ b/dashboard/src/components/api/builder/che-user-builder.ts
@@ -23,7 +23,7 @@ export class CheUserBuilder {
* Default constructor.
*/
constructor() {
- this.user = {
+ this.user = {
email: '',
name: '',
aliases: [],
diff --git a/dashboard/src/components/api/che-api-config.ts b/dashboard/src/components/api/che-api-config.ts
index a2c19ebebe..7de6aa6e81 100644
--- a/dashboard/src/components/api/che-api-config.ts
+++ b/dashboard/src/components/api/che-api-config.ts
@@ -21,7 +21,7 @@ import {CheWebsocket} from './che-websocket.factory';
import {CheProfile} from './che-profile.factory';
import {ChePreferences} from './che-preferences.factory';
import {CheService} from './che-service.factory';
-import {CheHttpBackendProviderFactory} from './test/che-http-backend-provider.factory'
+import {CheHttpBackendProviderFactory} from './test/che-http-backend-provider.factory';
import {CheFactoryTemplate} from './che-factory-template.factory';
import {CheHttpBackendFactory} from './test/che-http-backend.factory';
import {CheAPIBuilder} from './builder/che-api-builder.factory';
@@ -34,6 +34,13 @@ import {CheNamespaceRegistry} from './namespace/che-namespace-registry.factory';
import {CheUser} from './che-user.factory';
import {ChePageObject} from './paging-resource/page-object.factory';
import {CheJsonRpcApi} from './json-rpc/che-json-rpc-api.factory';
+import {CheKeycloak} from './che-keycloak.factory';
+import {CheOrganization} from './che-organizations.factory';
+import {ChePermissions} from './che-permissions.factory';
+import {CheResourcesDistribution} from './che-resources-distribution.factory';
+import {CheTeam} from './che-team.factory';
+import {CheTeamEventsManager} from './che-team-events-manager.factory';
+import {CheInvite} from './che-invite.factory';
export class ApiConfig {
@@ -62,5 +69,12 @@ export class ApiConfig {
register.factory('cheUser', CheUser);
register.factory('chePageObject', ChePageObject);
register.factory('cheJsonRpcApi', CheJsonRpcApi);
+ register.factory('cheKeycloak', CheKeycloak);
+ register.factory('cheOrganization', CheOrganization);
+ register.factory('chePermissions', ChePermissions);
+ register.factory('cheResourcesDistribution', CheResourcesDistribution);
+ register.factory('cheTeam', CheTeam);
+ register.factory('cheTeamEventsManager', CheTeamEventsManager);
+ register.factory('cheInvite', CheInvite);
}
}
diff --git a/dashboard/src/components/api/che-api.factory.ts b/dashboard/src/components/api/che-api.factory.ts
index 95f0a0107c..ceda6ddc03 100644
--- a/dashboard/src/components/api/che-api.factory.ts
+++ b/dashboard/src/components/api/che-api.factory.ts
@@ -16,7 +16,6 @@ import {CheFactory} from './che-factory.factory';
import {CheFactoryTemplate} from './che-factory-template.factory';
import {ChePreferences} from './che-preferences.factory';
import {CheProjectTemplate} from './che-project-template.factory';
-import {CheWebsocket} from './che-websocket.factory';
import {CheService} from './che-service.factory';
import {CheRecipe} from './che-recipe.factory';
import {CheRecipeTemplate} from './che-recipe-template.factory';
@@ -47,6 +46,8 @@ export class CheAPI {
private cheAgent: CheAgent;
private cheSsh: CheSsh;
private cheUser: CheUser;
+ private chePermissions: che.api.IChePermissions;
+ private cheOrganization: che.api.ICheOrganization;
/**
* Default constructor that is using resource
@@ -55,7 +56,7 @@ export class CheAPI {
constructor(cheWorkspace: CheWorkspace, cheFactory: CheFactory, cheFactoryTemplate: CheFactoryTemplate, cheProfile: CheProfile,
chePreferences: ChePreferences, cheProjectTemplate: CheProjectTemplate, cheService: CheService,
cheRecipe: CheRecipe, cheRecipeTemplate: CheRecipeTemplate, cheStack: CheStack, cheOAuthProvider: CheOAuthProvider,
- cheAgent: CheAgent, cheSsh: CheSsh, cheUser: CheUser) {
+ cheAgent: CheAgent, cheSsh: CheSsh, cheUser: CheUser, chePermissions: che.api.IChePermissions, cheOrganization: che.api.ICheOrganization) {
this.cheWorkspace = cheWorkspace;
this.cheProfile = cheProfile;
this.cheFactory = cheFactory;
@@ -70,6 +71,8 @@ export class CheAPI {
this.cheAgent = cheAgent;
this.cheSsh = cheSsh;
this.cheUser = cheUser;
+ this.chePermissions = chePermissions;
+ this.cheOrganization = cheOrganization;
}
/**
@@ -184,4 +187,20 @@ export class CheAPI {
getUser(): CheUser {
return this.cheUser;
}
+
+ /**
+ * The Che Permissions API
+ * @returns {che.api.IChePermissions|*}
+ */
+ getPermissions(): che.api.IChePermissions {
+ return this.chePermissions;
+ }
+
+ /**
+ * The Che Organization API
+ * @return {che.api.ICheOrganization}
+ */
+ getOrganization(): che.api.ICheOrganization {
+ return this.cheOrganization;
+ }
}
diff --git a/dashboard/src/components/api/che-factory.spec.ts b/dashboard/src/components/api/che-factory.spec.ts
index 482b3b87cb..083b986f36 100644
--- a/dashboard/src/components/api/che-factory.spec.ts
+++ b/dashboard/src/components/api/che-factory.spec.ts
@@ -14,7 +14,7 @@ import {CheAPIBuilder} from './builder/che-api-builder.factory';
import {CheFactory} from './che-factory.factory';
/**
- * Test of the Codenvy Factory API
+ * Test of the Che Factory API
*/
describe('CheFactory', () => {
diff --git a/dashboard/src/components/api/che-invite.factory.ts b/dashboard/src/components/api/che-invite.factory.ts
new file mode 100644
index 0000000000..4a6a2f215b
--- /dev/null
+++ b/dashboard/src/components/api/che-invite.factory.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+interface IInviteResource extends ng.resource.IResourceClass {
+ invite: any;
+ getInvited: any;
+ delete: any;
+}
+
+/**
+ * This class is handling the invitation API.
+ *
+ * @author Ann Shumilova
+ */
+export class CheInvite implements che.api.ICheInvite {
+ /**
+ * Angular promise service.
+ */
+ private $q: ng.IQService;
+
+ /**
+ * Angular Resource service.
+ */
+ private $resource: ng.resource.IResourceService;
+ /**
+ * Team invitations with team's id as a key.
+ */
+ private teamInvitations: Map;
+ /**
+ * Client to make remote invitation API calls.
+ */
+ private remoteInviteAPI: IInviteResource;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $resource: ng.resource.IResourceService) {
+ this.$q = $q;
+ this.$resource = $resource;
+
+ this.teamInvitations = new Map();
+
+ this.remoteInviteAPI = >this.$resource('/api/invite', {}, {
+ invite: {method: 'POST', url: '/api/invite'},
+ getInvited: {method: 'GET', url: '/api/invite/:domain?instance=:instance', isArray: true},
+ remove: {method: 'DELETE', url: '/api/invite/:domain?instance=:instance&email=:email'}
+ });
+ }
+
+ /**
+ * Invite non existing user to the team.
+ *
+ * @param {string} teamId id of the team to invite to
+ * @param {string} email user's email to send invite
+ * @param {string[]} actions actions to be granted
+ * @return {angular.IPromise}
+ */
+ inviteToTeam(teamId: string, email: string, actions: Array): ng.IPromise {
+ let promise = this.remoteInviteAPI.invite({domainId: 'organization', instanceId: teamId, email: email, actions: actions}).$promise;
+ return promise;
+ }
+
+ /**
+ * Fetches the list of team invitations.
+ *
+ * @param {string} teamId id of the team to fetch invites
+ * @return {angular.IPromise}
+ */
+ fetchTeamInvitations(teamId: string): ng.IPromise {
+ let deferred = this.$q.defer();
+ let promise = this.remoteInviteAPI.getInvited({domain: 'organization', instance: teamId}).$promise;
+ promise.then((data: any) => {
+ this.teamInvitations.set(teamId, data);
+ deferred.resolve(data);
+ }, (error: any) => {
+ if (error.status === 304) {
+ deferred.resolve(this.teamInvitations.get(teamId));
+ } else {
+ deferred.reject(error);
+ }
+ });
+ return deferred.promise;
+ }
+
+ /**
+ * Returns team's invitations by team's id.
+ *
+ * @param {string} teamId id of the team
+ * @return {Array}
+ */
+ getTeamInvitations(teamId: string): Array {
+ return this.teamInvitations.get(teamId);
+ }
+
+ /**
+ * Deletes team invitation team's id and user's email.
+ *
+ * @param {string} teamId id of the team
+ * @param {string} email user email to delete invitation
+ * @return {angular.IPromise}
+ */
+ deleteTeamInvitation(teamId: string, email: string): void {
+ return this.remoteInviteAPI.remove({domain: 'organization', instance: teamId, email: email}).$promise;
+ }
+}
diff --git a/dashboard/src/components/api/che-keycloak.factory.ts b/dashboard/src/components/api/che-keycloak.factory.ts
new file mode 100644
index 0000000000..43963a8a35
--- /dev/null
+++ b/dashboard/src/components/api/che-keycloak.factory.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+export type keycloakUserInfo = {
+ email: string;
+ family_name: string;
+ given_name: string;
+ name: string;
+ preferred_username: string;
+ sub: string;
+};
+
+/**
+ * This class is handling interactions with Keycloak.
+ * @author Oleksii Kurinnyi
+ */
+export class CheKeycloak {
+ $q: ng.IQService;
+ keycloak: any;
+ keycloakConfig: any;
+
+ /**
+ * Default constructor that is using resource injection
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, keycloakAuth: any) {
+ this.$q = $q;
+ this.keycloak = keycloakAuth.keycloak;
+ this.keycloakConfig = keycloakAuth.config;
+ }
+
+ fetchUserInfo(): ng.IPromise {
+ const defer = this.$q.defer();
+
+ if (this.keycloak === null) {
+ defer.reject('Keycloak is not found on the page.');
+ return defer.promise;
+ }
+
+ this.keycloak.loadUserInfo().success((userInfo: keycloakUserInfo) => {
+ defer.resolve(userInfo);
+ }).error((error: any) => {
+ defer.reject(`User info fetching failed, error: ${error}`);
+ });
+
+ return defer.promise;
+ }
+
+ isPresent(): boolean {
+ return this.keycloak !== null;
+ }
+
+ getProfileUrl(): string {
+ return this.keycloak.createAccountUrl();
+ }
+
+ logout(): void {
+ this.keycloak.logout();
+ }
+
+}
diff --git a/dashboard/src/components/api/che-organization-actions.ts b/dashboard/src/components/api/che-organization-actions.ts
new file mode 100644
index 0000000000..4afa15af0b
--- /dev/null
+++ b/dashboard/src/components/api/che-organization-actions.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+/**
+ * This is class of organization actions.
+ *
+ * @author Oleksii Orel
+ * @author Oleksii Kurinnyi
+ */
+class CheOrganizationActionsStatic {
+ static get UPDATE(): string {
+ return 'update';
+ }
+ static get DELETE(): string {
+ return 'delete';
+ }
+ static get SET_PERMISSIONS(): string {
+ return 'setPermissions';
+ }
+ static get MANAGE_RESOURCES(): string {
+ return 'manageResources';
+ }
+ static get CREATE_WORKSPACES(): string {
+ return 'createWorkspaces';
+ }
+ static get MANAGE_WORKSPACES(): string {
+ return 'manageWorkspaces';
+ }
+ static get MANAGE_SUB_ORGANIZATION(): string {
+ return 'manageSuborganizations';
+ }
+}
+
+export const CheOrganizationActions: che.resource.ICheOrganizationActions = CheOrganizationActionsStatic;
diff --git a/dashboard/src/components/api/che-organization-roles.ts b/dashboard/src/components/api/che-organization-roles.ts
new file mode 100644
index 0000000000..c564e757d4
--- /dev/null
+++ b/dashboard/src/components/api/che-organization-roles.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+import {CheOrganizationActions} from './che-organization-actions';
+
+/**
+ * This is class of member's roles in organization.
+ *
+ * @author Oleksii Orel
+ */
+class CheOrganizationRolesStatic {
+
+ static get MEMBER(): che.IRole {
+ return {
+ 'name': 'MEMBER',
+ 'title': 'Member',
+ 'description': 'Can create workspaces in organization and use resources.',
+ 'actions': [CheOrganizationActions.CREATE_WORKSPACES]
+ };
+ }
+
+ static get ADMIN(): che.IRole {
+ return {
+ 'name': 'ADMIN',
+ 'title': 'Admin',
+ 'description': 'Can edit the organization’s settings, manage members and sub-organizations.',
+ 'actions': [
+ CheOrganizationActions.UPDATE,
+ CheOrganizationActions.SET_PERMISSIONS,
+ CheOrganizationActions.MANAGE_RESOURCES,
+ CheOrganizationActions.MANAGE_WORKSPACES,
+ CheOrganizationActions.CREATE_WORKSPACES,
+ CheOrganizationActions.DELETE,
+ CheOrganizationActions.MANAGE_SUB_ORGANIZATION]
+ };
+ }
+
+ static getRoles(): Array {
+ return [
+ CheOrganizationRolesStatic.MEMBER.name,
+ CheOrganizationRolesStatic.ADMIN.name
+ ];
+ }
+
+ static getValues(): Array {
+ return [
+ CheOrganizationRolesStatic.MEMBER,
+ CheOrganizationRolesStatic.ADMIN
+ ];
+ }
+
+}
+
+export const CheOrganizationRoles: che.resource.ICheOrganizationRoles = CheOrganizationRolesStatic;
diff --git a/dashboard/src/components/api/che-organizations.factory.ts b/dashboard/src/components/api/che-organizations.factory.ts
new file mode 100644
index 0000000000..b9089168c1
--- /dev/null
+++ b/dashboard/src/components/api/che-organizations.factory.ts
@@ -0,0 +1,451 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+interface IOrganizationsResource extends ng.resource.IResourceClass {
+ findOrganization(data: { name: string }): ng.resource.IResource;
+ createOrganization(data: { name: string, parent?: string }): ng.resource.IResource;
+ fetchOrganization(data: { id: string }): ng.resource.IResource;
+ deleteOrganization(data: { id: string }): ng.resource.IResource;
+ updateOrganization(data: { id: string }, organization: che.IOrganization): ng.resource.IResource;
+ fetchSubOrganizations(data: { id: string }): ng.resource.IResource;
+}
+
+const MAIN_URL = '/api/organization';
+
+/**
+ * This class is handling the interactions with Organization management API.
+ *
+ * @author Oleksii Orel
+ */
+export class CheOrganization implements che.api.ICheOrganization {
+ /**
+ * Angular Resource service.
+ */
+ private $resource: ng.resource.IResourceService;
+ private $q: ng.IQService;
+ private lodash: any;
+ /**
+ * Factory for PageObjectResource.
+ */
+ private chePageObject: any;
+ /**
+ * Current user organization map by organization's id.
+ */
+ private organizationsByIdMap: Map = new Map();
+ /**
+ * Current user organization map by organization's qualified name.
+ */
+ private organizationByNameMap: Map = new Map();
+ /**
+ * User organization page map by users's id.
+ */
+ private userOrganizationPageMap: Map = new Map();
+ /**
+ * Array of current user organizations.
+ */
+ private currentUserOrganizations: Array = [];
+ /**
+ * Client for requesting Organization API.
+ */
+ private remoteOrganizationAPI: IOrganizationsResource;
+ /**
+ * Organizations map by parent organization's id.
+ */
+ private subOrganizationsMap: Map> = new Map();
+
+ private cheUser: any;
+
+ private pageInfo: che.IPageInfo;
+
+ private organizationRoles: che.resource.ICheOrganizationRoles;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($resource: ng.resource.IResourceService, $q: ng.IQService, cheUser: any, lodash: any, chePageObject: any, resourcesService: che.service.IResourcesService) {
+ this.chePageObject = chePageObject;
+ this.$resource = $resource;
+ this.cheUser = cheUser;
+ this.lodash = lodash;
+ this.$q = $q;
+ this.organizationRoles = resourcesService.getOrganizationRoles();
+
+ this.remoteOrganizationAPI = >$resource(MAIN_URL, {}, {
+ fetchOrganization: {method: 'GET', url: MAIN_URL + '/:id'},
+ createOrganization: {method: 'POST', url: MAIN_URL},
+ deleteOrganization: {method: 'DELETE', url: MAIN_URL + '/:id'},
+ updateOrganization: {method: 'POST', url: MAIN_URL + '/:id'},
+ fetchSubOrganizations: {method: 'GET', url: MAIN_URL + '/:id/organizations', isArray: true},
+ findOrganization: {method: 'GET', url: MAIN_URL + '/find?name=:name'}
+ });
+ }
+
+ /**
+ * Requests organization by it's name.
+ *
+ * @param name the organization's name
+ * @returns {ng.IPromise} result promise
+ */
+ fetchOrganizationByName(name: string): ng.IPromise {
+ let promise = this.remoteOrganizationAPI.findOrganization({'name' : name}).$promise;
+ let resultPromise = promise.then((organization: che.IOrganization) => {
+ this.organizationByNameMap.set(organization.qualifiedName, organization);
+ return organization;
+ }, (error: any) => {
+ if (error && error.status === 304) {
+ return this.getOrganizationByName(name);
+ }
+ return this.$q.reject(error);
+ });
+
+ return resultPromise;
+ }
+
+ /**
+ * Request the list of available organizations with the same parent id.
+ *
+ * @param id {string} parent organization's id
+ * @returns {ng.IPromise}
+ */
+ fetchSubOrganizationsById(id: string): ng.IPromise {
+ let data = {'id': id};
+ let promise = this.remoteOrganizationAPI.fetchSubOrganizations(data).$promise;
+ let resultPromise = promise.then((organizations: Array) => {
+ this.subOrganizationsMap.set(id, organizations);
+ return organizations;
+ }, (error: any) => {
+ if (error && error.status === 304) {
+ return this.subOrganizationsMap.get(id);
+ }
+ return this.$q.reject(error);
+ });
+
+ return resultPromise;
+ }
+
+ /**
+ * Request the list of current user organizations for the first page.
+ *
+ * @returns {ng.IPromise}
+ */
+ fetchOrganizations(maxItems?: number): ng.IPromise {
+ let userDeferred = this.$q.defer();
+ let user: che.IUser = this.cheUser.getUser();
+ if (angular.isUndefined(user)) {
+ this.cheUser.fetchUser().then((user: che.IUser) => {
+ userDeferred.resolve(user);
+ }, (error: any) => {
+ userDeferred.reject(error);
+ });
+ } else {
+ userDeferred.resolve(user);
+ }
+
+ return userDeferred.promise.then((user: che.IUser) => {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(user.id);
+ return this.fetchUserOrganizations(user.id, maxItems).then((organizations: Array) => {
+ this.pageInfo = userOrganizationsPageObject.getPagesInfo();
+ this._updateCurrentUserOrganizations(organizations);
+ return this.$q.when(organizations);
+ });
+ });
+ }
+
+ /**
+ * Request the list of current user organizations for a page depends on pageKey('first', 'prev', 'next', 'last').
+ * @param pageKey {string}
+ * @returns {ng.IPromise}
+ */
+ fetchOrganizationPageObjects(pageKey?: string): ng.IPromise {
+ let user: che.IUser = this.cheUser.getUser();
+ if (!user || !user.id) {
+ return this.$q.reject({data: {message: 'Error. No user object.'}});
+ }
+ let userOrganizationsPageObject = this._getUserOrganizationPage(user.id);
+
+ return userOrganizationsPageObject.fetchPageObjects(pageKey).then((organizations: Array) => {
+ this._updateCurrentUserOrganizations(organizations);
+ this.pageInfo = userOrganizationsPageObject.getPagesInfo();
+ return this.$q.when(this.currentUserOrganizations);
+ });
+ }
+
+ /**
+ * Returns the current user page info.
+ *
+ * @returns {che.IPageInfo}
+ */
+ getPageInfo(): che.IPageInfo {
+ return this.pageInfo;
+ }
+
+ /**
+ * Request the list of available organizations for an user.
+ * @param userId {string}
+ * @param maxItems {number}
+ * @returns {ng.IPromise}
+ */
+ fetchUserOrganizations(userId: string, maxItems?: number): ng.IPromise {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(userId);
+
+ let promise = userOrganizationsPageObject.fetchObjects(maxItems);
+
+ return promise.then((organizations: Array) => {
+ return organizations;
+ }, (error: any) => {
+ return this.$q.reject(error);
+ });
+ }
+
+ /**
+ * Request the list of user's organizations for a page depends on pageKey('first', 'prev', 'next', 'last').
+ * @param userId {string}
+ * @param pageKey {string}
+ * @returns {ng.IPromise}
+ */
+ fetchUserOrganizationPageObjects(userId: string, pageKey: string): ng.IPromise {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(userId);
+
+ return userOrganizationsPageObject.fetchPageObjects(pageKey);
+ }
+
+ /**
+ * Returns the array of user's organizations.
+ * @param userId {string}
+ * @returns {Array} the array of organizations
+ */
+ getUserOrganizations(userId: string): Array {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(userId);
+
+ return userOrganizationsPageObject.getPageObjects();
+ }
+
+ /**
+ * Returns the user's page info.
+ * @param userId {string}
+ * @returns {che.IPageInfo}
+ */
+ getUserOrganizationPageInfo(userId: string): che.IPageInfo {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(userId);
+
+ return userOrganizationsPageObject.getPagesInfo();
+ }
+
+ /**
+ * Returns the user's request data.
+ * @param userId {string}
+ * @returns {che.IRequestData}
+ */
+ getUserOrganizationRequestData(userId: string): che.IRequestData {
+ let userOrganizationsPageObject = this._getUserOrganizationPage(userId);
+
+ return userOrganizationsPageObject.getRequestDataObject();
+ }
+
+ /**
+ * Update current user organizations objects
+ * @param organizations {Array}
+ * @private
+ */
+ _updateCurrentUserOrganizations(organizations: Array): void {
+ this.currentUserOrganizations.length = 0;
+ organizations.forEach((organization: che.IOrganization) => {
+ this.currentUserOrganizations.push(organization);
+ this.organizationByNameMap.set(organization.qualifiedName, organization);
+ this.organizationsByIdMap.set(organization.id, organization);
+ });
+ }
+
+ /**
+ * Gets user's page object (create new or get existing one)
+ * @param userId
+ * @returns {any} - user's page object
+ * @private
+ */
+ _getUserOrganizationPage(userId: string): any {
+ let userOrganizationsPageObject: any;
+ if (!this.userOrganizationPageMap.has(userId)) {
+ userOrganizationsPageObject = this.chePageObject.createPageObjectResource(MAIN_URL, {user: userId}, 'id', this.organizationsByIdMap);
+ this.userOrganizationPageMap.set(userId, userOrganizationsPageObject);
+ return userOrganizationsPageObject;
+ }
+
+ return this.userOrganizationPageMap.get(userId);
+ }
+
+ /**
+ * Returns the array of current user organizations.
+ *
+ * @returns {Array} the array of organizations
+ */
+ getOrganizations(): Array {
+ return this.currentUserOrganizations;
+ }
+
+ /**
+ * Requests organization by it's id.
+ *
+ * @param id the organization's Id
+ * @returns {ng.IPromise} result promise
+ */
+ fetchOrganizationById(id: string): ng.IPromise {
+ let data = {'id': id};
+ let promise = this.remoteOrganizationAPI.fetchOrganization(data).$promise;
+ return promise.then((organization: che.IOrganization) => {
+ this.organizationsByIdMap.set(id, organization);
+ return organization;
+ }, (error: any) => {
+ if (error.status === 304) {
+ return this.organizationsByIdMap.get(id);
+ }
+ return this.$q.reject();
+ });
+ }
+
+ /**
+ * Returns organization by it's id.
+ *
+ * @param id {string} organization's id
+ * @returns {any} organization or } result promise
+ */
+ createOrganization(name: string, parentId?: string): ng.IPromise {
+ let data: { name: string; parent?: string } = {name: name};
+ if (parentId) {
+ data.parent = parentId;
+ }
+ return this.remoteOrganizationAPI.createOrganization(data).$promise;
+ }
+
+ /**
+ * Delete organization by pointed id.
+ *
+ * @param id organization's id to be deleted
+ * @returns {ng.IPromise} result promise
+ */
+ deleteOrganization(id: string): ng.IPromise {
+ let promise = this.remoteOrganizationAPI.deleteOrganization({'id': id}).$promise;
+
+ return promise.then(() => {
+ if (this.organizationsByIdMap.has(id)) {
+ const {qualifiedName} = this.organizationsByIdMap.get(id);
+ this.organizationsByIdMap.delete(id);
+ if (this.organizationByNameMap.has(qualifiedName)) {
+ this.organizationByNameMap.delete(qualifiedName);
+ }
+ }
+ return this.$q.when();
+ });
+ }
+
+ /**
+ * Update organization's info.
+ *
+ * @param organization {che.IOrganization} the organization info to be updated
+ * @returns {ng.IPromise} result promise
+ */
+ updateOrganization(organization: che.IOrganization): ng.IPromise {
+ let promise = this.remoteOrganizationAPI.updateOrganization({'id': organization.id}, organization).$promise;
+
+ return promise.then((organization: che.IOrganization) => {
+ if (organization) {
+ if (this.organizationsByIdMap.has(organization.id)) {
+ this.organizationsByIdMap.set(organization.id, organization);
+ }
+ if (this.organizationByNameMap.has(organization.qualifiedName)) {
+ this.organizationByNameMap.set(organization.qualifiedName, organization);
+ }
+ }
+ return organization;
+ });
+ }
+
+ /**
+ * Forms the list of roles based on the list of actions
+ *
+ * @param actions array of actions
+ * @returns {Array} array of roles
+ */
+ getRolesFromActions(actions: Array): Array {
+ let roles = [];
+ let organizationRoles = this.organizationRoles.getValues();
+ organizationRoles.forEach((role: che.IRole) => {
+ if (this.lodash.difference(role.actions, actions).length === 0) {
+ roles.push(role);
+ }
+ });
+
+ // avoid roles intake (filter if any role's action is subset of any other):
+ roles = this.lodash.filter(roles, (role: che.IRole) => {
+ return !this._checkIsSubset(role, roles);
+ });
+
+ return roles;
+ }
+
+ /**
+ * Checks the actions in provided role to be part (subset) of any other role's actions.
+ *
+ * @param role role to be checked
+ * @param roles list of roles
+ * @returns {boolean} ): boolean {
+ let isSubset = false;
+ for (let i = 0; i < roles.length; i++) {
+ let r = roles[i];
+ // checks provided role's action is subset of any other role's actions in the roles list:
+ if (role.actions.length === this.lodash.intersection(role.actions, r.actions).length && role.actions.length !== r.actions.length) {
+ return true;
+ }
+ }
+
+ return isSubset;
+ }
+
+ /**
+ * Forms the list actions based on the list of roles.
+ *
+ * @param {Array} roles array of roles
+ * @returns {Array} actions array
+ */
+ getActionsFromRoles(roles: Array): Array {
+ let actions = [];
+ roles.forEach((role: any) => {
+ actions = actions.concat(role.actions);
+ });
+
+ return actions;
+ }
+}
diff --git a/dashboard/src/components/api/che-permissions.factory.ts b/dashboard/src/components/api/che-permissions.factory.ts
new file mode 100644
index 0000000000..e588d27b8b
--- /dev/null
+++ b/dashboard/src/components/api/che-permissions.factory.ts
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2015-2017 Red Hat, Inc.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ */
+'use strict';
+
+interface IPermissionsResource extends ng.resource.IResourceClass {
+ store: any;
+ remove: any;
+ getSystemPermissions: any;
+ getPermissionsByInstance: any;
+}
+
+/**
+ * This class is handling the permissions API
+ * @author Ann Shumilova
+ * @author Oleksii Orel
+ */
+export class ChePermissions implements che.api.IChePermissions {
+ /**
+ * Angular promise service.
+ */
+ private $q: ng.IQService;
+ /**
+ * Angular Resource service.
+ */
+ private $resource: ng.resource.IResourceService;
+ /**
+ * Services availability to user.
+ */
+ private userServices: any;
+ /**
+ * Workspace permissions with workspace's id as a key.
+ */
+ private workspacePermissions: Map;
+ /**
+ * Team permissions with organization's id as a key.
+ */
+ private organizationPermissions: Map;
+ /**
+ * Available system permissions.
+ */
+ private systemPermissions: che.api.ISystemPermissions;
+ /**
+ * Client to make remote permissions API calls.
+ */
+ private remotePermissionsAPI: IPermissionsResource;
+
+ /**
+ * Default constructor that is using resource
+ * @ngInject for Dependency injection
+ */
+ constructor($q: ng.IQService, $resource: ng.resource.IResourceService) {
+ this.$q = $q;
+ this.$resource = $resource;
+
+ this.workspacePermissions = new Map();
+ this.organizationPermissions = new Map();
+ this.systemPermissions = null;
+
+ this.userServices = {
+ hasUserService: false,
+ hasUserProfileService: false,
+ hasAdminUserService: false,
+ hasInstallationManagerService: false
+ };
+
+ this.remotePermissionsAPI = >this.$resource('/api/permissions', {}, {
+ store: {method: 'POST', url: '/api/permissions'},
+ remove: {method: 'DELETE', url: '/api/permissions/:domain?instance=:instance&user=:user'},
+ getSystemPermissions: {method: 'GET', url: '/api/permissions/system'},
+ getPermissionsByInstance: {method: 'GET', url: '/api/permissions/:domain/all?instance=:instance', isArray: true}
+ });
+ }
+
+ /**
+ * Stores permissions data.
+ *
+ * @param data - permissions data
+ * @returns {ng.IPromise}
+ */
+ storePermissions(data: any): ng.IPromise {
+ return this.remotePermissionsAPI.store(data).$promise;
+ }
+
+ /**
+ * Fetch organization permissions by organizations's id.
+ *
+ * @param organizationId organization id
+ * @returns {ng.IPromise}
+ */
+ fetchOrganizationPermissions(organizationId: string): ng.IPromise {
+ let promise = this.remotePermissionsAPI.getPermissionsByInstance({domain: 'organization', instance: organizationId}).$promise;
+ let resultPromise = promise.then((permissions: any) => {
+ this.organizationPermissions.set(organizationId, permissions);
+ return permissions;
+ }, (error: any) => {
+ if (error.status === 304) {
+ return this.organizationPermissions.get(organizationId);
+ } else if (error.status === 403) {
+ this.organizationPermissions.set(organizationId, []);
+ return this.organizationPermissions.get(organizationId);
+ }
+ return this.$q.reject(error);
+ });
+
+ return resultPromise;
+ }
+
+ /**
+ * Returns the list of organization's permissions by organization's id
+ *
+ * @param organizationId organization id
+ * @returns {*} list of organization permissions
+ */
+ getOrganizationPermissions(organizationId: string): any {
+ return this.organizationPermissions.get(organizationId);
+ }
+
+ /**
+ * Remove permissions for pointed user in pointed organization.
+ *
+ * @param organizationId organization id
+ * @param userId user id
+ * @returns {ng.IPromise} request promise
+ */
+ removeOrganizationPermissions(organizationId: string, userId: string): ng.IPromise {
+ let promise = this.remotePermissionsAPI.remove({domain: 'organization', instance: organizationId, user: userId}).$promise;
+ return promise;
+ }
+
+ /**
+ * Fetch workspace permissions by workspace's id.
+ *
+ * @param workspaceId {string} workspace id
+ * @returns {ng.IPromise}
+ */
+ fetchWorkspacePermissions(workspaceId: string): ng.IPromise
+
+
+
+
+
+
+
+
+
+ {{$chip}}
+
+
+
+ Users with emails
+ {{addDeveloperController.callbackController.getNotExistingEmails()}} not found. Workspaces can be shared with registered users only.
+
+ true if all members in list are checked.
+ * @returns {boolean}
+ */
+ isAllMembersSelected(): boolean {
+ return this.isAllSelected;
+ }
+
+ /**
+ * Returns true if all members in list are not checked.
+ * @returns {boolean}
+ */
+ isNoMemberSelected(): boolean {
+ return this.isNoSelected;
+ }
+
+ /**
+ * Make all members in list selected.
+ */
+ selectAllMembers(): void {
+ this.members.forEach((member: any) => {
+ this.membersSelectedStatus[member.userId] = true;
+ });
+ }
+
+ /**
+ * Make all members in list deselected.
+ */
+ deselectAllMembers(): void {
+ this.members.forEach((member: any) => {
+ this.membersSelectedStatus[member.userId] = false;
+ });
+ }
+
+ /**
+ * Change bulk selection value.
+ */
+ changeBulkSelection(): void {
+ if (this.isBulkChecked) {
+ this.deselectAllMembers();
+ this.isBulkChecked = false;
+ } else {
+ this.selectAllMembers();
+ this.isBulkChecked = true;
+ }
+ this.updateSelectedStatus();
+ }
+
+ /**
+ * Update members selected status.
+ */
+ updateSelectedStatus(): void {
+ this.isNoSelected = true;
+ this.isAllSelected = true;
+
+ Object.keys(this.membersSelectedStatus).forEach((key: string) => {
+ if (this.membersSelectedStatus[key]) {
+ this.isNoSelected = false;
+ } else {
+ this.isAllSelected = false;
+ }
+ });
+
+ if (this.isNoSelected) {
+ this.isBulkChecked = false;
+ return;
+ }
+
+ this.isBulkChecked = (this.isAllSelected && Object.keys(this.membersSelectedStatus).length === this.members.length);
+ }
+}
diff --git a/dashboard/src/app/workspaces/share-workspace/add-members/add-members.html b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.html
new file mode 100644
index 0000000000..45a6b8a860
--- /dev/null
+++ b/dashboard/src/app/workspaces/share-workspace/add-members/add-members.html
@@ -0,0 +1,63 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ No members found.
+
+ There are no members.
+
+
+
+
+
+
+
+
+ Email
+ ![]()
+ {{userItemController.user.email}}
+
+
+ Permissions
+
+
+
+ Actions
+
+
+
+
+
+
+ null if not found
+ */
+ getOrganizationById(id: string): che.IOrganization {
+ return this.organizationsByIdMap.get(id);
+ }
+
+ /**
+ * Returns organization by it's name.
+ *
+ * @param name {string} organization's name
+ * @returns {any} organization or null if not found
+ */
+ getOrganizationByName(name: string): che.IOrganization {
+ return this.organizationByNameMap.get(name);
+ }
+
+ /**
+ * Creates new organization with pointed name.
+ *
+ * @param name the name of the organization to be created
+ * @param parentId {string} the id of the parent organization
+ * @returns {ng.IPromisetrue if subset
+ * @private
+ */
+ _checkIsSubset(role: any, roles: Array