This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a commit to branch feat/DATALAB-2864/delete-one-image
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to
refs/heads/feat/DATALAB-2864/delete-one-image by this push:
new 87db970c8 minor fix
87db970c8 is described below
commit 87db970c837c041d58170c9fa0ccda9f34e14e7a
Author: Hennadii_Shpak <[email protected]>
AuthorDate: Fri Aug 26 13:30:12 2022 +0300
minor fix
---
.../terminate-image-dialog.component.html | 48 ----------------------
.../terminate-image-dialog.component.scss | 45 --------------------
.../terminate-image-dialog.component.ts | 41 ------------------
.../terminate-image-dialog.module.ts | 37 -----------------
.../src/app/resources/images/images.component.html | 3 +-
.../src/app/resources/images/images.component.ts | 2 -
.../webapp/src/app/resources/resources.module.ts | 2 -
.../confirmation-dialog.model.ts | 1 -
.../notification-dialog.component.ts | 2 +-
9 files changed, 2 insertions(+), 179 deletions(-)
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.html
deleted file mode 100644
index 28f1068b4..000000000
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.html
+++ /dev/null
@@ -1,48 +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 id="dialog-box">
- <header class="dialog-header">
- <h4 class="modal-title">Terminate Image</h4>
- <button type="button" class="close"
(click)="dialogRef.close()">×</button>
- </header>
- <section class="content">
- <mat-list>
- <mat-list-item class="list-header sans image-terminate">
- <div class="image">Image</div>
- <div class="status">Further status</div>
- </mat-list-item>
- <div class="scrolling-content scrolling image-list">
-<!-- <mat-list-item *ngFor="let endpoint of filterEndpoints()"
class="sans node">-->
-<!-- <div class="endpoint ellipsis">{{endpoint.name}}</div>-->
-<!-- <div class="status terminated">Terminated</div>-->
-<!-- </mat-list-item>-->
- </div>
- </mat-list>
- <p class="question center">
- Do you want proceed?
- </p>
- <div class="text-center m-top-30 m-bott-10">
- <button type="button" class="butt mat-raised-button"
(click)="dialogRef.close()">No</button>
- <button type="button" class="butt butt-success mat-raised-button"
- (click)="onShare()">Yes
- </button>
- </div>
- </section>
-</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.scss
deleted file mode 100644
index 33451cd07..000000000
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.scss
+++ /dev/null
@@ -1,45 +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.
-*/
-
-.content {
- max-height: 75vh;
- margin: 0;
- padding: 20px 50px;
- font-weight: 600;
-}
-
-::ng-deep .mat-list.mat-list-base > .list-header.image-terminate >
.mat-list-item-content {
- justify-content: space-between;
-}
-
-.proceed {
- text-align: center;
-}
-
-.question {
- color: #718ba6;
-}
-
-.center {
- text-align: center;
-}
-
-.image-list {
- margin-bottom: 20px;
-}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.ts
deleted file mode 100644
index ab393459c..000000000
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.component.ts
+++ /dev/null
@@ -1,41 +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, Inject, OnInit } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
-import { ImageModalData } from '../../images';
-
-@Component({
- selector: 'datalab-terminate-image-dialog',
- templateUrl: './terminate-image-dialog.component.html',
- styleUrls: ['./terminate-image-dialog.component.scss']
-})
-export class TerminateImageDialogComponent implements OnInit {
-
- constructor(
- public dialogRef: MatDialogRef<TerminateImageDialogComponent>,
- @Inject(MAT_DIALOG_DATA) public data: ImageModalData,
- ) { }
-
- ngOnInit(): void {}
-
- onShare() {
- console.log(this.data.image);
- }
-}
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.module.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.module.ts
deleted file mode 100644
index ee65b0826..000000000
---
a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/terminate-image-dialog/terminate-image-dialog.module.ts
+++ /dev/null
@@ -1,37 +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 { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { TerminateImageDialogComponent } from
'./terminate-image-dialog.component';
-import { MaterialModule } from '../../../shared/material.module';
-
-
-
-@NgModule({
- declarations: [
- TerminateImageDialogComponent
- ],
- imports: [
- CommonModule,
- MaterialModule
- ],
- entryComponents: [ TerminateImageDialogComponent ]
-})
-export class TerminateImageDialogModule { }
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
index ee2d37c19..6a88c9928 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.html
@@ -323,8 +323,7 @@
<span>Share</span>
</button>
</li>
-<!-- <li *ngIf="element.imageUserPermissions.canTerminate">-->
- <li (click)="onTerminateClick(element)">
+ <li *ngIf="element.imageUserPermissions.canTerminate">
<button class="action-button__share">
<i class="material-icons">phonelink_off</i>
<span>Terminate</span>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts
b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts
index f1f4362ee..687ba653d 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.ts
@@ -28,7 +28,6 @@ import { GeneralEnvironmentStatus } from
'../../administration/management/manage
import { ApplicationSecurityService, HealthStatusService } from
'../../core/services';
import { FilteredColumnList, ImageFilterFormDropdownData,
ImageFilterFormValue, ImageModel, ProjectModel } from './images.model';
import {
- TooltipStatuses,
Image_Table_Column_Headers,
Image_Table_Titles,
ImageStatuses,
@@ -45,7 +44,6 @@ import { ImagesService } from './images.service';
import { ProgressBarService } from '../../core/services/progress-bar.service';
import { ImageDetailDialogComponent } from
'../exploratory/image-detail-dialog/image-detail-dialog.component';
import { ActivatedRoute } from '@angular/router';
-import { TerminateImageDialogComponent } from
'../exploratory/terminate-image-dialog/terminate-image-dialog.component';
@Component({
selector: 'datalab-images',
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 c9cd6dc5a..6bef1c4e2 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
@@ -41,7 +41,6 @@ import { ImageDetailDialogModule } from
'./exploratory/image-detail-dialog/image
import {LibraryInfoModalModule} from
'./exploratory/library-info-modal/library-info-modal.module';
import { PageFilterComponent } from
'./exploratory/page-filter/page-filter.component';
import { DirectivesModule } from '../core/directives';
-import { TerminateImageDialogModule } from
'./exploratory/terminate-image-dialog/terminate-image-dialog.module';
@NgModule({
imports: [
@@ -63,7 +62,6 @@ import { TerminateImageDialogModule } from
'./exploratory/terminate-image-dialog
LibraryInfoModalModule,
DirectivesModule,
IsElementAvailablePipeModule,
- TerminateImageDialogModule
],
declarations: [
ResourcesComponent,
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts
index 92d70c230..71abde30b 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.model.ts
@@ -76,7 +76,6 @@ export class ConfirmationDialogModel {
}
private terminateExploratory(): Observable<{}> {
- console.log(this.manageAction);
return this.manageAction ?
this.manageEnvironmentsService.environmentManagement(
this.notebook.user, 'terminate', this.notebook.project,
this.notebook.name
) :
this.userResourceService.suspendExploratoryEnvironment(this.notebook,
'terminate');
diff --git
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index ea8a5b9ad..4f532c0e8 100644
---
a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++
b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -129,7 +129,7 @@ import { Endpoint } from
'../../../administration/project/project.model';
<div class="scrolling-content scrolling">
<mat-list-item *ngFor="let resource of
data.item.resources" class="sans node">
<div class="endpoint ellipsis">{{resource}}</div>
- <div class="status terminated">Terminated111111</div>
+ <div class="status terminated">Terminated</div>
</mat-list-item>
</div>
</mat-list>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
