From 2603f2b47c3d89262b9fea9620c16d1324f9960f Mon Sep 17 00:00:00 2001
From: Soheel Chughtai <soheel_chughtai@uk.ibm.com>
Date: Fri, 25 Mar 2022 11:29:41 +0000
Subject: [PATCH] Add GetProject method

---
 services/discovery/discovery-utils2.js     | 22 ++++++++++
 services/discovery/v2-project-manager.html | 36 +++++++++++++++-
 services/discovery/v2-project-manager.js   | 48 +++++++++++++++++-----
 3 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/services/discovery/discovery-utils2.js b/services/discovery/discovery-utils2.js
index c1a715c2..895d5120 100644
--- a/services/discovery/discovery-utils2.js
+++ b/services/discovery/discovery-utils2.js
@@ -44,10 +44,32 @@ DiscoveryUtils2.prototype = {
   },
 
 
+  paramProjectCheck: function(params) {
+    var response = '';
+    if (!params.projectId) {
+      response = 'Missing Project ID ';
+    }
+    return response;
+  },
+
+  buildParamsFor: function(msg, config, params, field) {
+    if (msg.discoveryparams && msg.discoveryparams[field]) {
+      params[field] = msg.discoveryparams[field];
+    } else if (config[field]) {
+      params[field] = config[field];
+    }
+    return params;
+  },
+
+
   buildParams: function(msg, config) {
     var params = {},
       me = this;
 
+    ['projectId'].forEach(function(f) {
+      params = me.buildParamsFor(msg, config, params, f);
+    });
+
     return params;
   }
 
diff --git a/services/discovery/v2-project-manager.html b/services/discovery/v2-project-manager.html
index 175a7d8e..885dd5d7 100644
--- a/services/discovery/v2-project-manager.html
+++ b/services/discovery/v2-project-manager.html
@@ -46,6 +46,12 @@
         </select>
     </div>
 
+    <div class="form-row">
+        <label for="node-input-projectId"><i class="fa fa-tag"></i> Project ID</label>
+        <input type="text" id="node-input-projectId" placeholder="">
+    </div>
+
+
 </script>
 
 <script type="text/x-red" data-help-name="watson-discovery-v2-project-manager">
@@ -57,6 +63,26 @@
       <p><b>List Existing Projects</b><p>
       <p>For this method the node does not need any input.
       </p>
+      <p>Node output : </p>
+        <ul>
+          <li><code>msg.projects</code> : A list of the projects created under
+        the Discovery service instance.</li>
+        </ul>
+    </li>
+
+    <br/>
+
+    <li>
+      <p><b>Retrieve project details</b><p>
+      <p>For this method the node needs an Project ID as input.
+      </p>
+      <p>The project being requested can be overridden by specifying
+        the search id in <code>msg.discoveryparams.projectId</code>
+      </p>
+      <p>Node output : </p>
+        <ul>
+          <li><code>msg.discovery_response</code> : Details of the requested project.</li>
+        </ul>
     </li>
 
     </ul>
@@ -74,9 +100,9 @@
     // This is the namespace for this version of this Node.
     var disV2pm = new DiscoveryExperimentalV1();
 
-    //disV2pm.abc = 'abc';
-    disV2pm.hideAll = function() {
 
+    disV2pm.hideAll = function() {
+      $('#node-input-projectId').parent().hide();
     };
 
     disV2pm.showSelectedFields = function(fields) {
@@ -89,6 +115,11 @@
       disV2pm.hideAll();
       fields = [];
 
+      switch (method) {
+        case 'getProject':
+        fields.push('#node-input-projectId');
+      }
+
       disV2pm.showSelectedFields(fields);
     }
 
@@ -123,6 +154,7 @@
             category: 'IBM Watson',
             defaults: {
                 name: {value: ''},
+                projectId: {value: ''},
                 'discovery-method': {value:'listProjects'},
                 'service-endpoint' :{value: ''}
             },
diff --git a/services/discovery/v2-project-manager.js b/services/discovery/v2-project-manager.js
index 7b43d9d9..747b147d 100644
--- a/services/discovery/v2-project-manager.js
+++ b/services/discovery/v2-project-manager.js
@@ -28,18 +28,12 @@ module.exports = function (RED) {
     sEndpoint = '';
 
   const ExecutionList = {
-    'listProjects' : executeProjectList
+    'listProjects' : executeListProjects,
+    'getProject' : executeDiscoveryMethod
   };
 
-  function executeProjectList(node, discovery, params, msg) {
-    let fields = {
-      node : node,
-      discovery : discovery,
-      params : params,
-      msg : msg,
-      method : "listProjects",
-      response : "projects"
-    }
+  function executeListProjects(fields) {
+    fields.response = "projects";
     return executeListMethod(fields)
   }
 
@@ -58,6 +52,24 @@ module.exports = function (RED) {
   }
 
 
+  function executeDiscoveryMethod(fields) {
+    var p = new Promise(function resolver(resolve, reject){
+      fields.discovery[fields.method](fields.params)
+        .then((response) => {
+          fields.msg.discovery_response = response;
+          if (response && response.result) {
+            fields.msg.discovery_response = response.result;
+          }
+          resolve();
+        })
+        .catch((err) => {
+          reject(err);
+        });
+    });
+    return p;
+  }
+
+
   function initialCheck(k, m) {
     var message = '';
     if (!k) {
@@ -74,6 +86,12 @@ module.exports = function (RED) {
   function checkParams(method, params) {
     var response = '';
 
+    switch (method) {
+      case 'getProject':
+        response = discoveryutils.paramProjectCheck(params);
+        break;
+    }
+
     if (response) {
       return Promise.reject(response);
     } else {
@@ -93,7 +111,15 @@ module.exports = function (RED) {
       exe = unknownMethod
     }
 
-    return exe(node, discovery, params, msg);
+    let fields = {
+      node : node,
+      discovery : discovery,
+      params : params,
+      msg : msg,
+      method : method
+    }
+
+    return exe(fields);
   }