@opengis/fastify-table 2.5.23 → 2.5.25
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"getData.d.ts","sourceRoot":"","sources":["../../../../../server/routes/table/functions/getData.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAC5C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAuGzD,wBAA8B,OAAO,CACnC,EACE,EAAqB,EACrB,MAAM,EACN,KAAK,EACL,EAAE,EACF,OAAY,EACZ,KAAU,EACV,IAAS,EACT,YAAY,EACZ,YAAY,EACZ,KAAY,EACZ,UAAU,EACV,OAAO,EAAE,YAAY,EACrB,WAAW,EAAE,gBAAgB,EAC7B,OAAO,EAAE,YAAY,EACrB,QAAgB,GACjB,EAAE;IACD,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,MAAM,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACxD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,EACD,KAAK,CAAC,EAAE,YAAY,EACpB,MAAM,CAAC,EAAE,GAAG,gBAk5Bb"}
|
|
@@ -38,7 +38,7 @@ const mockReply = {
|
|
|
38
38
|
},
|
|
39
39
|
send: (txt) => Object.assign(mockReply.response, txt),
|
|
40
40
|
};
|
|
41
|
-
function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, iscalled = false) {
|
|
41
|
+
function getOrder({ queryOrder, queryDesc, defaultOrder, columnList, cols, sqlColumns, iscalled = false, }) {
|
|
42
42
|
if (iscalled && queryOrder) {
|
|
43
43
|
return `order by ${queryOrder}`;
|
|
44
44
|
}
|
|
@@ -47,7 +47,11 @@ function getOrder(queryOrder, queryDesc, defaultOrder, columnList, sqlColumns, i
|
|
|
47
47
|
}
|
|
48
48
|
const orderArr = queryOrder.split(/[|]/g).map((el) => el.split(/[-]/));
|
|
49
49
|
const validOrder = orderArr
|
|
50
|
-
.filter((el) => el[0] &&
|
|
50
|
+
.filter((el) => el[0] &&
|
|
51
|
+
(columnList || "")
|
|
52
|
+
.concat(sqlColumns || "")
|
|
53
|
+
.concat(cols || "")
|
|
54
|
+
.includes(el[0]))
|
|
51
55
|
.map((el) => `${el[0]} ${queryDesc || el[1] === "desc" ? "desc" : ""}`)
|
|
52
56
|
.join(",");
|
|
53
57
|
return `order by ${validOrder || "true::boolean"} nulls last`;
|
|
@@ -294,7 +298,15 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
|
|
|
294
298
|
const offset = query?.page && query?.page > 0 && !objectId ? (query?.page - 1) * limit : 0;
|
|
295
299
|
args.push(offset);
|
|
296
300
|
Object.assign(idx, { offset: args.length });
|
|
297
|
-
const order = getOrder(
|
|
301
|
+
const order = getOrder({
|
|
302
|
+
queryOrder: query?.order,
|
|
303
|
+
queryDesc: query?.desc,
|
|
304
|
+
defaultOrder: loadTable?.order,
|
|
305
|
+
columnList,
|
|
306
|
+
cols,
|
|
307
|
+
sqlColumns: loadTable?.sqlColumns,
|
|
308
|
+
iscalled: !!called,
|
|
309
|
+
});
|
|
298
310
|
const isSearchable = loadTable?.meta?.search &&
|
|
299
311
|
typeof loadTable.meta.search === "string" &&
|
|
300
312
|
query?.search &&
|
|
@@ -354,11 +366,14 @@ export default async function dataAPI({ pg = pgClients.client, params, table, id
|
|
|
354
366
|
interfaceQuery,
|
|
355
367
|
interfaceQuery1,
|
|
356
368
|
].filter(Boolean);
|
|
369
|
+
const omitGeometry = !objectId && loadTable?.showGeometryMode === "card";
|
|
357
370
|
const q1 = `select ${pk ? `"${pk}" as id,` : ""}
|
|
358
371
|
${objectId || query?.key ? "*" : columnsParam || sqlColumns || cols || "*"}
|
|
359
372
|
${metaCols}
|
|
360
373
|
${dbColumns.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
|
|
361
|
-
.length &&
|
|
374
|
+
.length &&
|
|
375
|
+
!columnsParam &&
|
|
376
|
+
!omitGeometry
|
|
362
377
|
? `,${dbColumns
|
|
363
378
|
.filter((el) => pg.pgType?.[el.dataTypeID] === "geometry")
|
|
364
379
|
.map((el) => `st_asgeojson("${el.name.replace(/'/g, "''")}")::json as "${el.name.replace(/'/g, "''")}"`)
|