You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/19 14:14:10 UTC
[incubator-datalab] 01/03: [DATALAB-2229]: Merge develop
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2229
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 01a48be49ebc69cb4e5daa961b4acdff93e4430a
Merge: c387d5e a8c62c8
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Feb 19 15:53:11 2021 +0200
[DATALAB-2229]: Merge develop
.../src/general/files/gcp/base_Dockerfile | 2 +-
.../backendapi/resources/OdahuResource.java | 10 +-
.../management/endpoints/endpoints.component.html | 2 +-
.../management/endpoints/endpoints.component.scss | 4 +-
.../management-grid/management-grid.component.html | 2 +-
.../management-grid/management-grid.component.ts | 2 +-
.../create-odahu-cluster.component.ts | 2 +-
.../app/administration/odahu/odahu-data.service.ts | 5 +-
.../odahu/odahu-grid/odahu-grid.component.ts | 3 +-
.../app/administration/odahu/odahu.component.ts | 2 +-
.../project-form/project-form.component.html | 4 +-
.../project-list/project-list.component.html | 14 +-
.../project-list/project-list.component.scss | 2 +-
.../resources/webapp/src/app/app.routing.module.ts | 10 +-
.../services/applicationServiceFacade.service.ts | 3 +
.../webapp/src/app/core/services/index.ts | 2 +-
.../app/core/services/odahu-deployment.service.ts | 9 +-
.../reporting-grid/reporting-grid.component.html | 24 ++-
.../reporting-grid/reporting-grid.component.scss | 41 +++-
.../reporting-grid/reporting-grid.component.ts | 55 ++----
.../bucket-browser/bucket-browser.component.html | 6 +-
.../bucket-browser/bucket-browser.component.ts | 1 -
.../folder-tree/folder-tree.component.ts | 5 -
...utational-resource-create-dialog.component.html | 10 +-
.../create-environment.component.html | 8 +-
.../detail-dialog/detail-dialog.component.html | 2 +-
.../detail-dialog/detail-dialog.component.ts | 4 +-
.../install-libraries.component.html | 2 +-
.../resources-grid/resources-grid.component.html | 40 ++--
.../resources-grid/resources-grid.component.ts | 14 +-
.../resources-grid/resources-grid.model.ts | 212 ++++++++-------------
.../src/app/resources/resources.component.html | 2 +-
.../src/app/resources/resources.component.ts | 4 +-
.../shared/form-controls/dropdowns.component.scss | 7 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../modal-dialog/edge-action-dialog/index.ts | 2 +-
.../notification-dialog.component.ts | 2 +-
.../webapp/src/app/shared/navbar/index.ts | 4 +-
.../webapp/src/assets/styles/_dialogs.scss | 4 +
.../src/main/resources/webapp/src/styles.scss | 14 +-
40 files changed, 266 insertions(+), 276 deletions(-)
diff --cc services/self-service/src/main/resources/webapp/src/app/core/services/applicationServiceFacade.service.ts
index 4a1ea54,7d91013..5a9e8f8
--- 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
@@@ -777,6 -779,9 +777,9 @@@ export class ApplicationServiceFacade
this.requestRegistry.Add(ApplicationServiceFacade.ENDPOINT, '/api/endpoint');
this.requestRegistry.Add(ApplicationServiceFacade.ENDPOINT_CONNECTION, '/api/endpoint/url/');
- //Odahu
++ // Odahu
+ this.requestRegistry.Add(ApplicationServiceFacade.ODAHU, '/api/odahu');
+
// audit
this.requestRegistry.Add(ApplicationServiceFacade.AUDIT, '/api/audit');
diff --cc services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
index 82d6c69,c112ff9..f3cb7b7
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources.component.html
@@@ -35,7 -35,7 +35,7 @@@
<div class="control selector-wrapper" *ngIf="projects?.length">
<mat-form-field>
<mat-label>Select project</mat-label>
- <mat-select [(value)]="resourcesGrid.activeProject" panelClass="top-select">
- <mat-select [(value)]="resourcesGrid.activeProject" panelClass="scrolling">
++ <mat-select [(value)]="resourcesGrid.activeProject" panelClass="top-select scrolling">
<mat-option *ngIf="projects?.length > 1" (click)="setActiveProject('')">Show all</mat-option>
<mat-option *ngFor="let project of projects" [value]="project"
(click)="setActiveProject(project)">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org