Skip to content

Commit

Permalink
Merge pull request #333 from bitfinexcom/staging
Browse files Browse the repository at this point in the history
Release version 4.20.0
ezewer authored Mar 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 80d8d8b + 630b4a9 commit c683605
Showing 27 changed files with 315 additions and 118 deletions.
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ bfx-reports-framework/config/*.json
bfx-reports-framework/config/facs/*.json
bfx-reports-framework/logs/*.log
bfx-reports-framework/csv
bfx-reports-framework/report-files
bfx-report-ui/build
bfx-report-ui/bfx-report-express/logs/*.log
bfx-report-ui/bfx-report-express/config/*.json
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
REPO_OWNER=bitfinexcom
REPO_BRANCH=master
IS_BFX_API_STAGING=0
IS_DEV_ENV=0
61 changes: 34 additions & 27 deletions .github/workflows/build-electron-app.yml
Original file line number Diff line number Diff line change
@@ -22,6 +22,9 @@ on:
isNotarizeDisabled:
description: 'Is notarize disabled (true / 1)?'
required: false
repoOwner:
description: 'Repository owner for auto-update'
required: false

env:
DOCKER_BUILDKIT: 1
@@ -36,11 +39,6 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- name: Set repo owner
run: |
sed -i -e \
"s/owner: '.*'/owner: '${{ github.repository_owner }}'/g" \
"./electron-builder-config.js"
- if: github.event.inputs.version != ''
name: Set release version
run: |
@@ -55,9 +53,16 @@ jobs:
name: Use BFX API Staging for queries
run: |
echo "IS_BFX_API_STAGING=1" >> $GITHUB_ENV
- name: Set repository owner for auto-update
run: |
if [[ "${{ github.event.inputs.repoOwner }}" != "" ]]; then
echo "REPO_OWNER=${{ github.event.inputs.repoOwner }}" >> $GITHUB_ENV
else
echo "REPO_OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV
fi
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: electron-cache-v1
with:
@@ -69,7 +74,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
continue-on-error: false
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -82,14 +87,14 @@ jobs:
- name: Zip Linux Unpacked build
run: zip -r dist/linux-unpacked.zip dist/linux-unpacked
- name: Upload Linux Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux-unpacked
path: dist/linux-unpacked.zip
- name: Zip Win Unpacked build
run: zip -r dist/win-unpacked.zip dist/win-unpacked
- name: Upload Win Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: win-unpacked
path: dist/win-unpacked.zip
@@ -110,11 +115,6 @@ jobs:
run: |
brew install gnu-sed
echo "$(brew --prefix)/opt/gnu-sed/libexec/gnubin" >> $GITHUB_PATH
- name: Set repo owner
run: |
sed -i -e \
"s/owner: '.*'/owner: '${{ github.repository_owner }}'/g" \
"./electron-builder-config.js"
- if: github.event.inputs.version != ''
name: Set release version
run: |
@@ -133,12 +133,19 @@ jobs:
name: Use BFX API Staging for queries
run: |
echo "IS_BFX_API_STAGING=1" >> $GITHUB_ENV
- uses: actions/setup-node@v3
- name: Set repository owner for auto-update
run: |
if [[ "${{ github.event.inputs.repoOwner }}" != "" ]]; then
echo "REPO_OWNER=${{ github.event.inputs.repoOwner }}" >> $GITHUB_ENV
else
echo "REPO_OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV
fi
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Cache Electron binaries
id: electron-cache
uses: actions/cache@v3
uses: actions/cache@v4
env:
cache-name: electron-cache-v1
with:
@@ -149,7 +156,7 @@ jobs:
${{ runner.os }}-build-${{ env.cache-name }}-
- name: Build release
id: release-builder
uses: nick-fields/retry@v2
uses: nick-fields/retry@v3
continue-on-error: false
env:
APPLE_TEAM_ID: ${{ secrets.BFX_APPLE_TEAM_ID }}
@@ -175,7 +182,7 @@ jobs:
- name: Zip Mac Unpacked build
run: zip -r dist/mac.zip dist/mac
- name: Upload Mac Unpacked build
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: mac-unpacked
path: dist/mac.zip
@@ -188,20 +195,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Linux Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: linux-unpacked
path: dist
- name: Unzip Linux Unpacked build
run: unzip dist/linux-unpacked.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
@@ -220,20 +227,20 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Linux Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: win-unpacked
path: dist
- name: Unzip Win Unpacked build
run: 7z -y x dist/win-unpacked.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
@@ -254,20 +261,20 @@ jobs:
uses: actions/checkout@v4
- name: Prepare Mac runner
uses: ./.github/actions/prepare-mac-runner
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Install main dev deps
run: npm i --development --no-audit --progress=false --force
- name: Download Mac Unpacked build
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: mac-unpacked
path: dist
- name: Unzip Mac Unpacked build
run: unzip dist/mac.zip
- name: Run tests
uses: coactions/setup-xvfb@v1.0.1
uses: coactions/setup-xvfb@6b00cf1889f4e1d5a48635647013c0508128ee1a
with:
run: npm run e2e
- name: Normalize E2E test report
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ jobs:
uses: actions/checkout@v4
with:
submodules: recursive
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 18.17.1
- name: Setup configs and install deps
1 change: 1 addition & 0 deletions .github/workflows/e2e-test-report.yml
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ jobs:
e2e-web-page-report:
name: E2E Web Page Report
runs-on: ubuntu-22.04
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: dorny/test-reporter@v1
id: linux-e2e-test-results
1 change: 1 addition & 0 deletions .github/workflows/test-report.yml
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ jobs:
web-page-report:
name: Web Page Report
runs-on: ubuntu-22.04
if: ${{ github.event.workflow_run.conclusion == 'success' }}
steps:
- uses: dorny/test-reporter@v1
id: test-results
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.20.0] - 2024-03-06

### Added

- Added missing translations for `2FA`. PR: [bfx-report-ui#774](https://github.com/bitfinexcom/bfx-report-ui/pull/774)
- Implemented exporting to PDF support for `Ledgers` and `Tax Reports`. PRs: [bfx-report#347](https://github.com/bitfinexcom/bfx-report/pull/347), [bfx-reports-framework#352](https://github.com/bitfinexcom/bfx-reports-framework/pull/352), [bfx-report-electron#319](https://github.com/bitfinexcom/bfx-report-electron/pull/319), [bfx-ext-pdf-js#4](https://github.com/bitfinexcom/bfx-ext-pdf-js/pull/4), [bfx-report#349](https://github.com/bitfinexcom/bfx-report/pull/349), [bfx-reports-framework#354](https://github.com/bitfinexcom/bfx-reports-framework/pull/354), [bfx-report-ui#775](https://github.com/bitfinexcom/bfx-report-ui/pull/775)
- Added detection for `BFX` auth error: `ERR_AUTH_API: ERR_TOKEN_ALREADY_USED`. PR: [bfx-report#348](https://github.com/bitfinexcom/bfx-report/pull/348)
- Added improvements to the token refresh flow: stop the auth token refresh interval if catch an auth error. PR: [bfx-reports-framework#353](https://github.com/bitfinexcom/bfx-reports-framework/pull/353)
- Added option to set repo owner for auto-update in manual run. PR: [bfx-report-electron#331](https://github.com/bitfinexcom/bfx-report-electron/pull/331)

### Changed

- Reworked navigation for the `Movements` report according to the latest UX improvement proposals: remove tabs from wallets & movements, make movements a separate navigation item under `My History`. PR: [bfx-report-ui#771](https://github.com/bitfinexcom/bfx-report-ui/pull/771)
- Reworked navigation for the `My History` section according to the latest UX improvement proposals. PR: [bfx-report-ui#778](https://github.com/bitfinexcom/bfx-report-ui/pull/778)
- Enhanced `loading` and `no data` states representation for reports with tables. PR: [bfx-report-ui#779](https://github.com/bitfinexcom/bfx-report-ui/pull/779)
- Set `90sec` timeout for grc requests to have the same timeout as for api requests. PR: [bfx-report#351](https://github.com/bitfinexcom/bfx-report/pull/351)
- Set `90sec` timeout for `html-pdf` lib. PR: [bfx-reports-framework#355](https://github.com/bitfinexcom/bfx-reports-framework/pull/355)
- Optimized GitHub Actions Workflow for release build. PR: [bfx-report-electron#322](https://github.com/bitfinexcom/bfx-report-electron/pull/322)
- Updated Actions to use Nodejs `v20`. PR: [bfx-report-electron#323](https://github.com/bitfinexcom/bfx-report-electron/pull/323)

### Fixed

- Updated UI engines configuration to prevent issues. PR: [bfx-report-ui#772](https://github.com/bitfinexcom/bfx-report-ui/pull/772)
- Fixed `2FA` authorization flow according to: After the first push of the auth button, we should lock the button (till we get any response from this endpoint) to prevent sending several of the same requests. PR: [bfx-report-ui#776](https://github.com/bitfinexcom/bfx-report-ui/pull/776)
- Fixed the potential possibility of duplicated sending for correct `OTP`: it should keep btn disabled until the successful auth will be completed. PR: [bfx-report-ui#780](https://github.com/bitfinexcom/bfx-report-ui/pull/780)
- Fixed 11 `auto-update-toast:width` listeners added. PR: [bfx-report-electron#330](https://github.com/bitfinexcom/bfx-report-electron/pull/330)

## [4.19.0] - 2024-02-14

### Added
1 change: 1 addition & 0 deletions Dockerfile.linux-builder
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
bc \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN chown root:root .

COPY . .

1 change: 1 addition & 0 deletions Dockerfile.mac-builder
Original file line number Diff line number Diff line change
@@ -14,6 +14,7 @@ RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
bc \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN chown root:root .

COPY . .

1 change: 1 addition & 0 deletions Dockerfile.ui-builder
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ ENV IS_DEV_ENV=${IS_DEV_ENV:-0}
COPY ./scripts/helpers/install-nodejs.sh ./scripts/helpers/install-nodejs.sh

RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION}
RUN chown root:root .

COPY . .

1 change: 1 addition & 0 deletions Dockerfile.win-builder
Original file line number Diff line number Diff line change
@@ -17,6 +17,7 @@ RUN ./scripts/helpers/install-nodejs.sh ${NODE_VERSION} \
bc \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN chown root:root .

COPY . .

2 changes: 1 addition & 1 deletion bfx-report-ui
Submodule bfx-report-ui updated 89 files
+4 −4 package-lock.json
+3 −3 package.json
+5 −3 public/locales/en/translations.json
+1 −1 public/locales/vi/translations.json
+35 −15 src/components/AccountSummary/AccountSummary.derivFees.js
+11 −2 src/components/AccountSummary/AccountSummary.feeTierVolume.js
+49 −25 src/components/AccountSummary/AccountSummary.fees.js
+31 −26 src/components/AccountSummary/AccountSummary.js
+34 −15 src/components/AccountSummary/AccountSummary.leo.js
+24 −4 src/components/AccountSummary/AccountSummary.paidFees.js
+28 −10 src/components/AccountSummary/AccountSummary.volume.js
+26 −16 src/components/AffiliatesEarnings/AffiliatesEarnings.js
+15 −18 src/components/AppSummary/AppSummary.byAsset.js
+14 −61 src/components/AppSummary/AppSummary.columns.js
+17 −2 src/components/AppSummary/_AppSummary.scss
+7 −2 src/components/Auth/LoginOtp/LoginOtp.js
+15 −1 src/components/ChangeLogs/ChangeLogs.columns.js
+23 −14 src/components/ChangeLogs/ChangeLogs.js
+15 −1 src/components/ConcentrationRisk/ConcentrationRisk.columns.js
+20 −13 src/components/ConcentrationRisk/ConcentrationRisk.js
+30 −1 src/components/Derivatives/Derivatives.columns.js
+29 −19 src/components/Derivatives/Derivatives.js
+13 −0 src/components/ExportDialog/ExportDialog.helpers.js
+13 −2 src/components/ExportDialog/ExportDialog.js
+39 −1 src/components/FundingCreditHistory/FundingCreditHistory.columns.js
+27 −17 src/components/FundingCreditHistory/FundingCreditHistory.js
+36 −1 src/components/FundingLoanHistory/FundingLoanHistory.columns.js
+17 −7 src/components/FundingLoanHistory/FundingLoanHistory.js
+30 −1 src/components/FundingOfferHistory/FundingOfferHistory.columns.js
+17 −7 src/components/FundingOfferHistory/FundingOfferHistory.js
+27 −17 src/components/FundingPayment/FundingPayment.js
+45 −1 src/components/Invoices/Invoices.columns.js
+18 −9 src/components/Invoices/Invoices.js
+33 −4 src/components/Ledgers/Ledgers.columns.js
+27 −17 src/components/Ledgers/Ledgers.js
+24 −2 src/components/Logins/Logins.columns.js
+24 −15 src/components/Logins/Logins.js
+38 −3 src/components/Movements/Movements.columns.js
+17 −9 src/components/Movements/Movements.js
+42 −1 src/components/Orders/Orders.columns.js
+17 −7 src/components/Orders/Orders.js
+46 −5 src/components/Positions/Positions.columns.js
+17 −7 src/components/Positions/Positions.js
+14 −7 src/components/PositionsActive/PositionsActive.js
+16 −7 src/components/PositionsAudit/PositionsAudit.js
+32 −10 src/components/PublicFunding/PublicFunding.columns.js
+26 −17 src/components/PublicFunding/PublicFunding.js
+25 −5 src/components/PublicTrades/PublicTrades.columns.js
+30 −21 src/components/PublicTrades/PublicTrades.js
+40 −39 src/components/Snapshots/PositionsSnapshot/PositionsSnapshot.js
+0 −1 src/components/Snapshots/PositionsSnapshot/PositionsSnapshot.props.js
+17 −21 src/components/Snapshots/Snapshots.js
+42 −38 src/components/Snapshots/TickersSnapshot/TickersSnapshot.js
+0 −1 src/components/Snapshots/TickersSnapshot/TickersSnapshot.props.js
+25 −26 src/components/Snapshots/WalletsSnapshot/WalletsSnapshot.js
+0 −1 src/components/Snapshots/WalletsSnapshot/WalletsSnapshot.props.js
+27 −17 src/components/StakingPayments/StakingPayments.js
+39 −25 src/components/TaxReport/Result/Balances.columns.js
+93 −30 src/components/TaxReport/Result/Result.js
+0 −53 src/components/TaxReport/Result/Result.props.js
+7 −25 src/components/TaxReport/Snapshot/Snapshot.js
+18 −4 src/components/Tickers/Tickers.columns.js
+27 −18 src/components/Tickers/Tickers.js
+30 −4 src/components/Trades/Trades.columns.js
+27 −17 src/components/Trades/Trades.js
+18 −2 src/components/Wallets/Wallets.columns.js
+25 −12 src/components/Wallets/Wallets.data.js
+4 −18 src/components/Wallets/Wallets.js
+33 −1 src/components/WeightedAverages/WeightedAverages.columns.js
+19 −11 src/components/WeightedAverages/WeightedAverages.js
+8 −0 src/state/auth/actions.js
+1 −0 src/state/auth/constants.js
+6 −0 src/state/auth/reducer.js
+7 −0 src/state/auth/saga.js
+2 −0 src/state/auth/selectors.js
+8 −0 src/state/query/actions.js
+1 −0 src/state/query/constants.js
+6 −0 src/state/query/reducer.js
+8 −4 src/state/query/saga.js
+2 −0 src/state/query/selectors.js
+9 −1 src/styles/index.scss
+13 −1 src/ui/DataTable/DataTable.js
+5 −1 src/ui/DataTable/_DataTable.scss
+27 −0 src/ui/ExportToPdf/ExportToPdf.js
+1 −0 src/ui/ExportToPdf/index.js
+2 −2 src/ui/LoadingPlaceholder/LoadingPlaceholder.js
+4 −3 src/ui/NavMenu/NavMenu.helpers.js
+0 −17 src/ui/SectionSwitch/SectionSwitch.helpers.js
+173 −104 src/utils/columns.js
2 changes: 1 addition & 1 deletion bfx-reports-framework
Submodule bfx-reports-framework updated 43 files
+2 −0 .gitignore
+1 −1 README.md
+1 −1 bfx-report-ui
+2 −2 config/service.report.json.example
+4 −4 docker-compose.yaml
+1 −1 nginx-configs/autoindex-format.xslt
+3 −3 nginx-configs/templates/default.conf.template
+6 −5 package.json
+3 −3 scripts/setup.sh
+2 −2 scripts/worker-entrypoint.sh
+34 −12 test/1-api-sync-mode-sqlite.spec.js
+26 −8 test/2-additional-api-sync-mode-sqlite.spec.js
+13 −13 test/3-api-filter-sync-mode-sqlite.spec.js
+24 −4 test/4-sub-account.spec.js
+5 −5 test/helpers/helpers.tests.js
+75 −54 test/test-cases/additional-api-sync-mode-sqlite-test-cases.js
+116 −87 test/test-cases/api-sync-mode-sqlite-test-cases.js
+8 −4 workers/api.framework.report.wrk.js
+12 −8 workers/loc.api/di/app.deps.js
+1 −1 workers/loc.api/di/types.js
+13 −1 workers/loc.api/errors/index.js
+6 −7 workers/loc.api/generate-report-file/csv-writer/full-snapshot-report-csv-writer.js
+7 −8 workers/loc.api/generate-report-file/csv-writer/full-tax-report-csv-writer.js
+0 −0 workers/loc.api/generate-report-file/csv-writer/index.js
+152 −0 workers/loc.api/generate-report-file/pdf-writer/index.js
+6 −0 workers/loc.api/generate-report-file/pdf-writer/template-file-names.js
+83 −0 workers/loc.api/generate-report-file/pdf-writer/templates/full-snapshot-report.pug
+95 −0 workers/loc.api/generate-report-file/pdf-writer/templates/full-tax-report.pug
+25 −0 workers/loc.api/generate-report-file/pdf-writer/translations.yml
+70 −56 workers/loc.api/generate-report-file/report.file.job.data.js
+1 −1 workers/loc.api/helpers/check-params.js
+28 −28 workers/loc.api/helpers/schema.js
+24 −2 workers/loc.api/process.message.manager/index.js
+3 −1 workers/loc.api/process.message.manager/process.messages.js
+3 −1 workers/loc.api/process.message.manager/process.states.js
+132 −76 workers/loc.api/service.report.framework.js
+6 −1 workers/loc.api/sync/authenticator/index.js
+2 −2 workers/loc.api/sync/colls.accessors/index.js
+10 −10 workers/loc.api/sync/colls.accessors/public.colls.conf.accessors.js
+3 −3 workers/loc.api/sync/data.inserter/data.checker/index.js
+4 −0 workers/loc.api/sync/full.snapshot.report/index.js
+5 −0 workers/loc.api/sync/full.tax.report/index.js
+20 −0 workers/loc.api/ws-transport/ws.event.emitter.js
3 changes: 3 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -28,6 +28,7 @@ services:
IS_PUBLISHED: ${IS_PUBLISHED:-0}
GH_TOKEN: ${GH_TOKEN:-}
GITHUB_TOKEN: ${GITHUB_TOKEN:-}
REPO_OWNER: ${REPO_OWNER:-}
EP_GH_IGNORE_TIME: ${EP_GH_IGNORE_TIME:-true}
CURRENT_UID: ${CURRENT_UID:-"1000:1000"}
volumes:
@@ -52,6 +53,7 @@ services:
IS_PUBLISHED: ${IS_PUBLISHED:-0}
GH_TOKEN: ${GH_TOKEN:-}
GITHUB_TOKEN: ${GITHUB_TOKEN:-}
REPO_OWNER: ${REPO_OWNER:-}
EP_GH_IGNORE_TIME: ${EP_GH_IGNORE_TIME:-true}
CURRENT_UID: ${CURRENT_UID:-"1000:1000"}
volumes:
@@ -76,6 +78,7 @@ services:
IS_PUBLISHED: ${IS_PUBLISHED:-0}
GH_TOKEN: ${GH_TOKEN:-}
GITHUB_TOKEN: ${GITHUB_TOKEN:-}
REPO_OWNER: ${REPO_OWNER:-}
EP_GH_IGNORE_TIME: ${EP_GH_IGNORE_TIME:-true}
CURRENT_UID: ${CURRENT_UID:-"1000:1000"}
volumes:
Loading

0 comments on commit c683605

Please sign in to comment.