Merge pull request #91 from hoijnet/issue/optimize

Fix the broken branch optimize function

Author: Neelterminusdb

lib/connectionConfig.js

@@ -569,7 +569,7 @@ ConnectionConfig.prototype.commitDescriptorUrl = function(commitId) {
 ConnectionConfig.prototype.optimizeBranchUrl = function(branchId) {
     //let o = this.optimizeBase()
     const dbBase = this.dbBase('optimize')
-    return `${dbBase}${this.repoid}/branch/${encodeURISegment(branchId)}`
+    return `${dbBase}/${this.repoid}/branch/${encodeURIComponent(branchId)}`
     //return dbBase + `${this.user()}/${this.db()}/${this.repoid}/branch/${nuid}`
 }
 

lib/woqlClient.js

@@ -620,7 +620,7 @@ WOQLClient.prototype.resetBranch = function(branchId, commitId) {
  * @returns {Promise} A promise that returns the call response object, or an Error if rejected.
  */
 WOQLClient.prototype.optimizeBranch = function(branchId) {
-    return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeBranchUrl(branchId))
+    return this.dispatch(CONST.OPTIMIZE_SYSTEM, this.connectionConfig.optimizeBranchUrl(branchId), {})
 }
 
 /**

test/connectionConfing.spec.js

@@ -66,7 +66,7 @@ describe('connectionConfig tests', function() {
     })
 
     it('check set branch', function() {
-        const optimizeUrl = 'http://localhost:6363/api/optimize/admin/testDBlocal/branch/%23%23branch01'
+        const optimizeUrl = 'http://localhost:6363/api/optimize/admin/testDB/local/branch/%23%23branch01'
         /*
          * the dbURL dosen't change
          */