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
The following commit(s) were added to refs/heads/feature/projects by this push:
new 35c078a [DLAB-631]: removed old primitive dialog coponent
35c078a is described below
commit 35c078a314aea9aaf0c04854b95bf7e160a2638e
Author: Andriana Kovalyshyn <[email protected]>
AuthorDate: Thu May 30 16:33:04 2019 +0300
[DLAB-631]: removed old primitive dialog coponent
---
.../src/app/administration/management/index.ts | 8 +-
.../webapp/src/app/reporting/reporting.module.ts | 4 -
.../computational/cluster-details/index.ts | 3 +-
.../computational-resource-create-dialog/index.ts | 2 -
.../computational-resources-list/index.ts | 2 -
.../exploratory/ami-create-dialog/index.ts | 2 -
.../exploratory/install-libraries/index.ts | 3 +-
.../src/app/resources/resources-grid/index.ts | 3 +-
.../webapp/src/app/resources/resources.module.ts | 8 -
.../webapp/src/app/resources/scheduler/index.ts | 3 +-
.../main/resources/webapp/src/app/shared/index.ts | 1 -
.../confirmation-dialog.component.ts | 3 +-
.../modal-dialog/confirmation-dialog/index.ts | 3 +-
.../webapp/src/app/shared/modal-dialog/index.ts | 61 -----
.../shared/modal-dialog/key-upload-dialog/index.ts | 3 +-
.../app/shared/modal-dialog/modal.component.html | 42 ----
.../app/shared/modal-dialog/modal.component.scss | 260 ---------------------
.../src/app/shared/modal-dialog/modal.component.ts | 111 ---------
.../modal-dialog/notification-dialog/index.ts | 3 +-
.../webapp/src/app/shared/navbar/index.ts | 3 +-
.../src/app/shared/navbar/navbar.component.ts | 6 +-
21 files changed, 12 insertions(+), 522 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
index 329f1c2..58d4b5d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/administration/management/index.ts
@@ -21,12 +21,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import {
- ModalModule,
- UploadKeyDialogModule,
- BubbleModule,
- ConfirmationDialogModule
-} from '../../shared';
+import { UploadKeyDialogModule, BubbleModule, ConfirmationDialogModule } from
'../../shared';
import { MaterialModule } from '../../shared/material.module';
import { ManagementComponent } from './management.component';
@@ -51,7 +46,6 @@ export * from './management.component';
FormsModule,
ReactiveFormsModule,
ProjectModule,
- ModalModule,
UploadKeyDialogModule,
BubbleModule,
ConfirmationDialogModule,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts
index 37e9bb0..3067e9a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts
@@ -25,7 +25,6 @@ import { NgDateRangePickerModule } from 'ng-daterangepicker';
import { MaterialModule } from '../shared/material.module';
import { FormControlsModule } from '../shared/form-controls';
import { ReportingComponent } from './reporting.component';
-import { ModalModule, UploadKeyDialogModule, ProgressDialogModule } from
'../shared';
import { KeysPipeModule, LineBreaksPipeModule } from '../core/pipes';
import { ReportingGridComponent } from
'./reporting-grid/reporting-grid.component';
import { ToolbarComponent } from './toolbar/toolbar.component';
@@ -33,14 +32,11 @@ import { ToolbarComponent } from
'./toolbar/toolbar.component';
@NgModule({
imports: [
CommonModule,
- ModalModule,
FormsModule,
FormControlsModule,
KeysPipeModule,
LineBreaksPipeModule,
NgDateRangePickerModule,
- UploadKeyDialogModule,
- ProgressDialogModule,
MaterialModule
],
declarations: [
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts
index 25e12a3..88bfff6 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/index.ts
@@ -21,14 +21,13 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ModalModule } from '../../../shared';
import { MaterialModule } from '../../../shared/material.module';
import { DetailComputationalResourcesComponent } from
'./cluster-details.component';
export * from './cluster-details.component';
@NgModule({
- imports: [CommonModule, ModalModule, FormsModule, ReactiveFormsModule,
MaterialModule],
+ imports: [CommonModule, FormsModule, ReactiveFormsModule, MaterialModule],
declarations: [DetailComputationalResourcesComponent],
entryComponents: [DetailComputationalResourcesComponent],
exports: [DetailComputationalResourcesComponent],
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts
index 6098623..5b449b4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/index.ts
@@ -21,7 +21,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ModalModule } from '../../../shared/modal-dialog';
import { MaterialModule } from '../../../shared/material.module';
import { FormControlsModule } from '../../../shared/form-controls';
import { ComputationalResourceCreateDialogComponent } from
'./computational-resource-create-dialog.component';
@@ -29,7 +28,6 @@ import { ComputationalResourceCreateDialogComponent } from
'./computational-reso
@NgModule({
imports: [
CommonModule,
- ModalModule,
FormsModule,
ReactiveFormsModule,
FormControlsModule,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts
index be798a8..abdb7dd 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/index.ts
@@ -21,7 +21,6 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../../shared/material.module';
-import { ModalModule } from '../../../shared';
import { ComputationalResourcesListComponent, ConfirmationDialogComponent }
from './computational-resources-list.component';
import { DetailComputationalResourcesModule } from '../cluster-details';
import { SchedulerModule } from '../../scheduler';
@@ -31,7 +30,6 @@ export * from './computational-resources-list.component';
@NgModule({
imports: [
CommonModule,
- ModalModule,
DetailComputationalResourcesModule,
SchedulerModule,
MaterialModule
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts
index 93b8f50..bc00c97 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/ami-create-dialog/index.ts
@@ -22,14 +22,12 @@ import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../../../shared/material.module';
-import { ModalModule } from '../../../shared';
import { AmiCreateDialogComponent } from './ami-create-dialog.component';
export * from './ami-create-dialog.component';
@NgModule({
imports: [
CommonModule,
- ModalModule,
MaterialModule,
FormsModule,
ReactiveFormsModule
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts
index 427cd97..526aab4 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/index.ts
@@ -22,7 +22,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../../../shared/material.module';
-import { ModalModule, BubbleModule } from '../../../shared';
+import { BubbleModule } from '../../../shared';
import { FormControlsModule } from '../../../shared/form-controls';
import { KeysPipeModule, LibSortPipeModule, HighLightPipeModule } from
'../../../core/pipes';
@@ -34,7 +34,6 @@ export * from './install-libraries.component';
CommonModule,
FormsModule,
ReactiveFormsModule,
- ModalModule,
KeysPipeModule,
LibSortPipeModule,
HighLightPipeModule,
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 27e4daa..39a9732 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
@@ -23,7 +23,7 @@ import { RouterModule } from '@angular/router';
import { MaterialModule } from '../../shared/material.module';
import { ResourcesGridComponent } from './resources-grid.component';
import { ComputationalResourcesModule } from
'../computational/computational-resources-list';
-import { ModalModule, ConfirmationDialogModule, BubbleModule } from
'../../shared';
+import { ConfirmationDialogModule, BubbleModule } from '../../shared';
import { ComputationalResourceCreateDialogModule } from
'../computational/computational-resource-create-dialog';
import { DetailDialogModule } from '../exploratory/detail-dialog';
import { FormControlsModule } from '../../shared/form-controls';
@@ -38,7 +38,6 @@ import { UnderscorelessPipeModule } from
'../../core/pipes/underscoreless-pipe';
CommonModule,
RouterModule,
ComputationalResourcesModule,
- ModalModule,
ConfirmationDialogModule,
BubbleModule,
DetailDialogModule,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
index 2e0bbce..4c5f96b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/resources.module.ts
@@ -27,21 +27,13 @@ import { ResourcesGridModule } from './resources-grid';
import { ExploratoryEnvironmentCreateModule } from
'./exploratory/exploratory-environment-create-dialog';
import { ManageUngitComponent } from './manage-ungit/manage-ungit.component';
import { ConfirmDeleteAccountDialog } from
'./manage-ungit/manage-ungit.component';
-import {
- ModalModule,
- ProgressDialogModule,
- UploadKeyDialogModule
-} from '../shared';
@NgModule({
imports: [
CommonModule,
- ModalModule,
FormsModule,
ReactiveFormsModule,
ResourcesGridModule,
- ProgressDialogModule,
- UploadKeyDialogModule,
ExploratoryEnvironmentCreateModule,
MaterialModule
],
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts
index b2d7683..30dad18 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/scheduler/index.ts
@@ -22,7 +22,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../../shared/material.module';
-import { ModalModule, BubbleModule } from '../../shared';
+import { BubbleModule } from '../../shared';
import { FormControlsModule } from '../../shared/form-controls';
import { SchedulerComponent } from './scheduler.component';
import { TimePickerModule } from '../../shared/time-picker';
@@ -35,7 +35,6 @@ export * from './scheduler.model';
CommonModule,
FormsModule,
ReactiveFormsModule,
- ModalModule,
FormControlsModule,
MaterialModule,
BubbleModule,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/index.ts
index 9bcd6cd..5141d40 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/index.ts
@@ -17,7 +17,6 @@
* under the License.
*/
-export * from './modal-dialog';
export * from './modal-dialog/confirmation-dialog';
export * from './modal-dialog/progress-dialog';
export * from './modal-dialog/key-upload-dialog';
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts
index fda9525..3ba0214 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.ts
@@ -22,7 +22,6 @@ import { ToastrService } from 'ngx-toastr';
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
import { ConfirmationDialogModel } from './confirmation-dialog.model';
-import { ConfirmationDialogType } from './confirmation-dialog-type.enum';
import { UserResourceService, HealthStatusService, ManageEnvironmentsService }
from '../../../core/services';
import { HTTP_STATUS_CODES } from '../../../core/util';
import { DICTIONARY } from '../../../../dictionary/global.dictionary';
@@ -30,7 +29,7 @@ import { DICTIONARY } from
'../../../../dictionary/global.dictionary';
@Component({
selector: 'confirmation-dialog',
templateUrl: 'confirmation-dialog.component.html',
- styleUrls: ['./confirmation-dialog.component.scss',
'../modal.component.scss'],
+ styleUrls: ['./confirmation-dialog.component.scss'],
encapsulation: ViewEncapsulation.None
})
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts
index 331a072..a0a4605 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/index.ts
@@ -20,7 +20,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { ModalModule } from '..';
import { ConfirmationDialogComponent } from './confirmation-dialog.component';
import { MaterialModule } from '../../material.module';
@@ -28,7 +27,7 @@ export * from './confirmation-dialog.component';
export * from './confirmation-dialog-type.enum';
@NgModule({
- imports: [CommonModule, ModalModule, MaterialModule],
+ imports: [CommonModule, MaterialModule],
declarations: [ConfirmationDialogComponent],
entryComponents: [ConfirmationDialogComponent],
exports: [ConfirmationDialogComponent]
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts
deleted file mode 100644
index cb3835b..0000000
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/index.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { CommonModule } from '@angular/common';
-import { NgModule, Component } from '@angular/core';
-
-import { MaterialModule } from '../material.module';
-import { ModalComponent } from './modal.component';
-
-export * from './modal.component';
-
-@Component({
- selector: 'modal-header',
- template: `<ng-content></ng-content>`
-})
-export class ModalHeaderComponent {}
-
-@Component({
- selector: 'modal-content',
- template: `<ng-content></ng-content>`
-})
-export class ModalContentComponent {}
-
-@Component({
- selector: 'modal-footer',
- template: `<ng-content></ng-content>`
-})
-export class ModalFooterComponent {}
-
-@NgModule({
- imports: [CommonModule, MaterialModule],
- declarations: [
- ModalComponent,
- ModalHeaderComponent,
- ModalContentComponent,
- ModalFooterComponent
- ],
- exports: [
- ModalComponent,
- ModalHeaderComponent,
- ModalContentComponent,
- ModalFooterComponent
- ]
-})
-export class ModalModule {}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
index 9d165c5..9531f32 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/index.ts
@@ -20,14 +20,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { ModalModule } from '..';
import { UploadKeyDialogComponent } from './key-upload-dialog.component';
import { MaterialModule } from '../../material.module';
export * from './key-upload-dialog.component';
@NgModule({
- imports: [CommonModule, ModalModule, MaterialModule],
+ imports: [CommonModule, MaterialModule],
declarations: [UploadKeyDialogComponent],
entryComponents: [UploadKeyDialogComponent],
exports: [UploadKeyDialogComponent]
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
deleted file mode 100644
index bb7bac2..0000000
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-
-<div #modalRoot id="modalRoot" class="dialog" role="dialog" [ngClass]="{ in:
isOpened, out: isHide }"
- (keydown.esc)="closeOnEscape ? close() : 0"
(click)="closeOnOutsideClick($event) ? close() : 0">
- <div [class]="'dialog-container ' + modalClass">
- <div class="dialog-content" tabindex="0" *ngIf="isOpened">
- <div [ngClass]="{ 'dialog-header': isHeader, 'hidden': !isHeader }">
- <h4 class="modal-title" *ngIf="title">{{ title }}</h4>
- <ng-content select="modal-header"></ng-content>
- <button *ngIf="!hideCloseButton" type="button" class="close"
data-dismiss="modal"
- [attr.aria-label]="cancelButtonLabel || 'Close'"
(click)="close()">×</button>
- </div>
- <div class="dialog-body">
- <ng-content select="modal-content"></ng-content>
- </div>
- <div [ngClass]="{ 'modal-footer': isFooter, 'hidden': !isFooter }">
- <ng-content select="modal-footer"></ng-content>
- <button mat-raised-button *ngIf="cancelButtonLabel" type="button"
class="btn btn-default" data-dismiss="modal"
- (click)="close()">{{ cancelButtonLabel }}</button>
- <button mat-raised-button *ngIf="submitButtonLabel" type="button"
class="btn btn-primary"
- (click)="onSubmit.emit(undefined)">{{ submitButtonLabel }}</button>
- </div>
- </div>
- </div>
-</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
deleted file mode 100644
index 6a6fc02..0000000
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
+++ /dev/null
@@ -1,260 +0,0 @@
-/*!
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-/** Keyframes **/
-@keyframes show {
- from { opacity: 0; transform: translateY(-25%); }
- 20% { opacity: 0; transform: translateY(-20%); }
- to { opacity: 1; transform: translateY(0%); }
-}
-@keyframes hide {
- from { opacity: 1; transform: translateY(0%); }
- 35% { opacity: 0; transform: translateY(-20%)}
- to { opacity: 0; transform: translateY(-25%); }
-}
-@keyframes showSlideSide {
- from { opacity: 0; transform: translateX(150%); }
- 35% { opacity: 0; transform: translateX(100%); }
- to { opacity: 1; transform: translateX(0%); }
-}
-@keyframes hideSlideSide {
- from { opacity: 1; transform: translateX(0%); }
- 35% { opacity: 0; }
- to { opacity: 0; transform: translateX(150%); }
-}
-
-.modal-xs { width: 375px; }
-.modal-sm { width: 525px; }
-.modal-md { width: 545px; }
-.modal-lg { width: 580px; }
-.modal-xl-s { width: 660px; }
-.modal-xl { width: 900px; }
-.modal-xxl { width: 1000px; }
-
-.backdrop {
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 5;
- background-color: #000;
- transition: .3s ease-in-out;
- opacity: .5;
- filter: alpha(opacity=50);
-}
-
-.dialog {
- color: #718ba6;
- font-size: 14px;
- position: fixed;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- z-index: 10;
- overflow: hidden;
- -webkit-overflow-scrolling: touch;
- justify-content: center;
- outline: 0;
-}
-.dialog:not(.in) {
- visibility: hidden;
-}
-.dialog.in {
- visibility: visible;
- display: flex
-}
-
-.dialog.in .dialog-container {
- animation-duration: .35s;
- animation-fill-mode: forwards;
- animation-name: show;
- animation-timing-function: ease;
-}
-
-.dialog.out .dialog-container {
- animation-duration: .35s;
- animation-fill-mode: forwards;
- animation-name: hide;
- animation-timing-function: ease;
-}
-
-/* .dialog.in .dialog-container.install-libs {
- animation-duration: .35s;
- animation-fill-mode: forwards;
- animation-name: showSlideSide;
- animation-timing-function: ease;
- width: 100%;
-}
-
-.dialog.in .dialog-container.install-libs .dialog-content {
- height: 100vh;
- width: 100%;
-}
-
-.dialog.out .dialog-container.install-libs {
- animation-duration: .25s;
- animation-fill-mode: forwards;
- animation-name: hideSlideSide;
- animation-timing-function: ease;
-} */
-
-.dialog.in .dialog-container.install-libraries {
- animation-duration: .35s;
- animation-fill-mode: forwards;
- animation-name: showSlideSide;
- animation-timing-function: ease;
- width: 100%;
- height: 100%;
-}
-
-.dialog.in .dialog-container.install-libraries .dialog-content {
- width: 100%;
- height: 100%;
-}
-.install-libraries .dialog-body {
- height: calc(100% - 50px);
-}
-.install-libraries .mat-tab-body-wrapper {
- flex-grow: 1;
-}
-
-.install-libraries .mat-tab-body {
- display: flex !important;
- flex-direction: column;
-}
-
-.install-libraries .mat-tab-body-content {
- display: flex;
- flex-direction: column;
- flex-grow: 1;
- height: 100%;
-}
-.install-libraries .dialog-body .content-box {
- padding: 35px 50px 45px;
- height: 100%;
-}
-
-.dialog.out .dialog-container.install-libraries {
- animation-duration: .35s;
- animation-fill-mode: forwards;
- animation-name: hideSlideSide;
- animation-timing-function: ease;
-}
-
-.dialog-container {
- flex-direction: column;
- align-items: center;
- align-self: center;
- list-style: none;
- padding: 0;
- margin: 0;
- transition: all .35s linear .2s;
-}
-
-
-
-.modal-footer .btn {
- margin-top: 0;
-}
-
-
-
-.detail-header {
- border-bottom: 0;
- width: 100%;
- border-collapse: collapse;
- table-layout: fixed;
- td {
- border: 1px solid #edf1f5;
- text-align: center;
- padding: 20px;
- text-align: center !important;
- background: #fff;
- &:first-child {
- background: #f6fafe;
- font-size: 16px;
- font-weight: 600;
- color: #455c74;
- text-overflow: ellipsis;
- overflow: hidden;
- cursor: default;
- }
- &.tooltip-wrap {
- .hint-title {
- font-size: 16px;
- font-weight: 600;
- color: #455c74;
- overflow: hidden;
- text-overflow: ellipsis;
- }
- }
- }
-}
-
-.detail-info {
- p {
- font-weight: 400;
- margin-bottom: 10px;
- small {
- font-size: 12px;
- font-weight: 400;
- }
- }
- span {
- font-size: 14px;
- overflow: hidden;
- text-overflow: ellipsis;
- display: block;
- }
- .links_block {
- padding-left: 25px;
- }
- .time_info {
- margin-top: 15px;
- }
-}
-
-.create-cluster {
- .dialog-header {
- padding-left: 45px !important;
- }
-}
-
-.modal-content {
- display: block;
- position: relative;
- background-color: #fff;
- -webkit-background-clip: padding-box;
- background-clip: padding-box;
- border: 1px solid rgba(0,0,0,.2);
- border-radius: 3px;
- outline: 0;
- -webkit-box-shadow: 0 3px 9px rgba(0,0,0,.5);
- box-shadow: 0 3px 9px rgba(0,0,0,.5);
- .danger_color {
- padding-left: 5px;
- font-size: 12px;
- display: inline-block;
- font-family: 'Open Sans', sans-serif;
- font-weight: 300;
- border-color: #d9534f !important;
- }
-}
\ No newline at end of file
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts
deleted file mode 100644
index d6a1665..0000000
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-import { Component, OnDestroy, Input, Output, EventEmitter, ElementRef,
ViewChild, ViewEncapsulation } from '@angular/core';
-
-@Component({
- selector: 'modal-dialog',
- templateUrl: 'modal.component.html',
- styleUrls: ['./modal.component.scss'],
- encapsulation: ViewEncapsulation.None
-})
-
-export class ModalComponent implements OnDestroy {
-
- isOpened: boolean = false;
- isHeader: boolean = true;
- isFooter: boolean = true;
- onClosing: Function;
- isHide: boolean;
- clear: number;
-
- @Input() modalClass: string;
- @Input() title: string;
- @Input() cancelButtonLabel: string;
- @Input() submitButtonLabel: string;
- @Input() hideCloseButton: boolean = false;
- @Input() closeOnEscape: boolean = true;
-
- @Output() onOpen = new EventEmitter(false);
- @Output() onClose = new EventEmitter(false);
- @Output() onSubmit = new EventEmitter(false);
-
- @ViewChild('modalRoot') el: ElementRef;
-
- private backdropElement: HTMLElement;
-
- constructor() {
- this.createBackDrop();
- }
-
- closeOnOutsideClick($event): boolean {
- return ($event.target && $event.target.id === 'modalRoot');
- }
-
- ngOnDestroy() {
- document.body.className = document.body.className.replace(/modal-open\b/,
'');
- if (this.backdropElement && this.backdropElement.parentNode ===
document.body)
- document.body.removeChild(this.backdropElement);
- }
-
- public open(option: Object, ...args: any[]): void {
- if (this.isOpened)
- return;
-
- if (option) {
- for (const key in option) {
- this[key] = option[key];
- }
- }
-
- this.isOpened = true;
- this.isHide = false;
- this.onOpen.emit(args);
- document.body.appendChild(this.backdropElement);
- window.setTimeout(() => this.el.nativeElement.focus(), 0);
- document.body.className += ' modal-open';
- }
-
- public close(...args: any[]): void {
- if (!this.isOpened)
- return;
-
- if (this.onClosing)
- this.onClosing();
- this.onClose.emit(args);
-
- this.isHide = true;
- this.clear = window.setTimeout(() => {
- document.body.contains(this.backdropElement) &&
document.body.removeChild(this.backdropElement);
- document.body.className =
document.body.className.replace(/modal-open\b/, '');
- this.el.nativeElement.classList.remove('out');
- this.isOpened = false;
-
- clearTimeout(this.clear);
- }, 300);
-
- if (document.getElementsByClassName('dropdown open').length)
- document.getElementsByClassName('dropdown
open')[0].classList.remove('open');
- }
-
- private createBackDrop() {
- this.backdropElement = document.createElement('div');
- this.backdropElement.classList.add('backdrop');
- }
-}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts
index 4daec02..7f66ebc 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/index.ts
@@ -20,14 +20,13 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { ModalModule } from '..';
import { NotificationDialogComponent } from './notification-dialog.component';
import { MaterialModule } from '../../material.module';
export * from './notification-dialog.component';
@NgModule({
- imports: [CommonModule, ModalModule, MaterialModule],
+ imports: [CommonModule, MaterialModule],
declarations: [NotificationDialogComponent],
entryComponents: [NotificationDialogComponent],
exports: [NotificationDialogComponent]
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
index 121e255..539970a 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts
@@ -21,7 +21,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { RouterModule } from '@angular/router';
import { MaterialModule } from '../material.module';
-import { ModalModule, UploadKeyDialogModule, ProgressDialogModule,
BubbleModule } from '../index';
+import { UploadKeyDialogModule, ProgressDialogModule, BubbleModule } from
'../index';
import { NavbarComponent } from './navbar.component';
import { NotificationDialogModule } from '../modal-dialog/notification-dialog';
@@ -34,7 +34,6 @@ export * from './navbar.component';
RouterModule,
MaterialModule,
NotificationDialogModule,
- ModalModule,
UploadKeyDialogModule,
ProgressDialogModule,
BubbleModule
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 df29f29..4c333f8 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
@@ -59,8 +59,6 @@ export class NavbarComponent implements OnInit, OnDestroy {
healthStatus: GeneralEnvironmentStatus;
subscriptions: Subscription = new Subscription();
- @ViewChild('keyUploadModal') keyUploadDialog;
-
constructor(
public toastr: ToastrService,
private applicationSecurityService: ApplicationSecurityService,
@@ -162,7 +160,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
if (status === HTTP_STATUS_CODES.NOT_FOUND || status ===
HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR) {
!this.dialog.openDialogs.length && this.dialog.closeAll();
- this.keyUploadDialog.open({ isFooter: false });
+ // this.keyUploadDialog.open({ isFooter: false });
this.alive = false;
this.lastStatus = status;
} else if (status === HTTP_STATUS_CODES.ACCEPTED) {
@@ -183,7 +181,7 @@ export class NavbarComponent implements OnInit, OnDestroy {
}
this.alive = false;
this.dialog.closeAll();
- this.keyUploadDialog.close();
+ // this.keyUploadDialog.close();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
