This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1661 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 48dca196407fb0f1ae61a68c6f32d2e1d1c9ea32 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Tue Mar 24 16:52:32 2020 +0200 [DLAB-1661]: Started to group Compute/Notebook shapes by clouds --- .../src/main/resources/mongo/aws/mongo_roles.json | 28 ++++++++++++++++++++++ .../main/resources/mongo/azure/mongo_roles.json | 23 ++++++++++++++++++ .../src/main/resources/mongo/gcp/mongo_roles.json | 26 ++++++++++++++++++++ .../app/administration/roles/roles.component.ts | 5 ++-- .../services/applicationServiceFacade.service.ts | 6 ----- .../src/app/core/services/project.service.ts | 9 ------- .../multi-level-select-dropdown.component.html | 11 +++++++++ 7 files changed, 91 insertions(+), 17 deletions(-) diff --git a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json index 0a566f4..9998d84 100644 --- a/services/self-service/src/main/resources/mongo/aws/mongo_roles.json +++ b/services/self-service/src/main/resources/mongo/aws/mongo_roles.json @@ -3,6 +3,7 @@ "_id": "nbShapes_p2.xlarge_fetching", "description": "Use p2.xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "p2.xlarge" ], @@ -14,6 +15,7 @@ "_id": "nbShapes_t2.medium_fetching", "description": "Use t2.medium instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "t2.medium" ], @@ -25,6 +27,7 @@ "_id": "nbShapes_r3.xlarge_fetching", "description": "Use r3.xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "r3.xlarge" ], @@ -36,6 +39,7 @@ "_id": "nbShapes_r4.2xlarge_fetching", "description": "Use r4.2xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "r4.2xlarge" ], @@ -47,6 +51,7 @@ "_id": "nbShapes_r3.4xlarge_fetching", "description": "Use r3.4xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "r3.4xlarge" ], @@ -58,6 +63,7 @@ "_id": "nbShapes_r3.8xlarge_fetching", "description": "Use r3.8xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "r3.8xlarge" ], @@ -69,6 +75,7 @@ "_id": "nbShapes_c4.large_fetching", "description": "Use c4.large instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "c4.large" ], @@ -80,6 +87,7 @@ "_id": "nbShapes_c4.2xlarge_fetching", "description": "Use c4.2xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "c4.2xlarge" ], @@ -91,6 +99,7 @@ "_id": "nbShapes_c4.8xlarge_fetching", "description": "Use c4.8xlarge instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AWS", "exploratory_shapes": [ "c4.8xlarge" ], @@ -102,6 +111,7 @@ "_id": "nbCreateDeeplearning", "description": "Create Notebook Deep Learning", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-deeplearning" ], @@ -113,6 +123,7 @@ "_id": "nbCreateJupyter", "description": "Create Notebook Jupyter", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-jupyter" ], @@ -124,6 +135,7 @@ "_id": "nbCreateJupyterLab", "description": "Create Notebook JupyterLab", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-jupyterlab" ], @@ -135,6 +147,7 @@ "_id": "nbCreateRstudio", "description": "Create Notebook RStudio", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-rstudio" ], @@ -146,6 +159,7 @@ "_id": "nbCreateTensor", "description": "Create Notebook Jupyter with TensorFlow", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-tensor" ], @@ -157,6 +171,7 @@ "_id": "nbCreateZeppelin", "description": "Create Notebook Apache Zeppelin", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-zeppelin" ], @@ -168,6 +183,7 @@ "_id": "nbCreateTensorRstudio", "description": "Create Notebook RStudio with TensorFlow", "type": "NOTEBOOK", + "cloud": "AWS", "exploratories": [ "docker.dlab-tensor-rstudio" ], @@ -179,6 +195,7 @@ "_id": "nbCreateDataEngine", "description": "Create Data Engine", "type": "COMPUTATIONAL", + "cloud": "AWS", "computationals": [ "docker.dlab-dataengine" ], @@ -190,6 +207,7 @@ "_id": "nbCreateDataEngineService", "description": "Create Data Engine Service", "type": "COMPUTATIONAL", + "cloud": "AWS", "computationals": [ "docker.dlab-dataengine-service" ], @@ -201,6 +219,7 @@ "_id": "compShapes_c4.xlarge_fetching", "description": "Use c4.xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "c4.xlarge" ], @@ -212,6 +231,7 @@ "_id": "compShapes_r3.xlarge_fetching", "description": "Use r3.xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "r3.xlarge" ], @@ -223,6 +243,7 @@ "_id": "compShapes_r4.2xlarge_fetching", "description": "Use r4.2xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "r4.2xlarge" ], @@ -234,6 +255,7 @@ "_id": "compShapes_r3.4xlarge_fetching", "description": "Use r3.4xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "r3.4xlarge" ], @@ -245,6 +267,7 @@ "_id": "compShapes_r3.8xlarge_fetching", "description": "Use r3.8xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "r3.8xlarge" ], @@ -256,6 +279,7 @@ "_id": "compShapes_c4.2xlarge_fetching", "description": "Use c4.2xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "c4.2xlarge" ], @@ -267,6 +291,7 @@ "_id": "compShapes_c4.8xlarge_fetching", "description": "Use c4.8xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "c4.8xlarge" ], @@ -278,6 +303,7 @@ "_id": "compShapes_p2.xlarge_fetching", "description": "Use p2.xlarge instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AWS", "computational_shapes": [ "p2.xlarge" ], @@ -289,6 +315,7 @@ "_id": "nbBillingReportFull", "description": "View full billing report for all users", "type": "BILLING", + "cloud": "AWS", "pages": [ "/api/infrastructure_provision/billing" ], @@ -300,6 +327,7 @@ "_id": "admin", "description": "Allow to execute administration operation", "type": "ADMINISTRATION", + "cloud": "AWS", "pages": [ "environment/*", "/api/infrastructure/backup", diff --git a/services/self-service/src/main/resources/mongo/azure/mongo_roles.json b/services/self-service/src/main/resources/mongo/azure/mongo_roles.json index ca61082..113a705 100644 --- a/services/self-service/src/main/resources/mongo/azure/mongo_roles.json +++ b/services/self-service/src/main/resources/mongo/azure/mongo_roles.json @@ -3,6 +3,7 @@ "_id": "nbShapes_Standard_NC6_fetching", "description": "Use Standard_NC6 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_NC6" ], @@ -14,6 +15,7 @@ "_id": "nbShapes_Standard_E4s_v3_fetching", "description": "Use Standard_E4s_v3 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_E4s_v3" ], @@ -25,6 +27,7 @@ "_id": "nbShapes_Standard_E16s_v3_fetching", "description": "Use Standard_E16s_v3 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_E16s_v3" ], @@ -36,6 +39,7 @@ "_id": "nbShapes_Standard_E32s_v3_fetching", "description": "Use Standard_E32s_v3 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_E32s_v3" ], @@ -47,6 +51,7 @@ "_id": "nbShapes_Standard_F2s_fetching", "description": "Use Standard_F2s instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_F2s" ], @@ -58,6 +63,7 @@ "_id": "nbShapes_Standard_F4s_fetching", "description": "Use Standard_F4s instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_F4s" ], @@ -69,6 +75,7 @@ "_id": "nbShapes_Standard_F8s_fetching", "description": "Use Standard_F8s instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_F8s" ], @@ -80,6 +87,7 @@ "_id": "nbShapes_Standard_F16s_fetching", "description": "Use Standard_F16s instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "AZURE", "exploratory_shapes": [ "Standard_F16s" ], @@ -91,6 +99,7 @@ "_id": "nbCreateDeeplearning", "description": "Create Notebook Deep Learning", "type": "NOTEBOOK", + "cloud": "AZURE", "exploratories": [ "docker.dlab-deeplearning" ], @@ -102,6 +111,7 @@ "_id": "nbCreateJupyter", "description": "Create Notebook Jupyter", "type": "NOTEBOOK", + "cloud": "AZURE", "exploratories": [ "docker.dlab-jupyter" ], @@ -113,6 +123,7 @@ "_id": "nbCreateRstudio", "description": "Create Notebook RStudio", "type": "NOTEBOOK", + "cloud": "AZURE", "exploratories": [ "docker.dlab-rstudio" ], @@ -124,6 +135,7 @@ "_id": "nbCreateTensor", "description": "Create Notebook Jupyter with TensorFlow", "type": "NOTEBOOK", + "cloud": "AZURE", "exploratories": [ "docker.dlab-tensor" ], @@ -135,6 +147,7 @@ "_id": "nbCreateZeppelin", "description": "Create Notebook Apache Zeppelin", "type": "NOTEBOOK", + "cloud": "AZURE", "exploratories": [ "docker.dlab-zeppelin" ], @@ -146,6 +159,7 @@ "_id": "nbCreateDataEngine", "description": "Create Data Engine", "type": "COMPUTATIONAL", + "cloud": "AZURE", "computationals": [ "docker.dlab-dataengine" ], @@ -157,6 +171,7 @@ "_id": "compShapes_Standard_F4s_fetching", "description": "Use Standard_F4s instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_F4s" ], @@ -168,6 +183,7 @@ "_id": "compShapes_Standard_E4s_v3_fetching", "description": "Use Standard_E4s_v3 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_E4s_v3" ], @@ -179,6 +195,7 @@ "_id": "compShapes_Standard_E16s_v3_fetching", "description": "Use Standard_E16s_v3 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_E16s_v3" ], @@ -190,6 +207,7 @@ "_id": "compShapes_Standard_E32s_v3_fetching", "description": "Use Standard_E32s_v3 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_E32s_v3" ], @@ -201,6 +219,7 @@ "_id": "compShapes_Standard_F8s_fetching", "description": "Use Standard_F8s instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_F8s" ], @@ -212,6 +231,7 @@ "_id": "compShapes_Standard_F16s_fetching", "description": "Use Standard_F16s instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_F16s" ], @@ -223,6 +243,7 @@ "_id": "compShapes_Standard_NC6_fetching", "description": "Use Standard_NC6 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "AZURE", "computational_shapes": [ "Standard_NC6" ], @@ -234,6 +255,7 @@ "_id": "nbBillingReportFull", "description": "View full billing report for all users", "type": "BILLING", + "cloud": "AZURE", "pages": [ "/api/infrastructure_provision/billing" ], @@ -245,6 +267,7 @@ "_id": "admin", "description": "Allow to execute administration operation", "type": "ADMINISTRATION", + "cloud": "AZURE", "pages": [ "environment/*", "/api/infrastructure/backup", diff --git a/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json b/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json index d3c22ba..8098628 100644 --- a/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json +++ b/services/self-service/src/main/resources/mongo/gcp/mongo_roles.json @@ -3,6 +3,7 @@ "_id": "nbShapes_n1-highcpu-2_fetching", "description": "Use n1-highcpu-2 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highcpu-2" ], @@ -14,6 +15,7 @@ "_id": "nbShapes_n1-highcpu-8_fetching", "description": "Use n1-highcpu-8 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highcpu-8" ], @@ -25,6 +27,7 @@ "_id": "nbShapes_n1-highcpu-32_fetching", "description": "Use n1-highcpu-32 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highcpu-32" ], @@ -36,6 +39,7 @@ "_id": "nbShapes_n1-highmem-4_fetching", "description": "Use n1-highmem-4 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highmem-4" ], @@ -47,6 +51,7 @@ "_id": "nbShapes_n1-highmem-16_fetching", "description": "Use n1-highmem-16 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highmem-16" ], @@ -58,6 +63,7 @@ "_id": "nbShapes_n1-highmem-32_fetching", "description": "Use n1-highmem-32 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-highmem-32" ], @@ -69,6 +75,7 @@ "_id": "nbShapes_n1-standard-2_fetching", "description": "Use n1-standard-2 instance shape for notebook", "type": "NOTEBOOK_SHAPE", + "cloud": "GCP", "exploratory_shapes": [ "n1-standard-2" ], @@ -80,6 +87,7 @@ "_id": "nbCreateDeeplearning", "description": "Create Notebook Deep Learning", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-deeplearning" ], @@ -91,6 +99,7 @@ "_id": "nbCreateJupyter", "description": "Create Notebook Jupyter", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-jupyter" ], @@ -102,6 +111,7 @@ "_id": "nbCreateJupyterLab", "description": "Create Notebook JupyterLab", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-jupyterlab" ], @@ -113,6 +123,7 @@ "_id": "nbCreateSuperset", "description": "Create Notebook Superset", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-superset" ], @@ -124,6 +135,7 @@ "_id": "nbCreateRstudio", "description": "Create Notebook RStudio", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-rstudio" ], @@ -135,6 +147,7 @@ "_id": "nbCreateTensor", "description": "Create Notebook Jupyter with TensorFlow", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-tensor" ], @@ -146,6 +159,7 @@ "_id": "nbCreateTensorRstudio", "description": "Create Notebook RStudio with TensorFlow", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-tensor-rstudio" ], @@ -157,6 +171,7 @@ "_id": "nbCreateZeppelin", "description": "Create Notebook Apache Zeppelin", "type": "NOTEBOOK", + "cloud": "GCP", "exploratories": [ "docker.dlab-zeppelin" ], @@ -168,6 +183,7 @@ "_id": "nbCreateDataEngine", "description": "Create Data Engine", "type": "COMPUTATIONAL", + "cloud": "GCP", "computationals": [ "docker.dlab-dataengine" ], @@ -179,6 +195,7 @@ "_id": "nbCreateDataEngineService", "description": "Create Data Engine Service", "type": "COMPUTATIONAL", + "cloud": "GCP", "computationals": [ "docker.dlab-dataengine-service" ], @@ -190,6 +207,7 @@ "_id": "compShapes_n1-standard-2_fetching", "description": "Use n1-standard-2 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-standard-2" ], @@ -201,6 +219,7 @@ "_id": "compShapes_n1-highmem-4_fetching", "description": "Use n1-highmem-4 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highmem-4" ], @@ -212,6 +231,7 @@ "_id": "compShapes_n1-highmem-16_fetching", "description": "Use n1-highmem-16 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highmem-16" ], @@ -223,6 +243,7 @@ "_id": "compShapes_n1-highmem-32_fetching", "description": "Use n1-highmem-32 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highmem-32" ], @@ -234,6 +255,7 @@ "_id": "compShapes_n1-highcpu-8_fetching", "description": "Use n1-highcpu-8 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highcpu-8" ], @@ -245,6 +267,7 @@ "_id": "compShapes_n1-highcpu-2_fetching", "description": "Use n1-highcpu-2 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highcpu-2" ], @@ -256,6 +279,7 @@ "_id": "compShapes_n1-highcpu-32_fetching", "description": "Use n1-highcpu-32 instance shape for cluster", "type": "COMPUTATIONAL_SHAPE", + "cloud": "GCP", "computational_shapes": [ "n1-highcpu-32" ], @@ -267,6 +291,7 @@ "_id": "nbBillingReportFull", "description": "View full billing report for all users", "type": "BILLING", + "cloud": "GCP", "pages": [ "/api/infrastructure_provision/billing" ], @@ -278,6 +303,7 @@ "_id": "admin", "description": "Allow to execute administration operation", "type": "ADMINISTRATION", + "cloud": "GCP", "pages": [ "environment/*", "/api/infrastructure/backup", diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts index 11cd9ca..222849a 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts @@ -75,8 +75,9 @@ export class RolesComponent implements OnInit { (roles: any) => { this.roles = roles; this.rolesList = roles.map((role, index) => { - return {role: role.description, type: role.type}; - }) + return {role: role.description, type: role.type, cloud: role.cloud}; + }); + console.log(this.rolesList); this.rolesList = this.rolesList.sort((a, b) => (a.type > b.type) ? 1 : ((b.type > a.type) ? -1 : 0)); this.updateGroupData(groups); diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts index ac698a7..121188e 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts @@ -566,12 +566,6 @@ export class ApplicationServiceFacade { null); } - public buildDeleteProject(param): Observable<any> { - return this.buildRequest(HTTPMethod.DELETE, - this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param, - null); - } - public buildToggleProjectStatus(param, data): Observable<any> { return this.buildRequest(HTTPMethod.POST, this.requestRegistry.Item(ApplicationServiceFacade.PROJECT) + param, diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts index 805c8e8..0bb54b5 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/project.service.ts @@ -70,15 +70,6 @@ export class ProjectService { catchError(ErrorUtils.handleServiceError)); } - public deleteProject(data): Observable<{}> { - const url = `/${data}`; - return this.applicationServiceFacade - .buildDeleteProject(url) - .pipe( - map(response => response), - catchError(ErrorUtils.handleServiceError)); - } - public toggleProjectStatus(data, action): Observable<{}> { const url = `/${action}`; return this.applicationServiceFacade diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.html index f6b52da..7164ad4 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-level-select-dropdown/multi-level-select-dropdown.component.html @@ -49,6 +49,17 @@ </a> </li> +<!-- <li class="role-label" role="presentation" *ngIf="item.type === 'COMPUTATIONAL_SHAPE' && item.cloud !== items[i - 1].cloud || item.type === 'NOTEBOOK_SHAPE' && item.cloud !== items[i - 1].cloud || item.type === 'NOTEBOOK_SHAPE' && item.type !== items[i - 1].type" (click)="toggleItemsForLable(item.type, $event)">--> +<!-- <a href="#" class="list-item" role="menuitem">--> +<!-- <span class="arrow" [ngClass]="{'rotate-arrow': isOpenCategory[item.type], 'arrow-checked': selectedAllInCattegory(item.type) || selectedSomeInCattegory(item.type)}"></span>--> +<!-- <span class="empty-checkbox" [ngClass]="{'checked': selectedAllInCattegory(item.type) || selectedSomeInCattegory(item.type)}" (click)="toggleselectedCategory($event, model, item.type);$event.stopPropagation()" >--> +<!-- <span class="checked-checkbox" *ngIf="selectedAllInCattegory(item.type)"></span>--> +<!-- <span class="line-checkbox" *ngIf="selectedSomeInCattegory(item.type)"></span>--> +<!-- </span>--> +<!-- {{item.cloud | titlecase}}--> +<!-- </a>--> +<!-- </li>--> + <li class="role-item" role="presentation" *ngIf="model && isOpenCategory[item.type]" > <a href="#" class="list-item" role="menuitem" (click)="toggleSelectedOptions($event, model, item)"> <span class="empty-checkbox" [ngClass]="{'checked': checkInModel(item.role)}"> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
