@oneuptime/common 7.0.3357 → 7.0.3377
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/Utils/Monitor/Criteria/APIRequestCriteria.ts +4 -1
- package/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.ts +81 -0
- package/Server/Utils/Monitor/DataToProcess.ts +3 -1
- package/Server/Utils/Monitor/MonitorResource.ts +14 -0
- package/Types/Monitor/CriteriaFilter.ts +8 -0
- package/Types/Monitor/MetricMonitor/MetricMonitorResponse.ts +11 -0
- package/Types/Monitor/MonitorCriteriaInstance.ts +89 -0
- package/Types/Monitor/MonitorStep.ts +26 -0
- package/Types/Monitor/MonitorStepMetricMonitor.ts +28 -0
- package/Types/Monitor/MonitorType.ts +1 -2
- package/Types/RollingTime/RollingTime.ts +24 -0
- package/Types/RollingTime/RollingTimeUtil.ts +98 -0
- package/UI/Components/Charts/ChartGroup/ChartGroup.tsx +2 -1
- package/UI/Components/Date/StartAndEndDate.tsx +65 -71
- package/UI/Components/Filters/DateFilter.tsx +1 -1
- package/UI/Components/RollingTimePicker/RollingTimePicker.tsx +58 -0
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js +2 -1
- package/build/dist/Server/Utils/Monitor/Criteria/APIRequestCriteria.js.map +1 -1
- package/build/dist/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.js +51 -0
- package/build/dist/Server/Utils/Monitor/Criteria/MetricMonitorCriteria.js.map +1 -0
- package/build/dist/Server/Utils/Monitor/MonitorResource.js +11 -0
- package/build/dist/Server/Utils/Monitor/MonitorResource.js.map +1 -1
- package/build/dist/Types/Monitor/CriteriaFilter.js +2 -0
- package/build/dist/Types/Monitor/CriteriaFilter.js.map +1 -1
- package/build/dist/Types/Monitor/MetricMonitor/MetricMonitorResponse.js +2 -0
- package/build/dist/Types/Monitor/MetricMonitor/MetricMonitorResponse.js.map +1 -0
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js +76 -0
- package/build/dist/Types/Monitor/MonitorCriteriaInstance.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorStep.js +18 -1
- package/build/dist/Types/Monitor/MonitorStep.js.map +1 -1
- package/build/dist/Types/Monitor/MonitorStepMetricMonitor.js +19 -0
- package/build/dist/Types/Monitor/MonitorStepMetricMonitor.js.map +1 -0
- package/build/dist/Types/Monitor/MonitorType.js +1 -2
- package/build/dist/Types/Monitor/MonitorType.js.map +1 -1
- package/build/dist/Types/RollingTime/RollingTime.js +25 -0
- package/build/dist/Types/RollingTime/RollingTime.js.map +1 -0
- package/build/dist/Types/RollingTime/RollingTimeUtil.js +74 -0
- package/build/dist/Types/RollingTime/RollingTimeUtil.js.map +1 -0
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js +1 -1
- package/build/dist/UI/Components/Charts/ChartGroup/ChartGroup.js.map +1 -1
- package/build/dist/UI/Components/Date/StartAndEndDate.js +33 -46
- package/build/dist/UI/Components/Date/StartAndEndDate.js.map +1 -1
- package/build/dist/UI/Components/Filters/DateFilter.js +1 -1
- package/build/dist/UI/Components/Filters/DateFilter.js.map +1 -1
- package/build/dist/UI/Components/RollingTimePicker/RollingTimePicker.js +32 -0
- package/build/dist/UI/Components/RollingTimePicker/RollingTimePicker.js.map +1 -0
- package/package.json +2 -2
|
@@ -9,11 +9,9 @@ export var StartAndEndDateType;
|
|
|
9
9
|
StartAndEndDateType["DateTime"] = "DateTime";
|
|
10
10
|
})(StartAndEndDateType || (StartAndEndDateType = {}));
|
|
11
11
|
const StartAndEndDate = (props) => {
|
|
12
|
-
|
|
13
|
-
const [endDateTime, setEndDateTime] = React.useState(null);
|
|
12
|
+
var _a, _b;
|
|
14
13
|
const [startDateError, setStartDateError] = React.useState("");
|
|
15
14
|
const [endDateError, setEndDateError] = React.useState("");
|
|
16
|
-
const [didSetInitialValue, setDidSetInitialValue] = React.useState(false);
|
|
17
15
|
let inputType = InputType.TEXT;
|
|
18
16
|
if (props.type === StartAndEndDateType.Date) {
|
|
19
17
|
inputType = InputType.DATE;
|
|
@@ -21,35 +19,20 @@ const StartAndEndDate = (props) => {
|
|
|
21
19
|
else if (props.type === StartAndEndDateType.DateTime) {
|
|
22
20
|
inputType = InputType.DATETIME_LOCAL;
|
|
23
21
|
}
|
|
22
|
+
const startDateTime = (_a = props.value) === null || _a === void 0 ? void 0 : _a.startValue;
|
|
23
|
+
const endDateTime = (_b = props.value) === null || _b === void 0 ? void 0 : _b.endValue;
|
|
24
24
|
useEffect(() => {
|
|
25
|
-
|
|
26
|
-
if (!didSetInitialValue && props.initialValue instanceof InBetween) {
|
|
27
|
-
const inBetween = props.initialValue;
|
|
28
|
-
if (inBetween.startValue) {
|
|
29
|
-
setStartDateTime(OneUptimeDate.fromString(inBetween.startValue));
|
|
30
|
-
}
|
|
31
|
-
if (inBetween.endValue) {
|
|
32
|
-
setEndDateTime(OneUptimeDate.fromString(inBetween.endValue));
|
|
33
|
-
}
|
|
34
|
-
setDidSetInitialValue(true);
|
|
35
|
-
}
|
|
36
|
-
}, [props.initialValue]);
|
|
37
|
-
useEffect(() => {
|
|
38
|
-
if (startDateTime && endDateTime) {
|
|
25
|
+
if (endDateTime && startDateTime) {
|
|
39
26
|
// check if start date is after end date
|
|
40
27
|
if (!OneUptimeDate.isAfter(endDateTime, startDateTime)) {
|
|
41
28
|
setStartDateError("Start date should be before end date");
|
|
42
29
|
setEndDateError("End date should be after start date");
|
|
43
|
-
props.onValueChanged && props.onValueChanged(null);
|
|
44
30
|
return;
|
|
45
31
|
}
|
|
46
|
-
|
|
47
|
-
|
|
32
|
+
setStartDateError("");
|
|
33
|
+
setEndDateError("");
|
|
48
34
|
return;
|
|
49
35
|
}
|
|
50
|
-
if (!startDateTime || !endDateTime) {
|
|
51
|
-
return props.onValueChanged && props.onValueChanged(null);
|
|
52
|
-
}
|
|
53
36
|
if (startDateTime && !endDateTime) {
|
|
54
37
|
setStartDateError("");
|
|
55
38
|
setEndDateError("End date is required");
|
|
@@ -62,9 +45,7 @@ const StartAndEndDate = (props) => {
|
|
|
62
45
|
setStartDateError("");
|
|
63
46
|
setEndDateError("");
|
|
64
47
|
}
|
|
65
|
-
|
|
66
|
-
props.onValueChanged(new InBetween(startDateTime, endDateTime)));
|
|
67
|
-
}, [startDateTime, endDateTime]);
|
|
48
|
+
}, [props.value]);
|
|
68
49
|
// difference between both dates is 60 mins.
|
|
69
50
|
const is1Hour = props.type === StartAndEndDateType.DateTime &&
|
|
70
51
|
startDateTime &&
|
|
@@ -114,12 +95,15 @@ const StartAndEndDate = (props) => {
|
|
|
114
95
|
React.createElement("div", null,
|
|
115
96
|
React.createElement(Input, { error: startDateError, onChange: (changedValue) => {
|
|
116
97
|
if (!changedValue) {
|
|
117
|
-
|
|
98
|
+
props.onValueChanged &&
|
|
99
|
+
props.onValueChanged(new InBetween(OneUptimeDate.getCurrentDate(), endDateTime || OneUptimeDate.getCurrentDate()));
|
|
118
100
|
}
|
|
119
101
|
if (changedValue &&
|
|
102
|
+
endDateTime &&
|
|
120
103
|
(props.type === StartAndEndDateType.Date ||
|
|
121
104
|
props.type === StartAndEndDateType.DateTime)) {
|
|
122
|
-
|
|
105
|
+
props.onValueChanged &&
|
|
106
|
+
props.onValueChanged(new InBetween(OneUptimeDate.fromString(changedValue), endDateTime));
|
|
123
107
|
}
|
|
124
108
|
}, value: startDateTime || "", placeholder: `Start Date`, type: inputType }))),
|
|
125
109
|
React.createElement("div", { className: "w-1/2" },
|
|
@@ -127,12 +111,15 @@ const StartAndEndDate = (props) => {
|
|
|
127
111
|
React.createElement("div", null,
|
|
128
112
|
React.createElement(Input, { error: endDateError, onChange: (changedValue) => {
|
|
129
113
|
if (!changedValue) {
|
|
130
|
-
|
|
114
|
+
props.onValueChanged &&
|
|
115
|
+
props.onValueChanged(new InBetween(startDateTime || OneUptimeDate.getCurrentDate(), OneUptimeDate.getCurrentDate()));
|
|
131
116
|
}
|
|
132
117
|
if (changedValue &&
|
|
118
|
+
startDateTime &&
|
|
133
119
|
(props.type === StartAndEndDateType.Date ||
|
|
134
120
|
props.type === StartAndEndDateType.DateTime)) {
|
|
135
|
-
|
|
121
|
+
props.onValueChanged &&
|
|
122
|
+
props.onValueChanged(new InBetween(startDateTime, OneUptimeDate.fromString(changedValue)));
|
|
136
123
|
}
|
|
137
124
|
}, value: endDateTime || "", placeholder: `End Date`, type: inputType })))),
|
|
138
125
|
!props.hideTimeButtons && (React.createElement("div", { className: "mt-1 flex space-x-2 -ml-3" },
|
|
@@ -140,57 +127,57 @@ const StartAndEndDate = (props) => {
|
|
|
140
127
|
// set it to past 1 hour
|
|
141
128
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
142
129
|
const startDate = OneUptimeDate.addRemoveHours(endDate, -1);
|
|
143
|
-
|
|
144
|
-
|
|
130
|
+
props.onValueChanged &&
|
|
131
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
145
132
|
}, title: "1 hour" })),
|
|
146
133
|
props.type === StartAndEndDateType.DateTime && (React.createElement(Button, { buttonStyle: is3Hours ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
147
134
|
// set it to past 3 hour
|
|
148
135
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
149
136
|
const startDate = OneUptimeDate.addRemoveHours(endDate, -3);
|
|
150
|
-
|
|
151
|
-
|
|
137
|
+
props.onValueChanged &&
|
|
138
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
152
139
|
}, title: "3 hours" })),
|
|
153
140
|
React.createElement(Button, { buttonStyle: is1Day ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
154
141
|
// set it to past 1 day
|
|
155
142
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
156
143
|
const startDate = OneUptimeDate.addRemoveDays(endDate, -1);
|
|
157
|
-
|
|
158
|
-
|
|
144
|
+
props.onValueChanged &&
|
|
145
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
159
146
|
}, title: "1 day" }),
|
|
160
147
|
React.createElement(Button, { buttonStyle: is1Week ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
161
148
|
// set it to past 1 week
|
|
162
149
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
163
150
|
const startDate = OneUptimeDate.addRemoveDays(endDate, -7);
|
|
164
|
-
|
|
165
|
-
|
|
151
|
+
props.onValueChanged &&
|
|
152
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
166
153
|
}, title: "1 week" }),
|
|
167
154
|
React.createElement(Button, { buttonStyle: is2Weeks ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
168
155
|
// set it to past 1 week
|
|
169
156
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
170
157
|
const startDate = OneUptimeDate.addRemoveDays(endDate, -14);
|
|
171
|
-
|
|
172
|
-
|
|
158
|
+
props.onValueChanged &&
|
|
159
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
173
160
|
}, title: "2 weeks" }),
|
|
174
161
|
React.createElement(Button, { buttonStyle: is3Weeks ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
175
162
|
// set it to past 1 week
|
|
176
163
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
177
164
|
const startDate = OneUptimeDate.addRemoveDays(endDate, -21);
|
|
178
|
-
|
|
179
|
-
|
|
165
|
+
props.onValueChanged &&
|
|
166
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
180
167
|
}, title: "3 weeks" }),
|
|
181
168
|
React.createElement(Button, { buttonStyle: is1Month ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
182
169
|
// set it to past 1 month
|
|
183
170
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
184
171
|
const startDate = OneUptimeDate.addRemoveMonths(endDate, -1);
|
|
185
|
-
|
|
186
|
-
|
|
172
|
+
props.onValueChanged &&
|
|
173
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
187
174
|
}, title: "1 month" }),
|
|
188
175
|
React.createElement(Button, { buttonStyle: is3Months ? ButtonStyleType.PRIMARY : ButtonStyleType.NORMAL, buttonSize: ButtonSize.Small, onClick: () => {
|
|
189
176
|
// set it to past 1 month
|
|
190
177
|
const endDate = OneUptimeDate.getCurrentDate();
|
|
191
178
|
const startDate = OneUptimeDate.addRemoveMonths(endDate, -3);
|
|
192
|
-
|
|
193
|
-
|
|
179
|
+
props.onValueChanged &&
|
|
180
|
+
props.onValueChanged(new InBetween(startDate, endDate));
|
|
194
181
|
}, title: "3 months" })))));
|
|
195
182
|
}
|
|
196
183
|
return React.createElement(React.Fragment, null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StartAndEndDate.js","sourceRoot":"","sources":["../../../../../UI/Components/Date/StartAndEndDate.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,EAAE,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,SAAS,MAAM,qCAAqC,CAAC;AAC5D,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAC9C,OAAO,KAAK,EAAE,EAAgB,SAAS,EAAE,MAAM,OAAO,CAAC;AAEvD,MAAM,CAAN,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,4CAAqB,CAAA;AACvB,CAAC,EAHW,mBAAmB,KAAnB,mBAAmB,QAG9B;AAWD,MAAM,eAAe,GAAuB,CAC1C,KAAqB,EACP,EAAE
|
|
1
|
+
{"version":3,"file":"StartAndEndDate.js","sourceRoot":"","sources":["../../../../../UI/Components/Date/StartAndEndDate.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const DateFilter = (props) => {
|
|
|
7
7
|
if (filter.type !== FieldType.Date && filter.type !== FieldType.DateTime) {
|
|
8
8
|
return React.createElement(React.Fragment, null);
|
|
9
9
|
}
|
|
10
|
-
return (React.createElement(StartAndEndDate, {
|
|
10
|
+
return (React.createElement(StartAndEndDate, { value: filterData[filter.key], onValueChanged: (inBetween) => {
|
|
11
11
|
filterData[filter.key] = inBetween;
|
|
12
12
|
if (!filterData[filter.key]) {
|
|
13
13
|
delete filterData[filter.key];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DateFilter.tsx"],"names":[],"mappings":"AACA,OAAO,eAAe,EAAE,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAK3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,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,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzE,OAAO,yCAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,eAAe,IACd,
|
|
1
|
+
{"version":3,"file":"DateFilter.js","sourceRoot":"","sources":["../../../../../UI/Components/Filters/DateFilter.tsx"],"names":[],"mappings":"AACA,OAAO,eAAe,EAAE,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,OAAO,SAAS,MAAM,oBAAoB,CAAC;AAK3C,OAAO,KAAuB,MAAM,OAAO,CAAC;AAY5C,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,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ,EAAE,CAAC;QACzE,OAAO,yCAAK,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,eAAe,IACd,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAoB,EAChD,cAAc,EAAE,CAAC,SAAiC,EAAE,EAAE;YACpD,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,SAExB,CAAC;YAEF,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAChC,CAAC;YAED,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC1B,KAAK,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,EACD,IAAI,EACF,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,QAAQ;YAChC,CAAC,CAAC,mBAAmB,CAAC,QAAQ;YAC9B,CAAC,CAAC,mBAAmB,CAAC,IAAI,GAE9B,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
import React, { useEffect } from "react";
|
|
2
|
+
import Dropdown from "../Dropdown/Dropdown";
|
|
3
|
+
import DropdownUtil from "../../Utils/Dropdown";
|
|
4
|
+
import RollingTime from "../../../Types/RollingTime/RollingTime";
|
|
5
|
+
const RollingTimePicker = (props) => {
|
|
6
|
+
const [rollingTime, setRollingTime] = React.useState(props.initialValue || RollingTime.Past1Minute);
|
|
7
|
+
const dropdownOptions = DropdownUtil.getDropdownOptionsFromEnum(RollingTime);
|
|
8
|
+
useEffect(() => {
|
|
9
|
+
if (props.value) {
|
|
10
|
+
setRollingTime(props.value);
|
|
11
|
+
}
|
|
12
|
+
}, [props.value]);
|
|
13
|
+
useEffect(() => {
|
|
14
|
+
if (rollingTime) {
|
|
15
|
+
props.onChange && props.onChange(rollingTime);
|
|
16
|
+
}
|
|
17
|
+
}, [rollingTime]);
|
|
18
|
+
const currentDropdownOption = dropdownOptions.find((option) => {
|
|
19
|
+
return option.value === rollingTime;
|
|
20
|
+
});
|
|
21
|
+
return (React.createElement(Dropdown, { value: currentDropdownOption, onChange: (value) => {
|
|
22
|
+
if (value === null) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
if (Array.isArray(value)) {
|
|
26
|
+
return;
|
|
27
|
+
}
|
|
28
|
+
setRollingTime(value);
|
|
29
|
+
}, options: dropdownOptions }));
|
|
30
|
+
};
|
|
31
|
+
export default RollingTimePicker;
|
|
32
|
+
//# sourceMappingURL=RollingTimePicker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"RollingTimePicker.js","sourceRoot":"","sources":["../../../../../UI/Components/RollingTimePicker/RollingTimePicker.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAmC,SAAS,EAAE,MAAM,OAAO,CAAC;AAC1E,OAAO,QAA2C,MAAM,sBAAsB,CAAC;AAC/E,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAChD,OAAO,WAAW,MAAM,wCAAwC,CAAC;AAQjE,MAAM,iBAAiB,GAAsC,CAC3D,KAAqB,EACP,EAAE;IAChB,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,KAAK,CAAC,QAAQ,CAClD,KAAK,CAAC,YAAY,IAAI,WAAW,CAAC,WAAW,CAC9C,CAAC;IAEF,MAAM,eAAe,GACnB,YAAY,CAAC,0BAA0B,CAAC,WAAW,CAAC,CAAC;IAEvD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,cAAc,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAElB,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,WAAW,EAAE,CAAC;YAChB,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QAChD,CAAC;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,qBAAqB,GACzB,eAAe,CAAC,IAAI,CAAC,CAAC,MAAsB,EAAE,EAAE;QAC9C,OAAO,MAAM,CAAC,KAAK,KAAK,WAAW,CAAC;IACtC,CAAC,CAAC,CAAC;IAEL,OAAO,CACL,oBAAC,QAAQ,IACP,KAAK,EAAE,qBAAqB,EAC5B,QAAQ,EAAE,CAAC,KAAkD,EAAE,EAAE;YAC/D,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YAED,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO;YACT,CAAC;YAED,cAAc,CAAC,KAAoB,CAAC,CAAC;QACvC,CAAC,EACD,OAAO,EAAE,eAAe,GACxB,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,iBAAiB,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oneuptime/common",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.3377",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"airtable": "^0.12.2",
|
|
78
78
|
"axios": "^1.7.2",
|
|
79
79
|
"bullmq": "^5.3.3",
|
|
80
|
-
"Common": "npm:@oneuptime/common@7.0.
|
|
80
|
+
"Common": "npm:@oneuptime/common@7.0.3377",
|
|
81
81
|
"cookie-parser": "^1.4.7",
|
|
82
82
|
"cors": "^2.8.5",
|
|
83
83
|
"cron-parser": "^4.8.1",
|