Merge branch 'develop' into feature/web-ui-for-lookup-records

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20.13.1-buster
+FROM node:20.14.0-buster
 ENV node_env production
 ENV NPM_CONFIG_PREFIX=/home/node/.npm-global
 ENV PATH=$PATH:/home/node/.npm-global/bin

core/src/decorator/PopulateExportedMethods.decorator.ts

@@ -0,0 +1,6 @@
+export function PopulateExportedMethods <T extends { new (...args: any[]): {} }>(constructor: T) {
+  return class extends constructor {
+    _exportedMethods: any =Object.getOwnPropertyNames(constructor.prototype)
+    .filter(prop => prop !== 'constructor' && typeof this[prop] === 'function');
+  };
+}

core/src/decorator/index.ts

@@ -0,0 +1,3 @@
+export {
+    PopulateExportedMethods
+} from './PopulateExportedMethods.decorator';

core/src/index.ts

@@ -48,4 +48,5 @@ export {
 }
 from "./RecordAuditParams";
 
-export * from './model'
+export * from './model'
+export * from './decorator'

package.json

@@ -48,7 +48,7 @@
     "mongodb": "^6.3.0",
     "node-cache": "^5.1.2",
     "node-schedule": "^2.1.1",
-    "nodemailer": "^6.9.13",
+    "nodemailer": "^6.9.14",
     "numeral": "^2.0.6",
     "openid-client": "^5.6.5",
     "passport": "^0.7.0",
@@ -64,7 +64,7 @@
     "sails-hook-orm": "^4.0.3",
     "sails-hook-sockets": "^3.0.0",
     "sails-mongo": "^2.1.1",
-    "sass": "^1.77.4",
+    "sass": "^1.77.6",
     "sass-loader": "^14.2.1",
     "skipper": "^0.9.4",
     "skipper-gridfs": "^1.0.2",
@@ -74,11 +74,11 @@
     "ts-node": "^10.9.2",
     "tus-node-server": "^0.9.0",
     "typescript": "5.4",
-    "typescript-json-schema": "^0.63.0",
+    "typescript-json-schema": "^0.64.0",
     "typescript-require": "~0.3.0",
     "url-pattern": "^1.0.3",
-    "webpack": "^5.91.0",
-    "zone.js": "^0.14.6"
+    "webpack": "^5.92.0",
+    "zone.js": "^0.14.7"
   },
   "scripts": {
     "debug": "node debug app.js",

tsconfig.json

@@ -4,7 +4,8 @@
       "outDir": "./",
       "rootDir": "./typescript",
       "strict": false,
-      "inlineSourceMap": true
+      "inlineSourceMap": true,
+      "experimentalDecorators": true
     },
     "exclude": [
       "node_modules/**",
@@ -20,5 +21,6 @@
     "buildOnSave": false,
     "atom": {
         "rewriteTsconfig": false
-    }
+    },
+
 }

typescript/api/controllers/RenderViewController.ts

@@ -1,20 +1,17 @@
 //<reference path='./../../typings/loader.d.ts'/>
 
-import { Controllers as controllers} from '@researchdatabox/redbox-core-types';
-
+import { Controllers as controllers,PopulateExportedMethods} from '@researchdatabox/redbox-core-types';
 /**
  * Package that contains all Controllers.
  */
-export module Controllers {
 
-    export class RenderView extends controllers.Core.Controller {
 
-        /**
-         * Exported methods, accessible from internet.
-         */
-        protected _exportedMethods: any = [
-            'render'
-        ];
+
+
+export module Controllers {
+
+    @PopulateExportedMethods
+    export class RenderView extends controllers.Core.Controller {
 
         /**
          **************************************************************************************************

typescript/api/controllers/VocabController.ts

@@ -118,7 +118,7 @@ export module Controllers {
       const flattened_prefix = "flattened_";
       try {
         let mintResponse = await VocabService.findInMint(mintSourceType, searchString);
-        let response_docs = mintResponse.docs;
+        let response_docs = mintResponse.response.docs;
         if (unflatten == "true") {
           _.forEach(response_docs, (doc: any) => {
             _.forOwn(doc, (val: any, key: any) => {