@researchdatabox/sails-hook-redbox-storage-mongo 1.5.0 → 1.5.2

package/api/services/MongoStorageService.js

@@ -12,7 +12,7 @@ var __await = (this && this.__await) || function (v) { return this instanceof __
 var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _arguments, generator) {
     if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
     var g = generator.apply(thisArg, _arguments || []), i, q = [];
-    return i = {}, verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
+    return i = Object.create((typeof AsyncIterator === "function" ? AsyncIterator : Object).prototype), verb("next"), verb("throw"), verb("return", awaitReturn), i[Symbol.asyncIterator] = function () { return this; }, i;
     function awaitReturn(f) { return function (v) { return Promise.resolve(v).then(f, reject); }; }
     function verb(n, f) { if (g[n]) { i[n] = function (v) { return new Promise(function (a, b) { q.push([n, v, a, b]) > 1 || resume(n, v); }); }; if (f) i[n] = f(i[n]); } }
     function resume(n, v) { try { step(g[n](v)); } catch (e) { settle(q[0][3], e); } }
@@ -23,7 +23,8 @@ var __asyncGenerator = (this && this.__asyncGenerator) || function (thisArg, _ar
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Services = void 0;
-const Rx_1 = require("rxjs/Rx");
+const rxjs_1 = require("rxjs");
+const rxjs_2 = require("rxjs");
 const uuid_1 = require("uuid");
 const luxon_1 = require("luxon");
 const mongodb = require("mongodb");
@@ -371,7 +372,7 @@ var Services;
             });
         }
         getDeletedRecords(workflowState_1) {
-            return __awaiter(this, arguments, void 0, function* (workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = 'regex') {
+            return __awaiter(this, arguments, void 0, function* (workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode = 'regex', secondarySort = undefined) {
                 let query = {
                     "deletedRecordMetadata.metaMetadata.brandId": brand.id
                 };
@@ -395,6 +396,9 @@ var Services;
                         options['sort'][`${sort.substring(0, sort.indexOf(':'))}`] = _.toNumber(sort.substring(sort.indexOf(':') + 1));
                     }
                 }
+                if (!_.isEmpty(secondarySort)) {
+                    options['sort'][`${secondarySort.substring(0, secondarySort.indexOf(':'))}`] = _.toNumber(secondarySort.substring(secondarySort.indexOf(':') + 1));
+                }
                 let roleNames = this.getRoleNames(roles, brand);
                 let andArray = [];
                 let permissions = {
@@ -666,10 +670,11 @@ var Services;
         }
         updateDatastream(oid, record, newMetadata, fileRoot, fileIdsAdded) {
             return FormsService.getFormByName(record.metaMetadata.form, true)
-                .flatMap(form => {
+                .pipe((0, rxjs_2.mergeMap)(form => {
+                const typedForm = form;
                 const reqs = [];
-                record.metaMetadata.attachmentFields = form.attachmentFields;
-                _.each(form.attachmentFields, (attField) => __awaiter(this, void 0, void 0, function* () {
+                record.metaMetadata.attachmentFields = typedForm.attachmentFields;
+                _.each(typedForm.attachmentFields, (attField) => __awaiter(this, void 0, void 0, function* () {
                     const oldAttachments = record.metadata[attField];
                     const newAttachments = newMetadata[attField];
                     const removeIds = [];
@@ -692,10 +697,10 @@ var Services;
                     reqs.push(this.addAndRemoveDatastreams(oid, fileIdsAdded, removeIds));
                 }));
                 if (_.isEmpty(reqs)) {
-                    reqs.push(Rx_1.Observable.of({ "request": "dummy" }));
+                    reqs.push((0, rxjs_1.of)({ "request": "dummy" }));
                 }
-                return Rx_1.Observable.of(reqs);
-            });
+                return (0, rxjs_1.of)(reqs);
+            }));
         }
         removeDatastream(oid, datastream) {
             return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@researchdatabox/sails-hook-redbox-storage-mongo",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "A MongoDB storage plugin for ReDBox.",
   "main": "index.js",
   "sails": {
@@ -33,31 +33,30 @@
   "author": "QCIF Engineering dev@redboxresearchdata.com.au",
   "license": "GPL-3.0",
   "devDependencies": {
-    "@researchdatabox/redbox-core-types": "1.4.8",
+    "@researchdatabox/redbox-core-types": "^1.5.0",
     "@types/chai": "5.2.2",
     "@types/lodash": "4.17.17",
     "@types/mocha": "10.0.10",
     "@types/node": "20.17.51",
     "chai": "5.2.0",
     "fs": "0.0.1-security",
-    "mocha": "11.5.0",
-  "mocha-junit-reporter": "2.2.1",
-  "luxon": "^3.7.1",
+    "luxon": "^3.7.1",
+    "mocha": "11.7.1",
+    "mocha-junit-reporter": "2.2.1",
     "mongodb": "6.16.0",
-    "rxjs": "6.6.7",
-    "rxjs-compat": "6.6.7",
     "sails": "1.5.14",
     "stream": "0.0.3",
-    "typescript": "5.5.4",
+    "typescript": "5.9.2",
     "util": "0.12.5"
   },
   "dependencies": {
     "json2csv": "^5.0.3",
     "lodash": "^4.17.21",
-    "uuid": "8.3.0"
+    "uuid": "11.1.0"
   },
   "peerDependencies": {
-    "luxon": ">=3.0.0"
+    "luxon": ">=3.0.0",
+    "rxjs": ">=7.0.0"
   },
   "publishConfig": {
     "access": "public"

package/typescript/api/services/MongoStorageService.ts

@@ -1,6 +1,5 @@
-import {
-  Observable
-} from 'rxjs/Rx';
+import { Observable, of } from 'rxjs';
+import { mergeMap } from 'rxjs';
 
 import { Sails, Model } from "sails";
 import { v1 as uuidv1 } from 'uuid';
@@ -409,7 +408,7 @@ export module Services {
       return record;
     }
 
-    public async getDeletedRecords(workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode:string = 'regex') {
+    public async getDeletedRecords(workflowState, recordType = undefined, start, rows = 10, username, roles, brand, editAccessOnly = undefined, packageType = undefined, sort = undefined, filterFields = undefined, filterString = undefined, filterMode:string = 'regex', secondarySort = undefined) {
 
 
       // BrandId ...
@@ -438,6 +437,11 @@ export module Services {
           options['sort'][`${sort.substring(0, sort.indexOf(':'))}`] = _.toNumber(sort.substring(sort.indexOf(':') + 1));
         }
       }
+
+      if(!_.isEmpty(secondarySort)) {
+        options['sort'][`${secondarySort.substring(0, secondarySort.indexOf(':'))}`] = _.toNumber(secondarySort.substring(secondarySort.indexOf(':') + 1));
+      }
+
       // Authorization ...
       let roleNames = this.getRoleNames(roles, brand);
       let andArray = [];
@@ -736,38 +740,41 @@ export module Services {
     public updateDatastream(oid: string, record, newMetadata, fileRoot, fileIdsAdded): any {
       // loop thru the attachment fields and determine if we need to add or remove
       return FormsService.getFormByName(record.metaMetadata.form, true)
-        .flatMap(form => {
-          const reqs = [];
-          record.metaMetadata.attachmentFields = form.attachmentFields;
-          _.each(form.attachmentFields, async (attField) => {
-            const oldAttachments = record.metadata[attField];
-            const newAttachments = newMetadata[attField];
-            const removeIds = [];
-            // process removals
-            if (!_.isUndefined(oldAttachments) && !_.isNull(oldAttachments) && !_.isNull(newAttachments)) {
-              const toRemove = _.differenceBy(oldAttachments, newAttachments, 'fileId');
-              _.each(toRemove, (removeAtt) => {
-                if (removeAtt.type == 'attachment') {
-                  removeIds.push(new Datastream(removeAtt));
-                }
-              });
-            }
-            // process additions
-            if (!_.isUndefined(newAttachments) && !_.isNull(newAttachments)) {
-              const toAdd = _.differenceBy(newAttachments, oldAttachments, 'fileId');
-              _.each(toAdd, (addAtt) => {
-                if (addAtt.type == 'attachment') {
-                  fileIdsAdded.push(new Datastream(addAtt));
-                }
-              });
+        .pipe(
+          mergeMap(form => {
+            const typedForm = form as { attachmentFields: string[] };
+            const reqs = [];
+            record.metaMetadata.attachmentFields = typedForm.attachmentFields;
+            _.each(typedForm.attachmentFields, async (attField) => {
+              const oldAttachments = record.metadata[attField];
+              const newAttachments = newMetadata[attField];
+              const removeIds = [];
+              // process removals
+              if (!_.isUndefined(oldAttachments) && !_.isNull(oldAttachments) && !_.isNull(newAttachments)) {
+                const toRemove = _.differenceBy(oldAttachments, newAttachments, 'fileId');
+                _.each(toRemove, (removeAtt) => {
+                  if (removeAtt.type == 'attachment') {
+                    removeIds.push(new Datastream(removeAtt));
+                  }
+                });
+              }
+              // process additions
+              if (!_.isUndefined(newAttachments) && !_.isNull(newAttachments)) {
+                const toAdd = _.differenceBy(newAttachments, oldAttachments, 'fileId');
+                _.each(toAdd, (addAtt) => {
+                  if (addAtt.type == 'attachment') {
+                    fileIdsAdded.push(new Datastream(addAtt));
+                  }
+                });
+              }
+              reqs.push(this.addAndRemoveDatastreams(oid, fileIdsAdded, removeIds));
+            });
+            if (_.isEmpty(reqs)) {
+              reqs.push(of({ "request": "dummy" }));
             }
-            reqs.push(this.addAndRemoveDatastreams(oid, fileIdsAdded, removeIds));
-          });
-          if (_.isEmpty(reqs)) {
-            reqs.push(Observable.of({ "request": "dummy" }));
-          }
-          return Observable.of(reqs);
-        });
+            return of(reqs);
+          })
+        );
     }
 
     public async removeDatastream(oid, datastream: Datastream) {