You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by yk...@apache.org on 2020/12/16 09:33:22 UTC
[incubator-datalab] branch DATALAB-2174 updated (023618b -> db828f5)
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a change to branch DATALAB-2174
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 023618b Merge pull request #1011 from apache/DATALAB-2189
add c0aa8c9 [DLAB-1990]: Fixed total quota shouldn't be reset if only project quota is updated
add 8b3492e Merge remote-tracking branch 'origin/develop' into develop
add 04e71de Bucket browser fix
add e4cfbc6 Merge remote-tracking branch 'origin/develop' into develop
add b6c067c Merge remote-tracking branch 'origin/develop' into develop
add 7320803 Merge remote-tracking branch 'origin/develop' into develop
add 8aff266 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 47ed005 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 3a59155 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 5342439 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 941516f Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 7d4f352 [DLAB-2020]: Minor changes about library installation
add 74e2025 Merge remote-tracking branch 'origin/develop' into develop
add 507fa54 Merge remote-tracking branch 'origin/develop' into develop
add 5e65b5f [DLAB-2022]: Fixed allocation to another folder during refresh
add 069f5d0 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 2b1c972 Merge remote-tracking branch 'origin/develop' into develop
add f2fb35e Merge remote-tracking branch 'origin/develop' into develop
add d5a5713 Merge remote-tracking branch 'origin/develop' into develop
add e1eb9a7 Merge remote-tracking branch 'origin/develop' into develop
add 6329348 Merge remote-tracking branch 'origin/develop' into develop
add 459066c [DLAB-2050]: Fixed billing details on list of resources
add 85c3c59 Merge remote-tracking branch 'origin/develop' into develop
add 605050e Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add cea86df Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add bc4cee3 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add fde6fe6 Merge remote-tracking branch 'origin/develop' into develop
add 1610c1d Merge remote-tracking branch 'origin/develop' into develop
add 4eb9579 Merge remote-tracking branch 'origin/develop' into develop
add bc38f94 Merge remote-tracking branch 'origin/develop' into develop
add 470bfcd Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add cdb374e Merge remote-tracking branch 'origin/develop' into develop
add f97508c Merge remote-tracking branch 'origin/develop' into develop
add 152d2aa Merge remote-tracking branch 'origin/develop' into develop
add 20489fa Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 1f4a399 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add afb0fe0 Merge remote-tracking branch 'origin/develop' into develop
add 5d50ad3 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 2e9fb79 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 270cbba Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 41d56e9 Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 24bf17b Merge remote-tracking branch 'origin/develop' into develop
add b9a222c Merge remote-tracking branch 'origin/develop' into develop
add f37bda0 Merge remote-tracking branch 'origin/develop' into develop
add 4e00026 Merge remote-tracking branch 'origin/develop' into develop
add 8eb1bec Merge remote-tracking branch 'origin/develop' into develop
add a7669bb Merge branch 'develop' of github.com:apache/incubator-dlab into develop
add 37fd894 [DATALAB-2138]: Implement administration page
add 913014b [DATALAB-2157]: Update main block on administrative page
add 8bbfab5 Merge branch 'develop' of https://github.com/KinashYurii/incubator-datalab into DATALAB-2174
add 514012c [DATALAB-2174] -- added resource class
add 1ff289e [DATALAB-2174] -- added admin resource with dynamic change for properties(self/provisioning-service)
add fb57570 [DATALAB-2174] -- remove licence when read file
add cd7b7bf [DATALAB-2174] -- added restart logic
new db828f5 Merge pull request #1013 from KinashYurii/DATALAB-2174
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:
services/billing-azure/billing.yml | 250 ++++++++++++++-------
.../DynamicChangePropertiesException.java | 8 +
.../DynamicChangePropertiesExceptionMapper.java | 20 ++
.../datalab/backendapi/SelfServiceApplication.java | 2 +
.../resources/admin/ChangePropertiesResource.java | 116 ++++++++++
.../datalab/backendapi/resources/dto/YmlDTO.java | 9 +
.../service/impl/DynamicChangeProperties.java | 180 +++++++++++++++
.../src/main/resources/webapp/package-lock.json | 19 ++
.../src/main/resources/webapp/package.json | 1 +
.../app/administration/administration.module.ts | 5 +-
.../configuration/configuration.component.html | 110 +++++++++
.../configuration/configuration.component.scss | 92 ++++++++
.../configuration/configuration.component.ts | 214 ++++++++++++++++++
.../configuration}/index.ts | 26 +--
.../main/resources/webapp/src/app/app.module.ts | 4 +-
.../resources/webapp/src/app/app.routing.module.ts | 6 +
.../resources/webapp/src/app/core/core.module.ts | 5 +-
.../app/core/services/configutration.service.ts | 222 ++++++++++++++++++
.../multi-level-select-dropdown.component.scss | 2 +
.../src/app/shared/navbar/navbar.component.html | 6 +
.../webapp/src/assets/styles/_general.scss | 1 +
.../resources/webapp/src/assets/styles/_theme.scss | 22 ++
.../src/main/resources/webapp/src/styles.scss | 5 +-
23 files changed, 1227 insertions(+), 98 deletions(-)
create mode 100644 services/common/src/main/java/com/epam/datalab/exceptions/DynamicChangePropertiesException.java
create mode 100644 services/datalab-webapp-common/src/main/java/com/epam/datalab/rest/mappers/DynamicChangePropertiesExceptionMapper.java
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/resources/admin/ChangePropertiesResource.java
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/resources/dto/YmlDTO.java
create mode 100644 services/self-service/src/main/java/com/epam/datalab/backendapi/service/impl/DynamicChangeProperties.java
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.html
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.scss
create mode 100644 services/self-service/src/main/resources/webapp/src/app/administration/configuration/configuration.component.ts
copy services/self-service/src/main/resources/webapp/src/app/{resources/scheduler => administration/configuration}/index.ts (71%)
create mode 100644 services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: Merge pull request #1013 from
KinashYurii/DATALAB-2174
Posted by yk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ykinash pushed a commit to branch DATALAB-2174
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit db828f509af89144a96cc1774e8b0adb8df2c515
Merge: 023618b cd7b7bf
Author: Kinash Yurii <ur...@gmail.com>
AuthorDate: Wed Dec 16 11:33:11 2020 +0200
Merge pull request #1013 from KinashYurii/DATALAB-2174
[DATALAB-2174] : added BE for admin page
services/billing-azure/billing.yml | 250 ++++++++++++++-------
.../DynamicChangePropertiesException.java | 8 +
.../DynamicChangePropertiesExceptionMapper.java | 20 ++
.../datalab/backendapi/SelfServiceApplication.java | 2 +
.../resources/admin/ChangePropertiesResource.java | 116 ++++++++++
.../datalab/backendapi/resources/dto/YmlDTO.java | 9 +
.../service/impl/DynamicChangeProperties.java | 180 +++++++++++++++
.../src/main/resources/webapp/package-lock.json | 19 ++
.../src/main/resources/webapp/package.json | 1 +
.../app/administration/administration.module.ts | 5 +-
.../configuration/configuration.component.html | 110 +++++++++
.../configuration/configuration.component.scss | 92 ++++++++
.../configuration/configuration.component.ts | 214 ++++++++++++++++++
.../index.ts} | 28 ++-
.../main/resources/webapp/src/app/app.module.ts | 4 +-
.../resources/webapp/src/app/app.routing.module.ts | 6 +
.../resources/webapp/src/app/core/core.module.ts | 5 +-
.../app/core/services/configutration.service.ts | 222 ++++++++++++++++++
.../multi-level-select-dropdown.component.scss | 2 +
.../src/app/shared/navbar/navbar.component.html | 6 +
.../webapp/src/assets/styles/_general.scss | 1 +
.../resources/webapp/src/assets/styles/_theme.scss | 22 ++
.../src/main/resources/webapp/src/styles.scss | 5 +-
23 files changed, 1236 insertions(+), 91 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org