@oneuptime/common 10.0.52 → 10.0.53
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.
- package/Server/API/TelemetryAPI.ts +81 -0
- package/Server/Services/LabelService.ts +14 -1
- package/Server/Services/MonitorProbeService.ts +27 -0
- package/Server/Services/ProjectService.ts +8 -4
- package/Server/Services/TelemetryAttributeService.ts +117 -4
- package/UI/Components/BulkUpdate/BulkUpdateForm.tsx +60 -38
- package/UI/Components/Dictionary/Dictionary.tsx +13 -1
- package/UI/Components/Filters/FiltersForm.tsx +2 -0
- package/UI/Components/Filters/JSONFilter.tsx +5 -1
- package/UI/Components/Filters/Types/Filter.ts +2 -0
- package/UI/Components/ModelTable/BaseModelTable.tsx +10 -6
- package/build/dist/Server/API/TelemetryAPI.js +39 -0
- package/build/dist/Server/API/TelemetryAPI.js.map +1 -1
- package/build/dist/Server/Services/LabelService.js +10 -1
- package/build/dist/Server/Services/LabelService.js.map +1 -1
- package/build/dist/Server/Services/MonitorProbeService.js +19 -1
- package/build/dist/Server/Services/MonitorProbeService.js.map +1 -1
- package/build/dist/Server/Services/ProjectService.js +8 -4
- package/build/dist/Server/Services/ProjectService.js.map +1 -1
- package/build/dist/Server/Services/TelemetryAttributeService.js +83 -6
- package/build/dist/Server/Services/TelemetryAttributeService.js.map +1 -1
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js +31 -30
- package/build/dist/UI/Components/BulkUpdate/BulkUpdateForm.js.map +1 -1
- package/build/dist/UI/Components/Dictionary/Dictionary.js +9 -1
- package/build/dist/UI/Components/Dictionary/Dictionary.js.map +1 -1
- package/build/dist/UI/Components/Filters/FiltersForm.js +1 -1
- package/build/dist/UI/Components/Filters/FiltersForm.js.map +1 -1
- package/build/dist/UI/Components/Filters/JSONFilter.js +1 -1
- package/build/dist/UI/Components/Filters/JSONFilter.js.map +1 -1
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js +9 -5
- package/build/dist/UI/Components/ModelTable/BaseModelTable.js.map +1 -1
- package/package.json +1 -1
|
@@ -52,7 +52,7 @@ export class TelemetryAttributeService {
|
|
|
52
52
|
if (!source) {
|
|
53
53
|
return [];
|
|
54
54
|
}
|
|
55
|
-
const cacheKey = TelemetryAttributeService.getCacheKey(data.projectId, data.telemetryType);
|
|
55
|
+
const cacheKey = TelemetryAttributeService.getCacheKey(data.projectId, data.telemetryType, data.metricName);
|
|
56
56
|
const cachedEntry = await TelemetryAttributeService.getCachedAttributes(cacheKey);
|
|
57
57
|
if (cachedEntry && TelemetryAttributeService.isCacheFresh(cachedEntry)) {
|
|
58
58
|
return cachedEntry.attributes;
|
|
@@ -62,6 +62,7 @@ export class TelemetryAttributeService {
|
|
|
62
62
|
attributes = await TelemetryAttributeService.fetchAttributesFromDatabase({
|
|
63
63
|
projectId: data.projectId,
|
|
64
64
|
source,
|
|
65
|
+
metricName: data.metricName,
|
|
65
66
|
});
|
|
66
67
|
}
|
|
67
68
|
catch (error) {
|
|
@@ -76,8 +77,12 @@ export class TelemetryAttributeService {
|
|
|
76
77
|
}
|
|
77
78
|
return attributes;
|
|
78
79
|
}
|
|
79
|
-
static getCacheKey(projectId, telemetryType) {
|
|
80
|
-
|
|
80
|
+
static getCacheKey(projectId, telemetryType, metricName) {
|
|
81
|
+
const base = `${projectId.toString()}:${telemetryType}`;
|
|
82
|
+
if (metricName) {
|
|
83
|
+
return `${base}:${metricName}`;
|
|
84
|
+
}
|
|
85
|
+
return base;
|
|
81
86
|
}
|
|
82
87
|
static getLookbackStartDate() {
|
|
83
88
|
return OneUptimeDate.addRemoveDays(OneUptimeDate.getCurrentDate(), -TelemetryAttributeService.LOOKBACK_WINDOW_IN_DAYS);
|
|
@@ -150,7 +155,15 @@ export class TelemetryAttributeService {
|
|
|
150
155
|
AND ${data.timeColumn} >= ${{
|
|
151
156
|
type: TableColumnType.Date,
|
|
152
157
|
value: lookbackStartDate,
|
|
153
|
-
}}
|
|
158
|
+
}}`;
|
|
159
|
+
if (data.metricName) {
|
|
160
|
+
statement.append(SQL `
|
|
161
|
+
AND name = ${{
|
|
162
|
+
type: TableColumnType.Text,
|
|
163
|
+
value: data.metricName,
|
|
164
|
+
}}`);
|
|
165
|
+
}
|
|
166
|
+
statement.append(SQL `
|
|
154
167
|
ORDER BY ${data.timeColumn} DESC
|
|
155
168
|
LIMIT ${{
|
|
156
169
|
type: TableColumnType.Number,
|
|
@@ -164,8 +177,7 @@ export class TelemetryAttributeService {
|
|
|
164
177
|
LIMIT ${{
|
|
165
178
|
type: TableColumnType.Number,
|
|
166
179
|
value: TelemetryAttributeService.ATTRIBUTES_LIMIT,
|
|
167
|
-
}}
|
|
168
|
-
`;
|
|
180
|
+
}}`);
|
|
169
181
|
return statement;
|
|
170
182
|
}
|
|
171
183
|
static async fetchAttributesFromDatabase(data) {
|
|
@@ -175,6 +187,7 @@ export class TelemetryAttributeService {
|
|
|
175
187
|
attributesColumn: data.source.attributesColumn,
|
|
176
188
|
attributeKeysColumn: data.source.attributeKeysColumn,
|
|
177
189
|
timeColumn: data.source.timeColumn,
|
|
190
|
+
metricName: data.metricName,
|
|
178
191
|
});
|
|
179
192
|
const dbResult = await data.source.service.executeQuery(statement);
|
|
180
193
|
const response = await dbResult.json();
|
|
@@ -189,17 +202,81 @@ export class TelemetryAttributeService {
|
|
|
189
202
|
});
|
|
190
203
|
return Array.from(new Set(attributeKeys));
|
|
191
204
|
}
|
|
205
|
+
async fetchAttributeValues(data) {
|
|
206
|
+
const source = this.getTelemetrySource(data.telemetryType);
|
|
207
|
+
if (!source) {
|
|
208
|
+
return [];
|
|
209
|
+
}
|
|
210
|
+
return TelemetryAttributeService.fetchAttributeValuesFromDatabase({
|
|
211
|
+
projectId: data.projectId,
|
|
212
|
+
source,
|
|
213
|
+
metricName: data.metricName,
|
|
214
|
+
attributeKey: data.attributeKey,
|
|
215
|
+
});
|
|
216
|
+
}
|
|
217
|
+
static async fetchAttributeValuesFromDatabase(data) {
|
|
218
|
+
const lookbackStartDate = TelemetryAttributeService.getLookbackStartDate();
|
|
219
|
+
const statement = SQL `
|
|
220
|
+
SELECT DISTINCT ${data.source.attributesColumn}[${{
|
|
221
|
+
type: TableColumnType.Text,
|
|
222
|
+
value: data.attributeKey,
|
|
223
|
+
}}] AS attributeValue
|
|
224
|
+
FROM ${data.source.tableName}
|
|
225
|
+
WHERE projectId = ${{
|
|
226
|
+
type: TableColumnType.ObjectID,
|
|
227
|
+
value: data.projectId,
|
|
228
|
+
}}
|
|
229
|
+
AND ${data.source.timeColumn} >= ${{
|
|
230
|
+
type: TableColumnType.Date,
|
|
231
|
+
value: lookbackStartDate,
|
|
232
|
+
}}
|
|
233
|
+
AND mapContains(${data.source.attributesColumn}, ${{
|
|
234
|
+
type: TableColumnType.Text,
|
|
235
|
+
value: data.attributeKey,
|
|
236
|
+
}})`;
|
|
237
|
+
if (data.metricName) {
|
|
238
|
+
statement.append(SQL `
|
|
239
|
+
AND name = ${{
|
|
240
|
+
type: TableColumnType.Text,
|
|
241
|
+
value: data.metricName,
|
|
242
|
+
}}`);
|
|
243
|
+
}
|
|
244
|
+
statement.append(SQL `
|
|
245
|
+
ORDER BY attributeValue ASC
|
|
246
|
+
LIMIT ${{
|
|
247
|
+
type: TableColumnType.Number,
|
|
248
|
+
value: TelemetryAttributeService.ATTRIBUTE_VALUES_LIMIT,
|
|
249
|
+
}}`);
|
|
250
|
+
const dbResult = await data.source.service.executeQuery(statement);
|
|
251
|
+
const response = await dbResult.json();
|
|
252
|
+
const rows = response.data || [];
|
|
253
|
+
return rows
|
|
254
|
+
.map((row) => {
|
|
255
|
+
const val = row["attributeValue"];
|
|
256
|
+
return typeof val === "string" ? val.trim() : null;
|
|
257
|
+
})
|
|
258
|
+
.filter((val) => {
|
|
259
|
+
return Boolean(val);
|
|
260
|
+
});
|
|
261
|
+
}
|
|
192
262
|
}
|
|
193
263
|
TelemetryAttributeService.ATTRIBUTES_LIMIT = 5000;
|
|
194
264
|
TelemetryAttributeService.ROW_SCAN_LIMIT = 10000;
|
|
195
265
|
TelemetryAttributeService.CACHE_NAMESPACE = "telemetry-attributes";
|
|
196
266
|
TelemetryAttributeService.CACHE_STALE_AFTER_MINUTES = 5;
|
|
197
267
|
TelemetryAttributeService.LOOKBACK_WINDOW_IN_DAYS = 30;
|
|
268
|
+
TelemetryAttributeService.ATTRIBUTE_VALUES_LIMIT = 100;
|
|
198
269
|
__decorate([
|
|
199
270
|
CaptureSpan(),
|
|
200
271
|
__metadata("design:type", Function),
|
|
201
272
|
__metadata("design:paramtypes", [Object]),
|
|
202
273
|
__metadata("design:returntype", Promise)
|
|
203
274
|
], TelemetryAttributeService.prototype, "fetchAttributes", null);
|
|
275
|
+
__decorate([
|
|
276
|
+
CaptureSpan(),
|
|
277
|
+
__metadata("design:type", Function),
|
|
278
|
+
__metadata("design:paramtypes", [Object]),
|
|
279
|
+
__metadata("design:returntype", Promise)
|
|
280
|
+
], TelemetryAttributeService.prototype, "fetchAttributeValues", null);
|
|
204
281
|
export default new TelemetryAttributeService();
|
|
205
282
|
//# sourceMappingURL=TelemetryAttributeService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TelemetryAttributeService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryAttributeService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAa,MAAM,sCAAsC,CAAC;AACtE,OAAO,aAAa,MAAM,qCAAqC,CAAC;AAChE,OAAO,kBAAkB,MAAM,cAAc,CAAC;AAC9C,OAAO,qBAAqB,MAAM,iBAAiB,CAAC;AACpD,OAAO,mBAAmB,MAAM,eAAe,CAAC;AAChD,OAAO,eAAe,MAAM,+CAA+C,CAAC;AAG5E,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,WAAW,MAAM,+BAA+B,CAAC;AACxD,OAAO,WAAW,MAAM,gCAAgC,CAAC;AAmBzD,MAAM,OAAO,yBAAyB;IAO5B,kBAAkB,CACxB,aAA4B;QAE5B,QAAQ,aAAa,EAAE,CAAC;YACtB,KAAK,aAAa,CAAC,GAAG;gBACpB,OAAO;oBACL,OAAO,EAAE,kBAAkB;oBAC3B,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,SAAS;oBAC7C,gBAAgB,EAAE,YAAY;oBAC9B,mBAAmB,EAAE,eAAe;oBACpC,UAAU,EAAE,MAAM;iBACnB,CAAC;YACJ,KAAK,aAAa,CAAC,MAAM;gBACvB,OAAO;oBACL,OAAO,EAAE,qBAAqB;oBAC9B,SAAS,EAAE,qBAAqB,CAAC,KAAK,CAAC,SAAS;oBAChD,gBAAgB,EAAE,YAAY;oBAC9B,mBAAmB,EAAE,eAAe;oBACpC,UAAU,EAAE,MAAM;iBACnB,CAAC;YACJ,KAAK,aAAa,CAAC,KAAK;gBACtB,OAAO;oBACL,OAAO,EAAE,mBAAmB;oBAC5B,SAAS,EAAE,mBAAmB,CAAC,KAAK,CAAC,SAAS;oBAC9C,gBAAgB,EAAE,YAAY;oBAC9B,mBAAmB,EAAE,eAAe;oBACpC,UAAU,EAAE,WAAW;iBACxB,CAAC;YACJ;gBACE,OAAO,IAAI,CAAC;QAChB,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"TelemetryAttributeService.js","sourceRoot":"","sources":["../../../../Server/Services/TelemetryAttributeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,6 @@ import Button, { ButtonSize, ButtonStyleType } from "../Button/Button";
|
|
|
2
2
|
import Icon, { SizeProp } from "../Icon/Icon";
|
|
3
3
|
import ConfirmModal from "../Modal/ConfirmModal";
|
|
4
4
|
import ProgressBar, { ProgressBarSize } from "../ProgressBar/ProgressBar";
|
|
5
|
-
import SimpleLogViewer from "../SimpleLogViewer/SimpleLogViewer";
|
|
6
5
|
import { Green, Red } from "../../../Types/BrandColors";
|
|
7
6
|
import { LIMIT_PER_PROJECT } from "../../../Types/Database/LimitMax";
|
|
8
7
|
import IconProp from "../../../Types/Icon/IconProp";
|
|
@@ -13,7 +12,6 @@ const BulkUpdateForm = (props) => {
|
|
|
13
12
|
const [progressInfo, setProgressInfo] = React.useState(null);
|
|
14
13
|
const [showProgressInfoModal, setShowProgressInfoModal] = React.useState(false);
|
|
15
14
|
const [actionInProgress, setActionInProgress] = React.useState(false);
|
|
16
|
-
const [actionName, setActionName] = React.useState("");
|
|
17
15
|
if (props.selectedItems.length === 0) {
|
|
18
16
|
return React.createElement(React.Fragment, null);
|
|
19
17
|
}
|
|
@@ -22,34 +20,39 @@ const BulkUpdateForm = (props) => {
|
|
|
22
20
|
return (React.createElement(ProgressBar, { count: progressInfo.successItems.length + progressInfo.failed.length, totalCount: progressInfo.totalItems.length, suffix: props.pluralLabel, size: ProgressBarSize.Small }));
|
|
23
21
|
}
|
|
24
22
|
if (!actionInProgress && progressInfo) {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
" ",
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
23
|
+
const hasFailures = progressInfo.failed.length > 0;
|
|
24
|
+
const hasSuccesses = progressInfo.successItems.length > 0;
|
|
25
|
+
return (React.createElement("div", { className: "space-y-4" },
|
|
26
|
+
React.createElement("div", { className: "flex flex-col space-y-3" },
|
|
27
|
+
hasSuccesses && (React.createElement("div", { className: "flex items-center rounded-lg bg-green-50 p-3" },
|
|
28
|
+
React.createElement(Icon, { className: "h-5 w-5 flex-shrink-0", icon: IconProp.CheckCircle, color: Green }),
|
|
29
|
+
React.createElement("div", { className: "ml-2 text-sm font-medium text-green-800" },
|
|
30
|
+
progressInfo.successItems.length,
|
|
31
|
+
" ",
|
|
32
|
+
progressInfo.successItems.length === 1
|
|
33
|
+
? props.singularLabel
|
|
34
|
+
: props.pluralLabel,
|
|
35
|
+
" ",
|
|
36
|
+
"succeeded"))),
|
|
37
|
+
hasFailures && (React.createElement("div", { className: "flex items-center rounded-lg bg-red-50 p-3" },
|
|
38
|
+
React.createElement(Icon, { className: "h-5 w-5 flex-shrink-0", icon: IconProp.Close, color: Red }),
|
|
39
|
+
React.createElement("div", { className: "ml-2 text-sm font-medium text-red-800" },
|
|
37
40
|
progressInfo.failed.length,
|
|
38
41
|
" ",
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
42
|
+
progressInfo.failed.length === 1
|
|
43
|
+
? props.singularLabel
|
|
44
|
+
: props.pluralLabel,
|
|
45
|
+
" ",
|
|
46
|
+
"failed")))),
|
|
47
|
+
hasFailures && (React.createElement("div", { className: "rounded-lg border border-gray-200 overflow-hidden" },
|
|
48
|
+
React.createElement("div", { className: "max-h-64 overflow-y-auto divide-y divide-gray-200" }, progressInfo.failed.map((failedItem, i) => {
|
|
49
|
+
const itemName = props.itemToString
|
|
50
|
+
? props.itemToString(failedItem.item)
|
|
51
|
+
: "";
|
|
52
|
+
return (React.createElement("div", { className: "px-4 py-3 text-sm", key: i },
|
|
53
|
+
itemName && (React.createElement("div", { className: "font-medium text-gray-900" }, itemName)),
|
|
54
|
+
React.createElement("div", { className: "text-gray-500 mt-0.5" }, failedItem.failedMessage)));
|
|
55
|
+
}))))));
|
|
53
56
|
}
|
|
54
57
|
return React.createElement(React.Fragment, null);
|
|
55
58
|
};
|
|
@@ -89,7 +92,6 @@ const BulkUpdateForm = (props) => {
|
|
|
89
92
|
},
|
|
90
93
|
onBulkActionStart: () => {
|
|
91
94
|
setShowProgressInfoModal(true);
|
|
92
|
-
setActionName(button.title);
|
|
93
95
|
setProgressInfo({
|
|
94
96
|
inProgressItems: props.selectedItems,
|
|
95
97
|
successItems: [],
|
|
@@ -103,7 +105,6 @@ const BulkUpdateForm = (props) => {
|
|
|
103
105
|
},
|
|
104
106
|
onBulkActionEnd: () => {
|
|
105
107
|
setActionInProgress(false);
|
|
106
|
-
setActionName("");
|
|
107
108
|
},
|
|
108
109
|
};
|
|
109
110
|
if (button.confirmMessage) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BulkUpdateForm.js","sourceRoot":"","sources":["../../../../../UI/Components/BulkUpdate/BulkUpdateForm.tsx"],"names":[],"mappings":"AACA,OAAO,MAAM,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,YAEN,MAAM,uBAAuB,CAAC;AAC/B,OAAO,WAAW,EAAE,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE1E,OAAO,
|
|
1
|
+
{"version":3,"file":"BulkUpdateForm.js","sourceRoot":"","sources":["../../../../../UI/Components/BulkUpdate/BulkUpdateForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -82,15 +82,21 @@ const DictionaryForm = (props) => {
|
|
|
82
82
|
return (React.createElement("div", null,
|
|
83
83
|
React.createElement("div", null,
|
|
84
84
|
data.map((item, index) => {
|
|
85
|
+
var _a;
|
|
85
86
|
return (React.createElement("div", { key: index, className: "flex items-start mb-4 last:mb-0" },
|
|
86
87
|
React.createElement("div", { className: "mr-1 w-1/2" },
|
|
87
88
|
React.createElement("div", { className: "mb-1" },
|
|
88
89
|
React.createElement(FieldLabelElement, { title: "Key", required: true, hideOptionalLabel: true, className: "block text-xs text-gray-500 font-normal flex justify-between" })),
|
|
89
90
|
React.createElement(AutocompleteTextInput, { value: item.key, placeholder: props.keyPlaceholder, suggestions: props.keys, onChange: (value) => {
|
|
91
|
+
var _a;
|
|
90
92
|
const newData = [...data];
|
|
91
93
|
newData[index].key = value;
|
|
92
94
|
setData(newData);
|
|
93
95
|
onDataChange(newData);
|
|
96
|
+
// If this key matches one of the known keys, notify parent to fetch values
|
|
97
|
+
if (props.onKeySelected && ((_a = props.keys) === null || _a === void 0 ? void 0 : _a.includes(value))) {
|
|
98
|
+
props.onKeySelected(value);
|
|
99
|
+
}
|
|
94
100
|
} })),
|
|
95
101
|
React.createElement("div", { className: "mr-1 ml-1 flex items-center justify-center pt-8" },
|
|
96
102
|
React.createElement("span", { className: "text-slate-500 text-2xl leading-none" }, "=")),
|
|
@@ -110,7 +116,9 @@ const DictionaryForm = (props) => {
|
|
|
110
116
|
React.createElement("div", { className: "ml-1 w-1/2" },
|
|
111
117
|
React.createElement("div", { className: "mb-1" },
|
|
112
118
|
React.createElement(FieldLabelElement, { title: "Value", hideOptionalLabel: true, required: true, className: "block text-xs text-gray-500 font-normal flex justify-between" })),
|
|
113
|
-
item.type === ValueType.Text && (React.createElement(
|
|
119
|
+
item.type === ValueType.Text && (React.createElement(AutocompleteTextInput, { value: item.value.toString(), placeholder: props.valuePlaceholder, suggestions: item.key && ((_a = props.valueSuggestions) === null || _a === void 0 ? void 0 : _a[item.key])
|
|
120
|
+
? props.valueSuggestions[item.key]
|
|
121
|
+
: undefined, onChange: (value) => {
|
|
114
122
|
const newData = [...data];
|
|
115
123
|
newData[index].value = value;
|
|
116
124
|
setData(newData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Dictionary.js","sourceRoot":"","sources":["../../../../../UI/Components/Dictionary/Dictionary.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,QAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAElD,OAAO,QAAQ,MAAM,8BAA8B,CAAC;AACpD,OAAO,KAAK,EAAE,EAGZ,SAAS,EACT,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,qBAAqB,MAAM,gDAAgD,CAAC;AACnF,OAAO,iBAAiB,MAAM,4BAA4B,CAAC;AAE3D,MAAM,CAAN,IAAY,SAIX;AAJD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,8BAAiB,CAAA;IACjB,gCAAmB,CAAA;AACrB,CAAC,EAJW,SAAS,KAAT,SAAS,QAIpB;
|
|
1
|
+
{"version":3,"file":"Dictionary.js","sourceRoot":"","sources":["../../../../../UI/Components/Dictionary/Dictionary.tsx"],"names":[],"mappings":"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"}
|
|
@@ -48,7 +48,7 @@ const FiltersForm = (props) => {
|
|
|
48
48
|
React.createElement(DateFilter, { filter: filter, filterData: props.filterData, onFilterChanged: changeFilterData }),
|
|
49
49
|
React.createElement(TextFilter, { filter: filter, filterData: props.filterData, onFilterChanged: changeFilterData }),
|
|
50
50
|
React.createElement(NumberFilter, { filter: filter, filterData: props.filterData, onFilterChanged: changeFilterData }),
|
|
51
|
-
React.createElement(JSONFilter, { filter: filter, filterData: props.filterData, onFilterChanged: changeFilterData, jsonKeys: filter.jsonKeys })));
|
|
51
|
+
React.createElement(JSONFilter, { filter: filter, filterData: props.filterData, onFilterChanged: changeFilterData, jsonKeys: filter.jsonKeys, jsonValueSuggestions: filter.jsonValueSuggestions, onJsonKeySelected: filter.onJsonKeySelected })));
|
|
52
52
|
})),
|
|
53
53
|
props.showFilter && props.isFilterLoading && !props.filterError && (React.createElement(ComponentLoader, null)),
|
|
54
54
|
props.showFilter && props.filterError && (React.createElement(ErrorMessage, { message: props.filterError, onRefreshClick: props.onFilterRefreshClick })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FiltersForm.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/FiltersForm.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FiltersForm.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/FiltersForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ const JSONFilter = (props) => {
|
|
|
5
5
|
const filter = props.filter;
|
|
6
6
|
const filterData = Object.assign({}, props.filterData);
|
|
7
7
|
if (filter.type === FieldType.JSON) {
|
|
8
|
-
return (React.createElement(DictionaryForm, { keys: props.jsonKeys, addButtonSuffix: filter.title, keyPlaceholder: "Key", valuePlaceholder: "Value", valueTypes: [ValueType.Text
|
|
8
|
+
return (React.createElement(DictionaryForm, { keys: props.jsonKeys, valueSuggestions: props.jsonValueSuggestions, onKeySelected: props.onJsonKeySelected, addButtonSuffix: filter.title, keyPlaceholder: "Key", valuePlaceholder: "Value", valueTypes: [ValueType.Text], initialValue: filterData[filter.key] || {}, onChange: (value) => {
|
|
9
9
|
// if no keys in the dictionary, remove the filter
|
|
10
10
|
if (Object.keys(value).length > 0) {
|
|
11
11
|
filterData[filter.key] = value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JSONFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/JSONFilter.tsx"],"names":[],"mappings":"AACA,OAAO,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAK3C,OAAO,KAAuB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"JSONFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/JSONFilter.tsx"],"names":[],"mappings":"AACA,OAAO,cAAc,EAAE,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrE,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAK3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAe5C,MAAM,UAAU,GAAuB,CACrC,KAAwB,EACV,EAAE;IAChB,MAAM,MAAM,GAAc,KAAK,CAAC,MAAM,CAAC;IACvC,MAAM,UAAU,qBAAuB,KAAK,CAAC,UAAU,CAAE,CAAC;IAE1D,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,IAAI,EAAE,CAAC;QACnC,OAAO,CACL,oBAAC,cAAc,IACb,IAAI,EAAE,KAAK,CAAC,QAAQ,EACpB,gBAAgB,EAAE,KAAK,CAAC,oBAAoB,EAC5C,aAAa,EAAE,KAAK,CAAC,iBAAiB,EACtC,eAAe,EAAE,MAAM,CAAC,KAAK,EAC7B,cAAc,EAAE,KAAK,EACrB,gBAAgB,EAAE,OAAO,EACzB,UAAU,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,EAC5B,YAAY,EAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAwB,IAAI,EAAE,EAClE,QAAQ,EAAE,CAAC,KAA4C,EAAE,EAAE;gBACzD,kDAAkD;gBAElD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,KAExB,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;oBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBACpC,CAAC;YACH,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,OAAO,yCAAK,CAAC;AACf,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -1004,11 +1004,15 @@ const BaseModelTable = (props) => {
|
|
|
1004
1004
|
}, onBulkSelectAllItems: async () => {
|
|
1005
1005
|
await fetchAllBulkItems();
|
|
1006
1006
|
}, matchBulkSelectedItemByField: matchBulkSelectedItemByField || "_id", bulkItemToString: (item) => {
|
|
1007
|
-
var _a;
|
|
1008
|
-
|
|
1009
|
-
|
|
1010
|
-
|
|
1011
|
-
|
|
1007
|
+
var _a, _b;
|
|
1008
|
+
const label = props.singularName || item.singularName || "";
|
|
1009
|
+
const name = ((_a = item["name"]) === null || _a === void 0 ? void 0 : _a.toString()) ||
|
|
1010
|
+
"";
|
|
1011
|
+
if (name) {
|
|
1012
|
+
return label ? `${label}: ${name}` : name;
|
|
1013
|
+
}
|
|
1014
|
+
const id = ((_b = item[matchBulkSelectedItemByField]) === null || _b === void 0 ? void 0 : _b.toString()) || "";
|
|
1015
|
+
return label ? `${label} ${id}` : id;
|
|
1012
1016
|
}, filters: classicTableFilters, filterError: tableFilterError, isFilterLoading: isFilterFetchLoading, showFilterModal: showFilterModal, onFilterModalClose: () => {
|
|
1013
1017
|
setShowFilterModal(false);
|
|
1014
1018
|
}, onFilterModalOpen: () => {
|