You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by hs...@apache.org on 2022/08/11 09:32:37 UTC
[incubator-datalab] 01/01: fixed filter cancel by image name
This is an automated email from the ASF dual-hosted git repository.
hshpak pushed a commit to branch fix/DATALAB-2959/hide-non-working-Terminate-options-from-UI-side
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit f33ace1d96bdf049b55b09b2f9146dae090b1998
Author: Hennadii_Shpak <bo...@gmail.com>
AuthorDate: Thu Aug 11 12:32:13 2022 +0300
fixed filter cancel by image name
---
.../share-image-dialog.component.html | 4 ++-
.../share-image-dialog.component.scss | 0
.../share-image-dialog.component.ts | 2 +-
.../share-image-dialog.module.ts | 0
.../src/app/resources/images/images.component.html | 34 +++++++++++-----------
.../src/app/resources/images/images.component.ts | 9 +++---
.../src/app/resources/images/images.service.ts | 4 +--
.../webapp/src/app/resources/resources.module.ts | 2 +-
8 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.html
similarity index 89%
rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html
rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.html
index c4fb6e340..cded69b3e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.html
@@ -24,7 +24,9 @@
</header>
<section class="content">
<p class="description">
- The image <span class="image-name">{{imageName}}</span> will be shared with all current Regular Users on the project with all the data and code.
+ The image
+ <span class="image-name">{{imageName}}</span>
+ <span>will be shared with all current user groups on the project with all the data and code.</span>
</p>
<p class="question center">
Do you want proceed?
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.scss
similarity index 100%
rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.scss
rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.scss
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.ts
similarity index 97%
rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts
rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.ts
index 1d855c941..bc9bb1411 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.component.ts
@@ -24,7 +24,7 @@ import { ShareModalData, Toaster_Message } from '../../images';
import { ToastrService } from 'ngx-toastr';
@Component({
- selector: 'datalab-share-image',
+ selector: 'datalab-share-image-dialog',
templateUrl: './share-image-dialog.component.html',
styleUrls: ['./share-image-dialog.component.scss']
})
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.module.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.module.ts
similarity index 100%
rename from services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image/share-image-dialog.module.ts
rename to services/self-service/src/main/resources/webapp/src/app/resources/exploratory/share-image-dialog/share-image-dialog.module.ts
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 79e1fd80e..a7874b93a 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
@@ -160,13 +160,13 @@
<ng-container matColumnDef="checkbox">
<th mat-header-cell *matHeaderCellDef class="image-checkbox--wrapper">
<div class="header-cell--wrapper">
- <span *ngIf="(dataSource | async)?.length" >
- <datalab-checkbox
- (click)="allCheckboxToggle()"
- [checked]="checkboxSelected"
- class="image-checkbox"
- ></datalab-checkbox>
- </span>
+<!-- <span *ngIf="(dataSource | async)?.length" >-->
+<!-- <datalab-checkbox-->
+<!-- (click)="allCheckboxToggle()"-->
+<!-- [checked]="checkboxSelected"-->
+<!-- class="image-checkbox"-->
+<!-- ></datalab-checkbox>-->
+<!-- </span>-->
</div>
</th>
</ng-container>
@@ -179,7 +179,7 @@
*ngIf="($filteredColumnState | async)?.imageName"
type="button"
class="close__btn header__close--btn"
- (click)="onResetColumn(dropdownFieldNames.imageNames)"
+ (click)="onResetColumn(columnFieldNames.imageName)"
>
×
</button>
@@ -195,7 +195,7 @@
*ngIf="($filteredColumnState | async)?.statuses"
type="button"
class="close__btn header__close--btn"
- (click)="onResetColumn(dropdownFieldNames.statuses)"
+ (click)="onResetColumn(columnFieldNames.statuses)"
>
×
</button>
@@ -217,7 +217,7 @@
*ngIf="($filteredColumnState | async)?.endpoints"
type="button"
class="close__btn header__close--btn"
- (click)="onResetColumn(dropdownFieldNames.endpoints)"
+ (click)="onResetColumn(columnFieldNames.endpoints)"
>
×
</button>
@@ -233,7 +233,7 @@
*ngIf="($filteredColumnState | async)?.templateNames"
type="button"
class="close__btn header__close--btn"
- (click)="onResetColumn(dropdownFieldNames.templateNames)"
+ (click)="onResetColumn(columnFieldNames.templateNames)"
>
×
</button>
@@ -249,7 +249,7 @@
*ngIf="($filteredColumnState | async)?.sharingStatuses"
type="button"
class="close__btn header__close--btn"
- (click)="onResetColumn(dropdownFieldNames.sharingStatuses)"
+ (click)="onResetColumn(columnFieldNames.sharingStatuses)"
>
×
</button>
@@ -269,11 +269,11 @@
<td mat-cell *matCellDef="let element" class="exploratory" [attr.colspan]="8">
<tr *ngFor="let element of element?.images; let i = index" class="element-row mat-row">
<td mat-cell class="image-checkbox--wrapper">
- <datalab-checkbox
- (click)="onCheckboxClick(element)"
- class="image-checkbox"
- [checked]="element.isSelected"
- ></datalab-checkbox>
+<!-- <datalab-checkbox-->
+<!-- (click)="onCheckboxClick(element)"-->
+<!-- class="image-checkbox"-->
+<!-- [checked]="element.isSelected"-->
+<!-- ></datalab-checkbox>-->
</td>
<td class="name-col image-table-cell">
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 e679857cb..ccaea384b 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
@@ -38,9 +38,9 @@ import {
DropdownFieldNames,
FilterFormInitialValue,
ImageModelKeysForFilter,
- DropdownSelectAllValue,
+ DropdownSelectAllValue, FilterFormControlNames,
} from './images.config';
-import { ShareImageDialogComponent } from '../exploratory/share-image/share-image-dialog.component';
+import { ShareImageDialogComponent } from '../exploratory/share-image-dialog/share-image-dialog.component';
import { ImagesService } from './images.service';
import { ProgressBarService } from '../../core/services/progress-bar.service';
import { ImageDetailDialogComponent } from '../exploratory/image-detail-dialog/image-detail-dialog.component';
@@ -62,7 +62,7 @@ export class ImagesComponent implements OnInit, OnDestroy {
readonly placeholder: typeof Placeholders = Placeholders;
readonly sharedStatus: typeof Shared_Status = Shared_Status;
readonly imageStatus: typeof ImageStatuses = ImageStatuses;
- readonly tooltipStatuses: typeof TooltipStatuses = TooltipStatuses;
+ readonly columnFieldNames: typeof FilterFormControlNames = FilterFormControlNames;
readonly dropdownFieldNames: typeof DropdownFieldNames = DropdownFieldNames;
isActionsOpen: boolean = false;
@@ -192,7 +192,8 @@ export class ImagesComponent implements OnInit, OnDestroy {
this.imagesService.checkIsPageFiltered();
}
- onResetColumn(dropdownFieldNames: DropdownFieldNames): void {
+ onResetColumn(dropdownFieldNames: FilterFormControlNames): void {
+ console.log(dropdownFieldNames);
this.imagesService.resetFilterField(dropdownFieldNames, DropdownSelectAllValue);
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts
index bf9c87930..703ef44d0 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.service.ts
@@ -119,7 +119,7 @@ export class ImagesService {
this.addFilterDropdownData({...this.$$filterDropdownData.value, imageNames: filteredDropdownList});
}
- resetFilterField(field: keyof ImageFilterFormDropdownData, exceptionValue: string = ''): void {
+ resetFilterField(field: keyof ImageFilterFormValue, exceptionValue: string = ''): void {
const droppedFieldValue = this.getDroppedFieldValue(field);
const updatedFilterFormValue = {...this.$$filterFormValue.value, [field]: droppedFieldValue};
const normalizeFormValue = this.normalizeFilterFormValue(updatedFilterFormValue, exceptionValue);
@@ -158,7 +158,7 @@ export class ImagesService {
this.$$filteredColumnState.next(columnStateList);
}
- getDroppedFieldValue(field: keyof ImageFilterFormDropdownData): string | [] {
+ getDroppedFieldValue(field: keyof ImageFilterFormValue): string | [] {
return typeof this.$$filterFormValue.value[field] === 'string'
? ''
: [];
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 f0b0e6184..1d3d27869 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
@@ -36,7 +36,7 @@ import {CheckboxModule} from '../shared/checkbox';
import {BubbleModule} from '../shared';
import { IsElementAvailablePipeModule, NormalizeDropdownMultiValuePipeModule } from '../core/pipes';
import { LocalDatePipeModule } from '../core/pipes/local-date-pipe';
-import { ShareImageDialogModule } from './exploratory/share-image/share-image-dialog.module';
+import { ShareImageDialogModule } from './exploratory/share-image-dialog/share-image-dialog.module';
import { ImageDetailDialogModule } from './exploratory/image-detail-dialog/image-detail-dialog.module';
import {LibraryInfoModalModule} from './exploratory/library-info-modal/library-info-modal.module';
import { PageFilterComponent } from './exploratory/page-filter/page-filter.component';
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org