@journeyapps-labs/reactor-mod-data-browser 3.3.0 → 3.5.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 (133) hide show
  1. package/CHANGELOG.md +27 -0
  2. package/dist/@types/actions/schema-model/ViewHasManyAction.d.ts +12 -0
  3. package/dist/@types/core/AbstractConnection.d.ts +1 -0
  4. package/dist/@types/core/SchemaModelDefinition.d.ts +32 -5
  5. package/dist/@types/core/query/StandardModelFields.d.ts +4 -0
  6. package/dist/@types/core/query/query-simple/SimpleQueryFilterState.d.ts +4 -6
  7. package/dist/@types/core/query/widgets/BelongsToDisplayWidget.d.ts +1 -0
  8. package/dist/@types/core/query/widgets/ColumnDisplayWidget.d.ts +1 -0
  9. package/dist/@types/core/query/widgets/IDCellDisplayWidget.d.ts +5 -0
  10. package/dist/@types/core/query/widgets/PeekRelationshipButton.d.ts +1 -0
  11. package/dist/@types/core/query/widgets/SmartBelongsToDisplayWidget.d.ts +2 -0
  12. package/dist/@types/core/query/widgets/SmartColumnWidget.d.ts +7 -2
  13. package/dist/@types/core/query/widgets/SmartFilterWidget.d.ts +6 -0
  14. package/dist/@types/entities/SchemaModelObjectEntityDefinition.d.ts +2 -1
  15. package/dist/@types/entities/SchemaModelTreePresenterComponent.d.ts +10 -0
  16. package/dist/@types/forms/types/belongs-to-filter.d.ts +10 -0
  17. package/dist/@types/forms/types/shared/type-handler.d.ts +1 -0
  18. package/dist/@types/index.d.ts +1 -0
  19. package/dist/@types/preferences/QueryControlPreferences.d.ts +14 -2
  20. package/dist/@types/preferences/SchemaOrderingPreferences.d.ts +22 -0
  21. package/dist/DataBrowserModule.js +4 -0
  22. package/dist/DataBrowserModule.js.map +1 -1
  23. package/dist/actions/schema-model/ViewHasManyAction.js +112 -0
  24. package/dist/actions/schema-model/ViewHasManyAction.js.map +1 -0
  25. package/dist/core/AbstractConnection.js +11 -3
  26. package/dist/core/AbstractConnection.js.map +1 -1
  27. package/dist/core/SchemaModelDefinition.js +121 -7
  28. package/dist/core/SchemaModelDefinition.js.map +1 -1
  29. package/dist/core/query/StandardModelFields.js +3 -0
  30. package/dist/core/query/StandardModelFields.js.map +1 -1
  31. package/dist/core/query/query-simple/SimpleQueryColumns.js +74 -42
  32. package/dist/core/query/query-simple/SimpleQueryColumns.js.map +1 -1
  33. package/dist/core/query/query-simple/SimpleQueryFilterState.js +35 -7
  34. package/dist/core/query/query-simple/SimpleQueryFilterState.js.map +1 -1
  35. package/dist/core/query/query-simple/SimpleQuerySortState.js +0 -1
  36. package/dist/core/query/query-simple/SimpleQuerySortState.js.map +1 -1
  37. package/dist/core/query/widgets/BelongsToDisplayWidget.js +1 -1
  38. package/dist/core/query/widgets/BelongsToDisplayWidget.js.map +1 -1
  39. package/dist/core/query/widgets/ColumnDisplayWidget.js +13 -2
  40. package/dist/core/query/widgets/ColumnDisplayWidget.js.map +1 -1
  41. package/dist/core/query/widgets/IDCellDisplayWidget.js +38 -0
  42. package/dist/core/query/widgets/IDCellDisplayWidget.js.map +1 -0
  43. package/dist/core/query/widgets/PeekRelationshipButton.js +23 -16
  44. package/dist/core/query/widgets/PeekRelationshipButton.js.map +1 -1
  45. package/dist/core/query/widgets/SmartBelongsToDisplayWidget.js +1 -1
  46. package/dist/core/query/widgets/SmartBelongsToDisplayWidget.js.map +1 -1
  47. package/dist/core/query/widgets/SmartColumnWidget.js +3 -13
  48. package/dist/core/query/widgets/SmartColumnWidget.js.map +1 -1
  49. package/dist/core/query/widgets/SmartFilterWidget.js +10 -7
  50. package/dist/core/query/widgets/SmartFilterWidget.js.map +1 -1
  51. package/dist/entities/SchemaModelDefinitionEntityDefinition.js +3 -10
  52. package/dist/entities/SchemaModelDefinitionEntityDefinition.js.map +1 -1
  53. package/dist/entities/SchemaModelObjectEntityDefinition.js +15 -14
  54. package/dist/entities/SchemaModelObjectEntityDefinition.js.map +1 -1
  55. package/dist/entities/SchemaModelTreePresenterComponent.js +23 -0
  56. package/dist/entities/SchemaModelTreePresenterComponent.js.map +1 -0
  57. package/dist/forms/SchemaModelForm.js +31 -29
  58. package/dist/forms/SchemaModelForm.js.map +1 -1
  59. package/dist/forms/types/attachment-handler.js +1 -0
  60. package/dist/forms/types/attachment-handler.js.map +1 -1
  61. package/dist/forms/types/belongs-to-filter.js +57 -0
  62. package/dist/forms/types/belongs-to-filter.js.map +1 -0
  63. package/dist/forms/types/boolean-handler.js +34 -1
  64. package/dist/forms/types/boolean-handler.js.map +1 -1
  65. package/dist/forms/types/date-handler.js +1 -0
  66. package/dist/forms/types/date-handler.js.map +1 -1
  67. package/dist/forms/types/image-handler.js +1 -0
  68. package/dist/forms/types/image-handler.js.map +1 -1
  69. package/dist/forms/types/location-handler.js +1 -0
  70. package/dist/forms/types/location-handler.js.map +1 -1
  71. package/dist/forms/types/multiple-choice-handler.js +1 -0
  72. package/dist/forms/types/multiple-choice-handler.js.map +1 -1
  73. package/dist/forms/types/multiple-choice-integer-handler.js +1 -0
  74. package/dist/forms/types/multiple-choice-integer-handler.js.map +1 -1
  75. package/dist/forms/types/number-handler.js +3 -2
  76. package/dist/forms/types/number-handler.js.map +1 -1
  77. package/dist/forms/types/single-choice-handler.js +1 -0
  78. package/dist/forms/types/single-choice-handler.js.map +1 -1
  79. package/dist/forms/types/single-choice-integer-handler.js +1 -0
  80. package/dist/forms/types/single-choice-integer-handler.js.map +1 -1
  81. package/dist/forms/types/text-handler.js +1 -0
  82. package/dist/forms/types/text-handler.js.map +1 -1
  83. package/dist/index.js +1 -0
  84. package/dist/index.js.map +1 -1
  85. package/dist/panels/query/QueryPanelWidget.js +14 -9
  86. package/dist/panels/query/QueryPanelWidget.js.map +1 -1
  87. package/dist/panels/query/table-controls/FilterControlsWidget.js +1 -0
  88. package/dist/panels/query/table-controls/FilterControlsWidget.js.map +1 -1
  89. package/dist/preferences/QueryControlPreferences.js +45 -1
  90. package/dist/preferences/QueryControlPreferences.js.map +1 -1
  91. package/dist/preferences/SchemaOrderingPreferences.js +76 -0
  92. package/dist/preferences/SchemaOrderingPreferences.js.map +1 -0
  93. package/dist/tsconfig.tsbuildinfo +1 -1
  94. package/dist-module/bundle.js +51 -35
  95. package/dist-module/bundle.js.map +1 -1
  96. package/package.json +7 -6
  97. package/src/DataBrowserModule.ts +4 -0
  98. package/src/actions/schema-model/ViewHasManyAction.ts +114 -0
  99. package/src/core/AbstractConnection.ts +12 -3
  100. package/src/core/SchemaModelDefinition.ts +165 -9
  101. package/src/core/query/StandardModelFields.ts +8 -0
  102. package/src/core/query/query-simple/SimpleQueryColumns.tsx +103 -58
  103. package/src/core/query/query-simple/SimpleQueryFilterState.ts +42 -9
  104. package/src/core/query/query-simple/SimpleQuerySortState.ts +0 -1
  105. package/src/core/query/widgets/BelongsToDisplayWidget.tsx +2 -1
  106. package/src/core/query/widgets/ColumnDisplayWidget.tsx +17 -4
  107. package/src/core/query/widgets/IDCellDisplayWidget.tsx +59 -0
  108. package/src/core/query/widgets/PeekRelationshipButton.tsx +23 -16
  109. package/src/core/query/widgets/SmartBelongsToDisplayWidget.tsx +3 -0
  110. package/src/core/query/widgets/SmartColumnWidget.tsx +23 -20
  111. package/src/core/query/widgets/SmartFilterWidget.tsx +14 -5
  112. package/src/entities/SchemaModelDefinitionEntityDefinition.ts +3 -13
  113. package/src/entities/SchemaModelObjectEntityDefinition.ts +17 -15
  114. package/src/entities/SchemaModelTreePresenterComponent.ts +31 -0
  115. package/src/forms/SchemaModelForm.tsx +46 -41
  116. package/src/forms/types/attachment-handler.tsx +1 -0
  117. package/src/forms/types/belongs-to-filter.tsx +84 -0
  118. package/src/forms/types/boolean-handler.tsx +46 -2
  119. package/src/forms/types/date-handler.tsx +1 -0
  120. package/src/forms/types/image-handler.tsx +1 -0
  121. package/src/forms/types/location-handler.tsx +1 -0
  122. package/src/forms/types/multiple-choice-handler.tsx +1 -0
  123. package/src/forms/types/multiple-choice-integer-handler.tsx +1 -0
  124. package/src/forms/types/number-handler.tsx +3 -2
  125. package/src/forms/types/shared/type-handler.ts +1 -0
  126. package/src/forms/types/single-choice-handler.tsx +1 -0
  127. package/src/forms/types/single-choice-integer-handler.tsx +1 -0
  128. package/src/forms/types/text-handler.tsx +1 -0
  129. package/src/index.ts +1 -0
  130. package/src/panels/query/QueryPanelWidget.tsx +24 -22
  131. package/src/panels/query/table-controls/FilterControlsWidget.tsx +1 -0
  132. package/src/preferences/QueryControlPreferences.ts +51 -2
  133. package/src/preferences/SchemaOrderingPreferences.ts +82 -0
