This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1758
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a79c9beb2dd4509ff9d60337a83a9504a4945ec1
Merge: 49008a6 4ff2725
Author: Dmytro_Gnatyshyn <di1...@ukr.net>
AuthorDate: Thu Jun 4 13:01:24 2020 +0300
Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1758
NOTICE | 2 +-
.../scripts/deploy_keycloak/templates/nginx.conf | 21 +
.../templates/proxy_location_webapp_template.conf | 2 +-
.../src/ssn/templates/ssn.yml | 2 +-
.../terraform/bin/deploy/__init__.py | 20 +
pom.xml | 1 +
...BucketDownloadDTO.java => BucketDeleteDTO.java} | 9 +-
services/provisioning-service/pom.xml | 22 +-
.../dlab/backendapi/resources/BucketResource.java | 74 ++-
.../dlab/backendapi/service/BucketService.java | 9 +-
.../service/impl/aws/BucketServiceAwsImpl.java | 51 +-
.../service/impl/azure/BucketServiceAzureImpl.java | 73 ++-
.../service/impl/gcp/BucketServiceGcpImpl.java | 37 +-
services/self-service/pom.xml | 10 +
services/self-service/self-service.yml | 2 +-
.../epam/dlab/backendapi/dao/ExploratoryDAO.java | 4 +-
.../epam/dlab/backendapi/dao/UserRoleDaoImpl.java | 20 +-
.../dlab/backendapi/resources/BucketResource.java | 82 ++-
.../backendapi/resources/ExploratoryResource.java | 3 -
.../azure/ComputationalResourceAzure.java | 3 -
.../backendapi/resources/dto/BucketDeleteDTO.java} | 11 +-
.../backendapi/resources/dto/UserResourceInfo.java | 70 +--
.../dlab/backendapi/resources/dto/UserRoleDto.java | 8 +
.../dlab/backendapi/service/BucketService.java | 7 +-
.../backendapi/service/impl/BucketServiceImpl.java | 43 +-
.../service/impl/EndpointServiceImpl.java | 6 +-
.../service/impl/EnvironmentServiceImpl.java | 29 +-
.../impl/InfrastructureInfoServiceImpl.java | 60 +--
.../impl/InfrastructureTemplateServiceImpl.java | 35 +-
.../src/main/resources/mongo/aws/mongo_roles.json | 8 +-
.../main/resources/mongo/azure/mongo_roles.json | 8 +-
.../src/main/resources/mongo/gcp/mongo_roles.json | 8 +-
.../manage-environment-dilog.component.html | 2 +-
.../manage-environment-dilog.component.ts | 4 +
.../management-grid/management-grid.component.html | 5 +-
.../management-grid/management-grid.component.scss | 5 +-
.../management-grid/management-grid.component.ts | 31 +-
.../administration/management/management.model.ts | 6 +-
.../convert-file-size/convert-file-size.pipe.ts} | 28 +-
.../src/app/core/pipes/convert-file-size/index.ts} | 21 +-
.../src/app/core/services/appRouting.service.ts | 1 -
.../services/applicationServiceFacade.service.ts | 8 +-
.../app/core/services/bucket-browser.service.ts | 6 +-
.../src/app/core/services/progress-bar.service.ts | 19 +
.../webapp/src/app/core/util/copyPathUtils.ts} | 27 +-
.../webapp/src/app/core/util/http-methods.ts | 20 +-
.../resources/webapp/src/app/core/util/patterns.ts | 1 +
.../webapp/src/app/core/util/sortUtils.ts | 8 +-
.../reporting-grid/reporting-grid.component.html | 2 +-
.../reporting-grid/reporting-grid.component.ts | 8 +-
.../reporting/toolbar/toolbar.component.html | 4 +-
.../reports/reporting/toolbar/toolbar.component.ts | 4 +-
.../bucket-browser/bucket-browser.component.html | 285 ++++++++---
.../bucket-browser/bucket-browser.component.scss | 556 +++++++++++++++++++--
.../bucket-browser/bucket-browser.component.ts | 397 ++++++++++++---
.../bucket-browser.module.ts} | 35 +-
.../bucket-confirmation-dialog.component.html | 122 +++++
.../bucket-confirmation-dialog.component.scss | 176 +++++++
.../bucket-confirmation-dialog.component.ts | 58 +++
.../bucket-browser/bucket-data.service.ts | 87 +++-
.../buckets-tree/bucket-tree.component.html | 25 +
.../buckets-tree/bucket-tree.component.scss | 106 ++++
.../buckets-tree/bucket-tree.component.ts | 101 ++++
.../folder-tree/folder-tree.component.html | 75 ++-
.../folder-tree/folder-tree.component.scss | 69 ++-
.../folder-tree/folder-tree.component.ts | 203 ++++----
.../cluster-details/cluster-details.component.ts | 2 -
.../cost-details-dialog.component.html | 4 +-
.../detail-dialog/detail-dialog.component.html | 152 ++++--
.../detail-dialog/detail-dialog.component.scss | 19 +-
.../detail-dialog/detail-dialog.component.ts | 33 +-
.../install-libraries.component.ts | 10 +-
.../resources-grid/resources-grid.component.ts | 40 +-
.../resources-grid/resources-grid.model.ts | 4 +
.../src/app/resources/resources.component.html | 24 +-
.../src/app/resources/resources.component.ts | 18 +-
.../webapp/src/app/resources/resources.module.ts | 30 +-
.../multi-level-select-dropdown.component.ts | 2 +-
.../webapp/src/app/shared/material.module.ts | 3 +-
.../edge-action-dialog.component.ts | 19 +
.../src/app/shared/navbar/navbar.component.html | 34 +-
.../src/assets/img/blank-file-svgrepo-com.svg | 41 ++
.../webapp/src/assets/styles/_dialogs.scss | 62 +++
.../src/main/resources/webapp/src/styles.scss | 14 +-
84 files changed, 2980 insertions(+), 776 deletions(-)
diff --cc
services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 419655d,d8b2322..8f6a8ca
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@@ -95,37 -95,29 +95,37 @@@
<ng-template #env><i
class="material-icons">settings</i></ng-template>
</a>
</a>
- <a *ngIf="healthStatus?.billingEnabled" class="nav-item"
[routerLink]="['/billing_report']"
- [routerLinkActive]="['active']"
[routerLinkActiveOptions]="{exact:true}">
- <span *ngIf="isExpanded; else billing">Billing Report</span>
- <ng-template #billing><i
class="material-icons">account_balance_wallet</i></ng-template>
+ <a class="nav-item has-children"
*ngIf="healthStatus?.billingEnabled || true">
+ <span *ngIf="isExpanded">Reports</span>
+ <a *ngIf="healthStatus?.billingEnabled" class="sub-nav-item"
[routerLink]="['/billing_report']"
+ [routerLinkActive]="['active']"
[routerLinkActiveOptions]="{exact:true}" [style.margin-left.px]="isExpanded ?
'30' : '0'">
+ <span *ngIf="isExpanded; else billing">Billing</span>
+ <ng-template #billing><i
class="material-icons">account_balance_wallet</i></ng-template>
+ </a>
+ <a class="sub-nav-item" [routerLink]="['/audit']"
[style.margin-left.px]="isExpanded ? '30' : '0'"
+ [routerLinkActive]="['active']"
[routerLinkActiveOptions]="{exact:true}">
+ <span *ngIf="isExpanded; else audit">Audit</span>
+ <ng-template #audit><i
class="material-icons">library_books</i></ng-template>
+ </a>
</a>
</div>
- <div>
- <a class="nav-item" [routerLink]="['/swagger']"
[routerLinkActive]="['active']"
- [routerLinkActiveOptions]="{exact:true}">
- <span *ngIf="isExpanded; else endpoint">Cloud Endpoint API</span>
- <ng-template #endpoint>
- <span>
- <svg width="30px" height="27px" viewBox="0 0 256 256"
version="1.1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; preserveAspectRatio="xMidYMid">
- <g>
- <path d="M127.059657,255.996921 C58.8506544,255.526472
-0.457073619,198.918442 0.00265506057,126.998303 C0.444649399,57.7958628
57.9516598,-0.468967577 129.11002,0.00284555012 C198.267128,0.462386081
256.613109,57.8667711 255.995136,128.194199 C256.568091,197.883453
197.934268,256.489189 127.059657,255.996921 Z M127.059657,255.996921
C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303
C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0.002 [...]
- <path id="swager-bgr" d="M127.184644,238.997327
C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428
C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872
C188.934544,17.4010221 239.531905,67.1825241 238.995778,128.169251
C239.492444,188.602381 188.64743,239.424426 127.184644,238.997327 Z
M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744
17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106
128.963117,17.0024872 C18 [...]
- <path d="M169.327319,127.956161 C169.042723,133.246373
164.421106,137.639224 159.866213,136.872586 C159.844426,136.872586
159.821277,136.872586 159.798128,136.872586 C154.753021,136.879395
150.658383,132.794288 150.652936,127.749182 C150.824511,122.690458
155.019915,118.703395 160.08,118.789182 C165.125106,118.813692
169.59966,123.077182 169.327319,127.956161 Z M88.2011915,179.220161
C90.1034894,179.27599 92.0071489,179.235139 94.2008511,179.235139
L94.2008511,193.02 [...]
- </g>
- </svg>
- </span>
- </ng-template>
- </a>
- </div>
+ <!-- <div>-->
+ <!-- <a class="nav-item" [routerLink]="['/swagger']"
[routerLinkActive]="['active']"-->
+ <!-- [routerLinkActiveOptions]="{exact:true}">-->
+ <!-- <span *ngIf="isExpanded; else endpoint">Cloud Endpoint
API</span>-->
+ <!-- <ng-template #endpoint>-->
+ <!-- <span>-->
+ <!-- <svg width="30px" height="27px" viewBox="0 0 256 256"
version="1.1" xmlns="http://www.w3.org/2000/svg";
xmlns:xlink="http://www.w3.org/1999/xlink"; preserveAspectRatio="xMidYMid">-->
+ <!-- <g>-->
+ <!-- <path d="M127.059657,255.996921
C58.8506544,255.526472 -0.457073619,198.918442 0.00265506057,126.998303
C0.444649399,57.7958628 57.9516598,-0.468967577 129.11002,0.00284555012
C198.267128,0.462386081 256.613109,57.8667711 255.995136,128.194199
C256.568091,197.883453 197.934268,256.489189 127.059657,255.996921 Z
M127.059657,255.996921 C58.8506544,255.526472 -0.457073619,198.918442
0.00265506057,126.998303 C0.444649399,57.7958628 57.9516598,-0.468967577
129.11002,0 [...]
+ <!-- <path id="swager-bgr" d="M127.184644,238.997327
C68.0323765,238.589271 16.6036091,189.498744 17.0023028,127.131428
C17.3860285,67.1185953 67.2554,16.5917106 128.963117,17.0024872
C188.934544,17.4010221 239.531905,67.1825241 238.995778,128.169251
C239.492444,188.602381 188.64743,239.424426 127.184644,238.997327 Z
M127.184644,238.997327 C68.0323765,238.589271 16.6036091,189.498744
17.0023028,127.131428 C17.3860285,67.1185953 67.2554,16.5917106
128.963117,17.0024872 [...]
+ <!-- <path d="M169.327319,127.956161
C169.042723,133.246373 164.421106,137.639224 159.866213,136.872586
C159.844426,136.872586 159.821277,136.872586 159.798128,136.872586
C154.753021,136.879395 150.658383,132.794288 150.652936,127.749182
C150.824511,122.690458 155.019915,118.703395 160.08,118.789182
C165.125106,118.813692 169.59966,123.077182 169.327319,127.956161 Z
M88.2011915,179.220161 C90.1034894,179.27599 92.0071489,179.235139
94.2008511,179.235139 L94.2008511,19 [...]
+ <!-- </g>-->
+ <!-- </svg>-->
+ <!-- </span>-->
+ <!-- </ng-template>-->
+ <!-- </a>-->
+ <!-- </div>-->
</nav>
</mat-nav-list>
</mat-sidenav>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
