Browse Source

rewrite some fixes for dialogs

pull/14085/head
Maksym Tsymbarov 1 year ago
parent
commit
193d654329
  1. 2
      ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html
  2. 6
      ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss
  3. 3
      ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html
  4. 16
      ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
  5. 2
      ui-ngx/src/app/shared/components/entity/entity-type-select.component.ts
  6. 2
      ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html
  7. 5
      ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.ts

2
ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.html

@ -56,7 +56,7 @@
<ng-template matExpansionPanelContent> <ng-template matExpansionPanelContent>
<div class="entity-type-config-content flex flex-col gap-2"> <div class="entity-type-config-content flex flex-col gap-2">
<mat-divider></mat-divider> <mat-divider></mat-divider>
<div class="flex flex-col gt-xs:flex-row gap-1 gt-xs:gap-4"> <div class="flex flex-col gt-lg:flex-row gt-lg:gap-4">
<div class="flex flex-row gap-4 xs:flex-col xs:gap-0"> <div class="flex flex-row gap-4 xs:flex-col xs:gap-0">
<tb-entity-type-select <tb-entity-type-select
showLabel showLabel

6
ui-ngx/src/app/modules/home/components/vc/auto-commit-settings.component.scss

@ -13,6 +13,8 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
@import '../../../../../scss/constants';
:host { :host {
.mat-mdc-card.auto-commit-settings { .mat-mdc-card.auto-commit-settings {
margin: 8px; margin: 8px;
@ -52,7 +54,9 @@
padding: 0 8px 8px; padding: 0 8px 8px;
tb-branch-autocomplete { tb-branch-autocomplete {
min-width: 200px; min-width: 200px;
max-width: 200px; @media #{$mat-gt-xs} {
max-width: 200px;
}
display: block; display: block;
} }
} }

3
ui-ngx/src/app/modules/home/components/vc/complex-version-create.component.html

@ -39,7 +39,7 @@
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
</div> </div>
<mat-form-field class="mat-block" style="margin-bottom: 24px;"> <mat-form-field class="mat-block" style="margin-bottom: 24px;" subscriptSizing="dynamic">
<mat-label translate>version-control.default-sync-strategy</mat-label> <mat-label translate>version-control.default-sync-strategy</mat-label>
<mat-select required formControlName="syncStrategy"> <mat-select required formControlName="syncStrategy">
<mat-option *ngFor="let strategy of syncStrategies" [value]="strategy"> <mat-option *ngFor="let strategy of syncStrategies" [value]="strategy">
@ -49,7 +49,6 @@
<mat-hint [innerHTML]="(syncStrategyHints.get(createVersionFormGroup.get('syncStrategy').value) | translate) | safe:'html'"></mat-hint> <mat-hint [innerHTML]="(syncStrategyHints.get(createVersionFormGroup.get('syncStrategy').value) | translate) | safe:'html'"></mat-hint>
</mat-form-field> </mat-form-field>
<tb-entity-types-version-create <tb-entity-types-version-create
class="mt-5"
formControlName="entityTypes"> formControlName="entityTypes">
</tb-entity-types-version-create> </tb-entity-types-version-create>
</form> </form>

16
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 { :host ::ng-deep {
max-width: 100%; .mat-mdc-standard-chip{
} .mdc-evolution-chip__cell--primary,
.mdc-evolution-chip__action--primary,
:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__cell--primary, .mat-mdc-chip-action-label{
:host ::ng-deep .mat-mdc-standard-chip .mdc-evolution-chip__action--primary, overflow: hidden;
:host ::ng-deep .mat-mdc-standard-chip .mat-mdc-chip-action-label { }
overflow: hidden; }
} }

2
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} = {}; additionEntityTypes: {[key in string]: string} = {};
@Input() @Input()
appearance: MatFormFieldAppearance = 'fill'; appearance: MatFormFieldAppearance = 'outline';
@Input() @Input()
@coerceBoolean() @coerceBoolean()

2
ui-ngx/src/app/shared/components/vc/branch-autocomplete.component.html

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<mat-form-field [formGroup]="branchFormGroup" class="mat-block" [floatLabel]="(selectionMode || emptyPlaceholder) ? 'always' : 'auto'" subscriptSizing="{{ subscriptSizing }}"> <mat-form-field [formGroup]="branchFormGroup" class="mat-block" [floatLabel]="(selectionMode || emptyPlaceholder) ? 'always' : 'auto'" subscriptSizing="{{ subscriptSizing }}" [appearance]="appearance">
<mat-label>{{ 'version-control.branch' | translate }}</mat-label> <mat-label>{{ 'version-control.branch' | translate }}</mat-label>
<input matInput type="text" placeholder="{{emptyPlaceholder || ((loading ? 'common.loading' : 'version-control.select-branch') | translate)}}" <input matInput type="text" placeholder="{{emptyPlaceholder || ((loading ? 'common.loading' : 'version-control.select-branch') | translate)}}"
#branchInput #branchInput

5
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 { EntitiesVersionControlService } from '@core/http/entities-version-control.service';
import { isNotEmptyStr } from '@core/utils'; import { isNotEmptyStr } from '@core/utils';
import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete'; import { MatAutocomplete, MatAutocompleteTrigger } from '@angular/material/autocomplete';
import { SubscriptSizing } from '@angular/material/form-field'; import { MatFormFieldAppearance, SubscriptSizing } from '@angular/material/form-field';
@Component({ @Component({
selector: 'tb-branch-autocomplete', selector: 'tb-branch-autocomplete',
@ -93,6 +93,9 @@ export class BranchAutocompleteComponent implements ControlValueAccessor, OnInit
@Input() @Input()
emptyPlaceholder: string; emptyPlaceholder: string;
@Input()
appearance: MatFormFieldAppearance = 'outline';
@ViewChild('branchAutocomplete') matAutocomplete: MatAutocomplete; @ViewChild('branchAutocomplete') matAutocomplete: MatAutocomplete;
@ViewChild('branchInput', { read: MatAutocompleteTrigger, static: true }) autoCompleteTrigger: MatAutocompleteTrigger; @ViewChild('branchInput', { read: MatAutocompleteTrigger, static: true }) autoCompleteTrigger: MatAutocompleteTrigger;
@ViewChild('branchInput', {static: true}) branchInput: ElementRef<HTMLInputElement>; @ViewChild('branchInput', {static: true}) branchInput: ElementRef<HTMLInputElement>;

Loading…
Cancel
Save