From bfc539156431ed8362e60b667cf9c877d0da3086 Mon Sep 17 00:00:00 2001
From: kalytka <ykalytka@thingsboard.io>
Date: Wed, 15 Nov 2023 16:16:56 +0200
Subject: [PATCH] Shared query model + refactoring enum Direction

---
 .../widget/lib/entity/entities-table-widget.component.ts    | 2 +-
 .../home/components/widget/lib/table-widget.models.ts       | 3 ++-
 ui-ngx/src/app/shared/models/public-api.ts                  | 1 +
 ui-ngx/src/app/shared/models/query/query.models.ts          | 6 +-----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts b/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
index b7d1841431..20855b248e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/entity/entities-table-widget.component.ts
+++ b/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,
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
index 5110b6121d..7d55bdbe62 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/table-widget.models.ts
+++ b/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';
diff --git a/ui-ngx/src/app/shared/models/public-api.ts b/ui-ngx/src/app/shared/models/public-api.ts
index 22760018c5..517ede9ba3 100644
--- a/ui-ngx/src/app/shared/models/public-api.ts
+++ b/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';
diff --git a/ui-ngx/src/app/shared/models/query/query.models.ts b/ui-ngx/src/app/shared/models/query/query.models.ts
index 696ce5c3fb..45081908e3 100644
--- a/ui-ngx/src/app/shared/models/query/query.models.ts
+++ b/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;