tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Moved description fields to one standard

pull/15156/head
Maksym Tsymbarov 7 months ago
parent
c902d9ce96
commit
f8f3305fd6
17 changed files with 48 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html
  2. 2
      ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
  3. 2
      ui-ngx/src/app/modules/home/pages/asset/asset.component.html
  4. 10
      ui-ngx/src/app/modules/home/pages/customer/customer.component.html
  5. 12
      ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html
  6. 2
      ui-ngx/src/app/modules/home/pages/device/device.component.html
  7. 2
      ui-ngx/src/app/modules/home/pages/edge/edge.component.html
  8. 2
      ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html
  9. 2
      ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html
  10. 2
      ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.component.html
  11. 28
      ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
  12. 2
      ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html
  13. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
  14. 2
      ui-ngx/src/app/modules/home/pages/rulechain/rulechain.component.html
  15. 4
      ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html
  16. 8
      ui-ngx/src/app/modules/home/pages/user/user.component.html
  17. 10
      ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html

2
ui-ngx/src/app/modules/home/components/profile/asset-profile.component.html
View File

@ -89,7 +89,7 @@
</tb-gallery-image-input> </tb-gallery-image-input>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>asset-profile.description</mat-label> <mat-label translate>asset-profile.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</fieldset> </fieldset>
</form> </form>

2
ui-ngx/src/app/modules/home/components/profile/device-profile.component.html
View File

@ -114,7 +114,7 @@
</tb-gallery-image-input> </tb-gallery-image-input>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>device-profile.description</mat-label> <mat-label translate>device-profile.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
<mat-form-field *ngIf="standalone" class="mat-block"> <mat-form-field *ngIf="standalone" class="mat-block">
<mat-label translate>device-profile.transport-type</mat-label> <mat-label translate>device-profile.transport-type</mat-label>

2
ui-ngx/src/app/modules/home/pages/asset/asset.component.html
View File

@ -110,7 +110,7 @@
<div formGroupName="additionalInfo"> <div formGroupName="additionalInfo">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>asset.description</mat-label> <mat-label translate>asset.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

10
ui-ngx/src/app/modules/home/pages/customer/customer.component.html
View File

