diff --git a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.html b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.html index 5bda4c7550..3589e465fe 100644 --- a/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.html +++ b/ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - +

audit-log.audit-log-details

- - - - @@ -62,7 +60,7 @@
import.csv-delimiter - + {{ delimiter.value }} @@ -78,16 +76,15 @@
-
+
- @@ -98,16 +95,15 @@ {{ 'import.stepper-text.column-type' | translate }} -
+
- @@ -131,9 +127,8 @@ {{ translate.instant('import.message.error-entities', {count: this.statistical.error.entity}) }}

-
- - diff --git a/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts b/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts index 85064a7236..cd37c43223 100644 --- a/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts +++ b/ui-ngx/src/app/modules/home/components/import-export/import-export.models.ts @@ -17,9 +17,6 @@ import { Widget, WidgetType } from '@app/shared/models/widget.models'; import { DashboardLayoutId } from '@shared/models/dashboard.models'; import { WidgetsBundle } from '@shared/models/widgets-bundle.model'; -import { ActionNotificationShow } from '@core/notification/notification.actions'; -import { ActionType } from '@shared/models/audit-log.models'; -import { RuleChain, RuleChainMetaData } from '@shared/models/rule-chain.models'; export interface ImportWidgetResult { widget: Widget; diff --git a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.html b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.html index 889eaa9c1d..b7360837d7 100644 --- a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.html +++ b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - + @@ -52,5 +52,5 @@ - +
diff --git a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts index 9e759ec641..e2fe0caef2 100644 --- a/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts +++ b/ui-ngx/src/app/modules/home/components/import-export/table-columns-assignment.component.ts @@ -19,8 +19,12 @@ import { ControlValueAccessor, FormControl, NG_VALIDATORS, NG_VALUE_ACCESSOR, Va import { Store } from '@ngrx/store'; import { AppState } from '@core/core.state'; import { EntityType } from '@shared/models/entity-type.models'; -import { CsvColumnParam, ImportEntityColumnType, importEntityColumnTypeTranslations, - importEntityObjectColumns } from '@home/components/import-export/import-export.models'; +import { + CsvColumnParam, + ImportEntityColumnType, + importEntityColumnTypeTranslations, + importEntityObjectColumns +} from '@home/components/import-export/import-export.models'; import { BehaviorSubject, Observable } from 'rxjs'; import { CollectionViewer, DataSource } from '@angular/cdk/collections'; @@ -51,8 +55,6 @@ export class TableColumnsAssignmentComponent implements OnInit, ControlValueAcce displayedColumns = ['order', 'sampleData', 'type', 'key']; - importEntityColumnType = ImportEntityColumnType; - columnTypes: AssignmentColumnType[] = []; columnTypesTranslations = importEntityColumnTypeTranslations; @@ -138,12 +140,10 @@ export class TableColumnsAssignmentComponent implements OnInit, ControlValueAcce } public isColumnTypeDiffers(columnType: ImportEntityColumnType): boolean { - return columnType !== ImportEntityColumnType.name && - columnType !== ImportEntityColumnType.type && - columnType !== ImportEntityColumnType.label && - columnType !== ImportEntityColumnType.accessToken && - columnType !== ImportEntityColumnType.isGateway && - columnType !== ImportEntityColumnType.description; + return columnType === ImportEntityColumnType.clientAttribute || + columnType === ImportEntityColumnType.sharedAttribute || + columnType === ImportEntityColumnType.serverAttribute || + columnType === ImportEntityColumnType.timeseries; } private columnValid(column: CsvColumnParam): boolean { diff --git a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html index f2c1b70d9c..9368219816 100644 --- a/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html +++ b/ui-ngx/src/app/modules/home/dialogs/add-entities-to-customer-dialog.component.html @@ -16,7 +16,7 @@ -->
- +

{{ assignToCustomerTitle | translate }}

-
- -
- {{ assignToCustomerText | translate }} +
{{ assignToCustomerText | translate }}
-
- - -
+
-
+
-
- - - -
+
-
+
-
- +
-
- -
diff --git a/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html index 6abbd68dea..aeb705d631 100644 --- a/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html +++ b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html @@ -16,9 +16,8 @@ -->

{{data.title}}

-
-
-
+
+
diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.html b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.html index 00bd722c38..92b43d490f 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.html +++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.html @@ -17,7 +17,7 @@ --> {{ entitySubtypeTitle | translate }} - + {{ displaySubTypeFn(subType) }} diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.scss b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.scss index 3bda90f75f..bb3718c2da 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.scss +++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.scss @@ -14,7 +14,5 @@ * limitations under the License. */ :host { - mat-select.tb-entity-subtype-select { - min-width: 200px; - } + } diff --git a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.ts b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.ts index 7e41068e3d..72540ad4c8 100644 --- a/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.ts +++ b/ui-ngx/src/app/shared/components/entity/entity-subtype-select.component.ts @@ -14,26 +14,18 @@ /// limitations under the License. /// -import {AfterViewInit, Component, ElementRef, forwardRef, Input, OnInit, ViewChild, OnDestroy} from '@angular/core'; -import {ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR} from '@angular/forms'; -import {Observable, of, throwError, Subscription, Subject} from 'rxjs'; -import {PageLink} from '@shared/models/page/page-link'; -import {Direction} from '@shared/models/page/sort-order'; -import {filter, map, mergeMap, publishReplay, refCount, startWith, tap, publish} from 'rxjs/operators'; -import {PageData, emptyPageData} from '@shared/models/page/page-data'; -import {DashboardInfo} from '@app/shared/models/dashboard.models'; -import {DashboardId} from '@app/shared/models/id/dashboard-id'; -import {DashboardService} from '@core/http/dashboard.service'; -import {Store} from '@ngrx/store'; -import {AppState} from '@app/core/core.state'; -import {getCurrentAuthUser} from '@app/core/auth/auth.selectors'; -import {Authority} from '@shared/models/authority.enum'; -import {TranslateService} from '@ngx-translate/core'; -import {DeviceService} from '@core/http/device.service'; -import {EntitySubtype, EntityType} from '@app/shared/models/entity-type.models'; -import {BroadcastService} from '@app/core/services/broadcast.service'; -import {AssetService} from '@core/http/asset.service'; -import {EntityViewService} from '@core/http/entity-view.service'; +import { AfterViewInit, Component, forwardRef, Input, OnDestroy, OnInit } from '@angular/core'; +import { ControlValueAccessor, FormBuilder, FormGroup, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { Observable, Subject, Subscription, throwError } from 'rxjs'; +import { map, mergeMap, publishReplay, refCount, startWith, tap } from 'rxjs/operators'; +import { Store } from '@ngrx/store'; +import { AppState } from '@app/core/core.state'; +import { TranslateService } from '@ngx-translate/core'; +import { DeviceService } from '@core/http/device.service'; +import { EntitySubtype, EntityType } from '@app/shared/models/entity-type.models'; +import { BroadcastService } from '@app/core/services/broadcast.service'; +import { AssetService } from '@core/http/asset.service'; +import { EntityViewService } from '@core/http/entity-view.service'; @Component({ selector: 'tb-entity-subtype-select', diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json index a2f8a57316..b1d6dc9973 100644 --- a/ui-ngx/src/assets/locale/locale.constant-en_US.json +++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json @@ -247,7 +247,6 @@ "no-asset-types-matching": "No asset types matching '{{entitySubtype}}' were found.", "asset-type-list-empty": "No asset types selected.", "asset-types": "Asset types", - "created-time": "Created time", "name": "Name", "name-required": "Name is required.", "description": "Description", diff --git a/ui-ngx/src/styles.scss b/ui-ngx/src/styles.scss index e2adbe3f52..1367046828 100644 --- a/ui-ngx/src/styles.scss +++ b/ui-ngx/src/styles.scss @@ -679,18 +679,18 @@ mat-label { } .mat-toolbar-tools { - font-size: 20px; + //font-size: 20px; letter-spacing: .005em; - box-sizing: border-box; + //box-sizing: border-box; font-weight: 400; display: flex; align-items: center; flex-direction: row; width: 100%; - height: 64px; - max-height: 64px; + //height: 64px; + //max-height: 64px; padding: 0 16px; - margin: 0; + //margin: 0; } .mat-icon { @@ -782,6 +782,11 @@ mat-label { .mat-toolbar { line-height: normal; + + h1, h2, h3, h4, h5, h6 { + overflow: hidden; + text-overflow: ellipsis; + } } mat-toolbar *, mat-toolbar :after, mat-toolbar :before { @@ -817,6 +822,9 @@ mat-label { .mat-dialog-actions { margin-bottom: 0; padding: 8px 8px 8px 16px; + button:last-of-type{ + margin-right: 20px; + } } } } @@ -843,7 +851,7 @@ mat-label { } .tb-fullscreen-dialog { - @media #{$mat-lt-md} { + @media #{$mat-lt-sm} { min-height: 100%; min-width: 100%; max-width: none !important; @@ -904,6 +912,7 @@ mat-label { display: flex; height: calc(100% - 60px); text-transform: uppercase; + text-align: center; }