Browse Source

Merge pull request #15172 from thingsboard/rc

Merge rc into master
pull/15176/head
Viacheslav Klimov 8 months ago
committed by GitHub
parent
commit
50d4ae99e9
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 4
      ui-ngx/src/app/core/services/calculated-field-form.service.ts
  2. 8
      ui-ngx/src/app/core/services/resources.service.ts
  3. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html
  4. 2
      ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html
  5. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html
  6. 2
      ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html

4
ui-ngx/src/app/core/services/calculated-field-form.service.ts

@ -38,7 +38,7 @@ export class CalculatedFieldFormService {
buildForm(): FormGroup {
return this.fb.group({
name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
name: ['', [Validators.required, Validators.maxLength(255)]],
entityId: [null, Validators.required],
type: [CalculatedFieldType.SIMPLE],
debugSettings: [],
@ -48,7 +48,7 @@ export class CalculatedFieldFormService {
buildAlarmRuleForm(): FormGroup {
return this.fb.group({
name: ['', [Validators.required, Validators.pattern(oneSpaceInsideRegex), Validators.maxLength(255)]],
name: ['', [Validators.required, Validators.maxLength(255)]],
entityId: [null, Validators.required],
type: [CalculatedFieldType.ALARM],
debugSettings: [],

8
ui-ngx/src/app/core/services/resources.service.ts

@ -24,7 +24,9 @@ import {
ɵCssSelectorList,
ɵNG_COMP_DEF,
ɵNG_MOD_DEF,
ɵNG_PIPE_DEF,
ɵNgModuleDef,
ɵPipeDef,
DOCUMENT
} from '@angular/core';
@ -302,6 +304,12 @@ export class ResourcesService {
(component as any).standalone = false;
}
}
if (ɵNG_PIPE_DEF in decl) {
const pipe: ɵPipeDef<any> = decl[ɵNG_PIPE_DEF];
if (isUndefined(pipe.standalone) || pipe.standalone) {
(pipe as any).standalone = false;
}
}
}
}
modulesWithComponents.modules.push(moduleInfo);

2
ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rule-dialog.component.html

@ -40,8 +40,6 @@
<mat-error>
@if (fieldFormGroup.get('name').hasError('required')) {
{{ 'alarm-rule.alarm-type-required' | translate }}
} @else if (fieldFormGroup.get('name').hasError('pattern')) {
{{ 'alarm-rule.alarm-type-pattern' | translate }}
} @else if (fieldFormGroup.get('name').hasError('maxlength')) {
{{ 'alarm-rule.alarm-type-max-length' | translate }}
}

2
ui-ngx/src/app/modules/home/components/alarm-rules/alarm-rules.component.html

@ -47,8 +47,6 @@
<mat-error>
@if (entityForm.get('name').hasError('required')) {
{{ 'common.hint.title-required' | translate }}
} @else if (entityForm.get('name').hasError('pattern')) {
{{ 'common.hint.title-pattern' | translate }}
} @else if (entityForm.get('name').hasError('maxlength')) {
{{ 'common.hint.title-max-length' | translate }}
}

2
ui-ngx/src/app/modules/home/components/calculated-fields/calculated-field.component.html

@ -47,8 +47,6 @@
<mat-error>
@if (entityForm.get('name').hasError('required')) {
{{ 'common.hint.title-required' | translate }}
} @else if (entityForm.get('name').hasError('pattern')) {
{{ 'common.hint.title-pattern' | translate }}
} @else if (entityForm.get('name').hasError('maxlength')) {
{{ 'common.hint.title-max-length' | translate }}
}

2
ui-ngx/src/app/modules/home/components/calculated-fields/components/dialog/calculated-field-dialog.component.html

@ -39,8 +39,6 @@
<mat-error>
@if (fieldFormGroup.get('name').hasError('required')) {
{{ 'common.hint.title-required' | translate }}
} @else if (fieldFormGroup.get('name').hasError('pattern')) {
{{ 'common.hint.title-pattern' | translate }}
} @else if (fieldFormGroup.get('name').hasError('maxlength')) {
{{ 'common.hint.title-max-length' | translate }}
}

Loading…
Cancel
Save