@@ -0,0 +1,38 @@
1
+ import * as React from 'react';
2
+ import { observer } from 'mobx-react';
3
+ import { NotificationStore, NotificationType, PrefsStore, TableButtonWidget, ioc, styled } from '@journeyapps-labs/reactor-mod';
4
+ import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
5
+ import { QueryControlPreferences } from '../../../preferences/QueryControlPreferences';
6
+ export const IDCellDisplayWidget = observer((props) => {
7
+ const notifications = ioc.get(NotificationStore);
8
+ const showIdValue = ioc
9
+ .get(PrefsStore)
10
+ .getPreference(QueryControlPreferences.SHOW_ID_VALUE_IN_ID_COLUMN).checked;
11
+ return (React.createElement(S.Container, null,
12
+ showIdValue ? React.createElement(S.Value, null, props.id) : null,
13
+ React.createElement(TableButtonWidget, { icon: "copy", tooltip: "Copy ID", action: () => {
14
+ copyTextToClipboard(props.id);
15
+ notifications.showNotification({
16
+ title: 'Copied',
17
+ description: 'ID copied to clipboard',
18
+ type: NotificationType.SUCCESS
19
+ });
20
+ } })));
21
+ });
22
+ var S;
23
+ (function (S) {
24
+ S.Container = styled.div `
25
+ display: flex;
26
+ flex-direction: row;
27
+ align-items: center;
28
+ justify-content: space-between;
29
+ column-gap: 5px;
30
+ width: 100%;
31
+ `;
32
+ S.Value = styled.div `
33
+ overflow: hidden;
34
+ text-overflow: ellipsis;
35
+ white-space: nowrap;
36
+ `;
37
+ })(S || (S = {}));
38
+ //# sourceMappingURL=IDCellDisplayWidget.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"IDCellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/IDCellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,GAAG,EACH,MAAM,EACP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAMvF,MAAM,CAAC,MAAM,mBAAmB,GAAuC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IACxF,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG;SACpB,GAAG,CAAC,UAAU,CAAC;SACf,aAAa,CAAiB,uBAAuB,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;IAE7F,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACT,WAAW,CAAC,CAAC,CAAC,oBAAC,CAAC,CAAC,KAAK,QAAE,KAAK,CAAC,EAAE,CAAW,CAAC,CAAC,CAAC,IAAI;QACnD,oBAAC,iBAAiB,IAChB,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,SAAS,EACjB,MAAM,EAAE,GAAG,EAAE;gBACX,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC9B,aAAa,CAAC,gBAAgB,CAAC;oBAC7B,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,wBAAwB;oBACrC,IAAI,EAAE,gBAAgB,CAAC,OAAO;iBAC/B,CAAC,CAAC;YACL,CAAC,GACD,CACU,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAeV;AAfD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAI9B,CAAC;AACJ,CAAC,EAfS,CAAC,KAAD,CAAC,QAeV"}
@@ -68,8 +68,15 @@ export const PeekRelationshipButton = (props) => {
68
68
  title: 'ID',
69
69
  icon: 'copy',
70
70
  right: React.createElement(S.FieldValue, null, props.object.id),
71
- disabled: true,
72
- group: 'Object'
71
+ group: 'Object',
72
+ action: async () => {
73
+ copyTextToClipboard(props.object.id);
74
+ notifications.showNotification({
75
+ title: 'Copied',
76
+ description: 'Relationship ID copied to clipboard',
77
+ type: NotificationType.SUCCESS
78
+ });
79
+ }
73
80
  },
