Commit 198a4913a8715a922ab1b5d9bdcdc3227a6640b0
Committed by
GitHub
GitHub
Merge pull request #3681 from vvlladd28/improvement/device-wizard/view
UI: Fixed resize width windows device-wizard-dialog
Showing
3 changed files
with
16 additions
and
2 deletions
| @@ -76,13 +76,15 @@ | @@ -76,13 +76,15 @@ | ||
| 76 | [required]="!createProfile" | 76 | [required]="!createProfile" |
| 77 | [transportType]="deviceWizardFormGroup.get('transportType').value" | 77 | [transportType]="deviceWizardFormGroup.get('transportType').value" |
| 78 | formControlName="deviceProfileId" | 78 | formControlName="deviceProfileId" |
| 79 | + [ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 0}" | ||
| 79 | (deviceProfileChanged)="$event?.transportType ? deviceWizardFormGroup.get('transportType').patchValue($event?.transportType) : {}" | 80 | (deviceProfileChanged)="$event?.transportType ? deviceWizardFormGroup.get('transportType').patchValue($event?.transportType) : {}" |
| 80 | [addNewProfile]="false" | 81 | [addNewProfile]="false" |
| 81 | [selectDefaultProfile]="true" | 82 | [selectDefaultProfile]="true" |
| 82 | [selectFirstProfile]="true" | 83 | [selectFirstProfile]="true" |
| 83 | [editProfileEnabled]="false"> | 84 | [editProfileEnabled]="false"> |
| 84 | </tb-device-profile-autocomplete> | 85 | </tb-device-profile-autocomplete> |
| 85 | - <mat-form-field fxFlex class="mat-block"> | 86 | + <mat-form-field fxFlex class="mat-block" |
| 87 | + [ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}"> | ||
| 86 | <mat-label translate>device-profile.new-device-profile-name</mat-label> | 88 | <mat-label translate>device-profile.new-device-profile-name</mat-label> |
| 87 | <input matInput formControlName="newDeviceProfileTitle" | 89 | <input matInput formControlName="newDeviceProfileTitle" |
| 88 | [required]="createProfile"> | 90 | [required]="createProfile"> |
| @@ -93,12 +95,14 @@ | @@ -93,12 +95,14 @@ | ||
| 93 | </div> | 95 | </div> |
| 94 | <div fxLayout="column" fxLayoutAlign="flex-end start"> | 96 | <div fxLayout="column" fxLayoutAlign="flex-end start"> |
| 95 | <tb-rule-chain-autocomplete | 97 | <tb-rule-chain-autocomplete |
| 98 | + [ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}" | ||
| 96 | labelText="device-profile.default-rule-chain" | 99 | labelText="device-profile.default-rule-chain" |
| 97 | formControlName="defaultRuleChainId"> | 100 | formControlName="defaultRuleChainId"> |
| 98 | </tb-rule-chain-autocomplete> | 101 | </tb-rule-chain-autocomplete> |
| 99 | </div> | 102 | </div> |
| 100 | <div fxLayout="column" fxLayoutAlign="flex-end start"> | 103 | <div fxLayout="column" fxLayoutAlign="flex-end start"> |
| 101 | <tb-queue-type-list | 104 | <tb-queue-type-list |
| 105 | + [ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}" | ||
| 102 | [queueType]="serviceType" | 106 | [queueType]="serviceType" |
| 103 | formControlName="defaultQueueName"> | 107 | formControlName="defaultQueueName"> |
| 104 | </tb-queue-type-list> | 108 | </tb-queue-type-list> |
| @@ -22,6 +22,10 @@ | @@ -22,6 +22,10 @@ | ||
| 22 | max-height: 75vh; | 22 | max-height: 75vh; |
| 23 | } | 23 | } |
| 24 | } | 24 | } |
| 25 | + | ||
| 26 | + .invisible{ | ||
| 27 | + visibility: hidden; | ||
| 28 | + } | ||
| 25 | } | 29 | } |
| 26 | 30 | ||
| 27 | :host ::ng-deep { | 31 | :host ::ng-deep { |
| @@ -60,6 +64,12 @@ | @@ -60,6 +64,12 @@ | ||
| 60 | height: 100%; | 64 | height: 100%; |
| 61 | } | 65 | } |
| 62 | } | 66 | } |
| 67 | + | ||
| 68 | + tb-device-profile-autocomplete, tb-queue-type-list{ | ||
| 69 | + .mat-form-field-wrapper{ | ||
| 70 | + width: 180px !important; | ||
| 71 | + } | ||
| 72 | + } | ||
| 63 | } | 73 | } |
| 64 | } | 74 | } |
| 65 | } | 75 | } |
| @@ -875,7 +875,7 @@ | @@ -875,7 +875,7 @@ | ||
| 875 | "profile-configuration": "Profile configuration", | 875 | "profile-configuration": "Profile configuration", |
| 876 | "transport-configuration": "Transport configuration", | 876 | "transport-configuration": "Transport configuration", |
| 877 | "default-rule-chain": "Default rule chain", | 877 | "default-rule-chain": "Default rule chain", |
| 878 | - "select-queue-hint": "The queue name can be selected from a drop-down list or add a custom name.", | 878 | + "select-queue-hint": "Select from a drop-down list or add a custom name.", |
| 879 | "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?", | 879 | "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?", |
| 880 | "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.", | 880 | "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.", |
| 881 | "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?", | 881 | "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?", |