You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/06/25 13:29:22 UTC
[incubator-dlab] branch develop updated: [DLAB-1894]: Fixed set of
UI style tasks (#801)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new 25f1808 [DLAB-1894]: Fixed set of UI style tasks (#801)
25f1808 is described below
commit 25f1808acee317bd561083caacd5b58d43becd3e
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Thu Jun 25 16:29:16 2020 +0300
[DLAB-1894]: Fixed set of UI style tasks (#801)
[DLAB-1894]: Fixed set of UI style tasks
---
.../management-grid/management-grid.component.html | 10 +++++-----
.../management-grid/management-grid.component.scss | 2 +-
.../management-grid/management-grid.component.ts | 17 ++++++++++++-----
.../reports/audit/audit-grid/audit-grid.component.ts | 2 +-
.../reporting-grid/reporting-grid.component.html | 2 +-
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../src/app/reports/reporting/reporting.component.ts | 1 -
.../app/resources/bucket-browser/bucket-data.service.ts | 2 +-
.../cluster-details/cluster-details.component.ts | 1 -
.../multi-select-dropdown.component.html | 11 ++++++++---
.../multi-select-dropdown.component.ts | 1 -
11 files changed, 30 insertions(+), 21 deletions(-)
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 64b6e91..6182843 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
@@ -277,11 +277,11 @@
<ng-container matColumnDef="placeholder">
- <td mat-footer-cell *matFooterCellDef colspan="6" class="info">
- <span
+ <td mat-footer-cell *matFooterCellDef colspan="8" class="info">
+ <div
*ngIf="(!allFilteredEnvironmentData) && !filtering || (allFilteredEnvironmentData?.length == 0) && !filtering">
- To start working, please, create new environment</span>
- <span *ngIf="(allFilteredEnvironmentData?.length == 0) && filtering">No matches found</span>
+ To start working, please, create new environment</div>
+ <div *ngIf="(allFilteredEnvironmentData?.length == 0) && filtering">No matches found</div>
</td>
</ng-container>
@@ -291,7 +291,7 @@
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
- <tr [hidden]="allFilteredEnvironmentData?.length" mat-footer-row *matFooterRowDef="['placeholder']"></tr>
+ <tr [hidden]="allFilteredEnvironmentData?.length" mat-footer-row *matFooterRowDef="['placeholder']" class="info"></tr>
</table>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index 4fb54e0..7bde8bd 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -100,7 +100,7 @@ table.management {
background: transparent !important;
}
- td {
+ td:not(.info) {
padding: 5px;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index 226c9a5..fa2a37f 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -66,6 +66,7 @@ export class ManagementGridComponent implements OnInit {
displayedFilterColumns: string[] = ['checkbox-filter', 'user-filter', 'type-filter', 'project-filter', 'shape-filter', 'status-filter', 'resource-filter', 'actions-filter'];
private selected;
private allActiveNotebooks: any;
+ private cashedFilterForm: ManagementConfigModel = new ManagementConfigModel([], '', [], [], [], []);
constructor(
private healthStatusService: HealthStatusService,
@@ -85,7 +86,7 @@ export class ManagementGridComponent implements OnInit {
if (data) {
this.allEnvironmentData = EnvironmentModel.loadEnvironments(data);
this.getDefaultFilterConfiguration(data);
- this.applyFilter(this.filterForm);
+ this.applyFilter(this.cashedFilterForm || this.filterForm);
}
this.progressBarService.stopProgressBar();
}, () => {
@@ -107,12 +108,19 @@ export class ManagementGridComponent implements OnInit {
}
public resetFilterConfigurations(): void {
- // this.filterForm.defaultConfigurations();
+ this.filterForm.defaultConfigurations();
this.applyFilter(this.filterForm);
this.buildGrid();
}
public applyFilter(config) {
+ if (config) {
+ this.filterForm = JSON.parse(JSON.stringify(config));
+ Object.setPrototypeOf(this.filterForm, Object.getPrototypeOf(config));
+ this.cashedFilterForm = JSON.parse(JSON.stringify(config));
+ Object.setPrototypeOf(this.cashedFilterForm, Object.getPrototypeOf(config));
+ }
+
let filteredData = this.getEnvironmentDataCopy();
const containsStatus = (list, selectedItems) => {
@@ -132,9 +140,8 @@ export class ManagementGridComponent implements OnInit {
const isProject = config.projects.length > 0 ? (config.projects.indexOf(item.project) !== -1) : true;
const modifiedResources = containsStatus(item.resources, config.resources);
- let isResources = config.resources.length > 0 ? (modifiedResources.length > 0) : true;
-
- if (config.resources.length > 0 && modifiedResources.length > 0) { item.resources = modifiedResources; }
+ let isResources = config.resources.length > 0 ? (modifiedResources && modifiedResources.length > 0) : true;
+ if (config.resources.length > 0 && modifiedResources && modifiedResources.length > 0) { item.resources = modifiedResources; }
if (config.resources && config.resources.length === 0 && config.type === 'active' ||
modifiedResources && modifiedResources.length >= 0 && config.resources.length > 0 && config.type === 'active') {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index dedd0c7..adff99b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -32,7 +32,7 @@ export class AuditGridComponent implements OnInit {
public auditData: Array<object>;
public displayedColumns: string[] = ['date', 'user', 'action', 'project', 'resource-type', 'resource', 'buttons'];
public displayedFilterColumns: string[] = ['action-filter', 'user-filter', 'actions-filter', 'project-filter', 'resource-type-filter', 'resource-filter', 'filter-buttons'];
- public collapseFilterRow: boolean = true;
+ public collapseFilterRow: boolean = false;
public filterConfiguration: FilterAuditModel = new FilterAuditModel([], [], [], [], [], '', '');
public filterAuditData: FilterAuditModel = new FilterAuditModel([], [], [], [], [], '', '');
public itemsPrPage: Number[] = [25, 50, 100];
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
index afd4873..9366725 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html
@@ -222,7 +222,7 @@
</th>
</ng-container>
<ng-container matColumnDef="placeholder">
- <td mat-footer-cell *matFooterCellDef colspan="7" class="info">
+ <td mat-footer-cell *matFooterCellDef colspan="8" class="info">
No data available
</td>
</ng-container>
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index 8ff5a8d..9c88f27 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -31,7 +31,7 @@ export class ReportingGridComponent implements OnInit {
filterConfiguration: ReportingConfigModel;
// filteredReportData: ReportingConfigModel = new ReportingConfigModel([], [], [], [], [], '', '', '', []);
- collapseFilterRow: boolean = true;
+ collapseFilterRow: boolean = false;
reportData: Array<any> = [];
fullReport: Array<any>;
isFiltered: boolean = false;
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts
index 98b578b..f65dc19 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts
@@ -116,7 +116,6 @@ export class ReportingComponent implements OnInit, OnDestroy {
rebuildBillingReport(): void {
this.checkAutorize();
- console.log(this.cashedFilterData);
this.reportData = this.cashedFilterData;
this.buildBillingReport();
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
index 0ca004e..9eed7a9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-data.service.ts
@@ -104,7 +104,7 @@ export class BucketDataService {
public updateItem(node: TodoItemNode, file) {
node.item = file;
this._bucketData.next(this.data);
- }
+ }
public removeItem(parent, child) {
parent.children.splice( parent.children.indexOf(child), 1);
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
index 13916bd..c61e91d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.ts
@@ -120,6 +120,5 @@ export class DetailComputationalResourcesComponent implements OnInit {
private logAction(name: any, description: string) {
this.auditService.sendDataToAudit({resource_name: name, info: `User followed ${description} link`}).subscribe();
- console.log(`${name}: ${description}`);
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
index 210aef3..5ad1f09 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.html
@@ -19,7 +19,11 @@
<div class="dropdown-multiselect btn-group" ngClass="{{type || ''}}">
<button type="button" #list (click)="multiactions.toggle($event, list)">
- <span class="ellipsis" *ngIf="model.length === 0 && type">Select {{ type }}</span>
+ <span class="ellipsis" *ngIf="model.length === 0 && type">
+ <ng-container *ngIf="type === 'resource_type' || type === 'resource_types';else noResourceTypeSelect">Select {{ type | convertaction}}</ng-container>
+ <ng-template #noResourceTypeSelect>Select {{ type }}</ng-template>
+
+ </span>
<span class="selected-items ellipsis" *ngIf="model.length !== 0">
Selected {{model.length}} item<strong *ngIf="model.length > 1">s</strong>
</span>
@@ -41,14 +45,15 @@
<a href="#" class="list-item" role="menuitem" (click)="toggleSelectedOptions($event, model, item)">
<span class="material-icons" *ngIf="model.indexOf(item) >= 0">done</span>
<ng-container *ngIf="type !== 'resource_type' && type !== 'resource_types'">{{item}}</ng-container>
- <ng-container *ngIf="type === 'resource_type' || type === 'resource_types'">{{item | titlecase}}</ng-container>
+ <ng-container *ngIf="type === 'resource_type' || type === 'resource_types'">{{item | convertaction}}</ng-container>
</a>
</li>
</ng-template>
<li *ngIf="items?.length == 0">
<a role="menuitem" class="list-item">
<span class="material-icons">visibility_off</span>
- No {{type}}
+ <ng-container *ngIf="type === 'resource_type' || type === 'resource_types';else noResourceType">No {{type | convertaction}}</ng-container>
+ <ng-template #noResourceType>No {{type}}</ng-template>
</a>
</li>
</ul>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.ts
index 0e819ac..5fcb6d1 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/form-controls/multi-select-dropdown/multi-select-dropdown.component.ts
@@ -56,7 +56,6 @@ export class MultiSelectDropdownComponent {
}
onUpdate($event): void {
- console.log(this.type);
this.selectionChange.emit({ model: this.model, type: this.type, $event });
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org