Browse Source

Merge pull request #3681 from vvlladd28/improvement/device-wizard/view

UI: Fixed resize width windows device-wizard-dialog
pull/3703/head
Igor Kulikov 6 years ago
committed by GitHub
parent
commit
198a4913a8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html
  2. 10
      ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.scss
  3. 2
      ui-ngx/src/assets/locale/locale.constant-en_US.json

6
ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.html

@ -76,13 +76,15 @@
[required]="!createProfile" [required]="!createProfile"
[transportType]="deviceWizardFormGroup.get('transportType').value" [transportType]="deviceWizardFormGroup.get('transportType').value"
formControlName="deviceProfileId" formControlName="deviceProfileId"
[ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 0}"
(deviceProfileChanged)="$event?.transportType ? deviceWizardFormGroup.get('transportType').patchValue($event?.transportType) : {}" (deviceProfileChanged)="$event?.transportType ? deviceWizardFormGroup.get('transportType').patchValue($event?.transportType) : {}"
[addNewProfile]="false" [addNewProfile]="false"
[selectDefaultProfile]="true" [selectDefaultProfile]="true"
[selectFirstProfile]="true" [selectFirstProfile]="true"
[editProfileEnabled]="false"> [editProfileEnabled]="false">
</tb-device-profile-autocomplete> </tb-device-profile-autocomplete>
<mat-form-field fxFlex class="mat-block"> <mat-form-field fxFlex class="mat-block"
[ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}">
<mat-label translate>device-profile.new-device-profile-name</mat-label> <mat-label translate>device-profile.new-device-profile-name</mat-label>
<input matInput formControlName="newDeviceProfileTitle" <input matInput formControlName="newDeviceProfileTitle"
[required]="createProfile"> [required]="createProfile">
@ -93,12 +95,14 @@
</div> </div>
<div fxLayout="column" fxLayoutAlign="flex-end start"> <div fxLayout="column" fxLayoutAlign="flex-end start">
<tb-rule-chain-autocomplete <tb-rule-chain-autocomplete
[ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}"
labelText="device-profile.default-rule-chain" labelText="device-profile.default-rule-chain"
formControlName="defaultRuleChainId"> formControlName="defaultRuleChainId">
</tb-rule-chain-autocomplete> </tb-rule-chain-autocomplete>
</div> </div>
<div fxLayout="column" fxLayoutAlign="flex-end start"> <div fxLayout="column" fxLayoutAlign="flex-end start">
<tb-queue-type-list <tb-queue-type-list
[ngClass]="{invisible: deviceWizardFormGroup.get('addProfileType').value !== 1}"
[queueType]="serviceType" [queueType]="serviceType"
formControlName="defaultQueueName"> formControlName="defaultQueueName">
</tb-queue-type-list> </tb-queue-type-list>

10
ui-ngx/src/app/modules/home/components/wizard/device-wizard-dialog.component.scss

@ -22,6 +22,10 @@
max-height: 75vh; max-height: 75vh;
} }
} }
.invisible{
visibility: hidden;
}
} }
:host ::ng-deep { :host ::ng-deep {
@ -60,6 +64,12 @@
height: 100%; height: 100%;
} }
} }
tb-device-profile-autocomplete, tb-queue-type-list{
.mat-form-field-wrapper{
width: 180px !important;
}
}
} }
} }
} }

2
ui-ngx/src/assets/locale/locale.constant-en_US.json

@ -875,7 +875,7 @@
"profile-configuration": "Profile configuration", "profile-configuration": "Profile configuration",
"transport-configuration": "Transport configuration", "transport-configuration": "Transport configuration",
"default-rule-chain": "Default rule chain", "default-rule-chain": "Default rule chain",
"select-queue-hint": "The queue name can be selected from a drop-down list or add a custom name.", "select-queue-hint": "Select from a drop-down list or add a custom name.",
"delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?", "delete-device-profile-title": "Are you sure you want to delete the device profile '{{deviceProfileName}}'?",
"delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.", "delete-device-profile-text": "Be careful, after the confirmation the device profile and all related data will become unrecoverable.",
"delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?", "delete-device-profiles-title": "Are you sure you want to delete { count, plural, 1 {1 device profile} other {# device profiles} }?",

Loading…
Cancel
Save