Merge pull request #9642 from kalutkaz/sharedQueryModel

Add query.models to public-api

ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts

@@ -90,9 +90,9 @@ import {
   DisplayColumnsPanelComponent,
   DisplayColumnsPanelData
 } from '@home/components/widget/lib/display-columns-panel.component';
+import { Direction } from '@shared/models/page/sort-order';
 import {
   dataKeyToEntityKey,
-  Direction,
   EntityDataPageLink,
   entityDataPageLinkSortDirection,
   EntityKeyType,

ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts

@@ -19,7 +19,8 @@ import { DataKey, FormattedData, WidgetActionDescriptor, WidgetConfig } from '@s
 import { getDescendantProp, isDefined, isNotEmptyStr } from '@core/utils';
 import { AlarmDataInfo, alarmFields } from '@shared/models/alarm.models';
 import tinycolor from 'tinycolor2';
-import { Direction, EntityDataSortOrder, EntityKey } from '@shared/models/query/query.models';
+import { Direction } from '@shared/models/page/sort-order';
+import { EntityDataSortOrder, EntityKey } from '@shared/models/query/query.models';
 import { DataKeyType } from '@shared/models/telemetry/telemetry.models';
 import { WidgetContext } from '@home/models/widget-component.models';
 import { UtilsService } from '@core/services/utils.service';

ui-ngx/src/app/shared/models/public-api.ts

@@ -61,3 +61,4 @@ export * from './widget.models';
 export * from './widgets-bundle.model';
 export * from './window-message.model';
 export * from './usage.models';
+export * from './query/query.models';

ui-ngx/src/app/shared/models/query/query.models.ts

@@ -36,6 +36,7 @@ import { AlarmInfo, AlarmSearchStatus, AlarmSeverity } from '../alarm.models';
 import { Filter } from '@material-ui/icons';
 import { DatePipe } from '@angular/common';
 import { UserId } from '../id/user-id';
+import { Direction } from '@shared/models/page/sort-order';
 
 export enum EntityKeyType {
   ATTRIBUTE = 'ATTRIBUTE',
@@ -699,11 +700,6 @@ export interface EntityFilter extends EntityFilters {
   type?: AliasFilterType;
 }
 
-export enum Direction {
-  ASC = 'ASC',
-  DESC = 'DESC'
-}
-
 export interface EntityDataSortOrder {
   key: EntityKey;
   direction: Direction;