Add improvements for dev mode

docker-compose.yaml

@@ -8,6 +8,7 @@ services:
       dockerfile: Dockerfile.ui-builder
     environment:
       BRANCH: ${BRANCH}
+      UI_BUILD_FOLDER: /ui-build
     volumes:
       - ui-build:/ui-build
 
@@ -20,6 +21,7 @@ services:
       ELECTRON_CACHE: /root/.cache/electron
       ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
       BRANCH: ${BRANCH}
+      UI_BUILD_FOLDER: /ui-build
     volumes:
       - ui-build:/ui-build
       - ./dist:/dist
@@ -35,6 +37,7 @@ services:
       ELECTRON_CACHE: /root/.cache/electron
       ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
       BRANCH: ${BRANCH}
+      UI_BUILD_FOLDER: /ui-build
     volumes:
       - ui-build:/ui-build
       - ./dist:/dist
@@ -50,6 +53,7 @@ services:
       ELECTRON_CACHE: /root/.cache/electron
       ELECTRON_BUILDER_CACHE: /root/.cache/electron-builder
       BRANCH: ${BRANCH}
+      UI_BUILD_FOLDER: /ui-build
     volumes:
       - ui-build:/ui-build
       - ./dist:/dist

package.json

@@ -22,7 +22,7 @@
     "extract-zip": "^2.0.1",
     "find-free-port": "^2.0.0",
     "github-markdown-css": "^4.0.0",
-    "grenache-grape": "^0.9.8",
+    "grenache-grape": "git+https://github.com/bitfinexcom/grenache-grape.git",
     "js-yaml": "^4.0.0",
     "lodash": "^4.17.15",
     "new-github-issue-url": "^0.2.1",
