listConversations(TenantId tenantId, String token, SlackConversationType conversationType);
String getToken(TenantId tenantId);
diff --git a/ui-ngx/src/app/core/http/public-api.ts b/ui-ngx/src/app/core/http/public-api.ts
index 63cc393ce6..43354f6b60 100644
--- a/ui-ngx/src/app/core/http/public-api.ts
+++ b/ui-ngx/src/app/core/http/public-api.ts
@@ -21,11 +21,13 @@ export * from './asset.service';
export * from './asset-profile.service';
export * from './attribute.service';
export * from './audit-log.service';
+export * from './calculated-fields.service';
export * from './component-descriptor.service';
export * from './customer.service';
export * from './dashboard.service';
export * from './device.service';
export * from './device-profile.service';
+export * from './domain.service';
export * from './entities-version-control.service';
export * from './entity.service';
export * from './edge.service';
@@ -34,6 +36,8 @@ export * from './entity-view.service';
export * from './event.service';
export * from './http-utils';
export * from './image.service';
+export * from './mobile-app.service';
+export * from './mobile-application.service';
export * from './notification.service';
export * from './oauth2.service';
export * from './ota-package.service';
@@ -42,6 +46,7 @@ export * from './resource.service';
export * from './rule-chain.service';
export * from './tenant.service';
export * from './tenant-profile.service';
+export * from './two-factor-authentication.service';
export * from './ui-settings.service';
export * from './user.service';
export * from './user-settings.service';
diff --git a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
index 2ee3c0089d..c9e5eee944 100644
--- a/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
+++ b/ui-ngx/src/app/modules/home/components/alarm/alarm-filter-config.component.scss
@@ -13,6 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+@import '../scss/constants';
+
:host {
display: flex;
max-width: 100%;
@@ -39,16 +42,12 @@
tb-entity-subtype-list {
flex: 1;
- width: 180px;
+ @media #{$mat-gt-xs} {
+ width: 180px;
+ }
.mdc-evolution-chip-set__chips {
width: 100%;
}
}
-
- .mat-mdc-chip {
- .mdc-evolution-chip__cell, .mat-mdc-chip-action, .mat-mdc-chip-action-label {
- overflow: hidden;
- }
- }
}
}
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
index b4b5a939e1..4086b3e7b0 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.html
@@ -80,7 +80,7 @@
{{ 'entity.key' | translate }}
-
+
{{ argument.refEntityKey.key }}
diff --git a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
index ae8fd25170..430958d0f4 100644
--- a/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
+++ b/ui-ngx/src/app/modules/home/components/calculated-fields/components/arguments-table/calculated-field-arguments-table.component.scss
@@ -55,12 +55,6 @@
}
:host ::ng-deep {
- .mat-mdc-standard-chip {
- .mdc-evolution-chip__cell--primary, .mdc-evolution-chip__action--primary, .mdc-evolution-chip__text-label {
- overflow: hidden;
- }
- }
-
.arguments-table:not(.arguments-table-with-error) {
.mdc-data-table__row:last-child .mat-mdc-cell {
border-bottom: none;
diff --git a/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts b/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
index ac7333079d..7eae04452d 100644
--- a/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
+++ b/ui-ngx/src/app/modules/home/components/entity/entity-filter-view.component.ts
@@ -128,6 +128,9 @@ export class EntityFilterViewComponent implements ControlValueAccessor {
{edgeTypes});
}
break;
+ case AliasFilterType.apiUsageState:
+ this.filterDisplayValue = this.translate.instant('alias.filter-type-apiUsageState');
+ break;
case AliasFilterType.entityViewType:
const entityViewTypesQuoted = [];
this.filter.entityViewTypes.forEach((entityViewType) => {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
index 1af25bd01e..d65d4067e5 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/alias/entity-alias-select.component.ts
@@ -251,7 +251,6 @@ export class EntityAliasSelectComponent implements ControlValueAccessor, OnInit,
}, 0);
}
} else {
- this.entityAliasList.push(newAlias);
this.modelValue = newAlias.id;
this.selectEntityAliasFormGroup.get('entityAlias').patchValue(newAlias, {emitEvent: true});
this.propagateChange(this.modelValue);
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
index 5dbeb8b646..5307a18a7b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/settings/common/dynamic-form/dynamic-form-property-panel.component.html
@@ -116,7 +116,7 @@
dynamic-form.property.disable-on-property
-
+ {{ 'dynamic-form.property.disable-on-property-none' | translate }}
{{ prop }}
diff --git a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
index 98595de798..0f13409a3e 100644
--- a/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
+++ b/ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.ts
@@ -40,6 +40,7 @@ export interface TemplateNotificationDialogData {
predefinedType?: NotificationType;
isAdd?: boolean;
isCopy?: boolean;
+ name?: string;
}
@Component({
@@ -85,6 +86,9 @@ export class TemplateNotificationDialogComponent
this.hideSelectType = true;
this.templateNotificationForm.get('notificationType').setValue(this.data.predefinedType, {emitEvent: false});
}
+ if (isDefinedAndNotNull(this.data?.name)) {
+ this.templateNotificationForm.get('name').setValue(this.data.name, {emitEvent: false});
+ }
if (data.isAdd || data.isCopy) {
this.dialogTitle = 'notification.add-notification-template';
diff --git a/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss b/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
index e28d8ec14a..c8f678d679 100644
--- a/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/widget/widget-type-autocomplete.component.scss
@@ -24,7 +24,8 @@
}
.tb-widget-type-option-image-preview {
width: 36px;
- max-height: 100%;
+ height: 100%;
+ max-height: 36px;
object-fit: contain;
border-radius: 6px;
}
diff --git a/ui-ngx/src/app/shared/components/entity/entity-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
index 9510f2a952..6bf7cdb78d 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-list.component.html
@@ -25,6 +25,7 @@
{{entity.name}}
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
index 595010fb19..6635921d7f 100644
--- a/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
+++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.html
@@ -22,6 +22,7 @@
{{customTranslate(entitySubtype)}}
diff --git a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
index d5e67a1f60..d712f11114 100644
--- a/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
+++ b/ui-ngx/src/app/shared/components/notification/template-autocomplete.component.html
@@ -29,7 +29,7 @@
(click)="clear()">
close
-