74
81
  {
75
82
  key: 'meta-updated',
@@ -89,20 +96,20 @@ export const PeekRelationshipButton = (props) => {
89
96
  props.open(props.object);
90
97
  }
91
98
  },
92
- {
93
- key: 'copy',
94
- title: 'Copy ID',
95
- icon: 'copy',
96
- group: 'Actions',
97
- action: async () => {
98
- copyTextToClipboard(props.object.id);
99
- notifications.showNotification({
100
- title: 'Copied',
101
- description: 'Relationship ID copied to clipboard',
102
- type: NotificationType.SUCCESS
103
- });
104
- }
105
- }
99
+ ...(props.filterBelongsTo
100
+ ? [
101
+ {
102
+ key: 'filter-belongs-to',
103
+ title: 'Filter belongs to',
104
+ icon: 'filter',
105
+ group: 'Actions',
106
+ action: async () => {
107
+ var _a;
108
+ await ((_a = props.filterBelongsTo) === null || _a === void 0 ? void 0 : _a.call(props, props.object));
109
+ }
110
+ }
111
+ ]
112
+ : [])
106
113
  ];
107
114
  const directive = await ioc.get(ComboBoxStore2).show(new SimpleComboBoxDirective({
108
115
  title: props.object.data.display || props.object.id,
@@ -1 +1 @@
1
- {"version":3,"file":"PeekRelationshipButton.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/PeekRelationshipButton.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PeekRelationshipButton.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/PeekRelationshipButton.tsx"],"names":[],"mappings":"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"}
@@ -17,7 +17,7 @@ export const SmartBelongsToDisplayWidget = observer((props) => {
17
17
  source: ActionSource.BUTTON,
18
18
  targetEntity: object
19
19
  });
20
- }, relationship: row.model.definition.definition.belongsTo[variable_id.relationship], connection: connection, id: value }));
20
+ }, relationship: row.model.definition.definition.belongsTo[variable_id.relationship], connection: connection, id: value, filterBelongsTo: props.filterBelongsTo }));
21
21
  });
22
22
  var S;
