You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/16 14:05:12 UTC
[incubator-dlab] branch DLAB-1056 updated (deca22e -> 46787bc)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from deca22e DLAB-000 added project field to billing report
add 4f21dbb updated perameters and configurations
add bd9cffb added starting loader; mocked api url for dev mode
add dcd838a Fix develop.
add fba1e54 Fix develop2.
add 91232cf Merge pull request #307 from apache/fix-develop
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
new dc28460 merge dlab-loading into DLAB-1056
new 4416d09 Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
new b307c81 Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
new 39fa563 [DLAB-1056]: added filtering by project to billing report
new 46787bc [DLAB-1056]: changed ReportingConfigModel
The 5 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 | 4 +-
.../src/general/lib/os/redhat/ssn_lib.py | 4 +-
.../src/main/resources/webapp/angular.json | 25 +-
.../src/main/resources/webapp/package-lock.json | 8808 +++++++++-----------
.../src/main/resources/webapp/package.json | 46 +-
.../project/project-form/project-form.component.ts | 5 +-
.../main/resources/webapp/src/app/app.module.ts | 21 +-
.../resources/webapp/src/app/core/core.module.ts | 24 +-
.../core/interceptors/httpInterceptor.service.ts | 0
.../core/interceptors/logInterceptor.factory.ts | 0
.../services/applicationServiceFacade.service.ts | 10 +-
.../reporting-grid/reporting-grid.component.html | 8 +-
.../reporting-grid/reporting-grid.component.scss | 1 +
.../reporting-grid/reporting-grid.component.ts | 6 +-
.../src/app/reporting/reporting.component.ts | 11 +-
.../cluster-details/cluster-details.component.ts | 2 +-
...mputational-resource-create-dialog.component.ts | 6 +-
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.ts | 6 +-
.../install-libraries.component.ts | 4 +-
.../manage-ungit/manage-ungit.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 2 +-
.../app/resources/scheduler/scheduler.component.ts | 96 +-
.../webapp/src/app/shared/bubble/bubble.service.ts | 4 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../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 -
.../webapp/src/app/shared/navbar/index.ts | 5 +-
.../src/app/webterminal/webterminal.component.ts | 5 +-
.../webapp/src/assets/styles/app-loading.scss | 86 +
.../webapp/src/dictionary/aws.dictionary.ts | 5 +-
.../webapp/src/dictionary/azure.dictionary.ts | 2 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 2 +-
.../webapp/src/environments/environment.ts | 3 +-
.../src/main/resources/webapp/src/index.html | 80 +-
.../src/main/resources/webapp/tsconfig.json | 11 +-
38 files changed, 4172 insertions(+), 5385 deletions(-)
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
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] 03/05: Merge branch 'DLAB-1056' of
github.com:apache/incubator-dlab into DLAB-1056
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit b307c814b1f4aab72fd79904d7c23ed5718b2ff1
Merge: 4416d09 deca22e
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 16:48:03 2019 +0300
Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
.../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 1 +
.../src/main/java/com/epam/dlab/backendapi/dao/aws/AwsBillingDAO.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/05: [DLAB-1056]: added filtering by project to
billing report
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 39fa56364f35244929f6ccb0edc6782558616521
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 17:04:12 2019 +0300
[DLAB-1056]: added filtering by project to billing report
---
.../app/reporting/reporting-grid/reporting-grid.component.html | 8 ++++----
.../app/reporting/reporting-grid/reporting-grid.component.scss | 1 +
.../src/app/reporting/reporting-grid/reporting-grid.component.ts | 4 ++--
.../resources/webapp/src/app/reporting/reporting.component.ts | 7 +++++--
4 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
index eada0ff..dbaef33 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html
@@ -51,12 +51,12 @@
<ng-container matColumnDef="project">
<th mat-header-cell *matHeaderCellDef class="th_project">
<span class="label">Project</span>
- <!-- <button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
+ <button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
<i class="material-icons">
<span *ngIf="filteredReportData.project.length > 0; else project_filtered">filter_list</span>
<ng-template #project_filtered>more_vert</ng-template>
</i>
- </button> -->
+ </button>
</th>
<td mat-cell *matCellDef="let element"> {{element.project}} </td>
<td mat-footer-cell *matFooterCellDef></td>
@@ -157,8 +157,8 @@
</ng-container>
<ng-container matColumnDef="project-filter">
<th mat-header-cell *matHeaderCellDef>
- <!-- <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'project'"
- [items]="filterConfiguration.project" [model]="filteredReportData.project"></multi-select-dropdown> -->
+ <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'project'"
+ [items]="filterConfiguration.project" [model]="filteredReportData.project"></multi-select-dropdown>
</th>
</ng-container>
<ng-container matColumnDef="type-filter">
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
index 29fb1b2..be0cb7f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss
@@ -34,6 +34,7 @@
tr {
th {
font-size: 11px;
+ padding-right: 5px;
}
td {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
index 9cc7914..d303723 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts
@@ -32,8 +32,8 @@ export class ReportingGridComponent implements OnInit {
readonly DICTIONARY = DICTIONARY;
filterConfiguration: ReportingConfigModel;
- filteredReportData: ReportingConfigModel = new ReportingConfigModel([], [], [], [], [], '', '', '');
- collapseFilterRow: boolean = false;
+ filteredReportData: ReportingConfigModel = new ReportingConfigModel([], [], [], [], [], '', '', '', []);
+ collapseFilterRow: boolean = true;
reportData: Array<any> = [];
fullReport: Array<any>;
isFiltered: boolean = false;
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
index f8f0c85..8ecf158 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
@@ -125,7 +125,7 @@ export class ReportingComponent implements OnInit, OnDestroy {
}
getDefaultFilterConfiguration(data): void {
- const users = [], types = [], shapes = [], services = [], statuses = [];
+ const users = [], types = [], shapes = [], services = [], statuses = [], projects = [];
data.lines.forEach((item: any) => {
if (item.user && users.indexOf(item.user) === -1)
@@ -134,6 +134,9 @@ export class ReportingComponent implements OnInit, OnDestroy {
if (item.status && statuses.indexOf(item.status.toLowerCase()) === -1)
statuses.push(item.status.toLowerCase());
+ if (item.project && projects.indexOf(item.project) === -1)
+ projects.push(item.project);
+
if (item[DICTIONARY.billing.resourceType] && types.indexOf(item[DICTIONARY.billing.resourceType]) === -1)
types.push(item[DICTIONARY.billing.resourceType]);
@@ -161,7 +164,7 @@ export class ReportingComponent implements OnInit, OnDestroy {
});
if (!this.reportingGrid.filterConfiguration || !localStorage.getItem('report_config')) {
- this.filterConfiguration = new ReportingConfigModel(users, services, types, statuses, shapes, '', '', '');
+ this.filterConfiguration = new ReportingConfigModel(users, services, types, statuses, shapes, '', '', '', projects);
this.reportingGrid.setConfiguration(this.filterConfiguration);
localStorage.setItem('report_config', JSON.stringify(this.filterConfiguration));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/05: Merge branch 'DLAB-1056' of
github.com:apache/incubator-dlab into DLAB-1056
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4416d099b69e34a82b0ee04521071fdd7438094d
Merge: dc28460 effc3f8
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 16:06:27 2019 +0300
Merge branch 'DLAB-1056' of github.com:apache/incubator-dlab into DLAB-1056
.../src/main/java/com/epam/dlab/backendapi/dao/BaseBillingDAO.java | 3 +++
.../java/com/epam/dlab/backendapi/resources/dto/BillingFilter.java | 3 +++
2 files changed, 6 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 05/05: [DLAB-1056]: changed ReportingConfigModel
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 46787bc4aa93be530aa7c34e684619bb66f0b4a4
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 17:04:54 2019 +0300
[DLAB-1056]: changed ReportingConfigModel
---
.../src/main/resources/webapp/src/dictionary/aws.dictionary.ts | 5 +++--
.../src/main/resources/webapp/src/dictionary/azure.dictionary.ts | 2 +-
.../src/main/resources/webapp/src/dictionary/gcp.dictionary.ts | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
index 4c3fee3..0115109 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/aws.dictionary.ts
@@ -85,7 +85,8 @@ export const NAMING_CONVENTION = {
export class ReportingConfigModel {
static getDefault(): ReportingConfigModel {
- return new ReportingConfigModel([], [], [], [], [], '', '', '');
+ debugger;
+ return new ReportingConfigModel([], [], [], [], [], '', '', '', []);
}
constructor(
@@ -109,6 +110,6 @@ export class ReportingConfigModel {
this.date_start = '';
this.date_end = '';
this.dlab_id = '';
- // this.project = [];
+ this.project = [];
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
index 7db80d2..b8779b6 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/azure.dictionary.ts
@@ -86,7 +86,7 @@ export const NAMING_CONVENTION = {
export class ReportingConfigModel {
static getDefault(): ReportingConfigModel {
- return new ReportingConfigModel([], [], [], [], [], '', '', '');
+ return new ReportingConfigModel([], [], [], [], [], '', '', '', []);
}
constructor(
diff --git a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
index eeb6807..b5a928c 100644
--- a/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
+++ b/services/self-service/src/main/resources/webapp/src/dictionary/gcp.dictionary.ts
@@ -91,7 +91,7 @@ export const NAMING_CONVENTION = {
export class ReportingConfigModel {
static getDefault(): ReportingConfigModel {
- return new ReportingConfigModel([], [], [], [], [], '', '', '');
+ return new ReportingConfigModel([], [], [], [], [], '', '', '', []);
}
constructor(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/05: merge dlab-loading into DLAB-1056
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit dc284605d73e75cb259ebfd947e33ee3f106cfd8
Merge: 42803a4 a374b70
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Sep 16 15:58:53 2019 +0300
merge dlab-loading into DLAB-1056
infrastructure-provisioning/scripts/deploy_dlab.py | 2 +
.../src/general/lib/gcp/actions_lib.py | 25 +-
.../src/general/lib/os/debian/ssn_lib.py | 32 +-
.../src/general/lib/os/redhat/ssn_lib.py | 30 +-
.../general/scripts/aws/common_prepare_notebook.py | 3 +-
.../general/scripts/gcp/common_create_instance.py | 4 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +-
.../src/general/scripts/gcp/ssn_configure.py | 8 +-
.../src/ssn/scripts/configure_billing.py | 5 +
.../src/ssn/scripts/configure_ui.py | 3 +-
.../src/ssn/templates/supervisor_svc.conf | 4 +-
pom.xml | 18 +-
services/billing-gcp/billing.yml | 40 +-
services/billing-gcp/pom.xml | 84 +-
...licationGcp.java => BillingGcpApplication.java} | 17 +-
.../BillingApplicationConfiguration.java} | 17 +-
.../dlab/billing/gcp/conf/DlabConfiguration.java} | 24 +-
.../BillingDAO.java} | 10 +-
.../billing/gcp/dao/impl/BigQueryBillingDAO.java | 120 +
.../Project.java} | 13 +-
.../dlab/billing/gcp/documents/UserInstance.java | 55 +
.../epam/dlab/billing/gcp/model/BillingData.java | 70 +
.../dlab/billing/gcp/model/BillingHistory.java | 13 +
.../dlab/billing/gcp/model/GcpBillingData.java} | 25 +-
.../gcp/repository/BillingHistoryRepository.java | 7 +
.../BillingRepository.java} | 10 +-
.../ProjectRepository.java} | 9 +-
.../UserInstanceRepository.java} | 11 +-
.../BillingScheduler.java} | 21 +-
.../BillingService.java} | 8 +-
.../billing/gcp/service/BillingServiceImpl.java | 176 +
.../epam/dlab/billing/gcp/util/BillingUtils.java | 92 +
.../billing-gcp/src/main/resources/application.yml | 18 +
.../com/epam/dlab/model/exploratory/Image.java | 1 +
services/self-service/self-service.yml | 13 +-
.../epam/dlab/backendapi/dao/BaseBillingDAO.java | 206 +-
.../dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../backendapi/dao/ImageExploratoryDaoImpl.java | 15 +-
.../com/epam/dlab/backendapi/dao/ProjectDAO.java | 2 +
.../epam/dlab/backendapi/dao/ProjectDAOImpl.java | 7 +
.../dlab/backendapi/dao/aws/AwsBillingDAO.java | 205 +-
.../dlab/backendapi/dao/azure/AzureBillingDAO.java | 210 +-
.../dlab/backendapi/dao/gcp/GcpBillingDao.java | 89 +-
.../epam/dlab/backendapi/modules/DevModule.java | 19 +
.../backendapi/modules/GcpSelfServiceModule.java | 75 +-
.../resources/ImageExploratoryResource.java | 8 +-
.../backendapi/resources/UserGroupResource.java | 1 +
.../backendapi/resources/dto/BillingFilter.java | 4 +-
.../backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../resources/dto/aws/AwsBillingFilter.java | 6 +
.../resources/dto/azure/AzureBillingFilter.java | 12 +-
.../GcpBillingFilter.java} | 17 +-
.../resources/gcp/BillingResourceGcp.java | 76 +
.../dlab/backendapi/service/BillingService.java | 87 +-
.../service/ImageExploratoryService.java | 2 +-
.../backendapi/service/aws/AwsBillingService.java | 14 -
.../service/azure/AzureBillingService.java | 150 +-
.../backendapi/service/gcp/GcpBillingService.java | 102 +
.../service/impl/ImageExploratoryServiceImpl.java | 8 +-
.../service/impl/UserGroupServiceImpl.java | 10 +
.../src/main/resources/webapp/angular.json | 25 +-
.../src/main/resources/webapp/package-lock.json | 8760 +++++++++-----------
.../src/main/resources/webapp/package.json | 46 +-
.../project/project-form/project-form.component.ts | 5 +-
.../app/administration/roles/roles.component.ts | 3 +-
.../main/resources/webapp/src/app/app.module.ts | 21 +-
.../resources/webapp/src/app/core/core.module.ts | 24 +-
.../core/interceptors/httpInterceptor.service.ts | 0
.../core/interceptors/logInterceptor.factory.ts | 0
.../services/applicationServiceFacade.service.ts | 10 +-
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../src/app/reporting/reporting.component.ts | 4 +-
.../cluster-details/cluster-details.component.ts | 2 +-
...mputational-resource-create-dialog.component.ts | 6 +-
.../create-environment.component.ts | 2 +-
.../detail-dialog/detail-dialog.component.ts | 6 +-
.../install-libraries.component.ts | 4 +-
.../manage-ungit/manage-ungit.component.ts | 2 +-
.../src/app/resources/resources.component.ts | 2 +-
.../app/resources/scheduler/scheduler.component.ts | 96 +-
.../webapp/src/app/shared/bubble/bubble.service.ts | 4 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../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 -
.../webapp/src/app/shared/navbar/index.ts | 5 +-
.../src/app/webterminal/webterminal.component.ts | 5 +-
.../webapp/src/assets/styles/app-loading.scss | 86 +
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 6 +-
.../webapp/src/environments/environment.ts | 3 +-
.../src/main/resources/webapp/src/index.html | 80 +-
.../src/main/resources/webapp/tsconfig.json | 11 +-
.../resources/ImageExploratoryResourceTest.java | 12 +-
.../impl/ImageExploratoryServiceImplTest.java | 8 +-
97 files changed, 5753 insertions(+), 6085 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org