@journeyapps-labs/reactor-mod-data-browser 3.0.2 → 3.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (256) hide show
  1. package/CHANGELOG.md +39 -0
  2. package/dist/@types/actions/connections/SetConnectionColorAction.d.ts +11 -0
  3. package/dist/@types/actions/saved-queries/OpenSavedQueryAction.d.ts +10 -0
  4. package/dist/@types/actions/saved-queries/RemoveSavedQueryAction.d.ts +9 -0
  5. package/dist/@types/core/AbstractConnection.d.ts +2 -0
  6. package/dist/@types/core/SchemaModelDefinition.d.ts +5 -0
  7. package/dist/@types/core/connection-colors.d.ts +10 -0
  8. package/dist/@types/core/query/StandardModelFields.d.ts +5 -0
  9. package/dist/@types/core/query/filters.d.ts +46 -5
  10. package/dist/@types/core/query/query-simple/SimplePage.d.ts +2 -0
  11. package/dist/@types/core/query/query-simple/SimpleQuery.d.ts +12 -3
  12. package/dist/@types/core/query/query-simple/SimpleQueryColumns.d.ts +12 -0
  13. package/dist/@types/core/query/query-simple/SimpleQueryFilterState.d.ts +37 -0
  14. package/dist/@types/core/query/query-simple/SimpleQueryPlanner.d.ts +4 -0
  15. package/dist/@types/core/query/query-simple/SimpleQuerySortState.d.ts +23 -0
  16. package/dist/@types/core/query/query-simple/SimpleQueryTypes.d.ts +24 -0
  17. package/dist/@types/core/query/widgets/ColumnDisplayWidget.d.ts +1 -0
  18. package/dist/@types/core/query/widgets/PeekRelationshipButton.d.ts +7 -0
  19. package/dist/@types/core/query/widgets/SmartColumnWidget.d.ts +3 -0
  20. package/dist/@types/core/query/widgets/SmartFilterWidget.d.ts +6 -0
  21. package/dist/@types/entities/ConnectionEntityDefinition.d.ts +2 -0
  22. package/dist/@types/entities/SavedQueryEntityDefinition.d.ts +8 -0
  23. package/dist/@types/entities.d.ts +2 -1
  24. package/dist/@types/forms/APIConnectionForm.d.ts +1 -0
  25. package/dist/@types/forms/TypeEngine.d.ts +3 -21
  26. package/dist/@types/forms/types/attachment-handler.d.ts +2 -0
  27. package/dist/@types/forms/types/boolean-handler.d.ts +2 -0
  28. package/dist/@types/forms/types/date-handler.d.ts +2 -0
  29. package/dist/@types/forms/types/filters/ClearableFilterFormDialogDirective.d.ts +10 -0
  30. package/dist/@types/forms/types/filters/ConditionalFilterForm.d.ts +23 -0
  31. package/dist/@types/forms/types/image-handler.d.ts +2 -0
  32. package/dist/@types/forms/types/location-handler.d.ts +2 -0
  33. package/dist/@types/forms/types/multiple-choice-handler.d.ts +2 -0
  34. package/dist/@types/forms/types/multiple-choice-integer-handler.d.ts +2 -0
  35. package/dist/@types/forms/types/number-handler.d.ts +2 -0
  36. package/dist/@types/forms/types/shared/type-handler.d.ts +37 -0
  37. package/dist/@types/forms/types/shared/ui.d.ts +768 -0
  38. package/dist/@types/forms/types/single-choice-handler.d.ts +2 -0
  39. package/dist/@types/forms/types/single-choice-integer-handler.d.ts +2 -0
  40. package/dist/@types/forms/types/text-handler.d.ts +3 -0
  41. package/dist/@types/index.d.ts +1 -0
  42. package/dist/@types/panels/_shared/SharedConnectionPanelFactory.d.ts +19 -0
  43. package/dist/@types/panels/_shared/SharedModelPanelFactory.d.ts +5 -2
  44. package/dist/@types/panels/query/QueryPanelFactory.d.ts +6 -2
  45. package/dist/@types/panels/query/TableControlsWidget.d.ts +2 -0
  46. package/dist/@types/panels/query/table-controls/ChangesControlsWidget.d.ts +8 -0
  47. package/dist/@types/panels/query/table-controls/FilterControlsWidget.d.ts +7 -0
  48. package/dist/@types/panels/query/table-controls/PageControlsWidget.d.ts +9 -0
  49. package/dist/@types/panels/query/table-controls/QueryControlsWidget.d.ts +11 -0
  50. package/dist/@types/panels/query/table-controls/SortChipWidget.d.ts +10 -0
  51. package/dist/@types/panels/query/table-controls/SortControlsWidget.d.ts +7 -0
  52. package/dist/@types/preferences/QueryControlPreferences.d.ts +7 -0
  53. package/dist/@types/stores/SavedQueryStore.d.ts +34 -0
  54. package/dist/@types/widgets/EmptyValueWidget.d.ts +7 -0
  55. package/dist/DataBrowserModule.js +21 -7
  56. package/dist/DataBrowserModule.js.map +1 -1
  57. package/dist/actions/connections/AddConnectionAction.js +2 -2
  58. package/dist/actions/connections/AddConnectionAction.js.map +1 -1
  59. package/dist/actions/connections/RemoveConnectionAction.js +2 -2
  60. package/dist/actions/connections/RemoveConnectionAction.js.map +1 -1
  61. package/dist/actions/connections/SetConnectionColorAction.js +63 -0
  62. package/dist/actions/connections/SetConnectionColorAction.js.map +1 -0
  63. package/dist/actions/saved-queries/OpenSavedQueryAction.js +58 -0
  64. package/dist/actions/saved-queries/OpenSavedQueryAction.js.map +1 -0
  65. package/dist/actions/saved-queries/RemoveSavedQueryAction.js +43 -0
  66. package/dist/actions/saved-queries/RemoveSavedQueryAction.js.map +1 -0
  67. package/dist/actions/schema-definitions/CreateModelAction.js +2 -2
  68. package/dist/actions/schema-definitions/CreateModelAction.js.map +1 -1
  69. package/dist/actions/schema-definitions/QuerySchemaModelAction.js +2 -2
  70. package/dist/actions/schema-definitions/QuerySchemaModelAction.js.map +1 -1
  71. package/dist/actions/schema-model/EditSchemaModelAction.js +2 -2
  72. package/dist/actions/schema-model/EditSchemaModelAction.js.map +1 -1
  73. package/dist/actions/schema-model/ViewSchemaModelAsJsonAction.js +2 -2
  74. package/dist/actions/schema-model/ViewSchemaModelAsJsonAction.js.map +1 -1
  75. package/dist/core/AbstractConnection.js +116 -90
  76. package/dist/core/AbstractConnection.js.map +1 -1
  77. package/dist/core/SchemaModelDefinition.js +14 -0
  78. package/dist/core/SchemaModelDefinition.js.map +1 -1
  79. package/dist/core/connection-colors.js +36 -0
  80. package/dist/core/connection-colors.js.map +1 -0
  81. package/dist/core/query/StandardModelFields.js +10 -0
  82. package/dist/core/query/StandardModelFields.js.map +1 -0
  83. package/dist/core/query/filters.js +86 -4
  84. package/dist/core/query/filters.js.map +1 -1
  85. package/dist/core/query/query-simple/SimplePage.js +2 -4
  86. package/dist/core/query/query-simple/SimplePage.js.map +1 -1
  87. package/dist/core/query/query-simple/SimpleQuery.js +64 -68
  88. package/dist/core/query/query-simple/SimpleQuery.js.map +1 -1
  89. package/dist/core/query/query-simple/SimpleQueryColumns.js +88 -0
  90. package/dist/core/query/query-simple/SimpleQueryColumns.js.map +1 -0
  91. package/dist/core/query/query-simple/SimpleQueryFilterState.js +136 -0
  92. package/dist/core/query/query-simple/SimpleQueryFilterState.js.map +1 -0
  93. package/dist/core/query/query-simple/SimpleQueryPlanner.js +14 -0
  94. package/dist/core/query/query-simple/SimpleQueryPlanner.js.map +1 -0
  95. package/dist/core/query/query-simple/SimpleQuerySortState.js +140 -0
  96. package/dist/core/query/query-simple/SimpleQuerySortState.js.map +1 -0
  97. package/dist/core/query/query-simple/SimpleQueryTypes.js +44 -0
  98. package/dist/core/query/query-simple/SimpleQueryTypes.js.map +1 -0
  99. package/dist/core/query/widgets/BelongsToDisplayWidget.js +14 -7
  100. package/dist/core/query/widgets/BelongsToDisplayWidget.js.map +1 -1
  101. package/dist/core/query/widgets/CellDisplayWidget.js +5 -9
  102. package/dist/core/query/widgets/CellDisplayWidget.js.map +1 -1
  103. package/dist/core/query/widgets/ColumnDisplayWidget.js +13 -12
  104. package/dist/core/query/widgets/ColumnDisplayWidget.js.map +1 -1
  105. package/dist/core/query/widgets/PeekRelationshipButton.js +128 -0
  106. package/dist/core/query/widgets/PeekRelationshipButton.js.map +1 -0
  107. package/dist/core/query/widgets/SmartColumnWidget.js +18 -3
  108. package/dist/core/query/widgets/SmartColumnWidget.js.map +1 -1
  109. package/dist/core/query/widgets/SmartFilterWidget.js +88 -51
  110. package/dist/core/query/widgets/SmartFilterWidget.js.map +1 -1
  111. package/dist/entities/ConnectionEntityDefinition.js +32 -7
  112. package/dist/entities/ConnectionEntityDefinition.js.map +1 -1
  113. package/dist/entities/SavedQueryEntityDefinition.js +68 -0
  114. package/dist/entities/SavedQueryEntityDefinition.js.map +1 -0
  115. package/dist/entities/SchemaModelDefinitionEntityDefinition.js +3 -1
  116. package/dist/entities/SchemaModelDefinitionEntityDefinition.js.map +1 -1
  117. package/dist/entities.js +1 -0
  118. package/dist/entities.js.map +1 -1
  119. package/dist/forms/APIConnectionForm.js +11 -2
  120. package/dist/forms/APIConnectionForm.js.map +1 -1
  121. package/dist/forms/TypeEngine.js +30 -306
  122. package/dist/forms/TypeEngine.js.map +1 -1
  123. package/dist/forms/types/attachment-handler.js +29 -0
  124. package/dist/forms/types/attachment-handler.js.map +1 -0
  125. package/dist/forms/types/boolean-handler.js +22 -0
  126. package/dist/forms/types/boolean-handler.js.map +1 -0
  127. package/dist/forms/types/date-handler.js +97 -0
  128. package/dist/forms/types/date-handler.js.map +1 -0
  129. package/dist/forms/types/filters/ClearableFilterFormDialogDirective.js +25 -0
  130. package/dist/forms/types/filters/ClearableFilterFormDialogDirective.js.map +1 -0
  131. package/dist/forms/types/filters/ConditionalFilterForm.js +87 -0
  132. package/dist/forms/types/filters/ConditionalFilterForm.js.map +1 -0
  133. package/dist/forms/types/image-handler.js +82 -0
  134. package/dist/forms/types/image-handler.js.map +1 -0
  135. package/dist/forms/types/location-handler.js +49 -0
  136. package/dist/forms/types/location-handler.js.map +1 -0
  137. package/dist/forms/types/multiple-choice-handler.js +37 -0
  138. package/dist/forms/types/multiple-choice-handler.js.map +1 -0
  139. package/dist/forms/types/multiple-choice-integer-handler.js +37 -0
  140. package/dist/forms/types/multiple-choice-integer-handler.js.map +1 -0
  141. package/dist/forms/types/number-handler.js +79 -0
  142. package/dist/forms/types/number-handler.js.map +1 -0
  143. package/dist/forms/types/shared/type-handler.js +2 -0
  144. package/dist/forms/types/shared/type-handler.js.map +1 -0
  145. package/dist/forms/types/shared/ui.js +33 -0
  146. package/dist/forms/types/shared/ui.js.map +1 -0
  147. package/dist/forms/types/single-choice-handler.js +41 -0
  148. package/dist/forms/types/single-choice-handler.js.map +1 -0
  149. package/dist/forms/types/single-choice-integer-handler.js +41 -0
  150. package/dist/forms/types/single-choice-integer-handler.js.map +1 -0
  151. package/dist/forms/types/text-handler.js +170 -0
  152. package/dist/forms/types/text-handler.js.map +1 -0
  153. package/dist/index.js +1 -0
  154. package/dist/index.js.map +1 -1
  155. package/dist/panels/_shared/SharedConnectionPanelFactory.js +48 -0
  156. package/dist/panels/_shared/SharedConnectionPanelFactory.js.map +1 -0
  157. package/dist/panels/_shared/SharedModelPanelFactory.js +7 -2
  158. package/dist/panels/_shared/SharedModelPanelFactory.js.map +1 -1
  159. package/dist/panels/query/PageResultsWidget.js +28 -11
  160. package/dist/panels/query/PageResultsWidget.js.map +1 -1
  161. package/dist/panels/query/QueryPanelFactory.js +17 -2
  162. package/dist/panels/query/QueryPanelFactory.js.map +1 -1
  163. package/dist/panels/query/QueryPanelWidget.js +55 -9
  164. package/dist/panels/query/QueryPanelWidget.js.map +1 -1
  165. package/dist/panels/query/TableControlsWidget.js +29 -67
  166. package/dist/panels/query/TableControlsWidget.js.map +1 -1
  167. package/dist/panels/query/table-controls/ChangesControlsWidget.js +36 -0
  168. package/dist/panels/query/table-controls/ChangesControlsWidget.js.map +1 -0
  169. package/dist/panels/query/table-controls/FilterControlsWidget.js +106 -0
  170. package/dist/panels/query/table-controls/FilterControlsWidget.js.map +1 -0
  171. package/dist/panels/query/table-controls/PageControlsWidget.js +65 -0
  172. package/dist/panels/query/table-controls/PageControlsWidget.js.map +1 -0
  173. package/dist/panels/query/table-controls/QueryControlsWidget.js +85 -0
  174. package/dist/panels/query/table-controls/QueryControlsWidget.js.map +1 -0
  175. package/dist/panels/query/table-controls/SortChipWidget.js +75 -0
  176. package/dist/panels/query/table-controls/SortChipWidget.js.map +1 -0
  177. package/dist/panels/query/table-controls/SortControlsWidget.js +65 -0
  178. package/dist/panels/query/table-controls/SortControlsWidget.js.map +1 -0
  179. package/dist/preferences/QueryControlPreferences.js +28 -0
  180. package/dist/preferences/QueryControlPreferences.js.map +1 -0
  181. package/dist/stores/ConnectionStore.js +2 -0
  182. package/dist/stores/ConnectionStore.js.map +1 -1
  183. package/dist/stores/SavedQueryStore.js +131 -0
  184. package/dist/stores/SavedQueryStore.js.map +1 -0
  185. package/dist/tsconfig.tsbuildinfo +1 -1
  186. package/dist/widgets/EmptyValueWidget.js +15 -0
  187. package/dist/widgets/EmptyValueWidget.js.map +1 -0
  188. package/dist-module/bundle.js +181 -51
  189. package/dist-module/bundle.js.map +1 -1
  190. package/package.json +11 -11
  191. package/src/DataBrowserModule.ts +21 -7
  192. package/src/actions/connections/AddConnectionAction.tsx +2 -2
  193. package/src/actions/connections/RemoveConnectionAction.tsx +2 -2
  194. package/src/actions/connections/SetConnectionColorAction.ts +52 -0
  195. package/src/actions/saved-queries/OpenSavedQueryAction.ts +43 -0
  196. package/src/actions/saved-queries/RemoveSavedQueryAction.ts +27 -0
  197. package/src/actions/schema-definitions/CreateModelAction.ts +9 -2
  198. package/src/actions/schema-definitions/QuerySchemaModelAction.ts +9 -2
  199. package/src/actions/schema-model/EditSchemaModelAction.ts +9 -2
  200. package/src/actions/schema-model/ViewSchemaModelAsJsonAction.ts +9 -2
  201. package/src/core/AbstractConnection.ts +7 -1
  202. package/src/core/SchemaModelDefinition.ts +16 -0
  203. package/src/core/connection-colors.ts +49 -0
  204. package/src/core/query/StandardModelFields.ts +9 -0
  205. package/src/core/query/filters.ts +121 -6
  206. package/src/core/query/query-simple/SimplePage.ts +4 -5
  207. package/src/core/query/query-simple/SimpleQuery.tsx +83 -86
  208. package/src/core/query/query-simple/SimpleQueryColumns.tsx +126 -0
  209. package/src/core/query/query-simple/SimpleQueryFilterState.ts +160 -0
  210. package/src/core/query/query-simple/SimpleQueryPlanner.ts +18 -0
  211. package/src/core/query/query-simple/SimpleQuerySortState.ts +133 -0
  212. package/src/core/query/query-simple/SimpleQueryTypes.ts +61 -0
  213. package/src/core/query/widgets/BelongsToDisplayWidget.tsx +19 -11
  214. package/src/core/query/widgets/CellDisplayWidget.tsx +5 -10
  215. package/src/core/query/widgets/ColumnDisplayWidget.tsx +24 -20
  216. package/src/core/query/widgets/PeekRelationshipButton.tsx +161 -0
  217. package/src/core/query/widgets/SmartColumnWidget.tsx +26 -4
  218. package/src/core/query/widgets/SmartFilterWidget.tsx +119 -69
  219. package/src/entities/ConnectionEntityDefinition.tsx +33 -4
  220. package/src/entities/SavedQueryEntityDefinition.ts +72 -0
  221. package/src/entities/SchemaModelDefinitionEntityDefinition.ts +5 -2
  222. package/src/entities.ts +2 -1
  223. package/src/forms/APIConnectionForm.tsx +15 -2
  224. package/src/forms/TypeEngine.tsx +35 -421
  225. package/src/forms/types/attachment-handler.tsx +35 -0
  226. package/src/forms/types/boolean-handler.tsx +28 -0
  227. package/src/forms/types/date-handler.tsx +125 -0
  228. package/src/forms/types/filters/ClearableFilterFormDialogDirective.ts +32 -0
  229. package/src/forms/types/filters/ConditionalFilterForm.tsx +109 -0
  230. package/src/forms/types/image-handler.tsx +90 -0
  231. package/src/forms/types/location-handler.tsx +53 -0
  232. package/src/forms/types/multiple-choice-handler.tsx +37 -0
  233. package/src/forms/types/multiple-choice-integer-handler.tsx +37 -0
  234. package/src/forms/types/number-handler.tsx +100 -0
  235. package/src/forms/types/shared/type-handler.ts +36 -0
  236. package/src/forms/types/shared/ui.tsx +40 -0
  237. package/src/forms/types/single-choice-handler.tsx +47 -0
  238. package/src/forms/types/single-choice-integer-handler.tsx +47 -0
  239. package/src/forms/types/text-handler.tsx +247 -0
  240. package/src/index.ts +1 -0
  241. package/src/panels/_shared/SharedConnectionPanelFactory.tsx +55 -0
  242. package/src/panels/_shared/SharedModelPanelFactory.tsx +8 -2
  243. package/src/panels/query/PageResultsWidget.tsx +40 -28
  244. package/src/panels/query/QueryPanelFactory.tsx +19 -2
  245. package/src/panels/query/QueryPanelWidget.tsx +64 -9
  246. package/src/panels/query/TableControlsWidget.tsx +42 -120
  247. package/src/panels/query/table-controls/ChangesControlsWidget.tsx +72 -0
  248. package/src/panels/query/table-controls/FilterControlsWidget.tsx +145 -0
  249. package/src/panels/query/table-controls/PageControlsWidget.tsx +97 -0
  250. package/src/panels/query/table-controls/QueryControlsWidget.tsx +127 -0
  251. package/src/panels/query/table-controls/SortChipWidget.tsx +119 -0
  252. package/src/panels/query/table-controls/SortControlsWidget.tsx +95 -0
  253. package/src/preferences/QueryControlPreferences.ts +34 -0
  254. package/src/stores/ConnectionStore.ts +2 -0
  255. package/src/stores/SavedQueryStore.ts +121 -0
  256. package/src/widgets/EmptyValueWidget.tsx +20 -0
