updated reset conversation action

paschmann · Apr 25, 2018 · 174375f · 174375f
1 parent 56c9ea7
commit 174375f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 16 deletions.
diff --git a/server/routes/middleware.js b/server/routes/middleware.js
@@ -47,6 +47,16 @@ function routeRequest(req, res, next, agentObj){
     }
 }
 
+function sendOutput(http_code, res, body) {
+  res.writeHead(http_code, {
+    'Access-Control-Allow-Origin': '*',
+    'Content-Type': 'application/json'
+  });
+  if (body !== "") {
+    res.write(body);
+  }
+  res.end();
+}
 module.exports = {
   parseRasaRequest: parseRasaRequest
 };
diff --git a/server/routes/mw_routes/core_router.js b/server/routes/mw_routes/core_router.js
@@ -22,9 +22,25 @@ var await = require('asyncawait/await');
   }
 
   function restartRasaCoreConversation(req, res, next) {
-    console.log("Rasa Core Version Request -> " + global.rasacoreendpoint + "/version");
-    var responseBody =rasaCoreRequest(req,"continue",JSON.stringify({"events": [{"event": "restart"}]}));
-    console.log("RestartResponse" + JSON.stringify(responseBody));
+    console.log("Rasa Core Restart Request -> " + global.rasacoreendpoint);
+    try {
+      request({method: "POST",
+        uri: global.rasacoreendpoint +"/conversations/"+req.jwt.username+ "/continue",
+        body: JSON.stringify({"events": [{"event": "restart"}]})
+      }, function (error, response, body) {
+        if(error){
+          console.log(error);
+          sendHTTPResponse(500, res, '{"error" : "Exception caught !!"}');
+          return;
+        }
+        console.log("Restart Response" + JSON.stringify(body));
+        sendHTTPResponse(200, res, body);
+      });
+    }catch (err) {
+      console.log(err);
+      sendHTTPResponse(500, res, '{"error" : "Exception caught !!"}');
+      return;
+    }
   }
 
   function parseRequest(req, res, next, agentObj) {
@@ -89,6 +105,7 @@ var await = require('asyncawait/await');
             console.log(error);
             reject(err); return;
           }
+          console.log("After request:"+body);
           resolve(JSON.parse(body));
         });
     });
@@ -176,7 +193,7 @@ var await = require('asyncawait/await');
         var webhookResponse =await(fetchActionDetailsFromWebhook(req,rasa_core_response, agentObj));
         if(webhookResponse != undefined){
           rasa_core_response.response_text = JSON.parse(webhookResponse).displayText;
-          rasa_response.response_rich=JSON.parse(webhookResponse).dataToClient;
+          rasa_core_response.response_rich=JSON.parse(webhookResponse).dataToClient;
           console.log("Sending Rasa Core Response + Webhook response");
           addResponseInfoToCache(req,cacheKey,rasa_core_response);
         }else{

diff --git a/web/src/app/shared/aside/aside.html b/web/src/app/shared/aside/aside.html
@@ -25,7 +25,7 @@ <h6 class="dropdown-header">Rasa Core Options</h6>
                 <span class="dropdown-item" id="btnGroupAddon" style="margin: 2px;">
                   <input class="form-check-input position-static" type="checkbox" id="blankCheckbox" ng-model="wsEnabled"> Enable Web Socket
                 </span>
-                <a class="dropdown-item" href="#" ng-click="restartConversation()">Reset Conversation</a>
+                <a class="dropdown-item" style="cursor: pointer" ng-click="restartConversation()">Reset Conversation</a>
               </div>
 
             </span>

diff --git a/web/src/app/shared/aside/aside.js b/web/src/app/shared/aside/aside.js
@@ -67,16 +67,11 @@ function AsideController($scope, $rootScope, $interval, $http,Rasa_Parse, Rasa_C
   }
   $scope.restartConversation=function(){
     $scope.test_text_response={};
-    $http.post(api_endpoint_v2 + "/rasa/restart")
-      .then(
-        function(response){
-          // success callback
-          alert("Restarted Successfully");
-        },
-        function(errorResponse){
-          // failure callback
-        }
-      );
+    $http.post(api_endpoint_v2 + "/rasa/restart");
+    $scope.response_text=[];
+    $scope.test_text_response={};
+    $scope.test_text='';
+    $rootScope.$broadcast('setAlertText', "Conversation restarted!!");
   }
 
   $scope.executeTestRequest = function() {
@@ -104,11 +99,11 @@ function AsideController($scope, $rootScope, $interval, $http,Rasa_Parse, Rasa_C
               $scope.response_text.push(response.response_text);
             })
           }
+          $scope.test_text='';
         },
         function(errorResponse){
           // failure callback
         }
       );
-
   }
 }