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/07/01 10:29:28 UTC
[incubator-dlab] branch feature/projects updated (1a0c0d7 ->
e317594)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 1a0c0d7 DLAB-000 fixed project key regex
new 511ce88 [DLAB-823]: added placeholder to billing grid
new a9601a6 [DLAB-823]: added placeholder to management grid
new c5cf2c2 [DLAB-823]: added placeholder to management grid
new e317594 Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
The 4 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:
.../management-grid/management-grid.component.html | 7 ++
.../webapp/src/app/login/login.component.ts | 10 +-
.../reporting-grid/reporting-grid.component.html | 101 +++------------------
.../reporting-grid/reporting-grid.component.scss | 37 ++++++--
.../reporting-grid/reporting-grid.component.ts | 20 ++--
.../src/app/shared/navbar/navbar.component.html | 4 +-
6 files changed, 65 insertions(+), 114 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/04: [DLAB-823]: added placeholder to billing
grid
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 511ce8845ded84504649db4ba786f7aaf3da7f68
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Jun 27 12:44:08 2019 +0300
[DLAB-823]: added placeholder to billing grid
---
.../reporting-grid/reporting-grid.component.html | 101 +++------------------
.../reporting-grid/reporting-grid.component.scss | 37 ++++++--
.../reporting-grid/reporting-grid.component.ts | 20 ++--
3 files changed, 51 insertions(+), 107 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 968d148..9472370 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
@@ -17,81 +17,6 @@
~ under the License.
-->
-<!-- <table class="dashboard_table reporting">
- <tr>
- <th *ngFor="let column of filteringColumns" ngClass="{{column.className || ''}}"
- [hidden]="column.role && !full_report">{{ column.title }}
- <button mat-icon-button *ngIf="column.filtering" aria-label="More" class="ar" (click)="toggleFilterRow()">
- <i class="material-icons">
- <span
- *ngIf="isFiltered && filteredReportData[column.name].length > 0 && !collapseFilterRow">filter_list</span>
- <span
- [hidden]="isFiltered && filteredReportData[column.name].length > 0 && !collapseFilterRow">more_vert</span>
- </i>
- </button>
- </th>
- </tr>
-
- <tr *ngIf="collapseFilterRow" class="filter-row">
- <td *ngIf="full_report">
- <multi-select-dropdown (selectionChange)="onUpdate($event)" [type]="'user'" [items]="filterConfiguration.user"
- [model]="filteredReportData.user"></multi-select-dropdown>
- </td>
- <td>
- <input type="text" placeholder="Filter by environment name" class="form-control filter-field"
- [value]="filteredReportData.dlab_id" (input)="filteredReportData.dlab_id = $event.target.value" />
- </td>
- <td>
- <multi-select-dropdown (selectionChange)="onUpdate($event)" [type]="'resource_type'"
- [items]="filterConfiguration.resource_type" [model]="filteredReportData.resource_type"></multi-select-dropdown>
- </td>
- <td>
- <multi-select-dropdown (selectionChange)="onUpdate($event)" [type]="'status'" [items]="filterConfiguration.status"
- [model]="filteredReportData.status"></multi-select-dropdown>
- </td>
- <td>
- <multi-select-dropdown (selectionChange)="onUpdate($event)" [type]="[DICTIONARY.billing.instance_size]"
- [items]="filterConfiguration[DICTIONARY.billing.instance_size]"
- [model]="filteredReportData[DICTIONARY.billing.instance_size]"></multi-select-dropdown>
- </td>
- <td>
- <multi-select-dropdown (selectionChange)="onUpdate($event)" [type]="[DICTIONARY.billing.service_filter_key]"
- [items]="filterConfiguration[DICTIONARY.billing.service_filter_key]"
- [model]="filteredReportData[DICTIONARY.billing.service_filter_key]"></multi-select-dropdown>
- </td>
- <td>
- <div class="actions">
- <button mat-icon-button class="btn reset" (click)="resetFiltering(); isFiltered = !isFiltered">
- <i class="material-icons">close</i>
- </button>
-
- <button mat-icon-button class="btn apply" (click)="filter_btnClick()">
- <i class="material-icons">done</i>
- </button>
- </div>
- </td>
- </tr>
-
- <ng-template [ngIf]="reportData">
- <tr *ngFor="let line of reportData" class="dashboard_table_body">
- <td class="user-field" *ngIf="full_report">{{ line.user }}</td>
- <td class="env_name">{{ line[DICTIONARY.billing.dlabId] }}</td>
- <td>{{ line[DICTIONARY.billing.resourceType] }}</td>
- <td>
- <span class="status" ngClass="{{ line.status.toLowerCase() || '' }}"
- *ngIf="line.status">{{ line.status.toLowerCase() }}</span>
- <span *ngIf="!line.status">N/A</span>
- </td>
- <td><span [outerHTML]="line[DICTIONARY.billing.instance_size] | lineBreak"></span></td>
- <td>{{ line[DICTIONARY.billing.service] }}
- <span *ngIf="line.resource_type">({{ line.resource_type }})</span>
- </td>
- <td>{{ line[DICTIONARY.billing.cost] }} {{ line[DICTIONARY.billing.currencyCode] }}</td>
- </tr>
- </ng-template>
-</table> -->
-<!-- *ngIf="full_report" -->
-
<section class="table-wrapper" *ngIf="reportData?.lines">
<table mat-table [dataSource]="reportData.lines" class="data-grid reporting mat-elevation-z6">
@@ -147,7 +72,8 @@
{{ element[DICTIONARY.billing.cost] }} {{ element[DICTIONARY.billing.currencyCode] }}
</td>
<td mat-footer-cell *matFooterCellDef>
- <span *ngIf="reportData">{{ reportData[DICTIONARY.billing.costTotal] }} {{ reportData[DICTIONARY.billing.currencyCode] }}</span>
+ <span *ngIf="reportData">{{ reportData[DICTIONARY.billing.costTotal] }}
+ {{ reportData[DICTIONARY.billing.currencyCode] }}</span>
</td>
</ng-container>
@@ -205,20 +131,21 @@
</div>
</th>
</ng-container>
+ <ng-container matColumnDef="placeholder">
+ <td mat-footer-cell *matFooterCellDef colspan="7" class="info">
+ To start working, please, create new environment
+ </td>
+ </ng-container>
+
<tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr>
- <tr mat-header-row *matHeaderRowDef="displayedFilterColumns; sticky: true" class="filter-row"></tr>
- <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+ <ng-container *ngIf="reportData?.lines.length">
+ <tr mat-header-row *matHeaderRowDef="displayedFilterColumns; sticky: true" class="filter-row"></tr>
- <tr mat-footer-row *matFooterRowDef="displayedColumns; sticky: true"></tr>
+ <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+ <tr mat-footer-row *matFooterRowDef="displayedColumns; sticky: true"></tr>
+ </ng-container>
+ <tr [hidden]="reportData?.lines.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr>
</table>
</section>
-
-<!--
-<div *ngIf="!reportData" class="message_block message info">
- <span>To start working, please, create new environment</span>
-</div>
-<div *ngIf="reportData && reportData.length == 0" class="message_block message info">
- <span>No matches found</span>
-</div> -->
\ No newline at end of file
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 1c2ced0..5c565bb 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
@@ -17,34 +17,40 @@
* under the License.
*/
- .table-wrapper {
- width: 100%;
- }
+.table-wrapper {
+ width: 100%;
+}
.reporting {
width: 100%;
min-width: 1100px;
overflow: auto;
+
tr {
th {
font-size: 11px;
}
+
td {
- font-size: 13px;
+ font-size: 13px;
}
+
&.filter-row {
th {
padding: 5px;
}
+
.filter-field {
font-size: 13px;
}
}
}
+
.th_shape {
width: 10%;
}
+
.th_user,
.env_name,
.service {
@@ -52,43 +58,54 @@
overflow: hidden;
word-wrap: break-word;
}
+
.th_type {
width: 8%;
}
+
.th_status {
width: 8%;
}
+
.th_charges {
width: 8%;
}
}
+
.dashboard_table_body {
td:first-child {
cursor: default;
}
- .dropdown-multiselect {
- button {
- font-size: 14px;
- height: 34px;
- padding: 7px 20px;
+
+ .dropdown-multiselect {
+ button {
+ font-size: 14px;
+ height: 34px;
+ padding: 7px 20px;
+ }
}
- }
}
+.no-data {}
+
@media screen and (max-width: 1280px) {
.dashboard_table.reporting {
+
.env_name,
.service,
.th_type,
.th_rstatus {
width: 10%;
}
+
.th_user {
width: 12%;
}
+
.th_charges {
width: 6%;
}
+
.user-field {
word-wrap: break-word;
}
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 b919c27..9310c17 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
@@ -25,7 +25,7 @@ import { DICTIONARY, ReportingConfigModel } from '../../../dictionary/global.dic
selector: 'dlab-reporting-grid',
templateUrl: './reporting-grid.component.html',
styleUrls: ['./reporting-grid.component.scss',
- '../../resources/resources-grid/resources-grid.component.css']
+ '../../resources/resources-grid/resources-grid.component.css']
})
export class ReportingGridComponent implements OnInit {
readonly DICTIONARY = DICTIONARY;
@@ -41,15 +41,15 @@ export class ReportingGridComponent implements OnInit {
displayedColumns: string[] = ['name', 'user', 'type', 'status', 'shape', 'service', 'charge'];
displayedFilterColumns: string[] = ['name-filter', 'user-filter', 'type-filter', 'status-filter', 'shape-filter', 'service-filter', 'actions'];
- public filteringColumns: Array<any> = [
- { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'},
- { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true },
- { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true },
- { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true },
- { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true },
- { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true },
- { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false }
- ];
+ // public filteringColumns: Array<any> = [
+ // { title: 'User', name: 'user', className: 'th_user', filtering: true, role: 'admin'},
+ // { title: 'Environment name', name: 'dlab_id', className: 'env_name', filtering: true },
+ // { title: 'Resource Type', name: 'resource_type', className: 'th_type', filtering: true },
+ // { title: 'Status', name: 'status', className: 'th_rstatus', filtering: true },
+ // { title: DICTIONARY.instance_size, name: DICTIONARY.billing.instance_size, className: 'th_shape', filtering: true },
+ // { title: DICTIONARY.service, name: DICTIONARY.billing.service_filter_key, className: 'service', filtering: true },
+ // { title: 'Service Charges', name: 'charges', className: 'th_charges', filtering: false }
+ // ];
ngOnInit() { }
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/04: [DLAB-823]: added placeholder to management
grid
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit a9601a63a84a9ec6b33b166e2866fc044db4b0ea
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Jun 27 12:46:30 2019 +0300
[DLAB-823]: added placeholder to management grid
---
.../management/management-grid/management-grid.component.html | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index da87ed3..ce66673 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -112,9 +112,16 @@
</bubble-up>
</td>
</ng-container>
+ <ng-container matColumnDef="placeholder">
+ <td mat-footer-cell *matFooterCellDef colspan="6" class="info">
+ To start working, please, create new environment
+ </td>
+ </ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
+
+ <tr [hidden]="allEnvironmentData?.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr>
</table>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 04/04: Merge branch 'feature/projects' of
github.com:apache/incubator-dlab into feature/projects
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e317594544329f835306002f63bada27a3476f57
Merge: c5cf2c2 1a0c0d7
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 1 13:29:14 2019 +0300
Merge branch 'feature/projects' of github.com:apache/incubator-dlab into feature/projects
.../src/general/scripts/aws/edge_configure.py | 1 +
.../epam/dlab/dto/exploratory/ExploratoryBaseDTO.java | 2 +-
.../epam/dlab/dto/exploratory/ExploratoryCreateDTO.java | 17 +++++++++--------
.../com/epam/dlab/backendapi/dao/EndpointDAOImpl.java | 4 ++--
.../com/epam/dlab/backendapi/domain/ProjectDTO.java | 2 +-
.../backendapi/service/impl/ExploratoryServiceImpl.java | 2 +-
.../project/project-form/project-form.component.ts | 2 +-
7 files changed, 16 insertions(+), 14 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/04: [DLAB-823]: added placeholder to management
grid
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit c5cf2c2e4dbae7a6ea3855081ba9cb91fd793542
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Mon Jul 1 13:28:52 2019 +0300
[DLAB-823]: added placeholder to management grid
---
.../src/main/resources/webapp/src/app/login/login.component.ts | 10 +++++-----
.../webapp/src/app/shared/navbar/navbar.component.html | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
index b456bf1..489acae 100644
--- a/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/login/login.component.ts
@@ -50,11 +50,11 @@ export class LoginComponent implements OnInit, OnDestroy {
}
ngOnInit() {
- this.applicationSecurityService.isLoggedIn().subscribe(result => {
- console.log('LOGGED IN /login component');
+ // this.applicationSecurityService.isLoggedIn().subscribe(result => {
+ // console.log('LOGGED IN /login component');
- result && this.checkHealthStatusAndRedirect(result);
- });
+ // result && this.checkHealthStatusAndRedirect(result);
+ // });
}
ngOnDestroy() {
@@ -69,7 +69,7 @@ export class LoginComponent implements OnInit, OnDestroy {
.login(this.model)
.subscribe((result) => {
if (result) {
- this.checkHealthStatusAndRedirect(result);
+ this.appRoutingService.redirectToHomePage();
return true;
}
diff --git 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
index 10abf9c..c5a424f 100644
--- 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
@@ -32,9 +32,9 @@
</div>
<div class="control-area" *ngIf="healthStatus">
- <a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
+ <!-- <a *ngIf="healthStatus.status" [routerLink]="['/environment_management']" class="statusbar">
<span class="material-icons" ngClass="{{healthStatus.status || ''}}">radio_button_checked</span>
- </a>
+ </a> -->
<a class="statusbar" #info (click)="actions.toggle($event, info)" *ngIf="metadata">
<span class="material-icons meta">info</span>
</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org