23
23
  (function (S) {
@@ -1 +1 @@
1
- {"version":3,"file":"SmartBelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartBelongsToDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,MAAM,CAAC,MAAM,2BAA2B,GAA+C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;IACxG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,KAAK,GAAG,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,0CAAE,EAAE,CAAC;QAC1D,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IACV,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACf,qBAAqB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC;gBACrC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,YAAY,EAAE,MAAM;aACrB,CAAC,CAAC;QACL,CAAC,EACD,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,EACjF,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAU,CAAC,CAKV;AALD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAoB;6BAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;;GAEnF,CAAC;AACJ,CAAC,EALS,CAAC,KAAD,CAAC,QAKV"}
1
+ {"version":3,"file":"SmartBelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartBelongsToDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAIrE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAStC,MAAM,CAAC,MAAM,2BAA2B,GAA+C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;IACxG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,KAAK,GAAG,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,0CAAE,EAAE,CAAC;QAC1D,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IACV,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACf,qBAAqB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC;gBACrC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,YAAY,EAAE,MAAM;aACrB,CAAC,CAAC;QACL,CAAC,EACD,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,EACjF,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,KAAK,EACT,eAAe,EAAE,KAAK,CAAC,eAAe,GACtC,CACH,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAU,CAAC,CAKV;AALD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAoB;6BAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;;GAEnF,CAAC;AACJ,CAAC,EALS,CAAC,KAAD,CAAC,QAKV"}
@@ -1,23 +1,17 @@
1
1
  import * as React from 'react';
2
2
  import styled from '@emotion/styled';
3
3
  import { ColumnDisplayWidget } from './ColumnDisplayWidget';
4
- import { SmartFilterWidget } from './SmartFilterWidget';
4
+ import { SmartFilterWidget, SmartTypeEngineFilterWidget } from './SmartFilterWidget';
5
5
  import { SortDirection } from '../query-simple/SimpleQuery';
6
6
  export const SmartColumnWidget = (props) => {
7
7
  const baseLabel = props.variable.label || props.variable.name;
8
8
  const displayLabel = props.sortDirection
9
9
  ? `${baseLabel} ${props.sortDirection === SortDirection.ASC ? '↓' : '↑'}`
10
10
  : baseLabel;
11
- let display = React.createElement(ColumnDisplayWidget, { label: displayLabel, onClick: props.onToggleSort });
12
- if (props.type) {
13
- display = (React.createElement(S.TypeGroup, null,
14
- display,
15
- React.createElement(S.Type, { label: props.type.label })));
16
- }
17
11
  return (React.createElement(S.Container, null,
18
12
  React.createElement(S.TopRow, null,
19
- display,
20
- React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged }))));
13
+ React.createElement(ColumnDisplayWidget, { label: displayLabel, secondaryLabel: props.typeLabel, onClick: props.onToggleSort }),
14
+ props.setupFilter ? (React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, setupFilter: props.setupFilter, filterChanged: props.filterChanged })) : (React.createElement(SmartTypeEngineFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged })))));
21
15
  };
22
16
  var S;
