This is an automated email from the ASF dual-hosted git repository. hshpak pushed a commit to branch feat/DATALAB-2881/filter-function-to-Images-page in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit adeeaf754fd948748a19523147e91115010379b8 Author: Hennadii_Shpak <[email protected]> AuthorDate: Tue Aug 2 16:45:03 2022 +0300 fixed pipe for dropdown --- .../normalize-dropdown-multi-value.pipe.ts | 4 ++-- .../app/core/util/{to-title-case-util.ts => capitalize-util.ts} | 2 +- .../src/main/resources/webapp/src/app/core/util/index.ts | 2 +- .../resources/exploratory/page-filter/page-filter.component.html | 8 ++++---- .../resources/exploratory/page-filter/page-filter.component.scss | 2 +- .../webapp/src/app/resources/images/images.component.scss | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/core/pipes/normalize-dropdown-multi-value/normalize-dropdown-multi-value.pipe.ts b/services/self-service/src/main/resources/webapp/src/app/core/pipes/normalize-dropdown-multi-value/normalize-dropdown-multi-value.pipe.ts index 1bfed28a4..0f871e1e8 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/pipes/normalize-dropdown-multi-value/normalize-dropdown-multi-value.pipe.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/pipes/normalize-dropdown-multi-value/normalize-dropdown-multi-value.pipe.ts @@ -22,7 +22,7 @@ import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ name: 'normalizeDropdownMultiValue' }) export class NormalizeDropdownMultiValuePipe implements PipeTransform { - transform(value: string[]): string { + transform(value: string[], meaninglessValue: number = 0): string { if (!value.length) { return ''; } @@ -33,6 +33,6 @@ export class NormalizeDropdownMultiValuePipe implements PipeTransform { return value.length === 1 ? firstValue - : `${firstValue} (+${value.length - 1} others)`; + : `${firstValue} (+${value.length - meaninglessValue} others)`; } } diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/to-title-case-util.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/capitalize-util.ts similarity index 93% rename from services/self-service/src/main/resources/webapp/src/app/core/util/to-title-case-util.ts rename to services/self-service/src/main/resources/webapp/src/app/core/util/capitalize-util.ts index 42448bb11..a22722edf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/to-title-case-util.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/capitalize-util.ts @@ -17,7 +17,7 @@ * under the License. */ -export const toTitleCaseUtil = (value: string): string => { +export const capitalizeUtil = (value: string): string => { const firstLetter = value.substring(0, 1).toUpperCase(); return `${firstLetter}${value.substring(1).toLowerCase()}`; }; diff --git a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts index b15943474..78b23cd2b 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/util/index.ts @@ -28,4 +28,4 @@ export * from './patterns'; export * from './http-methods'; export * from './check-endpoint-list-util'; export * from './case-insensitive-sort-util'; -export * from './to-title-case-util'; +export * from './capitalize-util'; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.html index 246335a68..15bcdeeb0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.html @@ -51,7 +51,7 @@ (click)="onSelectClick()" > <mat-select-trigger class="select__value"> - {{($filterDropdownData | async).statuses | normalizeDropdownMultiValue | titlecase}} + {{statuses.value | normalizeDropdownMultiValue: 2 | titlecase}} </mat-select-trigger> <mat-option *ngIf="($filterDropdownData | async).statuses.length > 1" @@ -90,7 +90,7 @@ (click)="onSelectClick()" > <mat-select-trigger class="select__value"> - {{($filterDropdownData | async).endpoints | normalizeDropdownMultiValue}} + {{endpoints.value | normalizeDropdownMultiValue: 2}} </mat-select-trigger> <mat-option *ngIf="($filterDropdownData | async).endpoints.length > 1" @@ -129,7 +129,7 @@ (click)="onSelectClick()" > <mat-select-trigger class="select__value"> - {{($filterDropdownData | async).templateNames | normalizeDropdownMultiValue}} + {{templateNames.value | normalizeDropdownMultiValue: 2}} </mat-select-trigger> <mat-option *ngIf="($filterDropdownData | async).templateNames.length > 1" @@ -168,7 +168,7 @@ (click)="onSelectClick()" > <mat-select-trigger class="select__value"> - {{($filterDropdownData | async).sharingStatuses | normalizeDropdownMultiValue | titlecase}} + {{sharingStatuses.value | normalizeDropdownMultiValue: 2 | titlecase}} </mat-select-trigger> <mat-option *ngIf="($filterDropdownData | async).sharingStatuses.length > 1" diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.scss index 29084d57c..3a07d2f68 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/page-filter/page-filter.component.scss @@ -18,7 +18,7 @@ */ .filter-table__wrapper { - width: 450px; + width: 485px; padding: 20px 20px 30px; background-color: white; } diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss index ce03aa96e..df8580fb6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/resources/images/images.component.scss @@ -121,7 +121,7 @@ .filer__wrapper { position: absolute; top: 46px; - left: 170px; + left: 135px; z-index: 10; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
