Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

CHANGELOG

@@ -76,6 +76,8 @@ devel
 v3.0.8 (XXXX-XX-XX)
 -------------------
 
+* fixed issue #2005
+
 * fixed issue #2039
 
 

arangod/GeneralServer/VppCommTask.cpp

@@ -185,9 +185,6 @@ bool VppCommTask::processRead() {
   bool read_maybe_only_part_of_buffer = false;
   VppInputMessage message;  // filled in CASE 1 or CASE 2b
 
-  _agents.emplace(
-      std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true)));
-
   if (chunkHeader._isFirst && chunkHeader._chunk == 1) {
     // CASE 1: message is in one chunk
     if (auto rv = getMessageFromSingleChunk(chunkHeader, message, doExecute,
@@ -370,6 +367,9 @@ void VppCommTask::handleSimpleError(rest::ResponseCode responseCode,
 boost::optional<bool> VppCommTask::getMessageFromSingleChunk(
     ChunkHeader const& chunkHeader, VppInputMessage& message, bool& doExecute,
     char const* vpackBegin, char const* chunkEnd) {
+  _agents.emplace(
+      std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true)));
+
   auto agent = getAgent(chunkHeader._messageID);
   agent->acquire();
   agent->requestStatisticsAgentSetReadStart();
@@ -414,6 +414,9 @@ boost::optional<bool> VppCommTask::getMessageFromMultiChunks(
 
   // CASE 2a: chunk starts new message
   if (chunkHeader._isFirst) {  // first chunk of multi chunk message
+    _agents.emplace(
+        std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true)));
+
     auto agent = getAgent(chunkHeader._messageID);
     agent->acquire();
     agent->requestStatisticsAgentSetReadStart();

arangod/RestServer/VocbaseContext.cpp

@@ -82,9 +82,7 @@ bool VocbaseContext::useClusterAuthentication() const {
 rest::ResponseCode VocbaseContext::authenticate() {
   TRI_ASSERT(_vocbase != nullptr);
 
-  auto restServer =
-      application_features::ApplicationServer::getFeature<GeneralServerFeature>(
-          "GeneralServer");
+  auto restServer = application_features::ApplicationServer::getFeature<GeneralServerFeature>("GeneralServer");
 
   if (!restServer->authentication()) {
     // no authentication required at all
@@ -128,10 +126,10 @@ rest::ResponseCode VocbaseContext::authenticate() {
   return result;
 }
 
-rest::ResponseCode VocbaseContext::authenticateRequest(bool* forceOpen) {
-  auto restServer =
-      application_features::ApplicationServer::getFeature<GeneralServerFeature>(
-          "GeneralServer");
+rest::ResponseCode VocbaseContext::authenticateRequest(
+    bool* forceOpen) {
+  
+  auto restServer = application_features::ApplicationServer::getFeature<GeneralServerFeature>("GeneralServer");
 #ifdef ARANGODB_HAVE_DOMAIN_SOCKETS
   // check if we need to run authentication for this type of
   // endpoint
@@ -202,7 +200,8 @@ rest::ResponseCode VocbaseContext::authenticateRequest(bool* forceOpen) {
 /// @brief checks the authentication via basic
 ////////////////////////////////////////////////////////////////////////////////
 
-rest::ResponseCode VocbaseContext::basicAuthentication(const char* auth) {
+rest::ResponseCode VocbaseContext::basicAuthentication(
+    const char* auth) {
   if (useClusterAuthentication()) {
     std::string const expected = ServerState::instance()->getAuthentication();
 
@@ -252,7 +251,8 @@ rest::ResponseCode VocbaseContext::basicAuthentication(const char* auth) {
 /// @brief checks the authentication via jwt
 ////////////////////////////////////////////////////////////////////////////////
 
-rest::ResponseCode VocbaseContext::jwtAuthentication(std::string const& auth) {
+rest::ResponseCode VocbaseContext::jwtAuthentication(
+    std::string const& auth) {
   AuthResult result = GeneralServerFeature::AUTH_INFO.checkAuthentication(
       AuthInfo::AuthType::JWT, auth);
 

js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js

@@ -414,6 +414,8 @@
         // add those filters also to the collection
         self.collection.addFilter(f.attribute, f.operator, f.value);
       });
+
+      self.rerender();
     },
 
     addFilterItem: function () {

js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer2.js

@@ -1133,6 +1133,8 @@
           arangoHelper.arangoError('Graph', 'Could not expand node: ' + id + '.');
         }
       });
+
+      self.removeHelp();
     },
 
     checkExpand: function (data, origin) {
@@ -1671,13 +1673,14 @@
               e.color = e.originalColor;
             });
 
+            $('.nodeInfoDiv').remove();
             s.refresh({ skipIndexation: true });
           }
         };
 
         s.bind('rightClickStage', function (e) {
-          unhighlightNodes();
           self.nodeHighlighted = 'undefinedid';
+          unhighlightNodes();
         });
 
         s.bind('rightClickNode', function (e) {

js/apps/system/_admin/aardvark/APP/frontend/scss/_graphViewer2.scss

@@ -258,7 +258,6 @@
     background-color: $c-bluegrey-dark;
     border-radius: 2px;
     color: $c-white;
-    padding: 10px;
-    padding-left: 150px;
+    padding: 10px 20px;
   }
 }