@opengis/gis 0.2.176 → 0.2.178
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/README.md +181 -181
- package/dist/{CardIcon-c1Q2M3wQ.js → CardIcon-CMRD1LLh.js} +1 -1
- package/dist/{EntityTablePage-B5gpkH4S.js → EntityTablePage-XNNCltAN.js} +2 -2
- package/dist/{ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-DnGSvmMU.js → ExtentOutlineLayer.vue_vue_type_script_setup_true_lang-BqUjKTDY.js} +1 -1
- package/dist/{HeaderActions.vue_vue_type_script_setup_true_lang-C2B61JP6.js → HeaderActions.vue_vue_type_script_setup_true_lang-BXQ3hKwa.js} +1 -1
- package/dist/{MapSettings-6-Xru5Q8.js → MapSettings-P3h-vHn3.js} +2 -2
- package/dist/{RastersTablePage-CXNOcTy-.js → RastersTablePage-DnhGZLiH.js} +2 -2
- package/dist/{cartocss-BFVqWvfP.js → cartocss-BkrOeQg4.js} +6 -6
- package/dist/{import-utils-uxk4LdUJ.js → import-utils-BCATsbB5.js} +1 -1
- package/dist/{index-CahlV-Xs.js → index-cUagVqgA.js} +39 -39
- package/dist/index.css +1 -1
- package/dist/index.js +1 -1
- package/dist/index.umd.cjs +5 -5
- package/dist/{raster-CEi56f0P.js → raster-CP0tUp3j.js} +3 -3
- package/dist/{register-NFAGBNa3.js → register-Cr-uQcby.js} +3 -3
- package/dist/{service-BYspag8U.js → service-DwJaKrOd.js} +6 -6
- package/dist/{vs-datatable-CHcBr6zy.js → vs-datatable-B9WoVk-b.js} +2 -2
- package/module/gis/cls/service_type.json +42 -42
- package/module/gis/form/gis.registers.form.json +127 -127
- package/module/test/map/addr.json +302 -302
- package/module/test/map/addr1.yml +23 -23
- package/module/test/select/address.str_id.sql +3 -3
- package/package.json +77 -77
- package/plugin.js +64 -64
- package/server/migrations/array_intersect.sql +13 -13
- package/server/migrations/cartocss.sql +27 -27
- package/server/migrations/group_list.sql +74 -74
- package/server/migrations/maps.sql +30 -30
- package/server/migrations/metadata.sql +415 -415
- package/server/migrations/ogc.sql +106 -106
- package/server/migrations/rasters.sql +265 -265
- package/server/migrations/services.sql +247 -247
- package/server/migrations/services_users_rel.sql +22 -22
- package/server/migrations/widgets.sql +20 -20
- package/server/plugins/crons.js +21 -21
- package/server/plugins/mapnik/funcs/checkRasterFile.js +107 -107
- package/server/plugins/mapnik/funcs/mapnik.js +151 -151
- package/server/plugins/mapnik/funcs/rootFolder.mjs +8 -8
- package/server/plugins/mapnik/map.proto +437 -437
- package/server/plugins/vite.js +74 -74
- package/server/routes/cartocss/cartocss.route.js +31 -31
- package/server/routes/cartocss/cartocss.route.test.js +78 -78
- package/server/routes/cartocss/cartocss.schema.js +73 -73
- package/server/routes/cartocss/functions/add.cartocss.js +39 -39
- package/server/routes/cartocss/functions/get.cartocss.js +57 -57
- package/server/routes/gis/functions/checkXML.js +107 -107
- package/server/routes/gis/functions/dashboard.js +24 -24
- package/server/routes/gis/gis.route.js +26 -26
- package/server/routes/gis/gis.route.test.js +33 -33
- package/server/routes/map/functions/clearTiles.js +35 -35
- package/server/routes/map/functions/geojson.js +187 -187
- package/server/routes/map/functions/gis.convert.js +65 -65
- package/server/routes/map/functions/gis.icon.js +220 -220
- package/server/routes/map/functions/jsonData.js +206 -206
- package/server/routes/map/functions/layerList.js +102 -102
- package/server/routes/map/functions/map.js +122 -122
- package/server/routes/map/functions/mapCatalog.js +72 -72
- package/server/routes/map/functions/mapCatalogAttribute.js +53 -53
- package/server/routes/map/functions/mapFeatures.js +133 -133
- package/server/routes/map/functions/mapFormat.js +232 -232
- package/server/routes/map/functions/mapTiles.js +162 -162
- package/server/routes/map/functions/maps.js +15 -15
- package/server/routes/map/functions/marker_icon.js +43 -43
- package/server/routes/map/functions/parseGeoFile.js +85 -85
- package/server/routes/map/functions/pointHeight.js +51 -51
- package/server/routes/map/functions/vtile.js +174 -174
- package/server/routes/map/functions/vtile1.js +185 -185
- package/server/routes/map/map.route.js +280 -280
- package/server/routes/map/map.route.test.js +503 -503
- package/server/routes/map/map.schema.js +356 -356
- package/server/routes/map/pin/circle1.svg +76 -76
- package/server/routes/map/pin/circle2.svg +18 -18
- package/server/routes/map/pin/none.svg +12 -12
- package/server/routes/map/pin/pin.svg +14 -14
- package/server/routes/map/pin/pin1.svg +16 -16
- package/server/routes/map/pin/pin2.svg +7 -7
- package/server/routes/map/pin/pin3.svg +34 -34
- package/server/routes/map/pin/pin4.svg +14 -14
- package/server/routes/map/pin/pin5.svg +7 -7
- package/server/routes/map/pin/pin6.svg +12 -12
- package/server/routes/map/pin/pin7.svg +12 -12
- package/server/routes/mapnik/functions/cartoBounds.js +32 -32
- package/server/routes/mapnik/functions/clearTiles.js +103 -103
- package/server/routes/mapnik/functions/convertBoundToTile.js +27 -27
- package/server/routes/mapnik/functions/createXml.js +76 -76
- package/server/routes/mapnik/functions/createXmlMulti.js +72 -72
- package/server/routes/mapnik/functions/fileSearch.js +35 -35
- package/server/routes/mapnik/functions/fileStat.js +28 -28
- package/server/routes/mapnik/functions/pretile.js +138 -138
- package/server/routes/mapnik/functions/rasterInfo.js +66 -66
- package/server/routes/mapnik/functions/readDir.js +22 -22
- package/server/routes/mapnik/functions/rtile.js +164 -164
- package/server/routes/mapnik/functions/uploadRaster.js +152 -152
- package/server/routes/mapnik/functions/uploadXML.js +140 -140
- package/server/routes/mapnik/mapnik.route.js +102 -102
- package/server/routes/mapnik/mapnik.route.test.js +370 -370
- package/server/routes/mapnik/mapnik.schema.mjs +195 -195
- package/server/routes/mapnik.prefixless/functions/mapnikLogger.js +31 -31
- package/server/routes/mapnik.prefixless/functions/mapnikStat.js +21 -21
- package/server/routes/mapnik.prefixless/mapnik.prefixless.route.js +20 -20
- package/server/routes/mapnik.prefixless/mapnik.prefixless.route.test.js +91 -91
- package/server/routes/mapnik.prefixless/mapnik.prefixless.schema.mjs +27 -27
- package/server/routes/maps/functions/add.map.js +42 -42
- package/server/routes/maps/functions/del.map.js +17 -17
- package/server/routes/maps/functions/get.map.js +119 -119
- package/server/routes/maps/maps.route.js +58 -58
- package/server/routes/maps/maps.route.test.js +231 -231
- package/server/routes/maps/maps.schema.js +9 -9
- package/server/routes/metadata/functions/editMetadata.js +35 -35
- package/server/routes/metadata/functions/metadataXML.js +19 -19
- package/server/routes/metadata/metadata.route.js +26 -26
- package/server/routes/metadata/metadata.route.test.js +46 -46
- package/server/routes/metadata/metadata.schema.js +53 -53
- package/server/routes/ogc/functions/map.info.point.js +117 -117
- package/server/routes/ogc/ogc.route.js +21 -21
- package/server/routes/ogc/ogc.route.test.js +53 -53
- package/server/routes/ogc/ogc.schema.js +16 -16
- package/server/routes/permissions/functions/catalog.permissions.edit.js +20 -20
- package/server/routes/permissions/functions/catalog.permissions.js +12 -12
- package/server/routes/permissions/functions/get.permissions.js +59 -59
- package/server/routes/permissions/functions/gis.catalog.js +80 -80
- package/server/routes/permissions/permissions.route.js +35 -35
- package/server/routes/permissions/permissions.route.test.js +35 -35
- package/server/routes/permissions/permissions.schema.js +43 -43
- package/server/routes/registers/functions/add.registry.js +37 -37
- package/server/routes/registers/functions/classifiers.js +100 -100
- package/server/routes/registers/functions/columns.js +3 -3
- package/server/routes/registers/functions/content.type.js +9 -9
- package/server/routes/registers/functions/del.registry.js +14 -14
- package/server/routes/registers/functions/get.info.js +93 -93
- package/server/routes/registers/functions/getFilterSQLParametrized/formatValue.js +312 -0
- package/server/routes/registers/functions/getFilterSQLParametrized/getFilterQuery.js +126 -0
- package/server/routes/registers/functions/getFilterSQLParametrized/getRangeQuery.js +353 -0
- package/server/routes/registers/functions/getFilterSQLParametrized/index.js +81 -0
- package/server/routes/registers/functions/getTableColumnMeta.js +125 -0
- package/server/routes/registers/functions/gis.export.js +159 -159
- package/server/routes/registers/functions/gis.registry.js +71 -71
- package/server/routes/registers/functions/gis.registry.list.js +61 -61
- package/server/routes/registers/functions/gis.suggest.js +275 -0
- package/server/routes/registers/functions/handleRegistryRequest.js +175 -147
- package/server/routes/registers/functions/map.registry.js +87 -87
- package/server/routes/registers/registers.route.js +91 -80
- package/server/routes/registers/registers.route.test.js +173 -144
- package/server/routes/registers/registers.schema.js +275 -246
- package/server/routes/root.mjs +3 -3
- package/server/routes/services/functions/add.service.js +62 -62
- package/server/routes/services/functions/create.route.js +93 -93
- package/server/routes/services/functions/del.service.js +12 -12
- package/server/routes/services/functions/get.layer.geom.js +27 -27
- package/server/routes/services/functions/get.service.users.js +76 -76
- package/server/routes/services/functions/get.services.col.js +34 -34
- package/server/routes/services/functions/get.services.js +89 -89
- package/server/routes/services/functions/legend.auto.js +77 -77
- package/server/routes/services/services.route.js +76 -76
- package/server/routes/services/services.route.test.js +167 -167
- package/server/routes/services/services.schema.js +285 -278
- package/server/routes/widgets/functions/add.widget.js +38 -38
- package/server/routes/widgets/functions/del.widget.js +17 -17
- package/server/routes/widgets/functions/get.widget.js +41 -41
- package/server/routes/widgets/widgets.route.js +61 -61
- package/server/routes/widgets/widgets.route.test.js +144 -144
- package/server/routes/widgets/widgets.schema.js +24 -24
- package/server/shared/listFiles.js +14 -14
- package/utils.js +13 -13
|
@@ -0,0 +1,353 @@
|
|
|
1
|
+
/* eslint-disable no-restricted-globals */
|
|
2
|
+
const dateTypeList = [
|
|
3
|
+
"date",
|
|
4
|
+
"timestamp",
|
|
5
|
+
"timestamp without time zone",
|
|
6
|
+
"timestamp with time zone",
|
|
7
|
+
];
|
|
8
|
+
const numberTypeList = [
|
|
9
|
+
"float8",
|
|
10
|
+
"int4",
|
|
11
|
+
"int8",
|
|
12
|
+
"numeric",
|
|
13
|
+
"double precision",
|
|
14
|
+
"integer",
|
|
15
|
+
"bigint",
|
|
16
|
+
];
|
|
17
|
+
|
|
18
|
+
const isValidDate = (dateStr) => {
|
|
19
|
+
if (!dateStr) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
if (["min", "max", "cd", "cw", "cm", "cq", "cy"].includes(dateStr)) {
|
|
24
|
+
return true;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
// iso date: 2024-01-01
|
|
28
|
+
if (dateStr.includes("-")) {
|
|
29
|
+
return new Date(dateStr).toString() !== "Invalid Date";
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
// locale date: 01.01.2024
|
|
33
|
+
const [dd, mm, yyyy] = dateStr.split(".");
|
|
34
|
+
return new Date(`${yyyy}-${mm}-${dd}`).toString() !== "Invalid Date";
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
const isValidNumber = (numStr) =>
|
|
38
|
+
["min", "max"].includes(numStr) ? true : !isNaN(numStr);
|
|
39
|
+
|
|
40
|
+
function dt(y, m, d) {
|
|
41
|
+
return new Date(Date.UTC(y, m, d)).toISOString().slice(0, 10);
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
const dp = {
|
|
45
|
+
d: new Date().getDate(),
|
|
46
|
+
w: new Date().getDate() - (new Date().getDay() || 7) + 1,
|
|
47
|
+
m: new Date().getMonth(),
|
|
48
|
+
q: parseFloat((new Date().getMonth() / 4).toFixed()) * 3,
|
|
49
|
+
y: new Date().getFullYear(),
|
|
50
|
+
};
|
|
51
|
+
function formatDateISOString(date) {
|
|
52
|
+
if (!date?.includes(".")) return date;
|
|
53
|
+
const [day, month, year] = date.split(".");
|
|
54
|
+
return `${year}-${month}-${day}`;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
function checkValid(
|
|
58
|
+
value,
|
|
59
|
+
fieldType,
|
|
60
|
+
filterType,
|
|
61
|
+
sql,
|
|
62
|
+
) {
|
|
63
|
+
const sep =
|
|
64
|
+
(value.includes(",") ? "," : null) ||
|
|
65
|
+
(value.includes("_") ? "_" : null) ||
|
|
66
|
+
(value.includes("-") ? "-" : null);
|
|
67
|
+
|
|
68
|
+
// number range w/o valid separator => skip invalid filter
|
|
69
|
+
if (filterType === "range" && !sep) {
|
|
70
|
+
return { isvalid: false };
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
// date range, specific options: current day, week, month, year etc.
|
|
74
|
+
if (["date", "datepicker"].includes(filterType) && value === "cd") {
|
|
75
|
+
return {
|
|
76
|
+
min: dt(dp.y, dp.m, dp.d),
|
|
77
|
+
max: dt(dp.y, dp.m, dp.d),
|
|
78
|
+
isvalid: true,
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
if (["date", "datepicker"].includes(filterType) && value === "cw") {
|
|
83
|
+
return {
|
|
84
|
+
min: dt(dp.y, dp.m, dp.w),
|
|
85
|
+
max: dt(dp.y, dp.m, dp.w + 6),
|
|
86
|
+
isvalid: true,
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
if (["date", "datepicker"].includes(filterType) && value === "cm") {
|
|
91
|
+
return {
|
|
92
|
+
min: dt(dp.y, dp.m, 1),
|
|
93
|
+
max: dt(dp.y, dp.m + 1, 0),
|
|
94
|
+
isvalid: true,
|
|
95
|
+
};
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
if (["date", "datepicker"].includes(filterType) && value === "cq") {
|
|
99
|
+
return {
|
|
100
|
+
min: dt(dp.y, dp.q, 1),
|
|
101
|
+
max: dt(dp.y, dp.q + 3, 0),
|
|
102
|
+
isvalid: true,
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
if (["date", "datepicker"].includes(filterType) && value === "cy") {
|
|
107
|
+
return {
|
|
108
|
+
min: dt(dp.y, 0, 1),
|
|
109
|
+
max: dt(dp.y, 11, 31),
|
|
110
|
+
isvalid: true,
|
|
111
|
+
};
|
|
112
|
+
}
|
|
113
|
+
|
|
114
|
+
// specific period from now - days, months, years
|
|
115
|
+
if (
|
|
116
|
+
["date", "datepicker"].includes(filterType) &&
|
|
117
|
+
value.match(/^(?<val>[1-9]\d*)(?<unit>d|m|y)$/)?.groups?.unit
|
|
118
|
+
) {
|
|
119
|
+
const { val, unit } =
|
|
120
|
+
value.match(/^(?<val>[1-9]\d*)(?<unit>d|m|y)$/)?.groups || {};
|
|
121
|
+
const min =
|
|
122
|
+
(unit === "d" ? dt(dp.y, dp.m, dp.d - +val) : null) ||
|
|
123
|
+
(unit === "m" ? dt(dp.y, dp.m - +val, dp.d) : null) ||
|
|
124
|
+
(unit === "y" ? dt(dp.y - +val, dp.m, dp.d) : null);
|
|
125
|
+
return {
|
|
126
|
+
min,
|
|
127
|
+
max: dt(dp.y, dp.m, dp.d),
|
|
128
|
+
isvalid: isValidDate(min),
|
|
129
|
+
};
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
// specific quarter - before skip date value validation
|
|
133
|
+
if (
|
|
134
|
+
["date", "datepicker"].includes(filterType) &&
|
|
135
|
+
value.match(/^(?<year>\d{4})-q(?<quarter>[1-4])$/)?.groups?.quarter
|
|
136
|
+
) {
|
|
137
|
+
const { year, quarter } =
|
|
138
|
+
value.match(/^(?<year>\d{4})-q(?<quarter>[1-4])$/)?.groups || {};
|
|
139
|
+
const startMonth = +quarter * 3;
|
|
140
|
+
return {
|
|
141
|
+
min: dt(year, startMonth - 3, 1),
|
|
142
|
+
max: dt(year, startMonth, 0),
|
|
143
|
+
isvalid: true,
|
|
144
|
+
};
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
// date value validation
|
|
148
|
+
if (
|
|
149
|
+
["date", "datepicker"].includes(filterType) &&
|
|
150
|
+
!sep &&
|
|
151
|
+
!isValidDate(value)
|
|
152
|
+
) {
|
|
153
|
+
return { isvalid: false };
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
// specific date / day
|
|
157
|
+
if (
|
|
158
|
+
["date", "datepicker"].includes(filterType) &&
|
|
159
|
+
value.match(/^\d{4}-\d{2}-\d{2}$/)?.[0]
|
|
160
|
+
) {
|
|
161
|
+
return {
|
|
162
|
+
min: new Date(value).toISOString().split("T")[0],
|
|
163
|
+
max: new Date(value).toISOString().split("T")[0],
|
|
164
|
+
isvalid: true,
|
|
165
|
+
};
|
|
166
|
+
}
|
|
167
|
+
|
|
168
|
+
// specific month
|
|
169
|
+
if (
|
|
170
|
+
["date", "datepicker"].includes(filterType) &&
|
|
171
|
+
value.match(/^\d{4}-\d{2}$/)?.[0]
|
|
172
|
+
) {
|
|
173
|
+
return {
|
|
174
|
+
min: new Date(value).toISOString().split("T")[0],
|
|
175
|
+
max: dt(new Date(value).getFullYear(), new Date(value).getMonth() + 1, 0),
|
|
176
|
+
isvalid: true,
|
|
177
|
+
};
|
|
178
|
+
}
|
|
179
|
+
|
|
180
|
+
// specific year
|
|
181
|
+
if (
|
|
182
|
+
["date", "datepicker"].includes(filterType) &&
|
|
183
|
+
value.match(/^\d{4}$/)?.[0]
|
|
184
|
+
) {
|
|
185
|
+
return {
|
|
186
|
+
min: dt(value, 0, 1),
|
|
187
|
+
max: dt(value, 11, 31),
|
|
188
|
+
isvalid: true,
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
if (sep) {
|
|
193
|
+
const [minValue = "min", maxValue = "max"] = value.split(sep);
|
|
194
|
+
// range for numbers
|
|
195
|
+
if (filterType === "range" && fieldType) {
|
|
196
|
+
const isvalid =
|
|
197
|
+
(numberTypeList.includes(fieldType) || sql) &&
|
|
198
|
+
isValidNumber(minValue) &&
|
|
199
|
+
isValidNumber(maxValue);
|
|
200
|
+
return { min: minValue, max: maxValue, isvalid };
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
// date range, example: 01.01.2024-31.12.2024
|
|
204
|
+
if (["date", "datepicker"].includes(filterType)) {
|
|
205
|
+
const min = minValue === "min" ? minValue : formatDateISOString(minValue);
|
|
206
|
+
const max = maxValue === "max" ? maxValue : formatDateISOString(maxValue);
|
|
207
|
+
const isvalid =
|
|
208
|
+
fieldType &&
|
|
209
|
+
(dateTypeList.includes(fieldType) || sql) &&
|
|
210
|
+
isValidDate(min) &&
|
|
211
|
+
isValidDate(max);
|
|
212
|
+
return { min, max, isvalid };
|
|
213
|
+
}
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
return { isvalid: false };
|
|
217
|
+
}
|
|
218
|
+
export default function getRangeQuery({
|
|
219
|
+
value,
|
|
220
|
+
name,
|
|
221
|
+
fieldType,
|
|
222
|
+
filterType,
|
|
223
|
+
sql,
|
|
224
|
+
args: argsParams,
|
|
225
|
+
}) {
|
|
226
|
+
const { min, max, isvalid } = checkValid(
|
|
227
|
+
value,
|
|
228
|
+
fieldType,
|
|
229
|
+
filterType,
|
|
230
|
+
sql,
|
|
231
|
+
);
|
|
232
|
+
if (!isvalid) {
|
|
233
|
+
return { query: "false" };
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
const args = Array.from(argsParams || []);
|
|
237
|
+
|
|
238
|
+
const checkBoth =
|
|
239
|
+
sql && typeof sql === "string" && sql.includes("$1") && sql.includes("$2");
|
|
240
|
+
|
|
241
|
+
// with sql subquery
|
|
242
|
+
if (
|
|
243
|
+
filterType &&
|
|
244
|
+
["date", "datepicker"].includes(filterType) &&
|
|
245
|
+
typeof sql === "string"
|
|
246
|
+
) {
|
|
247
|
+
if (checkBoth) {
|
|
248
|
+
args.push(min);
|
|
249
|
+
args.push(max);
|
|
250
|
+
} else {
|
|
251
|
+
args.push(min || max);
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
return {
|
|
255
|
+
query: sql,
|
|
256
|
+
values: checkBoth ? [min, max] : [min || max],
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
// with sql subquery
|
|
260
|
+
if (filterType && ["range"].includes(filterType) && sql) {
|
|
261
|
+
if (checkBoth) {
|
|
262
|
+
args.push(min);
|
|
263
|
+
args.push(max);
|
|
264
|
+
} else {
|
|
265
|
+
args.push(min || max);
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
return {
|
|
269
|
+
query: sql,
|
|
270
|
+
values: checkBoth ? [min, max] : [min || max],
|
|
271
|
+
};
|
|
272
|
+
}
|
|
273
|
+
|
|
274
|
+
// preset date values
|
|
275
|
+
if (
|
|
276
|
+
filterType &&
|
|
277
|
+
["date", "datepicker"].includes(filterType) &&
|
|
278
|
+
["cd", "cw", "cm", "cq", "cy"].includes(value)
|
|
279
|
+
) {
|
|
280
|
+
if (value === "cd") {
|
|
281
|
+
args.push(min);
|
|
282
|
+
} else {
|
|
283
|
+
args.push(min);
|
|
284
|
+
args.push(max);
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
const query =
|
|
288
|
+
value === "cd"
|
|
289
|
+
? `${name}::date = $${args.length}::date`
|
|
290
|
+
: `${name}::date between $${args.length - 1}::date and $${args.length
|
|
291
|
+
}::date`;
|
|
292
|
+
return { query, values: value === "cd" ? [min] : [min, max] };
|
|
293
|
+
}
|
|
294
|
+
|
|
295
|
+
// same date
|
|
296
|
+
if (
|
|
297
|
+
filterType &&
|
|
298
|
+
["date", "datepicker"].includes(filterType) &&
|
|
299
|
+
max &&
|
|
300
|
+
min &&
|
|
301
|
+
min === max
|
|
302
|
+
) {
|
|
303
|
+
args.push(min);
|
|
304
|
+
return { query: `${name}::date = $${args.length}::date`, values: [min] };
|
|
305
|
+
}
|
|
306
|
+
|
|
307
|
+
// skip, same as 1=1
|
|
308
|
+
if (
|
|
309
|
+
filterType &&
|
|
310
|
+
["range"].includes(filterType) &&
|
|
311
|
+
min === "min" &&
|
|
312
|
+
max === "max"
|
|
313
|
+
) {
|
|
314
|
+
return { query: "true" };
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
// default
|
|
318
|
+
if (filterType && max === "max") {
|
|
319
|
+
args.push(min);
|
|
320
|
+
const query = ["date", "datepicker"].includes(filterType)
|
|
321
|
+
? `${name} >= $${args.length}::date`
|
|
322
|
+
: `${name} >= $${args.length}`;
|
|
323
|
+
return {
|
|
324
|
+
query,
|
|
325
|
+
values: [min],
|
|
326
|
+
};
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
if (filterType && min === "min") {
|
|
330
|
+
args.push(max);
|
|
331
|
+
const query = ["date", "datepicker"].includes(filterType)
|
|
332
|
+
? `${name} <= $${args.length}::date`
|
|
333
|
+
: `${name} <= $${args.length}`;
|
|
334
|
+
return { query, values: [max] };
|
|
335
|
+
}
|
|
336
|
+
|
|
337
|
+
if (filterType && ["date", "datepicker"].includes(filterType)) {
|
|
338
|
+
args.push(min);
|
|
339
|
+
args.push(max);
|
|
340
|
+
return {
|
|
341
|
+
query: `${name}::date between $${args.length - 1}::date and $${args.length
|
|
342
|
+
}::date`,
|
|
343
|
+
values: [min, max],
|
|
344
|
+
};
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
args.push(min);
|
|
348
|
+
args.push(max);
|
|
349
|
+
return {
|
|
350
|
+
query: `${name} between $${args.length - 1} and $${args.length}`,
|
|
351
|
+
values: [min, max],
|
|
352
|
+
};
|
|
353
|
+
}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
import { BadRequestError } from "@opengis/fastify-table/errors.js";
|
|
2
|
+
import { pgClients } from "@opengis/fastify-table/utils.js";
|
|
3
|
+
|
|
4
|
+
// filter util
|
|
5
|
+
import getFilterQuery from "./getFilterQuery.js";
|
|
6
|
+
|
|
7
|
+
export default function getFilterSQLParametrized({
|
|
8
|
+
table,
|
|
9
|
+
fields = [],
|
|
10
|
+
filter,
|
|
11
|
+
search,
|
|
12
|
+
searchColumn: searchColumn1,
|
|
13
|
+
filterList,
|
|
14
|
+
query,
|
|
15
|
+
uid,
|
|
16
|
+
}, pg = pgClients.client) {
|
|
17
|
+
if (!pg) {
|
|
18
|
+
throw new Error("empty pg");
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (!table) {
|
|
22
|
+
throw BadRequestError("param table is required");
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
if (!pg.pk[table]) {
|
|
26
|
+
throw BadRequestError("param table is invalid");
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
const args = Array.from([]);
|
|
30
|
+
|
|
31
|
+
const autoSearchColumn = fields
|
|
32
|
+
?.filter((el) => pg.pgType?.[el.dataTypeID] === "text")
|
|
33
|
+
?.map((el) => `"${el.name}"`)
|
|
34
|
+
.join(",");
|
|
35
|
+
|
|
36
|
+
const searchColumn =
|
|
37
|
+
searchColumn1 ||
|
|
38
|
+
autoSearchColumn;
|
|
39
|
+
|
|
40
|
+
const where = [];
|
|
41
|
+
|
|
42
|
+
|
|
43
|
+
if (search && searchColumn && typeof search === "string") {
|
|
44
|
+
args.push(
|
|
45
|
+
`%${decodeURIComponent(search.replace(/%/g, "%25")).replace(
|
|
46
|
+
/%/g,
|
|
47
|
+
"\\%"
|
|
48
|
+
)}%`
|
|
49
|
+
);
|
|
50
|
+
where.push(
|
|
51
|
+
`(${searchColumn
|
|
52
|
+
.split(",")
|
|
53
|
+
?.map((name) => `${name}::text ilike $${args.length}`)
|
|
54
|
+
?.join(" or ")})`
|
|
55
|
+
);
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const filters = getFilterQuery(
|
|
59
|
+
{
|
|
60
|
+
filter,
|
|
61
|
+
table,
|
|
62
|
+
fields,
|
|
63
|
+
filterList,
|
|
64
|
+
uid,
|
|
65
|
+
args,
|
|
66
|
+
},
|
|
67
|
+
pg
|
|
68
|
+
);
|
|
69
|
+
|
|
70
|
+
const filterQuery = filters
|
|
71
|
+
.filter((el) => el.query)
|
|
72
|
+
.map((el) => `${el.query}`)
|
|
73
|
+
.join(" and ");
|
|
74
|
+
|
|
75
|
+
const q = where
|
|
76
|
+
.concat([query, filterQuery])
|
|
77
|
+
.filter(Boolean)
|
|
78
|
+
.join(" and ");
|
|
79
|
+
|
|
80
|
+
return { q, args };
|
|
81
|
+
}
|
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
import {
|
|
2
|
+
pgClients,
|
|
3
|
+
getTemplate,
|
|
4
|
+
getMeta,
|
|
5
|
+
getSelect,
|
|
6
|
+
getFilter,
|
|
7
|
+
} from "@opengis/fastify-table/utils.js";
|
|
8
|
+
|
|
9
|
+
const defaultLimit = 50;
|
|
10
|
+
|
|
11
|
+
export default async function getTableColumnMeta(
|
|
12
|
+
{
|
|
13
|
+
table,
|
|
14
|
+
template,
|
|
15
|
+
column: queryColumn,
|
|
16
|
+
filtered,
|
|
17
|
+
startsWith,
|
|
18
|
+
key,
|
|
19
|
+
},
|
|
20
|
+
pg = pgClients.client
|
|
21
|
+
) {
|
|
22
|
+
if (!table || !queryColumn) {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
const metaColumns = await getMeta(
|
|
27
|
+
{
|
|
28
|
+
pg,
|
|
29
|
+
table,
|
|
30
|
+
},
|
|
31
|
+
).then((r) => r?.columns || []);
|
|
32
|
+
|
|
33
|
+
const { dataTypeID } =
|
|
34
|
+
(metaColumns || []).find((col) => col?.name === queryColumn) || {};
|
|
35
|
+
|
|
36
|
+
const { table: tableName, sql } = template
|
|
37
|
+
? await getTemplate("table", template)
|
|
38
|
+
: { table };
|
|
39
|
+
|
|
40
|
+
const filters = template
|
|
41
|
+
? await getFilter({ pg, table: template }).then((el) => el.list)
|
|
42
|
+
: null;
|
|
43
|
+
|
|
44
|
+
const { data: clsName } =
|
|
45
|
+
(filters || []).find((el) => el.name === queryColumn) || {};
|
|
46
|
+
const { arr, sql: select } =
|
|
47
|
+
(await getSelect(clsName || queryColumn, pg)) || // cls name === table:column
|
|
48
|
+
(await getSelect(queryColumn, pg)) || // cls name === column name
|
|
49
|
+
{};
|
|
50
|
+
|
|
51
|
+
const sqlTable =
|
|
52
|
+
(sql || [])
|
|
53
|
+
.filter(
|
|
54
|
+
(el) =>
|
|
55
|
+
!el.disabled && el.sql && el.sql.includes(queryColumn) && false
|
|
56
|
+
)
|
|
57
|
+
.map(
|
|
58
|
+
(el, i) =>
|
|
59
|
+
` left join lateral (${el.sql}) ${el.name || `t${i}`} on 1=1 `
|
|
60
|
+
)
|
|
61
|
+
?.join("") || "";
|
|
62
|
+
|
|
63
|
+
if (arr?.length && !arr.find((el) => el.id === "null")) {
|
|
64
|
+
arr.push({
|
|
65
|
+
color: "#B8B8B8",
|
|
66
|
+
icon: null,
|
|
67
|
+
id: "null",
|
|
68
|
+
text: "Показати порожні значення",
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
// w/out select
|
|
73
|
+
const searchQueryDefault =
|
|
74
|
+
startsWith && key
|
|
75
|
+
? `(left(lower("text"::text),${key.length}) = $1 )`
|
|
76
|
+
: '(lower("text"::text) ~ $1 )';
|
|
77
|
+
|
|
78
|
+
// w/ select
|
|
79
|
+
const searchQuerySelect =
|
|
80
|
+
startsWith && key
|
|
81
|
+
? `id in ( with cc(id, text) as (${select}) select id from cc where (left(lower("text"),${key.length})=$1) )`
|
|
82
|
+
: `id in ( with cc(id, text) as (${select}) select id from cc where (lower("text") ~ $1) )`;
|
|
83
|
+
|
|
84
|
+
if (pg.pgType?.[dataTypeID]?.includes("[]")) {
|
|
85
|
+
const original = filtered
|
|
86
|
+
? `with c(id,text) as (select id, id as text from (select unnest("${queryColumn.replace(
|
|
87
|
+
/"/g,
|
|
88
|
+
""
|
|
89
|
+
)}") as id from ${tableName} t ${sqlTable})q group by id) select id, text from c`
|
|
90
|
+
: `with c(id,text) as (select id, id as text, count(*) from (select unnest("${queryColumn.replace(
|
|
91
|
+
/"/g,
|
|
92
|
+
""
|
|
93
|
+
)}") as id from ${tableName} t ${sqlTable})q group by id limit ${defaultLimit}) select * from c`;
|
|
94
|
+
|
|
95
|
+
return {
|
|
96
|
+
arr,
|
|
97
|
+
original,
|
|
98
|
+
searchQuery: select ? searchQuerySelect : searchQueryDefault,
|
|
99
|
+
pk: "id",
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
const original = filtered
|
|
104
|
+
? `with c(id,text) as (select rtrim( replace( replace( replace( encode("${queryColumn.replace(/"/g, '')}"::bytea, 'base64'), '+', '' ), '-', '' ), '/', '' ), '=' ) as id, "${queryColumn.replace(
|
|
105
|
+
/"/g,
|
|
106
|
+
""
|
|
107
|
+
)}" as text from ${tableName} t ${sqlTable} group by "${queryColumn.replace(
|
|
108
|
+
/"/g,
|
|
109
|
+
""
|
|
110
|
+
)}") select id, text from c`
|
|
111
|
+
: `with c(id,text) as (select rtrim( replace( replace( replace( encode("${queryColumn.replace(/"/g, '')}"::bytea, 'base64'), '+', '' ), '-', '' ), '/', '' ), '=' ) as id, "${queryColumn.replace(
|
|
112
|
+
/"/g,
|
|
113
|
+
""
|
|
114
|
+
)}" as text, count(*) from ${tableName} t ${sqlTable} group by "${queryColumn.replace(
|
|
115
|
+
/"/g,
|
|
116
|
+
""
|
|
117
|
+
)}" limit ${defaultLimit}) select * from c`;
|
|
118
|
+
|
|
119
|
+
return {
|
|
120
|
+
arr,
|
|
121
|
+
original,
|
|
122
|
+
searchQuery: select ? searchQuerySelect : searchQueryDefault,
|
|
123
|
+
pk: "id",
|
|
124
|
+
};
|
|
125
|
+
}
|