@magda/org-tree 2.0.0-alpha.5 → 2.0.0-alpha.8

package/bin/org-tree/NestedSetModelQueryer.js

@@ -18010,8 +18010,8 @@ function parseIntParam(p) {
 }
 exports.parseIntParam = parseIntParam;
 exports.MAX_PAGE_RECORD_NUMBER = 500;
-function searchTableRecord(poolOrClient, table, contiditions = [], queryConfig) {
-    var _a, _b, _c;
+function searchTableRecord(poolOrClient, table, conditions = [], queryConfig) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
         if (!table.trim()) {
             throw new ServerError_1.default("invalid empty table name is supplied.");
@@ -18032,7 +18032,7 @@ function searchTableRecord(poolOrClient, table, contiditions = [], queryConfig)
                 ]
             };
         const authConditions = authDecision.toSql(config);
-        const where = sql_syntax_1.default.where(sql_syntax_1.default.joinWithAnd([...contiditions, authConditions]));
+        const where = sql_syntax_1.default.where(sql_syntax_1.default.joinWithAnd([...conditions, authConditions]));
         const sqlSyntax = sql_syntax_1.sqls `SELECT ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.selectedFields) ? sql_syntax_1.default.csv(...queryConfig.selectedFields)
             : sql_syntax_1.sqls `*`} 
         FROM ${escapeIdentifier(table)}
@@ -18043,11 +18043,15 @@ function searchTableRecord(poolOrClient, table, contiditions = [], queryConfig)
             ? sql_syntax_1.default.csv(...queryConfig.groupBy)
             : queryConfig.groupBy}`
             : sql_syntax_1.default.empty}
+        ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.orderBy) ? sql_syntax_1.sqls `ORDER BY ${typeof ((_c = queryConfig.orderBy) === null || _c === void 0 ? void 0 : _c.length) === "number"
+            ? sql_syntax_1.default.csv(...queryConfig.orderBy)
+            : queryConfig.orderBy}`
+            : sql_syntax_1.default.empty}
         ${offset ? sql_syntax_1.sqls `OFFSET ${offset}` : sql_syntax_1.default.empty}
         ${limit ? sql_syntax_1.sqls `LIMIT ${limit}` : sql_syntax_1.default.empty}
         `;
         const result = yield poolOrClient.query(...sqlSyntax.toQuery());
-        if (!((_c = result === null || result === void 0 ? void 0 : result.rows) === null || _c === void 0 ? void 0 : _c.length)) {
+        if (!((_d = result === null || result === void 0 ? void 0 : result.rows) === null || _d === void 0 ? void 0 : _d.length)) {
             return [];
         }
         else {
@@ -18072,9 +18076,9 @@ function getTableRecord(poolOrClient, table, id, authDecision = AuthDecision_1.U
     });
 }
 exports.getTableRecord = getTableRecord;
-function countTableRecord(poolOrClient, table, contiditions = [], authDecision, objectKind, toSqlConfig) {
+function countTableRecord(poolOrClient, table, conditions = [], authDecision, objectKind, toSqlConfig) {
     return __awaiter(this, void 0, void 0, function* () {
-        const records = yield searchTableRecord(poolOrClient, table, contiditions, {
+        const records = yield searchTableRecord(poolOrClient, table, conditions, {
             authDecision,
             objectKind,
             toSqlConfig,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/org-tree",
   "description": "MAGDA Organizational Hierarchy Management Utilities",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.8",
   "bin": {
     "org-tree": "./bin/org-tree/org-tree.js"
   },
@@ -14,9 +14,9 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/authorization-api": "^2.0.0-alpha.5",
-    "@magda/scripts": "^2.0.0-alpha.5",
-    "@magda/typescript-common": "^2.0.0-alpha.5",
+    "@magda/authorization-api": "^2.0.0-alpha.8",
+    "@magda/scripts": "^2.0.0-alpha.8",
+    "@magda/typescript-common": "^2.0.0-alpha.8",
     "fs-extra": "^2.1.2",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.10"
@@ -24,7 +24,7 @@
   "dependencies": {
     "chalk": "^2.4.1",
     "commander": "^2.17.0",
-    "pg": "^7.11.0",
+    "pg": "^8.7.3",
     "text-treeview": "^1.0.1"
   },
   "magda": {
@@ -41,7 +41,7 @@
     "org-tree"
   ],
   "engines": {
-    "node": ">=10.0.0 <13.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "bin"