@magda/org-tree 2.0.0-alpha.1 → 2.0.0-alpha.4

package/bin/org-tree/NestedSetModelQueryer.js

@@ -103,6 +103,18 @@ return /******/ (function(modules) { // webpackBootstrap
 /* 4 */,
 /* 5 */,
 /* 6 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+const uuidRegEx = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+const isUuid = (id) => typeof id === "string" && uuidRegEx.test(id);
+exports.default = isUuid;
+//# sourceMappingURL=isUuid.js.map
+
+/***/ }),
+/* 7 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -602,7 +614,6 @@ function getTableColumnName(columnName, tableRef = "", useLowerCaseColumnName =
 
 
 /***/ }),
-/* 7 */,
 /* 8 */,
 /* 9 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -17850,7 +17861,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.countTableRecord = exports.getTableRecord = exports.searchTableRecord = exports.MAX_PAGE_RECORD_NUMBER = exports.parseIntParam = exports.deleteTableRecord = exports.updateTableRecord = exports.createTableRecord = exports.getTableColumnName = exports.escapeIdentifier = exports.escapeIdentifierStr = void 0;
-const sql_syntax_1 = __importStar(__webpack_require__(6));
+const sql_syntax_1 = __importStar(__webpack_require__(7));
 const AuthDecision_1 = __webpack_require__(11);
 const lodash_1 = __webpack_require__(9);
 const ServerError_1 = __importDefault(__webpack_require__(17));
@@ -18108,7 +18119,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConciseOperand = exports.ConciseExpression = exports.ConciseRule = exports.UnconditionalFalseDecision = exports.UnconditionalTrueDecision = exports.isTrueEquivalent = void 0;
 const AspectQuery_1 = __webpack_require__(16);
-const sql_syntax_1 = __importStar(__webpack_require__(6));
+const sql_syntax_1 = __importStar(__webpack_require__(7));
 class AuthDecision {
     constructor(hasResidualRules, residualRules, result, hasWarns = false, warns = [], unknowns) {
         if (typeof hasResidualRules !== "boolean") {
@@ -18369,9 +18380,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeNotFoundError = void 0;
 const lodash_1 = __importDefault(__webpack_require__(9));
 const tsmonad_1 = __webpack_require__(15);
-const sql_syntax_1 = __importStar(__webpack_require__(6));
+const sql_syntax_1 = __importStar(__webpack_require__(7));
 const SQLUtils_1 = __webpack_require__(10);
 const AuthDecision_1 = __webpack_require__(11);
+const isUuid_1 = __importDefault(__webpack_require__(6));
 const textTree = __webpack_require__(18);
 class NodeNotFoundError extends Error {}
 
@@ -19325,24 +19337,17 @@ class NestedSetModelQueryer {
      */
   updateNode(nodeId, nodeData, client = null) {
     return __awaiter(this, void 0, void 0, function* () {
-      if (nodeId.trim() === "") {
-        throw new Error("nodeId can't be empty!");
-      }
-      const sqlValues = [nodeId];
-      const updateFields = Object.keys(nodeData).filter(k => k !== "left" && k !== "right" && k !== "id");
-      if (!updateFields.length) {
+      if (!isUuid_1.default(nodeId)) {
+        throw new Error("nodeId is not valid UUID!");
+      }
+      const sqlUpdates = Object.keys(nodeData).
+      filter(k => k !== "left" && k !== "right" && k !== "id").
+      map(fieldName => sql_syntax_1.sqls`${SQLUtils_1.escapeIdentifier(fieldName)} = ${nodeData[fieldName]}`);
+      if (!sqlUpdates.length) {
+        console.log("update node parameter: ", nodeId, nodeData);
         throw new Error("No valid node data passed for updating.");
       }
-      const setFieldList = updateFields.
-      map(f => {
-        if (!isValidSqlIdentifier(f)) {
-          throw new Error(`field name: ${f} contains invalid characters!`);
-        }
-        sqlValues.push(nodeData[f]);
-        return `"${f}" = $${sqlValues.length}`;
-      }).
-      join(", ");
-      yield (client ? client : this.pool).query(`UPDATE "${this.tableName}" SET ${setFieldList} WHERE "id" = $1`, sqlValues);
+      yield (client ? client : this.pool).query(...sql_syntax_1.sqls`UPDATE ${SQLUtils_1.escapeIdentifier(this.tableName)} SET ${sql_syntax_1.default.join(sqlUpdates, sql_syntax_1.sqls` , `)} WHERE "id" = ${nodeId}`.toQuery());
     });
   }
   getChildTextTreeNodes(parentId) {
@@ -19468,7 +19473,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AspectQueryGroup = exports.AspectQueryValueInArray = exports.AspectQueryArrayNotEmpty = exports.AspectQueryWithValue = exports.AspectQueryExists = exports.AspectQueryFalse = exports.AspectQueryTrue = exports.AspectQuery = exports.AspectQueryValue = void 0;
-const sql_syntax_1 = __importStar(__webpack_require__(6));
+const sql_syntax_1 = __importStar(__webpack_require__(7));
 const SQLUtils_1 = __webpack_require__(10);
 class AspectQueryValue {
     constructor(value) {

package/bin/org-tree/getNodeIdFromNameOrId.js

@@ -100,7 +100,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ 19:
 /***/ (function(module, exports, __webpack_require__) {
 
-const isUuid = __webpack_require__(7).default;
+const isUuid = __webpack_require__(6).default;
 async function getNodeIdByNameOrId(nameOrId, queryer) {
     if (isUuid(nameOrId)) {
         return nameOrId;
@@ -117,7 +117,7 @@ module.exports = getNodeIdByNameOrId;
 
 /***/ }),
 
-/***/ 7:
+/***/ 6:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";

package/bin/org-tree/getUserIdFromNameOrId.js

@@ -100,7 +100,7 @@ return /******/ (function(modules) { // webpackBootstrap
 /***/ 20:
 /***/ (function(module, exports, __webpack_require__) {
 
-const isUuid = __webpack_require__(7).default;
+const isUuid = __webpack_require__(6).default;
 async function getUserIdFromNameOrId(nameOrId, pool) {
     if (isUuid(nameOrId)) {
         return nameOrId;
@@ -120,7 +120,7 @@ module.exports = getUserIdFromNameOrId;
 
 /***/ }),
 
-/***/ 7:
+/***/ 6:
 /***/ (function(module, exports, __webpack_require__) {
 
 "use strict";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/org-tree",
   "description": "MAGDA Organizational Hierarchy Management Utilities",
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.4",
   "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.1",
-    "@magda/scripts": "^2.0.0-alpha.1",
-    "@magda/typescript-common": "^2.0.0-alpha.1",
+    "@magda/authorization-api": "^2.0.0-alpha.4",
+    "@magda/scripts": "^2.0.0-alpha.4",
+    "@magda/typescript-common": "^2.0.0-alpha.4",
     "fs-extra": "^2.1.2",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.10"