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 c5482594b5b44ceaedc71fff8292bf70ce7318ab
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Thu May 30 14:30:20 2019 +0300
[DLAB-631]: replaced cost detail component with material
---
.../webapp/src/app/administration/roles/roles.component.html | 9 +--------
.../computational-resource-create-dialog.component.html | 2 +-
.../cost-details-dialog/cost-details-dialog.component.html | 8 +++++---
.../cost-details-dialog/cost-details-dialog.component.scss | 0
.../cost-details-dialog/cost-details-dialog.component.ts | 0
.../{billing => exploratory}/cost-details-dialog/index.ts | 3 +--
.../resources/webapp/src/app/resources/resources-grid/index.ts | 2 +-
.../app/resources/resources-grid/resources-grid.component.html | 4 ++--
.../src/app/resources/resources-grid/resources-grid.component.ts | 5 ++---
.../resources/webapp/src/app/shared/navbar/navbar.component.ts | 1 -
.../src/main/resources/webapp/src/assets/styles/_theme.scss | 2 +-
11 files changed, 14 insertions(+), 22 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
index cade0b6..778de7b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.html
@@ -17,12 +17,7 @@
~ under the License.
-->
-<!-- <modal-dialog #bindDialog modalClass="manage-roles-dialog modal-xxl">
- <modal-header>
- <h4 class="modal-title">Manage roles</h4>
- </modal-header>
- <modal-content> -->
-<div class="content-box">
+<div class="manage-roles">
<button mat-raised-button class="butt add-group" (click)="stepperView =
!stepperView">
<i class="material-icons">people_outline</i>Add group
</button>
@@ -157,5 +152,3 @@
</table>
</div>
</div>
-<!-- </modal-content>
-</modal-dialog> -->
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index bfe0b74..6120083 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -17,7 +17,7 @@
~ under the License.
-->
-<div modalClass="create-cluster" id="dialog-box">
+<div class="create-cluster" id="dialog-box">
<header class="dialog-header">
<h4 class="modal-title">Add computational resources</h4>
<button type="button" class="close"
(click)="dialogRef.close()">×</button>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
similarity index 93%
rename from
services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html
rename to
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
index cf904f0..700cc54 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.html
@@ -17,9 +17,11 @@
~ under the License.
-->
-<div modalClass="billing-detail-dialog header-white modal-xl">
- <header></header>
- <div class="modal-content">
+<div id="dialog-box" class="billing-detail-dialog">
+ <header class="dialog-header header-white">
+ <button type="button" class="close"
(click)="dialogRef.close()">×</button>
+ </header>
+ <div class="dialog-content">
<div *ngIf="notebook">
<table class="detail-header">
<tr>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
similarity index 100%
rename from
services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.scss
rename to
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.scss
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.ts
similarity index 100%
rename from
services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/cost-details-dialog.component.ts
rename to
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/cost-details-dialog.component.ts
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts
similarity index 92%
rename from
services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts
rename to
services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts
index 11a0424..b95c183 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/billing/cost-details-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/cost-details-dialog/index.ts
@@ -22,12 +22,11 @@ import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../../shared/material.module';
import { CostDetailsDialogComponent } from './cost-details-dialog.component';
-import { ModalModule } from '../../../shared';
export * from './cost-details-dialog.component';
@NgModule({
- imports: [CommonModule, ModalModule, MaterialModule],
+ imports: [CommonModule, MaterialModule],
declarations: [CostDetailsDialogComponent],
entryComponents: [CostDetailsDialogComponent],
exports: [CostDetailsDialogComponent]
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
index ea94971..27e4daa 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
@@ -27,7 +27,7 @@ import { ModalModule, ConfirmationDialogModule, BubbleModule
} from '../../share
import { ComputationalResourceCreateDialogModule } from
'../computational/computational-resource-create-dialog';
import { DetailDialogModule } from '../exploratory/detail-dialog';
import { FormControlsModule } from '../../shared/form-controls';
-import { CostDetailsDialogModule } from '../billing/cost-details-dialog';
+import { CostDetailsDialogModule } from '../exploratory/cost-details-dialog';
import { InstallLibrariesModule } from '../exploratory/install-libraries';
import { AmiCreateDialogModule } from '../exploratory/ami-create-dialog';
import { SchedulerModule } from '../scheduler';
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 2297b6c..4126a52 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -74,8 +74,8 @@
<computational-resources-list [resources]="env.resources"
[environment]="env" [healthStatus]="healthStatus?.status"
(buildGrid)="buildGrid($event)"></computational-resources-list>
</td>
<td *ngIf="healthStatus?.billingEnabled">
- <span class="total_cost">{{ env.cost || 'N/A' }} {{env.currency_code ||
''}}</span>
- <span (click)="env.billing && printCostDetails(env)"
class="currency_details" [ngClass]="{'not-allowed' : !env.billing}">
+ <span class="total_cost">{{ env.cost || 'N/A' }} {{ env.currency_code ||
'' }}</span>
+ <span (click)="env.billing && printCostDetails(env)"
class="currency_details" [ngClass]="{ 'not-allowed' : !env.billing }">
<i class="material-icons">help_outline</i>
</span>
</td>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index bf08ec5..aa76c91 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -33,7 +33,7 @@ import { DetailDialogComponent } from
'../exploratory/detail-dialog';
import { AmiCreateDialogComponent } from '../exploratory/ami-create-dialog';
import { InstallLibrariesComponent } from '../exploratory/install-libraries';
import { ComputationalResourceCreateDialogComponent } from
'../computational/computational-resource-create-dialog/computational-resource-create-dialog.component';
-import { CostDetailsDialogComponent } from '../billing/cost-details-dialog';
+import { CostDetailsDialogComponent } from
'../exploratory/cost-details-dialog';
import { SchedulerComponent } from '../scheduler';
import { DICTIONARY } from '../../../dictionary/global.dictionary';
@@ -287,8 +287,7 @@ export class ResourcesGridComponent implements OnInit {
}
printCostDetails(data): void {
- // this.costDetailsDialog.open({ isFooter: false }, data);
- this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass:
'modal-lg' })
+ this.dialog.open(CostDetailsDialogComponent, { data: data, panelClass:
'modal-xl' })
.afterClosed().subscribe(() => this.buildGrid());
}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
index 7bf49a0..df29f29 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.ts
@@ -159,7 +159,6 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
private processAccessKeyStatus(status: number): void {
- debugger;
if (status === HTTP_STATUS_CODES.NOT_FOUND || status ===
HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) {
!this.dialog.openDialogs.length && this.dialog.closeAll();
diff --git
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 14695e2..b34ca96 100644
---
a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++
b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -234,7 +234,7 @@
white-space: pre-line !important;
word-break: break-all;
}
-.manage-roles-dialog,
+.manage-roles,
.project-form {
.mat-form-field {
width: 100%;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
