Merge pull request #1018 from alexstotsky/open-exported-file-in-os-manager

(feature) Open exported report in the file manager

Author: elvis-poggi

src/components/ExportSuccessDialog/ExportSuccessDialog.container.js

@@ -3,6 +3,7 @@ import { connect } from 'react-redux'
 import { withRouter } from 'react-router-dom'
 import { withTranslation } from 'react-i18next'
 
+import { openExportFolder } from 'state/query/actions'
 import { getLocalExportPath, getRemoteUrn } from 'state/query/selectors'
 import { toggleExportSuccessDialog } from 'state/ui/actions'
 import { getIsExportSuccessDialogOpen } from 'state/ui/selectors'
@@ -16,6 +17,7 @@ const mapStateToProps = state => ({
 })
 
 const mapDispatchToProps = {
+  openExportFolder,
   toggleDialog: toggleExportSuccessDialog,
 }
 

src/components/ExportSuccessDialog/ExportSuccessDialog.js

@@ -17,6 +17,7 @@ const ExportSuccessDialog = ({
   remoteUrn,
   toggleDialog,
   localExportPath,
+  openExportFolder,
 }) => {
   if (!isOpen) {
     return null
@@ -37,7 +38,7 @@ const ExportSuccessDialog = ({
               {t('download.remoteStorage')}
             </a>
           ) : (
-            <span>
+            <span onClick={openExportFolder}>
               {localExportPath}
             </span>
           )
@@ -73,6 +74,7 @@ ExportSuccessDialog.propTypes = {
   t: PropTypes.func.isRequired,
   isOpen: PropTypes.bool.isRequired,
   toggleDialog: PropTypes.func.isRequired,
+  openExportFolder: PropTypes.func.isRequired,
 }
 ExportSuccessDialog.defaultProps = {
   remoteUrn: null,

src/components/ExportSuccessDialog/_ExportSuccessDialog.scss

@@ -10,7 +10,9 @@
     text-align: center;
 
     span {
+      cursor: pointer;
       color: var(--thColor);
+      text-decoration: underline;
     }
   }
 

src/state/query/actions.js

@@ -67,6 +67,26 @@ export function setIsPdfRequired(isPdfRequired) {
   }
 }
 
+export function openExportFolder() {
+  return {
+    type: types.OPEN_EXPORT_FOLDER,
+  }
+}
+
+export function setIsSingleExport(isSingleExport) {
+  return {
+    type: types.SET_IS_SINGLE_EXPORT,
+    payload: isSingleExport,
+  }
+}
+
+export function setFirstExportPath(path) {
+  return {
+    type: types.SET_FIRST_EXPORT_PATH,
+    payload: path,
+  }
+}
+
 export default {
   exportReport,
   setRemoteUrn,
@@ -75,4 +95,7 @@ export default {
   setIsPdfRequired,
   setIsReportExporting,
   setLocalExportPath,
+  openExportFolder,
+  setIsSingleExport,
+  setFirstExportPath,
 }

src/state/query/constants.js

@@ -45,6 +45,9 @@ export default {
   SET_IS_PDF_REQUIRED: 'BITFINEX/EXPORT/IS_PDF_REQUIRED',
   PREPARE_EXPORT: 'BITFINEX/EXPORT/PREPARE',
   SET_EXPORT_EMAIL: 'BITFINEX/EMAIL/EXPORT',
+  OPEN_EXPORT_FOLDER: 'BITFINEX/EXPORT_FOLDER/OPEN',
+  SET_IS_SINGLE_EXPORT: 'BITFINEX/EXPORT/IS_SINGLE_EXPORT',
+  SET_FIRST_EXPORT_PATH: 'BITFINEX/EXPORT/FIRST_EXPORT_PATH',
   FILTER_ID: 'id',
   FILTER_PAIR: 'pair',
   FILTER_SYMBOL: 'symbol',

src/state/query/reducer.js

@@ -8,6 +8,8 @@ const initialState = {
   remoteUrn: null,
   isReportExporting: false,
   isPDFRequired: false,
+  isSingleExport: true,
+  firstExportPath: null,
 }
 
 export function queryReducer(state = initialState, action) {
@@ -38,6 +40,16 @@ export function queryReducer(state = initialState, action) {
         ...state,
         isPDFRequired: payload,
       }
+    case types.SET_IS_SINGLE_EXPORT:
+      return {
+        ...state,
+        isSingleExport: payload,
+      }
+    case types.SET_FIRST_EXPORT_PATH:
+      return {
+        ...state,
+        firstExportPath: payload,
+      }
     case authTypes.LOGOUT:
       return initialState
     default:

src/state/query/saga.js

@@ -9,6 +9,7 @@ import _assign from 'lodash/assign'
 import _isArray from 'lodash/isArray'
 import _includes from 'lodash/includes'
 
+import { logger } from 'utils/logger'
 import { LANGUAGES } from 'locales/i18n'
 import { makeFetchCall } from 'state/utils'
 import { formatRawSymbols, mapRequestSymbols, mapRequestPairs } from 'state/symbols/utils'
@@ -61,15 +62,21 @@ import config from 'config'
 
 import actions from './actions'
 import types from './constants'
-import { getExportEmail, getIsPdfExportRequired } from './selectors'
+import {
+  getExportEmail,
+  getIsSingleExport,
+  getLocalExportPath,
+  getFirstExportPath,
+  getIsPdfExportRequired,
+} from './selectors'
 import {
   getQueryLimit,
   NO_TIME_FRAME_TARGETS,
   NO_QUERY_LIMIT_TARGETS,
 } from './utils'
 
 
-const { showFrameworkMode } = config
+const { isElectronApp, showFrameworkMode } = config
 const {
   MENU_ACCOUNT_BALANCE,
   MENU_AFFILIATES_EARNINGS,
@@ -467,7 +474,22 @@ function* prepareExport() {
   }
 }
 
+function* openExportFolder() {
+  if (isElectronApp) {
+    const filePath = yield select(getFirstExportPath)
+    const folderPath = yield select(getLocalExportPath)
+    const isSingleExport = yield select(getIsSingleExport)
+    const fullPath = isSingleExport ? filePath : folderPath
+    try {
+      yield call(window.bfxReportElectronApi.showItemInFolder, { fullPath })
+    } catch (error) {
+      yield call(logger.error, error)
+    }
+  }
+}
+
 export default function* exportSaga() {
   yield takeLatest(types.PREPARE_EXPORT, prepareExport)
   yield takeLatest(types.EXPORT_REPORT, exportReport)
+  yield takeLatest(types.OPEN_EXPORT_FOLDER, openExportFolder)
 }

src/state/query/selectors.js

@@ -5,6 +5,8 @@ export const getExportEmail = state => getQuery(state).exportEmail
 export const getLocalExportPath = state => getQuery(state).localExportPath
 export const getIsReportExporting = state => getQuery(state)?.isReportExporting ?? false
 export const getIsPdfExportRequired = state => getQuery(state)?.isPDFRequired ?? false
+export const getIsSingleExport = state => getQuery(state)?.isSingleExport ?? true
+export const getFirstExportPath = state => getQuery(state)?.firstExportPath ?? null
 
 export default {
   getQuery,
@@ -13,4 +15,6 @@ export default {
   getIsReportExporting,
   getLocalExportPath,
   getIsPdfExportRequired,
+  getIsSingleExport,
+  getFirstExportPath,
 }

src/state/ws/saga.js

@@ -1,9 +1,16 @@
 import { call, put, takeLatest } from 'redux-saga/effects'
+import _get from 'lodash/get'
+import _size from 'lodash/size'
+import _first from 'lodash/first'
 
 import { initSync } from 'state/sync/saga'
 import { authExpired } from 'state/auth/actions'
 import { updateSyncStatus } from 'state/sync/actions'
-import { setIsReportExporting } from 'state/query/actions'
+import {
+  setIsSingleExport,
+  setFirstExportPath,
+  setIsReportExporting,
+} from 'state/query/actions'
 import { updateStatus, updateWarningStatus } from 'state/status/actions'
 import {
   toggleExportDialog,
@@ -35,7 +42,12 @@ function* handleTokenAuthRequired() {
   yield put(authExpired())
 }
 
-function* handleReportGenerationCompleted() {
+function* handleReportGenerationCompleted({ payload }) {
+  const files = payload?.result?.reportFilesMetadata
+  const isSingleExport = _size(files) === 1
+  const firstFilePath = _get(_first(files), 'filePath')
+  yield put(setIsSingleExport(isSingleExport))
+  yield put(setFirstExportPath(firstFilePath))
   yield put(setIsReportExporting(false))
   yield put(toggleExportDialog())
   yield put(toggleExportSuccessDialog())