23
17
  (function (S) {
@@ -33,10 +27,6 @@ var S;
33
27
  align-items: center;
34
28
  column-gap: 5px;
35
29
  `;
36
- S.Type = styled(ColumnDisplayWidget) `
37
- opacity: 0.5;
38
- `;
39
- S.TypeGroup = styled.div ``;
40
30
  S.FilterMetaRow = styled.div `
41
31
  display: flex;
42
32
  align-items: center;
@@ -1 +1 @@
1
- {"version":3,"file":"SmartColumnWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartColumnWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAW5D,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa;QACtC,CAAC,CAAC,GAAG,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE;QACzE,CAAC,CAAC,SAAS,CAAC;IACd,IAAI,OAAO,GAAG,oBAAC,mBAAmB,IAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,GAAI,CAAC;IACxF,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,GAAG,CACR,oBAAC,CAAC,CAAC,SAAS;YACT,OAAO;YACR,oBAAC,CAAC,CAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,GAAI,CACvB,CACf,CAAC;IACJ,CAAC;IACD,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,CAAC,CAAC,MAAM;YACN,OAAO;YACR,oBAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,GAAI,CAChG,CACC,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CA2BV;AA3BD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;IAEW,QAAM,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAK/B,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;;GAE9C,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;IAEzB,eAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKtC,CAAC;AACJ,CAAC,EA3BS,CAAC,KAAD,CAAC,QA2BV"}
1
+ {"version":3,"file":"SmartColumnWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartColumnWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AAErF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAgB5D,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa;QACtC,CAAC,CAAC,GAAG,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE;QACzE,CAAC,CAAC,SAAS,CAAC;IACd,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,CAAC,CAAC,MAAM;YACP,oBAAC,mBAAmB,IAAC,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,GAAI;YACzG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CACnB,oBAAC,iBAAiB,IAChB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,WAAW,EAAE,KAAK,CAAC,WAAW,EAC9B,aAAa,EAAE,KAAK,CAAC,aAAa,GAClC,CACH,CAAC,CAAC,CAAC,CACF,oBAAC,2BAA2B,IAC1B,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ,EACxB,aAAa,EAAE,KAAK,CAAC,aAAa,GAClC,CACH,CACQ,CACC,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAqBV;AArBD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;IAEW,QAAM,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAK/B,CAAC;IAEW,eAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKtC,CAAC;AACJ,CAAC,EArBS,CAAC,KAAD,CAAC,QAqBV"}
@@ -34,26 +34,29 @@ export const SmartFilterMetadataWidget = (props) => {
34
34
  export const SmartFilterWidget = (props) => {
35
35
  var _a, _b;
36
36
  const isActive = (((_b = (_a = props.filter) === null || _a === void 0 ? void 0 : _a.statements) === null || _b === void 0 ? void 0 : _b.length) || 0) > 0;
37
- const handler = ioc.get(TypeEngine).getHandler(props.variable.type);
38
- if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
39
- return null;
40
- }
41
37
  return (React.createElement(S.FilterButton, Object.assign({ active: isActive }, setupTooltipProps({
42
38
  tooltip: getFilterTooltip(props.filter),
43
39
  tooltipPos: TooltipPosition.BOTTOM
44
40
  }), { onClick: async (event) => {
45
- var _a;
46
- const filter = await ((_a = handler.setupFilter) === null || _a === void 0 ? void 0 : _a.call(handler, {
41
+ const filter = await props.setupFilter({
47
42
  variable: props.variable,
48
43
  filter: props.filter,
49
44
  position: event.nativeEvent
50
- }));
45
+ });
51
46
  if (filter == null) {
52
47
  return;
53
48
  }
54
49
  props.filterChanged(filter);
55
50
  } }), isActive ? React.createElement(DualIconWidget, { icon1: "filter", icon2: "check" }) : React.createElement(IconWidget, { icon: "filter" })));
56
51
  };
52
+ export const SmartTypeEngineFilterWidget = (props) => {
53
+ var _a;
54
+ const setupFilter = (_a = ioc.get(TypeEngine).getHandler(props.variable.type)) === null || _a === void 0 ? void 0 : _a.setupFilter;
55
+ if (!setupFilter) {
56
+ return null;
57
+ }
58
+ return React.createElement(SmartFilterWidget, Object.assign({}, props, { setupFilter: setupFilter }));
59
+ };
57
60
  var S;
58
61
  (function (S) {
59
62
  S.MetaList = styled.div `
@@ -1 +1 @@
1
- {"version":3,"file":"SmartFilterWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartFilterWidget.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SmartFilterWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartFilterWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EACL,cAAc,EACd,UAAU,EACV,cAAc,EACd,GAAG,EACH,iBAAiB,EACjB,MAAM,EACN,eAAe,EAChB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAgB,cAAc,EAAE,MAAM,YAAY,CAAC;AAmB1D,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAU,EAAE;IACzD,MAAM,QAAQ,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,WAAW,EAAE,KAAI,EAAE,CAAC;IAC7C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IACD,MAAM,KAAK,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,KAAK,MAAK,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAClE,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,GAAG,CAAC,CAAC;IAC3F,OAAO,gBAAgB,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;AACzC,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,MAAqB,EAAU,EAAE;IACzD,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACpE,OAAO,uBAAuB,CAAC;IACjC,CAAC;IACD,OAAO,GAAG,gBAAgB,CAAC,MAAM,CAAC,wBAAwB,CAAC;AAC7D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAA6C,CAAC,KAAK,EAAE,EAAE;;IAC3F,MAAM,QAAQ,GAAG,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,WAAW,EAAE,KAAI,EAAE,CAAC;IACnD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,UAAU,GAAG,CAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,KAAK,MAAK,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAC7E,OAAO,CACL,oBAAC,CAAC,CAAC,QAAQ,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,IACnC,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;;QAC7B,OAAO,CACL,oBAAC,KAAK,CAAC,QAAQ,IAAC,GAAG,EAAE,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,EAAE;YAC1D,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,oBAAC,CAAC,CAAC,UAAU,QAAE,UAAU,CAAgB,CAAC,CAAC,CAAC,IAAI;YAC7D,oBAAC,cAAc,oBAAK,KAAK,IAAE,MAAM,EAAE,MAAA,KAAK,CAAC,MAAM,mCAAI,IAAI,IAAI,CAC5C,CAClB,CAAC;IACJ,CAAC,CAAC,CACS,CACd,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;;IAC3E,MAAM,QAAQ,GAAG,CAAC,CAAA,MAAA,MAAA,KAAK,CAAC,MAAM,0CAAE,UAAU,0CAAE,MAAM,KAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC7D,OAAO,CACL,oBAAC,CAAC,CAAC,YAAY,kBACb,MAAM,EAAE,QAAQ,IACZ,iBAAiB,CAAC;QACpB,OAAO,EAAE,gBAAgB,CAAC,KAAK,CAAC,MAAM,CAAC;QACvC,UAAU,EAAE,eAAe,CAAC,MAAM;KACnC,CAAC,IACF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,WAAW,CAAC;gBACrC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,WAAW;aAC5B,CAAC,CAAC;YACH,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YACD,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC9B,CAAC,KAEA,QAAQ,CAAC,CAAC,CAAC,oBAAC,cAAc,IAAC,KAAK,EAAC,QAAQ,EAAC,KAAK,EAAC,OAAO,GAAG,CAAC,CAAC,CAAC,oBAAC,UAAU,IAAC,IAAI,EAAC,QAAQ,GAAG,CAC3E,CAClB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAA0D,CAAC,KAAK,EAAE,EAAE;;IAC1G,MAAM,WAAW,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,0CAAE,WAAW,CAAC;IACrF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,oBAAC,iBAAiB,oBAAK,KAAK,IAAE,WAAW,EAAE,WAAW,IAAI,CAAC;AACpE,CAAC,CAAC;AAEF,IAAU,CAAC,CAoCV;AApCD,WAAU,CAAC;IACI,UAAQ,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKjC,CAAC;IAEW,YAAU,GAAG,MAAM,CAAC,GAAG,CAAA;;;;aAIzB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS;;GAEvC,CAAC;IAEW,cAAY,GAAG,MAAM,CAAC,MAAM,CAAqB;;;;;;wBAMxC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;kBACtE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;aACrF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;;;;;;;;;eASpE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC;;GAE5F,CAAC;AACJ,CAAC,EApCS,CAAC,KAAD,CAAC,QAoCV"}
@@ -1,9 +1,10 @@
1
1
  import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
2
- import { DescendantEntityProviderComponent, EntityActionHandlerComponent, EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
2
+ import { DescendantEntityProviderComponent, EntityActionHandlerComponent, EntityDefinition, EntityDescriberComponent, InlineEntityEncoderComponent, inject, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
3
3
  import { DataBrowserEntities } from '../entities';
4
4
  import { ConnectionStore } from '../stores/ConnectionStore';
5
5
  import { SchemaModelDefinition } from '../core/SchemaModelDefinition';
6
6
  import { QuerySchemaModelAction } from '../actions/schema-definitions/QuerySchemaModelAction';
7
+ import { SchemaModelTreePresenterComponent } from './SchemaModelTreePresenterComponent';
7
8
  let SchemaModelDefinitionEntityDefinition = (() => {
8
9
  var _a, _SchemaModelDefinitionEntityDefinition_connectionStore_accessor_storage;
9
10
  let _classSuper = EntityDefinition;
@@ -58,15 +59,7 @@ let SchemaModelDefinitionEntityDefinition = (() => {
58
59
  return connection.waitForSchemaModelDefinitionByName(entity.type);
59
60
  }
60
61
  }));
61
- this.registerComponent(new InlineTreePresenterComponent({
62
- loadChildrenAsNodesAreOpened: true,
63
- cacheTreeEntities: true,
64
- augmentTreeNodeProps: () => {
65
- return {
66
- openOnSingleClick: false
67
- };
68
- }
69
- }));
62
+ this.registerComponent(new SchemaModelTreePresenterComponent({ loadChildrenAsNodesAreOpened: true }));
70
63
  this.registerComponent(new SimpleParentEntitySearchEngine({
71
64
  label: 'Simple',
72
65
  type: DataBrowserEntities.CONNECTION,
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,8 @@ import { EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoder
3
3
  import { DataBrowserEntities } from '../entities';
4
4
  import { ConnectionStore } from '../stores/ConnectionStore';
5
5
  import { SchemaModelObject } from '../core/SchemaModelObject';
6
+ import { validate as validateUUID } from 'uuid';
7
+ import { ViewHasManyAction } from '../actions/schema-model/ViewHasManyAction';
6
8
  let SchemaModelObjectEntityDefinition = (() => {
7
9
  var _a, _SchemaModelObjectEntityDefinition_connectionStore_accessor_storage;
8
10
  let _classSuper = EntityDefinition;
@@ -31,20 +33,6 @@ let SchemaModelObjectEntityDefinition = (() => {
31
33
  };
32
34
  }
33
35
  }));
34
- // this.registerComponent(
35
- // new SimpleParentEntitySearchEngine<SchemaModelDefinition,SchemaModelObject>({
36
- // label: 'ID',
37
- // filterResultsWithMatcher: false,
38
- // type: DataBrowserEntities.SCHEMA_MODEL_DEFINITION,
39
- // getEntities: async (event) => {
40
- // let object = await event.parameters.parent.resolve(event.value);
41
- // if(object){
42
- // return [object]
43
- // }
44
- // return []
45
- // }
46
- // })
47
- // );
48
36
  this.registerComponent(new SimpleParentEntitySearchEngine({
49
37
  label: 'Label',
50
38
  type: DataBrowserEntities.SCHEMA_MODEL_DEFINITION,
@@ -53,6 +41,13 @@ let SchemaModelObjectEntityDefinition = (() => {
53
41
  if (!event.value) {
54
42
  return [];
55
43
  }
44
+ if (validateUUID(event.value)) {
45
+ const object = await event.parameters.parent.resolve(event.value);
46
+ if (object) {
47
+ return [object];
48
+ }
49
+ return [];
50
+ }
56
51
  return await event.parameters.parent.search(event.value);
57
52
  }
58
53
  }));
@@ -81,6 +76,12 @@ let SchemaModelObjectEntityDefinition = (() => {
81
76
  getEntityUID(t) {
82
77
  return t.model.id;
83
78
  }
79
+ isActionAllowedForEntity(action, entity) {
80
+ if (action.id === ViewHasManyAction.ID) {
81
+ return Object.keys(entity.definition.definition.hasMany || {}).length > 0;
82
+ }
83
+ return super.isActionAllowedForEntity(action, entity);
84
+ }
84
85
  },
85
86
  _SchemaModelObjectEntityDefinition_connectionStore_accessor_storage = new WeakMap(),
86
87
  (() => {
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,23 @@
1
+ import { CachedEntityTreePresenterContext, EntityReactorNode, EntityTreePresenterComponent } from '@journeyapps-labs/reactor-mod';
2
+ import { SchemaModelOrderValue, SchemaModelOrderingPreference } from '../preferences/SchemaOrderingPreferences';
3
+ class SchemaModelTreePresenterContext extends CachedEntityTreePresenterContext {
4
+ getSortedEntities(entities) {
5
+ if (SchemaModelOrderingPreference.getValue() === SchemaModelOrderValue.AS_DEFINED_IN_SCHEMA) {
6
+ return entities;
7
+ }
8
+ return super.getSortedEntities(entities);
9
+ }
10
+ doGenerateTreeNode(entity, options) {
11
+ return new EntityReactorNode({
12
+ entity,
13
+ definition: this.definition,
14
+ events: options === null || options === void 0 ? void 0 : options.events
15
+ });
16
+ }
17
+ }
18
+ export class SchemaModelTreePresenterComponent extends EntityTreePresenterComponent {
19
+ _generateContext() {
20
+ return new SchemaModelTreePresenterContext(this);
21
+ }
22
+ }
23
+ //# sourceMappingURL=SchemaModelTreePresenterComponent.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"SchemaModelTreePresenterComponent.js","sourceRoot":"","sources":["../../src/entities/SchemaModelTreePresenterComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,iBAAiB,EACjB,4BAA4B,EAE7B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEhH,MAAM,+BAAgC,SAAQ,gCAAuD;IACnG,iBAAiB,CAAC,QAAiC;QACjD,IAAI,6BAA6B,CAAC,QAAQ,EAAE,KAAK,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;YAC5F,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAES,kBAAkB,CAAC,MAA6B,EAAE,OAAO;QACjE,OAAO,IAAI,iBAAiB,CAAC;YAC3B,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;SACxB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,iCAAkC,SAAQ,4BAAmD;IAC9F,gBAAgB;QACxB,OAAO,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;CACF"}
@@ -1,10 +1,10 @@
1
1
  import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
2
2
  import { EntityInput, FormModel, inject } from '@journeyapps-labs/reactor-mod';
3
- import * as _ from 'lodash';
4
3
  import { DataBrowserEntities } from '../entities';
5
4
  import { DirtyWrapperInput } from './inputs/DirtyWrapperInput';
6
5
  import { TypeEngine } from './TypeEngine';
7
6
  import { autorun } from 'mobx';
7
+ import { OrderedSchemaFieldType } from '../core/SchemaModelDefinition';
8
8
  let Binding = (() => {
9
9
  var _a, _Binding_typeEngine_accessor_storage;
10
10
  let _typeEngine_decorators;
@@ -97,41 +97,43 @@ let SchemaModelForm = (() => {
97
97
  _SchemaModelForm_typeEngine_accessor_storage.set(this, __runInitializers(this, _typeEngine_initializers, void 0));
98
98
  this.bindings = __runInitializers(this, _typeEngine_extraInitializers);
99
99
  this.bindings = new Set();
100
- _.map(options.definition.definition.belongsTo, (relationship) => {
101
- const definition = options.definition.connection.getSchemaModelDefinitionByName(relationship.foreignType.name);
102
- let entity = new EntityInput({
103
- name: relationship.name,
104
- entityType: DataBrowserEntities.SCHEMA_MODEL_OBJECT,
105
- parent: definition,
106
- label: relationship.name,
107
- value: null
108
- });
109
- return new Binding({
110
- name: relationship.name,
111
- model: this.options.object,
112
- input: entity,
113
- resolve: () => {
114
- if (!options.object.data.belongs_to[relationship.name]) {
115
- return null;
116
- }
117
- return definition.resolve(options.object.data.belongs_to[relationship.name]);
118
- }
119
- });
120
- })
121
- .filter((f) => !!f)
122
- .forEach((binding) => {
123
- this.bindings.add(binding);
124
- this.addInput(new DirtyWrapperInput(binding.input, options.object));
125
- });
126
- _.map(options.definition.definition.attributes, (attribute) => {
100
+ options.definition
101
+ .getOrderedFieldsAndRelationships()
102
+ .map((entry) => {
127
103
  var _b;
104
+ if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
105
+ const relationship = entry.object;
106
+ const definition = options.definition.connection.getSchemaModelDefinitionByName(relationship.foreignType.name);
107
+ if (!definition) {
108
+ return null;
109
+ }
110
+ const entity = new EntityInput({
111
+ name: relationship.name,
112
+ entityType: DataBrowserEntities.SCHEMA_MODEL_OBJECT,
113
+ parent: definition,
114
+ label: relationship.name,
115
+ value: null
116
+ });
117
+ return new Binding({
118
+ name: relationship.name,
119
+ model: this.options.object,
120
+ input: entity,
121
+ resolve: () => {
122
+ if (!options.object.data.belongs_to[relationship.name]) {
123
+ return null;
124
+ }
125
+ return definition.resolve(options.object.data.belongs_to[relationship.name]);
126
+ }
127
+ });
128
+ }
129
+ const attribute = entry.object;
128
130
  let field = (_b = this.typeEngine.getHandler(attribute.type)) === null || _b === void 0 ? void 0 : _b.generateField({
129
131
  name: attribute.name,
130
132
  label: attribute.label,
131
133
  type: attribute.type
132
134
  });
133
135
  if (!field) {
134
- return;
136
+ return null;
135
137
  }
136
138
  return new TypedBinding({
137
139
  variable: attribute,
@@ -1 +1 @@
1
- {"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { FileInput, TableButtonWidget } from '@journeyapps-labs/reactor-mod';
3
3
  import * as React from 'react';
4
4
  export const attachmentHandler = {
5
5
  matches: (type) => type instanceof AttachmentType,
6
+ getTypeLabel: () => 'Attachment',
6
7
  encode: async (value) => {
7
8
  return Attachment.create({
8
9
  data: await value.arrayBuffer(),
@@ -1 +1 @@
1
- {"version":3,"file":"attachment-handler.js","sourceRoot":"","sources":["../../../src/forms/types/attachment-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,CAAC,MAAM,iBAAiB,GAAgB;IAC5C,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAc;IACjD,MAAM,EAAE,KAAK,EAAE,KAAW,EAAE,EAAE;QAC5B,OAAO,UAAU,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,MAAM,KAAK,CAAC,WAAW,EAAE;YAC/B,QAAQ,EAAE,KAAK,CAAC,IAAI;SACrB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,KAAiB,EAAE,EAAE;QAClC,OAAO,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,KAAW,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,EAAE;IACxD,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;IAChF,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,OAAO,IAAI,SAAS,CAAC;YACnB,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,eAAe,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QAC7B,OAAO,CACL,oBAAC,iBAAiB,IAChB,IAAI,EAAC,UAAU,EACf,MAAM,EAAE,GAAG,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC,GACD,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}
1
+ {"version":3,"file":"attachment-handler.js","sourceRoot":"","sources":["../../../src/forms/types/attachment-handler.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC7E,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,MAAM,CAAC,MAAM,iBAAiB,GAAgB;IAC5C,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,cAAc;IACjD,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY;IAChC,MAAM,EAAE,KAAK,EAAE,KAAW,EAAE,EAAE;QAC5B,OAAO,UAAU,CAAC,MAAM,CAAC;YACvB,IAAI,EAAE,MAAM,KAAK,CAAC,WAAW,EAAE;YAC/B,QAAQ,EAAE,KAAK,CAAC,IAAI;SACrB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,KAAK,EAAE,KAAiB,EAAE,EAAE;QAClC,OAAO,IAAI,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,aAAa,EAAE,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,cAAc,EAAE,KAAK,EAAE,KAAW,EAAE,EAAE,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,KAAI,EAAE;IACxD,gBAAgB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,EAAE,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC;IAChF,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE;QACjC,OAAO,IAAI,SAAS,CAAC;YACnB,IAAI;YACJ,KAAK;SACN,CAAC,CAAC;IACL,CAAC;IACD,eAAe,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;QAC7B,OAAO,CACL,oBAAC,iBAAiB,IAChB,IAAI,EAAC,UAAU,EACf,MAAM,EAAE,GAAG,EAAE;gBACX,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;YACrC,CAAC,GACD,CACH,CAAC;IACJ,CAAC;CACF,CAAC"}
@@ -0,0 +1,57 @@
1
+ import { ArrayInput, DialogStore2, EntityInput, FormModel, ioc } from '@journeyapps-labs/reactor-mod';
2
+ import { Condition, SimpleFilter, Statement, StatementMatch } from '../../core/query/filters';
3
+ import { DataBrowserEntities } from '../../entities';
4
+ import { ClearableFilterFormDialogDirective } from './filters/ClearableFilterFormDialogDirective';
5
+ class BelongsToFilterForm extends FormModel {
6
+ constructor(foreignDefinition) {
7
+ super();
8
+ this.foreignDefinition = foreignDefinition;
9
+ this.addInput(new ArrayInput({
10
+ name: 'values',
11
+ label: 'Matches any of',
12
+ value: [null],
13
+ generate: () => {
14
+ return new EntityInput({
15
+ name: 'value',
16
+ label: foreignDefinition.definition.label || foreignDefinition.definition.name,
17
+ entityType: DataBrowserEntities.SCHEMA_MODEL_OBJECT,
18
+ parent: foreignDefinition,
19
+ value: null
20
+ });
21
+ }
22
+ }));
23
+ }
24
+ async hydrateFromFilter(filter) {
25
+ const values = await Promise.all(((filter === null || filter === void 0 ? void 0 : filter.statements) || [])
26
+ .map((statement) => `${statement.arg || ''}`)
27
+ .filter((id) => !!id)
28
+ .map((id) => this.foreignDefinition.resolve(id)));
29
+ this.setValues({
30
+ values: values.filter((value) => !!value).length > 0 ? values.filter((value) => !!value) : [null]
31
+ });
32
+ }
33
+ toFilter(variable) {
34
+ var _a;
35
+ const values = (((_a = this.value()) === null || _a === void 0 ? void 0 : _a.values) || []).filter((value) => !!(value === null || value === void 0 ? void 0 : value.id));
36
+ if (values.length === 0) {
37
+ return null;
38
+ }
39
+ return new SimpleFilter(variable, values.map((value) => new Statement(Condition.EQUALS, value.id)), StatementMatch.ANY);
40
+ }
41
+ }
42
+ export const setupBelongsToFilter = async (options) => {
43
+ const foreignDefinition = options.definition.connection.getSchemaModelDefinitionByName(options.relationship.foreignType.name);
44
+ const form = new BelongsToFilterForm(foreignDefinition);
45
+ await form.hydrateFromFilter(options.filter);
46
+ const result = await ioc.get(DialogStore2).showDialog(new ClearableFilterFormDialogDirective({
47
+ title: `Filter ${options.relationship.name}`,
48
+ form,
49
+ filter: options.filter,
50
+ handler: async () => { }
51
+ }));
52
+ if (!result) {
53
+ return null;
54
+ }
55
+ return form.toFilter(options.variable);
56
+ };
57
+ //# sourceMappingURL=belongs-to-filter.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"belongs-to-filter.js","sourceRoot":"","sources":["../../../src/forms/types/belongs-to-filter.tsx"],"names":[],"mappings":"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"}