@ -83,11 +83,8 @@
{{ 'customer.title-max-length' | translate }} {{ 'customer.title-max-length' | translate }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<tb-contact [parentForm]="entityForm" [isEdit]="isEdit"></tb-contact>
<div formGroupName="additionalInfo" class="flex flex-col"> <div formGroupName="additionalInfo" class="flex flex-col">
<mat-form-field class="mat-block">
<mat-label translate>customer.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea>
</mat-form-field>
<section class="tb-default-dashboard flex flex-1 flex-col" *ngIf="entity?.id"> <section class="tb-default-dashboard flex flex-1 flex-col" *ngIf="entity?.id">
<section class="flex flex-1 flex-col gt-sm:flex-row"> <section class="flex flex-1 flex-col gt-sm:flex-row">
<tb-dashboard-autocomplete <tb-dashboard-autocomplete
@ -103,8 +100,11 @@
</mat-checkbox> </mat-checkbox>
</section> </section>
</section> </section>
<mat-form-field class="mat-block">
<mat-label translate>customer.description</mat-label>
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field>
</div> </div>
<tb-contact [parentForm]="entityForm" [isEdit]="isEdit"></tb-contact>
</fieldset> </fieldset>
</form> </form>
</div> </div>

12
ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html
View File

@ -124,12 +124,6 @@
{{ 'dashboard.title-max-length' | translate }} {{ 'dashboard.title-max-length' | translate }}
</mat-error> </mat-error>
</mat-form-field> </mat-form-field>
<div formGroupName="configuration" class="flex flex-col">
<mat-form-field class="mat-block">
<mat-label translate>dashboard.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea>
</mat-form-field>
</div>
<tb-entity-list <tb-entity-list
*ngIf="isAdd" *ngIf="isAdd"
formControlName="assignedCustomerIds" formControlName="assignedCustomerIds"
@ -150,6 +144,12 @@
formControlName="image"> formControlName="image">
</tb-gallery-image-input> </tb-gallery-image-input>
</div> </div>
<div formGroupName="configuration" class="flex flex-col mt-5">
<mat-form-field class="mat-block">
<mat-label translate>dashboard.description</mat-label>
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field>
</div>
</fieldset> </fieldset>
</form> </form>
</div> </div>

2
ui-ngx/src/app/modules/home/pages/device/device.component.html
View File

@ -150,7 +150,7 @@
</div> </div>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>device.description</mat-label> <mat-label translate>device.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

2
ui-ngx/src/app/modules/home/pages/edge/edge.component.html
View File

@ -198,7 +198,7 @@
<div formGroupName="additionalInfo" class="flex flex-col"> <div formGroupName="additionalInfo" class="flex flex-col">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>edge.description</mat-label> <mat-label translate>edge.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

2
ui-ngx/src/app/modules/home/pages/entity-view/entity-view.component.html
View File

@ -161,7 +161,7 @@
<div formGroupName="additionalInfo"> <div formGroupName="additionalInfo">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>entity-view.description</mat-label> <mat-label translate>entity-view.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

2
ui-ngx/src/app/modules/home/pages/mobile/bundes/mobile-bundle-dialog.component.html
View File

@ -73,7 +73,7 @@
</tb-entity-autocomplete> </tb-entity-autocomplete>
<mat-form-field appearance="outline"> <mat-form-field appearance="outline">
<mat-label translate>mobile.description</mat-label> <mat-label translate>mobile.description</mat-label>
<textarea matInput formControlName="description" rows="1"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</form> </form>
</mat-step> </mat-step>

2
ui-ngx/src/app/modules/home/pages/notification/recipient/recipient-notification-dialog.component.html
View File

@ -155,7 +155,7 @@
</section> </section>
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</div> </div>

28
ui-ngx/src/app/modules/home/pages/notification/rule/rule-notification-dialog.component.html
View File

@ -150,7 +150,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -204,7 +204,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -233,7 +233,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -287,7 +287,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -343,7 +343,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -402,7 +402,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -439,7 +439,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -464,7 +464,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -501,7 +501,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -538,7 +538,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -551,7 +551,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -574,7 +574,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -587,7 +587,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>
@ -650,7 +650,7 @@
<section formGroupName="additionalConfig"> <section formGroupName="additionalConfig">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>notification.description</mat-label> <mat-label translate>notification.description</mat-label>
<input matInput formControlName="description"> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</section> </section>
</form> </form>

2
ui-ngx/src/app/modules/home/pages/ota-update/ota-update.component.html
View File

@ -177,7 +177,7 @@
<div formGroupName="additionalInfo"> <div formGroupName="additionalInfo">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>ota-update.description</mat-label> <mat-label translate>ota-update.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

2
ui-ngx/src/app/modules/home/pages/rulechain/rule-node-details.component.html
View File

@ -75,7 +75,7 @@
<div formGroupName="additionalInfo"> <div formGroupName="additionalInfo">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>rulenode.rule-node-description</mat-label> <mat-label translate>rulenode.rule-node-description</mat-label>
<textarea matInput formControlName="description" rows="1"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</div> </div>

2
ui-ngx/src/app/modules/home/pages/rulechain/rulechain.component.html
View File

@ -94,7 +94,7 @@
<div formGroupName="additionalInfo"> <div formGroupName="additionalInfo">
<mat-form-field class="mat-block"> <mat-form-field class="mat-block">
<mat-label translate>rulechain.description</mat-label> <mat-label translate>rulechain.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea> <textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
</fieldset> </fieldset>

4
ui-ngx/src/app/modules/home/pages/scada-symbol/metadata-components/scada-symbol-metadata.component.html
View File

@ -37,8 +37,10 @@
<div class="fixed-title-width" translate>scada.description</div> <div class="fixed-title-width" translate>scada.description</div>
<mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic"> <mat-form-field class="flex-1" appearance="outline" subscriptSizing="dynamic">
<textarea matInput <textarea matInput
cdkTextareaAutosize
cdkAutosizeMinRows="1"
formControlName="description" formControlName="description"
rows="2"></textarea> rows="1"></textarea>
</mat-form-field> </mat-form-field>
</div> </div>
<div class="tb-form-row"> <div class="tb-form-row">

8
ui-ngx/src/app/modules/home/pages/user/user.component.html
View File

@ -119,10 +119,6 @@
} }
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field class="mat-block" appearance="outline">
<mat-label translate>user.description</mat-label>
<textarea matInput formControlName="description" rows="2"></textarea>
</mat-form-field>
<section class="tb-default-dashboard flex flex-1 flex-col" *ngIf="entity?.id"> <section class="tb-default-dashboard flex flex-1 flex-col" *ngIf="entity?.id">
<section class="flex flex-1 flex-col items-baseline gt-sm:flex-row"> <section class="flex flex-1 flex-col items-baseline gt-sm:flex-row">
<tb-dashboard-autocomplete <tb-dashboard-autocomplete
@ -155,6 +151,10 @@
</mat-checkbox> </mat-checkbox>
</section> </section>
</section> </section>
<mat-form-field class="mat-block" appearance="outline">
<mat-label translate>user.description</mat-label>
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1"></textarea>
</mat-form-field>
</div> </div>
</fieldset> </fieldset>
</form> </form>

10
ui-ngx/src/app/modules/home/pages/widget/widget-type.component.html
View File

@ -58,11 +58,6 @@
label="{{'widget.image-preview' | translate}}" label="{{'widget.image-preview' | translate}}"
formControlName="image"> formControlName="image">
</tb-gallery-image-input> </tb-gallery-image-input>
<mat-form-field class="mat-block">
<mat-label translate>widget.description</mat-label>
<textarea matInput formControlName="description" rows="2" maxlength="1024" #descriptionInput></textarea>
<mat-hint align="end">{{descriptionInput.value?.length || 0}}/1024</mat-hint>
</mat-form-field>
<tb-string-items-list <tb-string-items-list
label="{{ 'widget.tags' | translate }}" label="{{ 'widget.tags' | translate }}"
formControlName="tags"> formControlName="tags">
@ -75,6 +70,11 @@
{{ 'widget.deprecated' | translate }} {{ 'widget.deprecated' | translate }}
</mat-slide-toggle> </mat-slide-toggle>
</div> </div>
<mat-form-field class="mat-block mt-5">
<mat-label translate>widget.description</mat-label>
<textarea matInput formControlName="description" cdkTextareaAutosize cdkAutosizeMinRows="1" rows="1" maxlength="1024" #descriptionInput></textarea>
<mat-hint align="end">{{descriptionInput.value?.length || 0}}/1024</mat-hint>
</mat-form-field>
</fieldset> </fieldset>
</form> </form>
</div> </div>

Write Preview
Loading…
Cancel
Save