From c38facccf57ff1ce6aac6bbbc7a9b1c39ad87f40 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 30 Sep 2025 13:39:01 +0300 Subject: [PATCH 1/9] fixed modals --- .../vc/auto-commit-settings.component.html | 6 +++--- .../vc/complex-version-create.component.html | 1 + .../sent/sent-notification-dialog.component.scss | 10 ++++++++++ .../app/shared/components/file-input.component.html | 12 +++++++----- 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html index d80892664d..716722d795 100644 --- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html @@ -38,7 +38,7 @@
- +
@@ -56,7 +56,7 @@
-
+
-
{{ 'version-control.export-credentials' | translate }} diff --git a/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html b/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html index e97e02190a..2621979b89 100644 --- a/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html @@ -49,6 +49,7 @@ diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss index 0dd9996b6a..24d07b59d5 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss @@ -233,3 +233,13 @@ } } } + +:host ::ng-deep .mdc-evolution-chip-set__chips { + max-width: 100%; +} + +:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__cell--primary, +:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__action--primary, +:host ::ng-deep .mat-mdc-standard-chip .mat-mdc-chip-action-label { + overflow: hidden; +} diff --git a/ui-ngx/src/app/shared/components/file-input.component.html b/ui-ngx/src/app/shared/components/file-input.component.html index 105257dd24..1f46ea1e34 100644 --- a/ui-ngx/src/app/shared/components/file-input.component.html +++ b/ui-ngx/src/app/shared/components/file-input.component.html @@ -39,11 +39,13 @@ [flow]="flow.flowJs">
cloud_upload - {{ dropLabel }} - +
+ {{ dropLabel }} + +
From 193d654329fc30a9460f0ad9c6f4ec9b75fa458e Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Fri, 3 Oct 2025 09:59:17 +0300 Subject: [PATCH 2/9] rewrite some fixes for dialogs --- .../vc/auto-commit-settings.component.html | 2 +- .../vc/auto-commit-settings.component.scss | 6 +++++- .../vc/complex-version-create.component.html | 3 +-- .../sent/sent-notification-dialog.component.scss | 16 ++++++++-------- .../entity/entity-type-select.component.ts | 2 +- .../vc/branch-autocomplete.component.html | 2 +- .../vc/branch-autocomplete.component.ts | 5 ++++- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html index 716722d795..d985ddb06b 100644 --- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html @@ -56,7 +56,7 @@
-
+
- + version-control.default-sync-strategy @@ -49,7 +49,6 @@ diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss index 24d07b59d5..ab502910e1 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss @@ -234,12 +234,12 @@ } } -:host ::ng-deep .mdc-evolution-chip-set__chips { - max-width: 100%; -} - -:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__cell--primary, -:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__action--primary, -:host ::ng-deep .mat-mdc-standard-chip .mat-mdc-chip-action-label { - overflow: hidden; +:host ::ng-deep { + .mat-mdc-standard-chip{ + .mdc-evolution-chip__cell--primary, + .mdc-evolution-chip__action--primary, + .mat-mdc-chip-action-label{ + overflow: hidden; + } + } } diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts index f8a4f49a82..ee2fc29b96 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts @@ -66,7 +66,7 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit, additionEntityTypes: {[key in string]: string} = {}; @Input() - appearance: MatFormFieldAppearance = 'fill'; + appearance: MatFormFieldAppearance = 'outline'; @Input() @coerceBoolean() diff --git a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html index 4515797a85..3fa79df85f 100644 --- a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html +++ b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - + {{ 'version-control.branch' | translate }} ; From 60c706610d4a99cba5809613627d175149691398 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Fri, 3 Oct 2025 10:26:34 +0300 Subject: [PATCH 3/9] fixed auto commit branch field --- .../home/components/vc/auto-commit-settings.component.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss index a5bb664709..17910b21bb 100644 --- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss +++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss @@ -54,9 +54,6 @@ padding: 0 8px 8px; tb-branch-autocomplete { min-width: 200px; - @media #{$mat-gt-xs} { - max-width: 200px; - } display: block; } } From 63e093d345727ef7dda693a4aaca033726ba4fd1 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Mon, 6 Oct 2025 17:11:38 +0300 Subject: [PATCH 4/9] fix modals --- .../home/components/vc/auto-commit-settings.component.html | 2 ++ .../home/components/vc/auto-commit-settings.component.scss | 2 -- .../notification/sent/sent-notification-dialog.component.html | 4 ++-- .../shared/components/entity/entity-type-select.component.ts | 2 +- .../app/shared/components/vc/branch-autocomplete.component.ts | 3 --- 5 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html index d985ddb06b..2bf50da468 100644 --- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html +++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html @@ -60,6 +60,7 @@
diff --git a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss index 17910b21bb..e925c79b0d 100644 --- a/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss +++ b/ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss @@ -13,8 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import '../../../../../scss/constants'; - :host { .mat-mdc-card.auto-commit-settings { margin: 8px; diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html index cb157a0904..59114d754e 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html @@ -172,9 +172,9 @@
- + {{ recipientTitle }} - +
diff --git a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts index ee2fc29b96..f8a4f49a82 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts @@ -66,7 +66,7 @@ export class EntityTypeSelectComponent implements ControlValueAccessor, OnInit, additionEntityTypes: {[key in string]: string} = {}; @Input() - appearance: MatFormFieldAppearance = 'outline'; + appearance: MatFormFieldAppearance = 'fill'; @Input() @coerceBoolean() diff --git a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts index ede06e97ad..d682a2646d 100644 --- a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts @@ -93,9 +93,6 @@ export class BranchAutocompleteComponent implements ControlValueAccessor, OnInit @Input() emptyPlaceholder: string; - @Input() - appearance: MatFormFieldAppearance = 'outline'; - @ViewChild('branchAutocomplete') matAutocomplete: MatAutocomplete; @ViewChild('branchInput', { read: MatAutocompleteTrigger, static: true }) autoCompleteTrigger: MatAutocompleteTrigger; @ViewChild('branchInput', {static: true}) branchInput: ElementRef; From e76a5f1764ac444e72ab7d853ed93db1cafbbce0 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 7 Oct 2025 11:44:13 +0300 Subject: [PATCH 5/9] fixed sent notification chip styles --- .../sent/sent-notification-dialog.component.html | 6 +++--- .../sent/sent-notification-dialog.component.scss | 10 ---------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html index 59114d754e..6a789197a2 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html @@ -171,11 +171,11 @@
- - + + {{ recipientTitle }} - +
diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss index ab502910e1..0dd9996b6a 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss @@ -233,13 +233,3 @@ } } } - -:host ::ng-deep { - .mat-mdc-standard-chip{ - .mdc-evolution-chip__cell--primary, - .mdc-evolution-chip__action--primary, - .mat-mdc-chip-action-label{ - overflow: hidden; - } - } -} From 185a0e2337e5adcf14361e76416a5d9e062ce2fb Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 7 Oct 2025 11:54:04 +0300 Subject: [PATCH 6/9] reduce file changes --- .../app/shared/components/vc/branch-autocomplete.component.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts index d682a2646d..7b30a38456 100644 --- a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts @@ -35,8 +35,7 @@ import { BranchInfo } from '@shared/models/vc.models'; import { EntitiesVersionControlService } from '@core/http/entities-version-control.service'; import { isNotEmptyStr } from '@core/utils'; import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete'; -import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; - +import { SubscriptSizing, MatFormFieldAppearance } from '@angular/material/form-field'; @Component({ selector: 'tb-branch-autocomplete', templateUrl: './branch-autocomplete.component.html', From fc3c09593bf0b8a99bddcb4f32fd30cc0a3100a0 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 7 Oct 2025 11:54:34 +0300 Subject: [PATCH 7/9] formatting --- .../app/shared/components/vc/branch-autocomplete.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts index 7b30a38456..454a3b10d6 100644 --- a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts @@ -36,6 +36,7 @@ import { EntitiesVersionControlService } from '@core/http/entities-version-contr import { isNotEmptyStr } from '@core/utils'; import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete'; import { SubscriptSizing, MatFormFieldAppearance } from '@angular/material/form-field'; + @Component({ selector: 'tb-branch-autocomplete', templateUrl: './branch-autocomplete.component.html', From 9077f678b03568df0f02a74fac476b12cac22455 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Thu, 9 Oct 2025 10:37:11 +0300 Subject: [PATCH 8/9] fixed chip-grid error --- .../notification/sent/sent-notification-dialog.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html index 6a789197a2..9bc01e9e8f 100644 --- a/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html +++ b/ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html @@ -171,11 +171,11 @@
- + {{ recipientTitle }} - +
From 9cc544c04927758b22c00bbaa4b1a02e7f71568b Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Fri, 24 Oct 2025 16:36:41 +0300 Subject: [PATCH 9/9] fixed merge errors --- .../shared/components/vc/branch-autocomplete.component.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts index 454a3b10d6..b8f7a0f646 100644 --- a/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts +++ b/ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts @@ -35,7 +35,7 @@ import { BranchInfo } from '@shared/models/vc.models'; import { EntitiesVersionControlService } from '@core/http/entities-version-control.service'; import { isNotEmptyStr } from '@core/utils'; import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete'; -import { SubscriptSizing, MatFormFieldAppearance } from '@angular/material/form-field'; +import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field'; @Component({ selector: 'tb-branch-autocomplete', @@ -93,6 +93,9 @@ export class BranchAutocompleteComponent implements ControlValueAccessor, OnInit @Input() emptyPlaceholder: string; + @Input() + appearance: MatFormFieldAppearance = 'fill'; + @ViewChild('branchAutocomplete') matAutocomplete: MatAutocomplete; @ViewChild('branchInput', { read: MatAutocompleteTrigger, static: true }) autoCompleteTrigger: MatAutocompleteTrigger; @ViewChild('branchInput', {static: true}) branchInput: ElementRef;