@@ -1,15 +1,17 @@
1
1
  import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
2
- import { inject } from '@journeyapps-labs/reactor-mod';
2
+ import { inject, ioc } from '@journeyapps-labs/reactor-mod';
3
3
  import { ConnectionStore } from '../../../stores/ConnectionStore';
4
4
  import * as _ from 'lodash';
5
- import * as React from 'react';
6
5
  import { action, observable } from 'mobx';
7
- import { CellDisplayWidget } from '../widgets/CellDisplayWidget';
8
- import { SmartColumnWidget } from '../widgets/SmartColumnWidget';
9
- import { SmartCellDisplayWidget } from '../widgets/SmartCellDisplayWidget';
10
6
  import { SimplePage } from './SimplePage';
11
7
  import { AbstractSerializableQuery } from '../AbstractSerializableQuery';
12
- import { SmartBelongsToDisplayWidget } from '../widgets/SmartBelongsToDisplayWidget';
8
+ import { TypeEngine } from '../../../forms/TypeEngine';
9
+ import { SimpleQuerySort, SortDirection } from './SimpleQueryTypes';
10
+ import { applyFiltersAndSorts } from './SimpleQueryPlanner';
11
+ import { buildSimpleQueryColumns } from './SimpleQueryColumns';
12
+ import { SimpleQuerySortState } from './SimpleQuerySortState';
13
+ import { SimpleQueryFilterState } from './SimpleQueryFilterState';
14
+ export { SortDirection, SimpleQuerySort };
13
15
  let SimpleQuery = (() => {
14
16
  var _a, _SimpleQuery_connStore_accessor_storage, _SimpleQuery__totalPages_accessor_storage, _SimpleQuery__pages_accessor_storage;
15
17
  let _classSuper = AbstractSerializableQuery;
@@ -38,29 +40,54 @@ let SimpleQuery = (() => {
38
40
  _SimpleQuery_connStore_accessor_storage.set(this, __runInitializers(this, _connStore_initializers, void 0));
39
41
  _SimpleQuery__totalPages_accessor_storage.set(this, (__runInitializers(this, _connStore_extraInitializers), __runInitializers(this, __totalPages_initializers, void 0)));
40
42
  _SimpleQuery__pages_accessor_storage.set(this, (__runInitializers(this, __totalPages_extraInitializers), __runInitializers(this, __pages_initializers, void 0)));
41
- this.simple_filters = __runInitializers(this, __pages_extraInitializers);
43
+ this.sortState = __runInitializers(this, __pages_extraInitializers);
42
44
  this._totalPages = 0;
43
45
  this._pages = [];
44
- this.simple_filters = new Map();
46
+ this.sortState = new SimpleQuerySortState(options.definition);
47
+ this.filterState = new SimpleQueryFilterState({
48
+ definition: options.definition,
49
+ typeEngine: ioc.get(TypeEngine)
50
+ });
51
+ this.suspendStateLoad = false;
52
+ this.scheduleLoad = _.debounce(() => {
53
+ if (this.suspendStateLoad) {
54
+ return;
55
+ }
56
+ this.load();
57
+ }, 10, { trailing: true, leading: false });
58
+ const onStateChange = () => {
59
+ if (this.suspendStateLoad) {
60
+ return;
61
+ }
62
+ this.scheduleLoad();
63
+ };
64
+ this.sortState.registerListener({
65
+ changed: () => {
66
+ onStateChange();
67
+ }
68
+ });
69
+ this.filterState.registerListener({
70
+ changed: () => {
71
+ onStateChange();
72
+ }
73
+ });
45
74
  }
46
75
  async load() {
47
76
  this._pages = [];
48
- let collection = await this.options.definition.getCollection();
49
- let query = collection.all();
50
- this.simple_filters.forEach((f) => {
51
- query = f.augment(query);
52
- });
53
- let results = await collection.adapter.doApiQuery(query);
77
+ const collection = await this.options.definition.getCollection();
78
+ const query = applyFiltersAndSorts(collection.all(), Array.from(this.filterState.simpleFilters.values()), this.sortState.sorts);
79
+ const results = await collection.adapter.doApiQuery(query);
54
80
  this._totalPages = Math.ceil(results.total / this.options.limit);
55
81
  }
56
82
  getPage(number) {
57
83
  if (!this._pages[number]) {
58
- let page = new SimplePage({
84
+ const page = new SimplePage({
59
85
  offset: number * this.options.limit,
60
86
  limit: this.options.limit,
61
87
  definition: this.options.definition,
62
88
  index: number,
63
- filters: Array.from(this.simple_filters.values())
89
+ filters: Array.from(this.filterState.simpleFilters.values()),
90
+ sorts: this.sortState.sorts
64
91
  });
65
92
  page.load();
66
93
  this._pages[number] = page;
@@ -71,68 +98,37 @@ let SimpleQuery = (() => {
71
98
  return this._totalPages;
72
99
  }
73
100
  serialize() {
74
- return Object.assign(Object.assign({}, super.serialize()), { definition: this.options.definition.definition.name, limit: this.options.limit });
101
+ return Object.assign(Object.assign({}, super.serialize()), { definition: this.options.definition.definition.name, limit: this.options.limit, filters: this.filterState.getSerializedFilters(), sorts: this.sortState.getSerializedSorts() });
75
102
  }
76
103
  async deserialize(connectionStore, data) {
77
104
  await super.deserialize(connectionStore, data);
78
- this.options.limit = data.limit;
79
- this.options.definition = await this.connection.waitForSchemaModelDefinitionByName(data.definition);
105
+ this.suspendStateLoad = true;
106
+ try {
107
+ this.options.limit = data.limit;
108
+ const definition = await this.connection.waitForSchemaModelDefinitionByName(data.definition);
109
+ this.options.definition = definition;
110
+ this.sortState.setDefinition(definition);
111
+ this.filterState.setDefinition(definition);
112
+ this.filterState.hydrateFilters(data.filters || []);
113
+ this.sortState.hydrateSorts(data.sorts || []);
114
+ }
115
+ finally {
116
+ this.suspendStateLoad = false;
117
+ }
80
118
  }
81
119
  getColumns() {
82
- return [
83
- {
84
- key: 'id',
85
- display: 'ID',
86
- noWrap: true,
87
- shrink: true
88
- },
89
- {
90
- key: 'updated_at',
91
- display: 'Updated at',
92
- noWrap: true,
93
- shrink: true,
94
- accessor: (cell, row) => {
95
- return React.createElement(CellDisplayWidget, { name: "updated_at", cell: row.model.updated_at, row: row });
96
- }
97
- },
98
- ..._.map(this.options.definition.definition.belongsToIdVars, (a) => {
99
- return {
100
- key: a.name,
101
- display: (React.createElement(SmartColumnWidget, { variable: this.options.definition.definition.belongsToVars[a.relationship], type: this.options.definition.definition.belongsTo[a.relationship].foreignType, filterChanged: (filter) => { } })),
102
- noWrap: true,
103
- shrink: true,
104
- accessor: (cell, row) => {
105
- return React.createElement(SmartBelongsToDisplayWidget, { variable_id: a, row: row, connection: this.connection });
106
- }
107
- };
108
- }),
109
- ..._.map(this.options.definition.definition.attributes, (a) => {
110
- return {
111
- key: a.name,
112
- display: (React.createElement(SmartColumnWidget, { variable: a, filter: this.simple_filters.get(a), filterChanged: (filter) => {
113
- if (!filter) {
114
- this.simple_filters.delete(a);
115
- this.load();
116
- }
117
- else {
118
- this.simple_filters.set(a, filter);
119
- this.load();
120
- }
121
- } })),
122
- noWrap: true,
123
- shrink: true,
124
- accessor: (cell, row) => {
125
- return React.createElement(SmartCellDisplayWidget, { name: a.name, row: row });
126
- }
127
- };
128
- })
129
- ];
120
+ return buildSimpleQueryColumns({
121
+ definition: this.options.definition,
122
+ connection: this.connection,
123
+ sortState: this.sortState,
124
+ filterState: this.filterState
125
+ });
130
126
  }
131
127
  getSimpleName() {
132
128
  return `Query: ${this.options.definition.definition.label}`;
133
129
  }
134
130
  getDirtyObjects() {
135
- return _.flatMap(this._pages.filter((p) => !!p), (page) => page.getDirtyObjects());
131
+ return this._pages.flatMap((page) => (page === null || page === void 0 ? void 0 : page.getDirtyObjects()) || []);
136
132
  }
137
133
  },
138
134
  _SimpleQuery_connStore_accessor_storage = new WeakMap(),
@@ -1 +1 @@
1
- {"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuery.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuery.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,88 @@
1
+ import * as React from 'react';
2
+ import * as _ from 'lodash';
3
+ import { CellDisplayWidget } from '../widgets/CellDisplayWidget';
4
+ import { SmartColumnWidget } from '../widgets/SmartColumnWidget';
5
+ import { SmartCellDisplayWidget } from '../widgets/SmartCellDisplayWidget';
6
+ import { SmartBelongsToDisplayWidget } from '../widgets/SmartBelongsToDisplayWidget';
7
+ import { ColumnDisplayWidget } from '../widgets/ColumnDisplayWidget';
8
+ import { SimpleQuerySort, SortDirection } from './SimpleQueryTypes';
9
+ import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields } from '../StandardModelFields';
10
+ export const buildSimpleQueryColumns = (options) => {
11
+ const getSortLabel = (field, label) => {
12
+ var _a;
13
+ const direction = (_a = options.sortState.getSort(field)) === null || _a === void 0 ? void 0 : _a.direction;
14
+ if (!direction) {
15
+ return label;
16
+ }
17
+ return `${label} ${direction === SortDirection.ASC ? '↑' : '↓'}`;
18
+ };
19
+ return [
20
+ {
21
+ key: StandardModelFields.ID,
22
+ display: (React.createElement(ColumnDisplayWidget, { label: getSortLabel(StandardModelFields.ID, STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID]), onClick: async () => {
23
+ const sort = options.sortState.getSort(StandardModelFields.ID);
24
+ if (!sort) {
25
+ options.sortState.addSort(SimpleQuerySort.create(StandardModelFields.ID));
26
+ return;
27
+ }
28
+ sort.toggle();
29
+ } })),
30
+ noWrap: true,
31
+ shrink: true
32
+ },
33
+ {
34
+ key: StandardModelFields.UPDATED_AT,
35
+ display: (React.createElement(ColumnDisplayWidget, { label: getSortLabel(StandardModelFields.UPDATED_AT, STANDARD_MODEL_FIELD_LABELS[StandardModelFields.UPDATED_AT]), onClick: async () => {
36
+ const sort = options.sortState.getSort(StandardModelFields.UPDATED_AT);
37
+ if (!sort) {
38
+ options.sortState.addSort(SimpleQuerySort.create(StandardModelFields.UPDATED_AT));
39
+ return;
40
+ }
41
+ sort.toggle();
42
+ } })),
43
+ noWrap: true,
44
+ shrink: true,
45
+ accessor: (cell, row) => {
46
+ return React.createElement(CellDisplayWidget, { name: StandardModelFields.UPDATED_AT, cell: row.model.updated_at, row: row });
47
+ }
48
+ },
49
+ ..._.map(options.definition.definition.belongsToIdVars, (a) => {
50
+ return {
51
+ key: a.name,
52
+ display: (React.createElement(SmartColumnWidget, { variable: options.definition.definition.belongsToVars[a.relationship], type: options.definition.definition.belongsTo[a.relationship].foreignType, filterChanged: (filter) => { } })),
53
+ noWrap: true,
54
+ shrink: true,
55
+ accessor: (cell, row) => {
56
+ return React.createElement(SmartBelongsToDisplayWidget, { variable_id: a, row: row, connection: options.connection });
57
+ }
58
+ };
59
+ }),
60
+ ..._.map(options.definition.definition.attributes, (a) => {
61
+ var _a;
62
+ return {
63
+ key: a.name,
64
+ display: (React.createElement(SmartColumnWidget, { variable: a, filter: options.filterState.getFilter(a.name), sortDirection: (_a = options.sortState.getSort(a.name)) === null || _a === void 0 ? void 0 : _a.direction, onToggleSort: async () => {
65
+ const sort = options.sortState.getSort(a.name);
66
+ if (!sort) {
67
+ options.sortState.addSort(SimpleQuerySort.create(a.name));
68
+ return;
69
+ }
70
+ sort.toggle();
71
+ }, filterChanged: async (filter) => {
72
+ var _a;
73
+ if (!filter) {
74
+ (_a = options.filterState.getFilter(a.name)) === null || _a === void 0 ? void 0 : _a.delete();
75
+ return;
76
+ }
77
+ options.filterState.setFilter(a.name, filter);
78
+ } })),
79
+ noWrap: true,
80
+ shrink: true,
81
+ accessor: (cell, row) => {
82
+ return React.createElement(SmartCellDisplayWidget, { name: a.name, row: row });
83
+ }
84
+ };
85
+ })
86
+ ];
87
+ };
88
+ //# sourceMappingURL=SimpleQueryColumns.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SimpleQueryColumns.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryColumns.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,136 @@
1
+ var _SimpleQueryFilterState_definition_accessor_storage;
2
+ import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
3
+ import * as _ from 'lodash';
4
+ import { BaseObserver } from '@journeyapps-labs/common-utils';
5
+ import { SimpleFilter } from '../filters';
6
+ export class SimpleQueryFilterState extends BaseObserver {
7
+ get definition() { return __classPrivateFieldGet(this, _SimpleQueryFilterState_definition_accessor_storage, "f"); }
8
+ set definition(value) { __classPrivateFieldSet(this, _SimpleQueryFilterState_definition_accessor_storage, value, "f"); }
9
+ constructor(options) {
10
+ super();
11
+ _SimpleQueryFilterState_definition_accessor_storage.set(this, void 0);
12
+ this.simpleFilters = new Map();
13
+ this.definition = options.definition;
14
+ this.typeEngine = options.typeEngine;
15
+ }
16
+ get filters() {
17
+ return Array.from(this.simpleFilters.values());
18
+ }
19
+ clear() {
20
+ this.filters.forEach((filter) => filter.delete());
21
+ }
22
+ setDefinition(definition) {
23
+ var _a, _b, _c;
24
+ const definitionChanged = ((_b = (_a = this.definition) === null || _a === void 0 ? void 0 : _a.definition) === null || _b === void 0 ? void 0 : _b.name) !== ((_c = definition === null || definition === void 0 ? void 0 : definition.definition) === null || _c === void 0 ? void 0 : _c.name);
25
+ this.definition = definition;
26
+ const hadFilters = this.simpleFilters.size > 0;
27
+ if (definitionChanged) {
28
+ this.clear();
29
+ }
30
+ if (definitionChanged && !hadFilters) {
31
+ this.iterateListeners((cb) => { var _a; return (_a = cb.changed) === null || _a === void 0 ? void 0 : _a.call(cb); });
32
+ }
33
+ return definitionChanged || hadFilters;
34
+ }
35
+ getFilterableFields() {
36
+ var _a;
37
+ if (!((_a = this.definition) === null || _a === void 0 ? void 0 : _a.definition)) {
38
+ return [];
39
+ }
40
+ return this.definition.getFilterableFields(this.typeEngine);
41
+ }
42
+ getActiveFilters() {
43
+ return Array.from(this.simpleFilters.entries()).map(([variable, filter]) => {
44
+ return {
45
+ variable,
46
+ filter
47
+ };
48
+ });
49
+ }
50
+ getFilter(field) {
51
+ const variable = this.resolveAttribute(field);
52
+ return variable ? this.simpleFilters.get(variable) : undefined;
53
+ }
54
+ getSerializedFilters() {
55
+ return this.filters.map((filter) => filter.serialize());
56
+ }
57
+ hydrateFilters(filters) {
58
+ this.clear();
59
+ const definition = this.definition;
60
+ if (!(definition === null || definition === void 0 ? void 0 : definition.definition)) {
61
+ return;
62
+ }
63
+ (filters || []).forEach((filter) => {
64
+ if (!SimpleFilter.canDeserialize(filter)) {
65
+ return;
66
+ }
67
+ const variable = _.find(_.values(definition.definition.attributes), (attribute) => {
68
+ return attribute.name === filter.variable;
69
+ });
70
+ if (!variable) {
71
+ return;
72
+ }
73
+ this.addFilter(variable, SimpleFilter.deserialize(variable, filter));
74
+ });
75
+ }
76
+ setFilter(field, filter) {
77
+ const variable = this.resolveAttribute(field);
78
+ if (!variable) {
79
+ return false;
80
+ }
81
+ return this.addFilter(variable, filter);
82
+ }
83
+ async setupFilterForField(field, position) {
84
+ const variable = this.resolveAttribute(field);
85
+ if (!variable) {
86
+ return false;
87
+ }
88
+ const handler = this.typeEngine.getHandler(variable.type);
89
+ if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
90
+ return false;
91
+ }
92
+ const existing = this.simpleFilters.get(variable);
93
+ const nextFilter = await handler.setupFilter({
94
+ variable,
95
+ filter: existing,
96
+ position
97
+ });
98
+ if (!nextFilter) {
99
+ return false;
100
+ }
101
+ return this.addFilter(variable, nextFilter);
102
+ }
103
+ addFilter(variable, filter) {
104
+ const existing = this.simpleFilters.get(variable);
105
+ if (existing && existing !== filter) {
106
+ existing.delete();
107
+ }
108
+ if (existing === filter) {
109
+ this.iterateListeners((cb) => { var _a; return (_a = cb.changed) === null || _a === void 0 ? void 0 : _a.call(cb); });
110
+ return true;
111
+ }
112
+ let unsubscribe = filter.registerListener({
113
+ removeRequested: () => {
114
+ unsubscribe();
115
+ if (this.simpleFilters.get(variable) === filter) {
116
+ this.simpleFilters.delete(variable);
117
+ this.iterateListeners((cb) => { var _a; return (_a = cb.changed) === null || _a === void 0 ? void 0 : _a.call(cb); });
118
+ }
119
+ }
120
+ });
121
+ this.simpleFilters.set(variable, filter);
122
+ this.iterateListeners((cb) => { var _a; return (_a = cb.changed) === null || _a === void 0 ? void 0 : _a.call(cb); });
123
+ return true;
124
+ }
125
+ resolveAttribute(field) {
126
+ var _a;
127
+ if (!((_a = this.definition) === null || _a === void 0 ? void 0 : _a.definition)) {
128
+ return undefined;
129
+ }
130
+ return _.find(_.values(this.definition.definition.attributes), (attribute) => {
131
+ return attribute.name === field;
132
+ });
133
+ }
134
+ }
135
+ _SimpleQueryFilterState_definition_accessor_storage = new WeakMap();
136
+ //# sourceMappingURL=SimpleQueryFilterState.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SimpleQueryFilterState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryFilterState.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,14 @@
1
+ import { SortDirection } from './SimpleQueryTypes';
2
+ export const applyFiltersAndSorts = (query, filters, sorts = []) => {
3
+ let next = query;
4
+ (filters || []).forEach((filter) => {
5
+ next = filter.augment(next);
6
+ });
7
+ if (sorts.length > 0) {
8
+ next = next.orderBy(...sorts.map((sort) => {
9
+ return sort.direction === SortDirection.DESC ? `-${sort.field}` : sort.field;
10
+ }));
11
+ }
12
+ return next;
13
+ };
14
+ //# sourceMappingURL=SimpleQueryPlanner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SimpleQueryPlanner.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryPlanner.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEpE,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,KAAY,EAAE,OAAyB,EAAE,QAA2B,EAAE,EAAS,EAAE;IACpH,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACjC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IACH,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrB,IAAI,GAAG,IAAI,CAAC,OAAO,CACjB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;YACpB,OAAO,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/E,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
@@ -0,0 +1,140 @@
1
+ import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
2
+ import { observable } from 'mobx';
3
+ import * as _ from 'lodash';
4
+ import { BaseObserver } from '@journeyapps-labs/common-utils';
5
+ import { SimpleQuerySort, SortDirection } from './SimpleQueryTypes';
6
+ import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields } from '../StandardModelFields';
7
+ let SimpleQuerySortState = (() => {
8
+ var _a, _SimpleQuerySortState_sorts_accessor_storage, _SimpleQuerySortState_definition_accessor_storage;
9
+ let _classSuper = BaseObserver;
10
+ let _sorts_decorators;
11
+ let _sorts_initializers = [];
12
+ let _sorts_extraInitializers = [];
13
+ return _a = class SimpleQuerySortState extends _classSuper {
14
+ get sorts() { return __classPrivateFieldGet(this, _SimpleQuerySortState_sorts_accessor_storage, "f"); }
15
+ set sorts(value) { __classPrivateFieldSet(this, _SimpleQuerySortState_sorts_accessor_storage, value, "f"); }
16
+ get definition() { return __classPrivateFieldGet(this, _SimpleQuerySortState_definition_accessor_storage, "f"); }
17
+ set definition(value) { __classPrivateFieldSet(this, _SimpleQuerySortState_definition_accessor_storage, value, "f"); }
18
+ constructor(definition) {
19
+ super();
20
+ _SimpleQuerySortState_sorts_accessor_storage.set(this, __runInitializers(this, _sorts_initializers, void 0));
21
+ _SimpleQuerySortState_definition_accessor_storage.set(this, __runInitializers(this, _sorts_extraInitializers));
22
+ this.sorts = [];
23
+ this.definition = definition;
24
+ }
25
+ setDefinition(definition) {
26
+ var _b, _c, _d;
27
+ const changed = ((_c = (_b = this.definition) === null || _b === void 0 ? void 0 : _b.definition) === null || _c === void 0 ? void 0 : _c.name) !== ((_d = definition === null || definition === void 0 ? void 0 : definition.definition) === null || _d === void 0 ? void 0 : _d.name);
28
+ this.definition = definition;
29
+ if (changed) {
30
+ this.iterateListeners((cb) => { var _b; return (_b = cb.changed) === null || _b === void 0 ? void 0 : _b.call(cb); });
31
+ }
32
+ return changed;
33
+ }
34
+ getSort(field) {
35
+ return this.sorts.find((sort) => sort.field === field);
36
+ }
37
+ addSort(sort) {
38
+ if (!(sort === null || sort === void 0 ? void 0 : sort.field)) {
39
+ return false;
40
+ }
41
+ const existing = this.getSort(sort.field);
42
+ if (existing) {
43
+ return false;
44
+ }
45
+ let unsubscribe = sort.registerListener({
46
+ changed: () => {
47
+ this.iterateListeners((cb) => { var _b; return (_b = cb.changed) === null || _b === void 0 ? void 0 : _b.call(cb); });
48
+ },
49
+ removeRequested: () => {
50
+ unsubscribe();
51
+ this.sorts = this.sorts.filter((entry) => entry !== sort);
52
+ this.iterateListeners((cb) => { var _b; return (_b = cb.changed) === null || _b === void 0 ? void 0 : _b.call(cb); });
53
+ }
54
+ });
55
+ this.sorts = [...this.sorts, sort];
56
+ this.iterateListeners((cb) => { var _b; return (_b = cb.changed) === null || _b === void 0 ? void 0 : _b.call(cb); });
57
+ return true;
58
+ }
59
+ moveSortBefore(sourceField, targetField) {
60
+ if (!sourceField || !targetField || sourceField === targetField) {
61
+ return false;
62
+ }
63
+ const sourceIndex = this.sorts.findIndex((sort) => sort.field === sourceField);
64
+ const targetIndex = this.sorts.findIndex((sort) => sort.field === targetField);
65
+ if (sourceIndex < 0 || targetIndex < 0) {
66
+ return false;
67
+ }
68
+ const next = [...this.sorts];
69
+ const [source] = next.splice(sourceIndex, 1);
70
+ const nextTargetIndex = next.findIndex((sort) => sort.field === targetField);
71
+ const insertIndex = sourceIndex < targetIndex ? nextTargetIndex + 1 : nextTargetIndex;
72
+ next.splice(insertIndex, 0, source);
73
+ this.sorts = next;
74
+ this.iterateListeners((cb) => { var _b; return (_b = cb.changed) === null || _b === void 0 ? void 0 : _b.call(cb); });
75
+ return true;
76
+ }
77
+ setSorts(sorts) {
78
+ const next = this.normalizeSorts(sorts);
79
+ [...this.sorts].forEach((sort) => sort.remove());
80
+ this.sorts = [];
81
+ next.forEach((sort) => this.addSort(sort));
82
+ return true;
83
+ }
84
+ hydrateSorts(serializedSorts = []) {
85
+ const next = (serializedSorts || []).map((sort) => SimpleQuerySort.deserialize(sort));
86
+ return this.setSorts(next);
87
+ }
88
+ getSerializedSorts() {
89
+ return this.sorts.map((sort) => sort.serialize());
90
+ }
91
+ getSortableFields() {
92
+ const definition = this.definition;
93
+ if (!(definition === null || definition === void 0 ? void 0 : definition.definition)) {
94
+ return [];
95
+ }
96
+ const dynamic = _.map(definition.definition.attributes, (attribute) => {
97
+ return {
98
+ key: attribute.name,
99
+ label: attribute.label || attribute.name
100
+ };
101
+ });
102
+ return [
103
+ { key: StandardModelFields.ID, label: STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID] },
104
+ {
105
+ key: StandardModelFields.UPDATED_AT,
106
+ label: STANDARD_MODEL_FIELD_LABELS[StandardModelFields.UPDATED_AT]
107
+ },
108
+ ...dynamic
109
+ ];
110
+ }
111
+ normalizeSorts(sorts) {
112
+ const seen = new Set();
113
+ return (sorts || []).filter((sort) => {
114
+ if (!(sort === null || sort === void 0 ? void 0 : sort.field)) {
115
+ return false;
116
+ }
117
+ if (!(sort.direction === SortDirection.ASC || sort.direction === SortDirection.DESC)) {
118
+ return false;
119
+ }
120
+ if (seen.has(sort.field)) {
121
+ return false;
122
+ }
123
+ seen.add(sort.field);
124
+ return true;
125
+ });
126
+ }
127
+ },
128
+ _SimpleQuerySortState_sorts_accessor_storage = new WeakMap(),
129
+ _SimpleQuerySortState_definition_accessor_storage = new WeakMap(),
130
+ (() => {
131
+ var _b;
132
+ const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create((_b = _classSuper[Symbol.metadata]) !== null && _b !== void 0 ? _b : null) : void 0;
133
+ _sorts_decorators = [observable];
134
+ __esDecorate(_a, null, _sorts_decorators, { kind: "accessor", name: "sorts", static: false, private: false, access: { has: obj => "sorts" in obj, get: obj => obj.sorts, set: (obj, value) => { obj.sorts = value; } }, metadata: _metadata }, _sorts_initializers, _sorts_extraInitializers);
135
+ if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
136
+ })(),
137
+ _a;
138
+ })();
139
+ export { SimpleQuerySortState };
140
+ //# sourceMappingURL=SimpleQuerySortState.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SimpleQuerySortState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuerySortState.ts"],"names":[],"mappings":"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"}