@@ -32,11 +32,11 @@
   },
   "devDependencies": {
     "app-builder-bin": "^3.5.13",
-    "electron": "13.1.2",
+    "electron": "13.1.6",
     "electron-builder": "22.11.7",
     "node-gyp": "7.1.2",
     "node-pre-gyp": "^0.11.0",
-    "standard": "^14.3.1"
+    "standard": "^16.0.3"
   },
   "standard": {
     "globals": [

scripts/build-ui.sh

@@ -3,13 +3,13 @@
 set -x
 
 export CI_ENVIRONMENT_NAME=production
+export SKIP_PREFLIGHT_CHECK=true
 
 ROOT="$PWD"
 frontendFolder="$ROOT/bfx-report-ui"
 pathToTriggerElectronLoad="$frontendFolder/src/utils/triggerElectronLoad.js"
 pathToFonts="$frontendFolder/src/styles/fonts"
-uiBuildFolder=/ui-build
-uiReadyFile="$uiBuildFolder/READY"
+uiBuildFolder="$frontendFolder/build"
 branch=master
 
 source $ROOT/scripts/update-submodules.sh
@@ -22,7 +22,13 @@ if [ "$BRANCH" != "" ]
 then
   branch=$BRANCH
 fi
+if [ "$UI_BUILD_FOLDER" != "" ]
+then
+  uiBuildFolder=$UI_BUILD_FOLDER
+fi
 
+mkdir $uiBuildFolder 2>/dev/null
+uiReadyFile="$uiBuildFolder/READY"
 rm -rf $uiBuildFolder/*
 
 function usage {
@@ -89,10 +95,10 @@ sed -i -e \
   "s/showFrameworkMode: false/showFrameworkMode: true/g" \
   $frontendFolder/src/config.js
 
-rm -f "$ROOT/.eslintrc"
-
+mv -f "$ROOT/.eslintrc" "$ROOT/eslint-conf-disabled-for-ui"
 npm i --no-audit
 npm run build
+mv -f "$ROOT/eslint-conf-disabled-for-ui" "$ROOT/.eslintrc"
 
 if ! [ -s "$frontendFolder/build/index.html" ]; then
   exit 1

scripts/init.sh

@@ -7,6 +7,7 @@ branch=master
 dbDriver=better-sqlite
 lastCommitFileName=lastCommit.json
 isZipReleaseFile="isZipRelease"
+bfxStagingUrl="https://api.staging.bitfinex.com"
 
 source $ROOT/scripts/get-conf-value.sh
 source $ROOT/scripts/escape-string.sh
@@ -62,7 +63,13 @@ expressFolder="$frontendFolder/bfx-report-express"
 backendFolder="$ROOT/bfx-reports-framework"
 
 linuxLauncherFolder="$ROOT/build/linux-launcher"
-uiBuildFolder=/ui-build
+
+uiBuildFolder="$frontendFolder/build"
+if [ "$UI_BUILD_FOLDER" != "" ]
+then
+  uiBuildFolder=$UI_BUILD_FOLDER
+fi
+mkdir $uiBuildFolder 2>/dev/null
 uiReadyFile="$uiBuildFolder/READY"
 
 mkdir $ROOT/dist 2>/dev/null
@@ -104,8 +111,9 @@ sed -i -e \
   $backendFolder/config/service.report.json
 
 if [ $isDevEnv != 0 ]; then
+  escapedBfxStagingUrl=$(escapeString $bfxStagingUrl)
   sed -i -e \
-    "s/\"restUrl\": \".*\"/\"restUrl\": \"https:\/\/test.bitfinex.com\"/g" \
+    "s/\"restUrl\": \".*\"/\"restUrl\": \"$escapedBfxStagingUrl\"/g" \
     $backendFolder/config/service.report.json
 fi
 

src/change-sync-frequency.js

@@ -176,7 +176,8 @@ module.exports = () => {
         ...alertOptions,
         text,
         inputValue: timeFormat.value === timeData.timeFormat
-          ? timeData.value : 1,
+          ? timeData.value
+          : 1,
         inputAttributes: {
           min: 1,
           max: 31,
@@ -189,7 +190,8 @@ module.exports = () => {
         ...alertOptions,
         text,
         inputValue: timeFormat.value === timeData.timeFormat
-          ? timeData.value : 2,
+          ? timeData.value
+          : 2,
         inputAttributes: {
           min: 1,
           max: 23,
@@ -202,7 +204,8 @@ module.exports = () => {
       ...alertOptions,
       text,
       inputValue: timeFormat.value === timeData.timeFormat
-        ? timeData.value : 20,
+        ? timeData.value
+        : 20,
       inputAttributes: {
         min: 10,
         max: 59,

src/error-manager/render-markdown-template.js

@@ -10,7 +10,7 @@ const templateByDefault = fs.readFileSync(
   path.join(__dirname, 'github-issue-template.md'),
   'utf8'
 )
-const placeholderPattern = new RegExp(/\$\{[a-zA-Z0-9]+\}/, 'g')
+const placeholderPattern = /\$\{[a-zA-Z0-9]+\}/g
 
 // The GitHub GET endpoint for opening a new issue
 // has a restriction for maximum length of a URL: 8192 bytes

src/helpers/get-debug-info.js

@@ -9,11 +9,18 @@ const productName = 'Bitfinex Report'
 
 const { getAppUpdateConfigSync } = require('../auto-updater')
 
-const appUpdateConfig = getAppUpdateConfigSync()
 const packageJson = require(path.join(appDir, 'package.json'))
 
 let lastCommit = { hash: '-', date: '-' }
+let appUpdateConfig = {}
 
+try {
+  appUpdateConfig = getAppUpdateConfigSync()
+} catch (err) {
+  console.debug(err)
+
+  appUpdateConfig = packageJson.build.publish
+}
 try {
   lastCommit = require(path.join(appDir, 'lastCommit.json'))
 } catch (err) {

src/window-creators.js

@@ -56,9 +56,9 @@ const _createWindow = async (
     manage
   } = isMainWindow
     ? windowStateKeeper({
-      defaultWidth,
-      defaultHeight
-    })
+        defaultWidth,
+        defaultHeight
+      })
     : {}
   const _props = {
     autoHideMenuBar: true,
@@ -82,10 +82,10 @@ const _createWindow = async (
 
   const startUrl = pathname
     ? url.format({
-      pathname,
-      protocol: 'file:',
-      slashes: true
-    })
+        pathname,
+        protocol: 'file:',
+        slashes: true
+      })
     : 'app://-'
 
   if (!pathname) {