You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/09/26 08:28:22 UTC

[incubator-dlab] branch develop updated (e56bf76 -> 8114011)

This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


    from e56bf76  Merge pull request #318 from apache/DLAB-1062
     add 6e4db18  [DLAB-1056]: added project data to reporting grid
     add 794fd91  [DLAB-1031]: fixed names overlaping on billing detail dialog
     add ba581b2  [DLAB-1094]: prevent extra scrollbar on create notebook dialog
     add 1bb1214  moved servise pages
     add cb1a557  moved servise pages; separate service page module
     add 1cd5653  moved servise pages; separate service page module
     add f303f8a  [DLAB-1056]: added project parameter to configuration model
     add 42803a4  [DLAB-987]: exteneded billing filtering; added expanding
     add 4f21dbb  updated perameters and configurations
     add bd9cffb  added starting loader; mocked api url for dev mode
     add 5b93b55  Merge branch 'develop' of github.com:apache/incubator-dlab into dlab-loading
     add 26c4c23  moved interseptors loading to core module
     add a374b70  initial page preloader
     add dc28460  merge dlab-loading into DLAB-1056
     add 9a3dfca  Merge remote-tracking branch 'remotes/origin/develop' into DLAB-1056
     add effc3f8  DLAB-000 added possibility to filter by project on billing report page
     add 4416d09  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add deca22e  DLAB-000 added project field to billing report
     add b307c81  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add 39fa563  [DLAB-1056]: added filtering by project to billing report
     add 46787bc  [DLAB-1056]: changed ReportingConfigModel
     add 0e30fb4  [DLAB-1116]: Alter url endpoint error message
     add 032ad0d  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add a2f4e02  added missed package
     add db72322  added missed package
     add f3aced2  routing animation added
     add 097fe95  added default api url key to production env variables
     add 957a333  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add 6d72270  [DLAB-1079]: added key generation on project creation
     add 941dc21  Merge branch 'DLAB-1079' of github.com:apache/incubator-dlab into DLAB-1056
     add e680da2  [DLAB-1079]: generate key service fixes
     add 48a04ad  [DLAB-1079]: download key parameters fixes; util options added
     add a3ad97a  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     add 4c0bdae  [DLAB-1079]: key format for saving added
     add f7e3db4  package versions updates; mismatching issues fixes
     add 69ebf13  shared material module update; imports fixes
     add ce2cc00  request methods mapping
     add fb1f9b1  toastr notification appearing fixes
     add af3b90e  [DLAB-472]: added filtering controls to management grid
     add 8b57048  [DLAB-472]: added positioning fixes on reporting
     add 54416cd  [DLAB-472]: generate key controls fixes
     add cb317e9  [DLAB-472]: added filtering configuration to management grid
     add a579843  [DLAB-472]: added filtering configuration to management grid
     add 4c9df43  [DLAB-472]: added filtering by multiple values
     add caf4ef6  [DLAB-472]: added filter row collapsing
     add ce232d1  Updated node.js to v12.
     add 3340139  Merge remote-tracking branch 'origin/DLAB-1056' into DLAB-1056
     add 5e247e2  Updated node.js to v12 ssn.
     add 1708e1e  Fixed "npm install"
     add a49ce33  Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
     add 604b0d4  [DLAB-472]: fixed filter collapse on list of resources grid
     add 022f4ca  [DLAB-1151][DLAB-1149]: extended tags tooltips;
     add 4c32065  [DLAB-1147]: prevent project status check on env management dialog
     add 0d0a110  Merge branch 'develop' of github.com:apache/incubator-dlab into DLAB-1056
     new 8114011  Merge pull request #321 from apache/DLAB-1056

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/general/lib/os/debian/ssn_lib.py           |     2 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |     2 +-
 .../src/ssn/scripts/configure_ui.py                |     2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   |     4 +
 .../dlab/backendapi/dao/aws/AwsBillingDAO.java     |     3 +-
 .../backendapi/resources/dto/BillingFilter.java    |     3 +
 .../src/main/resources/webapp/angular.json         |    25 +-
 .../src/main/resources/webapp/browserslist         |    12 +
 .../src/main/resources/webapp/package-lock.json    | 22793 ++++++++-----------
 .../src/main/resources/webapp/package.json         |    66 +-
 .../app/access-denied/access-denied.component.html |    33 -
 .../backup-dilog/backup-dilog.component.ts         |     2 +-
 .../management/endpoints/endpoints.component.html  |     4 +-
 .../management/endpoints/endpoints.component.ts    |     2 +-
 .../manage-environment-dilog.component.html        |    23 +-
 .../manage-environment-dilog.component.ts          |     2 +-
 .../management/management-data.service.ts          |     4 +
 .../management-grid/management-grid.component.html |   125 +-
 .../management-grid/management-grid.component.scss |    56 +-
 .../management-grid/management-grid.component.ts   |    90 +-
 .../management/management.component.html           |     8 +-
 .../management/management.component.ts             |     2 +-
 .../administration/management/management.model.ts  |    27 +
 .../ssn-monitor/ssn-monitor.component.ts           |     2 +-
 .../project-form/project-form.component.html       |     4 +
 .../project-form/project-form.component.scss       |     7 +
 .../project/project-form/project-form.component.ts |    23 +-
 .../project/project-list/project-list.component.ts |     2 +-
 .../administration/project/project.component.ts    |     2 +-
 .../app/administration/roles/roles.component.ts    |     2 +-
 .../main/resources/webapp/src/app/app.module.ts    |    35 +-
 .../resources/webapp/src/app/app.routing.module.ts |     4 +-
 .../resources/webapp/src/app/core/core.module.ts   |    28 +-
 .../core/interceptors/httpInterceptor.service.ts   |     0
 .../core/interceptors/logInterceptor.factory.ts    |     0
 .../services/applicationServiceFacade.service.ts   |   174 +-
 .../src/app/core/services/userAccessKey.service.ts |     8 +-
 .../webapp/src/app/core/util/fileUtils.ts          |    21 +-
 .../webapp/src/app/core/util/http-methods.ts       |    11 +
 .../webapp/src/app/core/util/http-status-codes.ts  |   106 +-
 .../resources/webapp/src/app/core/util/index.ts    |     1 +
 .../webapp/src/app/layout/layout.component.ts      |     1 +
 .../webapp/src/app/not-found/not-found.module.ts   |    29 -
 .../reporting-grid/reporting-grid.component.html   |    92 +-
 .../reporting-grid/reporting-grid.component.scss   |    27 +-
 .../reporting-grid/reporting-grid.component.ts     |    10 +-
 .../src/app/reporting/reporting.component.ts       |    11 +-
 .../cluster-details/cluster-details.component.ts   |     4 +-
 ...mputational-resource-create-dialog.component.ts |     8 +-
 .../computational-resources-list.component.ts      |     2 +-
 .../ami-create-dialog.component.ts                 |     2 +-
 .../cost-details-dialog.component.scss             |    15 +-
 .../cost-details-dialog.component.ts               |     2 +-
 .../create-environment.component.scss              |     2 +-
 .../create-environment.component.ts                |     4 +-
 .../detail-dialog/detail-dialog.component.ts       |     8 +-
 .../install-libraries.component.ts                 |     6 +-
 .../manage-ungit/manage-ungit.component.ts         |     4 +-
 .../resources-grid/resources-grid.component.html   |    38 +-
 .../resources-grid/resources-grid.component.scss   |    46 +-
 .../resources-grid/resources-grid.component.ts     |     2 +-
 .../src/app/resources/resources.component.ts       |     4 +-
 .../app/resources/scheduler/scheduler.component.ts |    98 +-
 .../access-denied/access-denied.component.scss     |     0
 .../access-denied/access-denied.component.ts       |    17 +-
 .../not-found/not-found.component.html             |     0
 .../not-found/not-found.component.scss             |     0
 .../not-found/not-found.component.ts               |     0
 .../service-pages.module.ts}                       |     9 +-
 .../webapp/src/app/shared/bubble/bubble.service.ts |     4 +-
 .../main/resources/webapp/src/app/shared/index.ts  |     1 -
 .../webapp/src/app/shared/material.module.ts       |    66 +-
 .../confirmation-dialog.component.ts               |     2 +-
 .../shared/modal-dialog/key-upload-dialog/index.ts |    34 -
 .../key-upload-dialog.component.html               |    64 -
 .../key-upload-dialog.component.ts                 |    82 -
 .../key-upload-dialog/key-upload.model.ts          |    80 -
 .../notification-dialog.component.ts               |     2 +-
 .../progress-dialog/progress-dialog.component.ts   |     2 +-
 .../webapp/src/app/shared/navbar/index.ts          |     5 +-
 .../src/app/shared/navbar/navbar.component.html    |     7 +-
 .../src/app/shared/navbar/navbar.component.scss    |    52 +
 .../src/app/shared/navbar/navbar.component.ts      |    44 +-
 .../shared/time-picker/time-picker.component.scss  |     2 -
 .../shared/time-picker/time-picker.component.ts    |     2 +-
 .../src/app/webterminal/webterminal.component.ts   |     5 +-
 .../webapp/src/assets/styles/_dialogs.scss         |     5 -
 .../resources/webapp/src/assets/styles/_theme.scss |    41 +-
 .../webapp/src/assets/styles/app-loading.scss      |    86 +
 .../webapp/src/dictionary/aws.dictionary.ts        |     6 +-
 .../webapp/src/dictionary/azure.dictionary.ts      |     6 +-
 .../webapp/src/dictionary/gcp.dictionary.ts        |     6 +-
 .../webapp/src/environments/environment.prod.ts    |     3 +-
 .../webapp/src/environments/environment.ts         |     3 +-
 .../src/main/resources/webapp/src/index.html       |    80 +-
 .../src/main/resources/webapp/src/polyfills.ts     |    33 +-
 .../src/main/resources/webapp/src/styles.scss      |    11 +-
 .../main/resources/webapp/src/tsconfig.app.json    |     2 -
 .../main/resources/webapp/src/tsconfig.spec.json   |     1 -
 .../src/main/resources/webapp/tsconfig.json        |    16 +-
 .../src/main/resources/webapp/tslint.json          |     8 +-
 101 files changed, 11302 insertions(+), 13620 deletions(-)
 create mode 100644 services/self-service/src/main/resources/webapp/browserslist
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/access-denied/access-denied.component.html
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/httpInterceptor.service.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/core/interceptors/logInterceptor.factory.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/util/http-methods.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/not-found/not-found.module.ts
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.scss (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/access-denied/access-denied.component.ts (69%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.html (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.scss (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{ => service-pages}/not-found/not-found.component.ts (100%)
 rename services/self-service/src/main/resources/webapp/src/app/{access-denied/access-denied.module.ts => service-pages/service-pages.module.ts} (75%)
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.html
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
 delete mode 100644 services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload.model.ts
 create mode 100644 services/self-service/src/main/resources/webapp/src/assets/styles/app-loading.scss


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


[incubator-dlab] 01/01: Merge pull request #321 from apache/DLAB-1056

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 8114011a1cf0ed935bb63f4e6508328e10030c44
Merge: e56bf76 0d0a110
Author: bhliva <bo...@ukr.net>
AuthorDate: Thu Sep 26 11:28:16 2019 +0300

    Merge pull request #321 from apache/DLAB-1056
    
    [DLAB-1079 | 1056 | 472]: Admin page filtering; billing extensions; packages updates

 .../src/general/lib/os/debian/ssn_lib.py           |     2 +-
 .../src/general/lib/os/redhat/ssn_lib.py           |     2 +-
 .../src/ssn/scripts/configure_ui.py                |     2 +-
 .../epam/dlab/backendapi/dao/BaseBillingDAO.java   |     4 +
 .../dlab/backendapi/dao/aws/AwsBillingDAO.java     |     3 +-
 .../backendapi/resources/dto/BillingFilter.java    |     3 +
 .../src/main/resources/webapp/angular.json         |    25 +-
 .../src/main/resources/webapp/browserslist         |    12 +
 .../src/main/resources/webapp/package-lock.json    | 22793 ++++++++-----------
 .../src/main/resources/webapp/package.json         |    66 +-
 .../app/access-denied/access-denied.component.html |    33 -
 .../backup-dilog/backup-dilog.component.ts         |     2 +-
 .../management/endpoints/endpoints.component.html  |     4 +-
 .../management/endpoints/endpoints.component.ts    |     2 +-
 .../manage-environment-dilog.component.html        |    23 +-
 .../manage-environment-dilog.component.ts          |     2 +-
 .../management/management-data.service.ts          |     4 +
 .../management-grid/management-grid.component.html |   125 +-
 .../management-grid/management-grid.component.scss |    56 +-
 .../management-grid/management-grid.component.ts   |    90 +-
 .../management/management.component.html           |     8 +-
 .../management/management.component.ts             |     2 +-
 .../administration/management/management.model.ts  |    27 +
 .../ssn-monitor/ssn-monitor.component.ts           |     2 +-
 .../project-form/project-form.component.html       |     4 +
 .../project-form/project-form.component.scss       |     7 +
 .../project/project-form/project-form.component.ts |    23 +-
 .../project/project-list/project-list.component.ts |     2 +-
 .../administration/project/project.component.ts    |     2 +-
 .../app/administration/roles/roles.component.ts    |     2 +-
 .../main/resources/webapp/src/app/app.module.ts    |    35 +-
 .../resources/webapp/src/app/app.routing.module.ts |     4 +-
 .../resources/webapp/src/app/core/core.module.ts   |    28 +-
 .../core/interceptors/httpInterceptor.service.ts   |     0
 .../core/interceptors/logInterceptor.factory.ts    |     0
 .../services/applicationServiceFacade.service.ts   |   174 +-
 .../src/app/core/services/userAccessKey.service.ts |     8 +-
 .../webapp/src/app/core/util/fileUtils.ts          |    21 +-
 .../webapp/src/app/core/util/http-methods.ts       |    11 +
 .../webapp/src/app/core/util/http-status-codes.ts  |   106 +-
 .../resources/webapp/src/app/core/util/index.ts    |     1 +
 .../webapp/src/app/layout/layout.component.ts      |     1 +
 .../webapp/src/app/not-found/not-found.module.ts   |    29 -
 .../reporting-grid/reporting-grid.component.html   |    92 +-
 .../reporting-grid/reporting-grid.component.scss   |    27 +-
 .../reporting-grid/reporting-grid.component.ts     |    10 +-
 .../src/app/reporting/reporting.component.ts       |    11 +-
 .../cluster-details/cluster-details.component.ts   |     4 +-
 ...mputational-resource-create-dialog.component.ts |     8 +-
 .../computational-resources-list.component.ts      |     2 +-
 .../ami-create-dialog.component.ts                 |     2 +-
 .../cost-details-dialog.component.scss             |    15 +-
 .../cost-details-dialog.component.ts               |     2 +-
 .../create-environment.component.scss              |     2 +-
 .../create-environment.component.ts                |     4 +-
 .../detail-dialog/detail-dialog.component.ts       |     8 +-
 .../install-libraries.component.ts                 |     6 +-
 .../manage-ungit/manage-ungit.component.ts         |     4 +-
 .../resources-grid/resources-grid.component.html   |    38 +-
 .../resources-grid/resources-grid.component.scss   |    46 +-
 .../resources-grid/resources-grid.component.ts     |     2 +-
 .../src/app/resources/resources.component.ts       |     4 +-
 .../app/resources/scheduler/scheduler.component.ts |    98 +-
 .../access-denied/access-denied.component.scss     |     0
 .../access-denied/access-denied.component.ts       |    17 +-
 .../not-found/not-found.component.html             |     0
 .../not-found/not-found.component.scss             |     0
 .../not-found/not-found.component.ts               |     0
 .../service-pages.module.ts}                       |     9 +-
 .../webapp/src/app/shared/bubble/bubble.service.ts |     4 +-
 .../main/resources/webapp/src/app/shared/index.ts  |     1 -
 .../webapp/src/app/shared/material.module.ts       |    66 +-
 .../confirmation-dialog.component.ts               |     2 +-
 .../shared/modal-dialog/key-upload-dialog/index.ts |    34 -
 .../key-upload-dialog.component.html               |    64 -
 .../key-upload-dialog.component.ts                 |    82 -
 .../key-upload-dialog/key-upload.model.ts          |    80 -
 .../notification-dialog.component.ts               |     2 +-
 .../progress-dialog/progress-dialog.component.ts   |     2 +-
 .../webapp/src/app/shared/navbar/index.ts          |     5 +-
 .../src/app/shared/navbar/navbar.component.html    |     7 +-
 .../src/app/shared/navbar/navbar.component.scss    |    52 +
 .../src/app/shared/navbar/navbar.component.ts      |    44 +-
 .../shared/time-picker/time-picker.component.scss  |     2 -
 .../shared/time-picker/time-picker.component.ts    |     2 +-
 .../src/app/webterminal/webterminal.component.ts   |     5 +-
 .../webapp/src/assets/styles/_dialogs.scss         |     5 -
 .../resources/webapp/src/assets/styles/_theme.scss |    41 +-
 .../webapp/src/assets/styles/app-loading.scss      |    86 +
 .../webapp/src/dictionary/aws.dictionary.ts        |     6 +-
 .../webapp/src/dictionary/azure.dictionary.ts      |     6 +-
 .../webapp/src/dictionary/gcp.dictionary.ts        |     6 +-
 .../webapp/src/environments/environment.prod.ts    |     3 +-
 .../webapp/src/environments/environment.ts         |     3 +-
 .../src/main/resources/webapp/src/index.html       |    80 +-
 .../src/main/resources/webapp/src/polyfills.ts     |    33 +-
 .../src/main/resources/webapp/src/styles.scss      |    11 +-
 .../main/resources/webapp/src/tsconfig.app.json    |     2 -
 .../main/resources/webapp/src/tsconfig.spec.json   |     1 -
 .../src/main/resources/webapp/tsconfig.json        |    16 +-
 .../src/main/resources/webapp/tslint.json          |     8 +-
 101 files changed, 11302 insertions(+), 13620 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org