diff --git a/ui-ngx/src/app/modules/common/modules-map.ts b/ui-ngx/src/app/modules/common/modules-map.ts index 3f0537dfac..3efe9e630f 100644 --- a/ui-ngx/src/app/modules/common/modules-map.ts +++ b/ui-ngx/src/app/modules/common/modules-map.ts @@ -33,40 +33,40 @@ import * as AngularCdkOverlay from '@angular/cdk/overlay'; import * as AngularCdkPortal from '@angular/cdk/portal'; import * as AngularCdkBidi from '@angular/cdk/bidi'; import * as AngularCdkPlatform from '@angular/cdk/platform'; -import * as AngularMaterialAutocomplete from '@angular/material/legacy-autocomplete'; +import * as AngularMaterialAutocomplete from '@angular/material/autocomplete'; import * as AngularMaterialBadge from '@angular/material/badge'; import * as AngularMaterialBottomSheet from '@angular/material/bottom-sheet'; -import * as AngularMaterialButton from '@angular/material/legacy-button'; +import * as AngularMaterialButton from '@angular/material/button'; import * as AngularMaterialButtonToggle from '@angular/material/button-toggle'; -import * as AngularMaterialCard from '@angular/material/legacy-card'; -import * as AngularMaterialCheckbox from '@angular/material/legacy-checkbox'; -import * as AngularMaterialChips from '@angular/material/legacy-chips'; -import * as AngularMaterialCore from '@angular/material/legacy-core'; +import * as AngularMaterialCard from '@angular/material/card'; +import * as AngularMaterialCheckbox from '@angular/material/checkbox'; +import * as AngularMaterialChips from '@angular/material/chips'; +import * as AngularMaterialCore from '@angular/material/core'; import * as AngularMaterialDatepicker from '@angular/material/datepicker'; -import * as AngularMaterialDialog from '@angular/material/legacy-dialog'; +import * as AngularMaterialDialog from '@angular/material/dialog'; import * as AngularMaterialDivider from '@angular/material/divider'; import * as AngularMaterialExpansion from '@angular/material/expansion'; -import * as AngularMaterialFormField from '@angular/material/legacy-form-field'; +import * as AngularMaterialFormField from '@angular/material/form-field'; import * as AngularMaterialGridList from '@angular/material/grid-list'; import * as AngularMaterialIcon from '@angular/material/icon'; -import * as AngularMaterialInput from '@angular/material/legacy-input'; -import * as AngularMaterialList from '@angular/material/legacy-list'; -import * as AngularMaterialMenu from '@angular/material/legacy-menu'; -import * as AngularMaterialPaginator from '@angular/material/legacy-paginator'; -import * as AngularMaterialProgressBar from '@angular/material/legacy-progress-bar'; -import * as AngularMaterialProgressSpinner from '@angular/material/legacy-progress-spinner'; -import * as AngularMaterialRadio from '@angular/material/legacy-radio'; -import * as AngularMaterialSelect from '@angular/material/legacy-select'; +import * as AngularMaterialInput from '@angular/material/input'; +import * as AngularMaterialList from '@angular/material/list'; +import * as AngularMaterialMenu from '@angular/material/menu'; +import * as AngularMaterialPaginator from '@angular/material/paginator'; +import * as AngularMaterialProgressBar from '@angular/material/progress-bar'; +import * as AngularMaterialProgressSpinner from '@angular/material/progress-spinner'; +import * as AngularMaterialRadio from '@angular/material/radio'; +import * as AngularMaterialSelect from '@angular/material/select'; import * as AngularMaterialSidenav from '@angular/material/sidenav'; -import * as AngularMaterialSlideToggle from '@angular/material/legacy-slide-toggle'; -import * as AngularMaterialSlider from '@angular/material/legacy-slider'; -import * as AngularMaterialSnackBar from '@angular/material/legacy-snack-bar'; +import * as AngularMaterialSlideToggle from '@angular/material/slide-toggle'; +import * as AngularMaterialSlider from '@angular/material/slider'; +import * as AngularMaterialSnackBar from '@angular/material/snack-bar'; import * as AngularMaterialSort from '@angular/material/sort'; import * as AngularMaterialStepper from '@angular/material/stepper'; -import * as AngularMaterialTable from '@angular/material/legacy-table'; -import * as AngularMaterialTabs from '@angular/material/legacy-tabs'; +import * as AngularMaterialTable from '@angular/material/table'; +import * as AngularMaterialTabs from '@angular/material/tabs'; import * as AngularMaterialToolbar from '@angular/material/toolbar'; -import * as AngularMaterialTooltip from '@angular/material/legacy-tooltip'; +import * as AngularMaterialTooltip from '@angular/material/tooltip'; import * as AngularMaterialTree from '@angular/material/tree'; import * as DragDropModule from '@angular/cdk/drag-drop'; import * as HttpClientModule from '@angular/common/http'; diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.html index 9c9f278934..d4d8644aad 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.html @@ -17,7 +17,7 @@ -->
- +
- + {{'filter.no-dynamic-value' | translate}} @@ -51,7 +51,7 @@
- +
diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.scss b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.scss deleted file mode 100644 index e501575a7c..0000000000 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -/** - * Copyright © 2016-2023 The Thingsboard Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -:host ::ng-deep { - .source-attribute { - /*TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. - */ - .mat-form-field-infix{ - width: 100%; - } - } -} diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.ts b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.ts index fbd017d07f..e14dcc6ea7 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.ts +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-duration-predicate-value.component.ts @@ -28,7 +28,7 @@ import { AlarmConditionType } from '@shared/models/device.models'; @Component({ selector: 'tb-alarm-duration-predicate-value', templateUrl: './alarm-duration-predicate-value.component.html', - styleUrls: ['./alarm-duration-predicate-value.component.scss'], + styleUrls: [], providers: [ { provide: NG_VALUE_ACCESSOR, diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition-dialog.component.html index e5c3676f01..fd6308de9d 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition-dialog.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-rule-condition-dialog.component.html @@ -15,7 +15,7 @@ limitations under the License. --> -
+

{{ (readonly ? 'device-profile.alarm-rule-condition' : 'device-profile.edit-alarm-rule-condition') | translate }}

@@ -56,7 +56,7 @@ >
- + diff --git a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-schedule-dialog.component.html b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-schedule-dialog.component.html index 70e7555110..b36e7d151a 100644 --- a/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-schedule-dialog.component.html +++ b/ui-ngx/src/app/modules/home/components/profile/alarm/alarm-schedule-dialog.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - +

{{ (readonly ? 'device-profile.schedule' : 'device-profile.edit-schedule') | translate }}

@@ -28,13 +28,9 @@
-
-
- - -
-
+ +