Merge pull request #249 from bitfinexcom/beta

Release version to master
bitfinexcom · Jan 18, 2023 · 9e53883 · 9e53883
2 parents 9fb0a56 + a05a82d
commit 9e53883
Show file tree

Hide file tree

Showing 23 changed files with 798 additions and 518 deletions.
diff --git a/bfx-report-ui b/bfx-report-ui
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bfx-reports-framework",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "Bitfinex reports framework",
   "main": "worker.js",
   "license": "Apache-2.0",

diff --git a/test/1-api-sync-mode-sqlite.spec.js b/test/1-api-sync-mode-sqlite.spec.js
@@ -27,7 +27,8 @@ const agent = request.agent(app)
 
 const {
   apiSyncModeSqliteTestCases,
-  signUpTestCase
+  signUpTestCase,
+  removeUserTestCases
 } = require('./test-cases')
 
 let wrkReportServiceApi = null
@@ -94,4 +95,6 @@ describe('Sync mode API with SQLite', () => {
 
   signUpTestCase(agent, params)
   apiSyncModeSqliteTestCases(agent, params)
+  signUpTestCase(agent, params)
+  removeUserTestCases(agent, params)
 })
diff --git a/test/3-api-filter-sync-mode-sqlite.spec.js b/test/3-api-filter-sync-mode-sqlite.spec.js
@@ -20,8 +20,7 @@ const {
   startEnvironment
 } = require('./helpers/helpers.boot')
 const {
-  emptyDB,
-  delay
+  emptyDB
 } = require('./helpers/helpers.core')
 const {
   createMockRESTv2SrvWithDate
@@ -31,7 +30,10 @@ process.env.NODE_CONFIG_DIR = path.join(__dirname, 'config')
 const { app } = require('bfx-report-express')
 const agent = request.agent(app)
 
-const { signUpTestCase } = require('./test-cases')
+const {
+  signUpTestCase,
+  getSyncProgressTestCase
+} = require('./test-cases')
 
 let wrkReportServiceApi = null
 let processorQueue = null
@@ -120,35 +122,7 @@ describe('API filter', () => {
     )
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth })
 
   it('it should be successfully performed by the editPublicTradesConf method', async function () {
     this.timeout(5000)
@@ -175,35 +149,7 @@ describe('API filter', () => {
     assert.isOk(res.body.result)
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth })
 
   it('it should be successfully performed by the editTickersHistoryConf method', async function () {
     this.timeout(5000)
@@ -230,35 +176,7 @@ describe('API filter', () => {
     assert.isOk(res.body.result)
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth })
 
   it('it should be successfully performed by the api methods', async function () {
     this.timeout(10000)

diff --git a/test/4-sub-account.spec.js b/test/4-sub-account.spec.js
@@ -32,7 +32,8 @@ const agent = request.agent(app)
 const {
   apiSyncModeSqliteTestCases,
   additionalApiSyncModeSqliteTestCases,
-  signUpTestCase
+  signUpTestCase,
+  removeUserTestCases
 } = require('./test-cases')
 
 let wrkReportServiceApi = null
@@ -429,5 +430,10 @@ describe('Sub-account', () => {
 
       additionalApiSyncModeSqliteTestCases(agent, params)
     })
+    describe('Removing sub-account API', () => {
+      before(beforeFn)
+
+      removeUserTestCases(agent, params)
+    })
   })
 })
diff --git a/test/6-update-sub-account.spec.js b/test/6-update-sub-account.spec.js
@@ -17,8 +17,7 @@ const {
 } = require('./helpers/helpers.boot')
 const {
   emptyDB,
-  getRServiceProxy,
-  delay
+  getRServiceProxy
 } = require('./helpers/helpers.core')
 const {
   createMockRESTv2SrvWithDate,
@@ -31,7 +30,8 @@ const { app } = require('bfx-report-express')
 const agent = request.agent(app)
 
 const {
-  signUpTestCase
+  signUpTestCase,
+  getSyncProgressTestCase
 } = require('./test-cases')
 
 let wrkReportServiceApi = null
@@ -289,35 +289,7 @@ describe('Update sub-account', () => {
     assert.isOk(res.body.result)
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth: subAccountAuth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth: subAccountAuth })
 
   it('it should be successfully performed by the getLedgers method, without params', async function () {
     this.timeout(5000)
@@ -517,35 +489,7 @@ describe('Update sub-account', () => {
     assert.isString(res.body.result.token)
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth: subAccountAuth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth: subAccountAuth })
 
   it('it should be successfully performed by the getUsers method', async function () {
     this.timeout(5000)
@@ -587,35 +531,7 @@ describe('Update sub-account', () => {
     })
   })
 
-  it('it should be successfully performed by the getSyncProgress method', async function () {
-    this.timeout(60000)
-
-    while (true) {
-      const res = await agent
-        .post(`${basePath}/json-rpc`)
-        .type('json')
-        .send({
-          auth: subAccountAuth,
-          method: 'getSyncProgress',
-          id: 5
-        })
-        .expect('Content-Type', /json/)
-        .expect(200)
-
-      assert.isObject(res.body)
-      assert.propertyVal(res.body, 'id', 5)
-      assert.isNumber(res.body.result)
-
-      if (
-        typeof res.body.result !== 'number' ||
-        res.body.result === 100
-      ) {
-        break
-      }
-
-      await delay()
-    }
-  })
+  getSyncProgressTestCase(agent, { basePath, auth: subAccountAuth })
 
   it('it should be successfully performed by the getLedgers method, without params', async function () {
     this.timeout(5000)
+7 −0		dependabot.yml
+227 −198		package-lock.json
+1 −1		package.json
+7 −0		public/locales/en/translations.json
+2 −1		src/components/Header/SyncMode/SyncMode.container.js
+51 −6		src/components/Header/SyncMode/SyncMode.helpers.js
+9 −3		src/components/Header/SyncMode/SyncMode.js
+8 −3		src/components/Preferences/Preferences.container.js
+87 −78		src/components/Preferences/Preferences.js
+0 −9		src/components/Preferences/Preferences.props.js
+10 −0		src/components/Preferences/_Preferences.scss
+1 −3		src/components/Preferences/index.js
+7 −0		src/state/auth/actions.js
+1 −0		src/state/auth/constants.js
+24 −0		src/state/auth/saga.js
+8 −0		src/state/sync/actions.js
+1 −0		src/state/sync/constants.js
+7 −0		src/state/sync/reducer.js
+19 −16		src/state/sync/saga.js
+3 −0		src/state/sync/selectors.js
+3 −0		src/utils/dates.js