Merge pull request #572 from pe4cey/3.0-fix-object-converter

Fix issue where objectConverter is missing when mapping from bolt
neo4j · May 31, 2017 · 3552b82 · 3552b82
2 parents d029819 + 947954e
commit 3552b82
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/src/browser/modules/Stream/Queries/QueriesFrame.jsx b/src/browser/modules/Stream/Queries/QueriesFrame.jsx
@@ -28,7 +28,7 @@ import {getAvailableProcedures} from 'shared/modules/features/featuresDuck'
 import {CYPHER_REQUEST, CLUSTER_CYPHER_REQUEST, AD_HOC_CYPHER_REQUEST} from 'shared/modules/cypher/cypherDuck'
 import {getConnectionState, CONNECTED_STATE} from 'shared/modules/connections/connectionsDuck'
 import {ConfirmationButton} from 'browser-components/buttons/ConfirmationButton'
-import {StyledTh, StyledHeaderRow, StyledTable, StyledTd, Code, StyledStatusBar, AutoRefreshToogle, RefreshQueriesButton, AutoRefreshSpan} from './styled'
+import {StyledTh, StyledHeaderRow, StyledTable, StyledTd, Code, StyledStatusBar, AutoRefreshToogle, RefreshQueriesButton, AutoRefreshSpan, StatusbarWrapper} from './styled'
 import {EnterpriseOnlyFrame} from 'browser-components/EditionView'
 import {RefreshIcon} from 'browser-components/icons/Icons'
 import Render from 'browser-components/Render'
@@ -206,7 +206,7 @@ export class QueriesFrame extends Component {
     if (this.canListQueries()) {
       frameContents = this.constructViewFromQueryList(this.state.queries)
       statusbar = (
-        <div>
+        <StatusbarWrapper>
           <Render if={this.state.errors}>
             <FrameError message={(this.state.errors || []).join(', ')} />
           </Render>
@@ -219,7 +219,7 @@ export class QueriesFrame extends Component {
               </AutoRefreshSpan>
             </StyledStatusBar>
           </Render>
-        </div>
+        </StatusbarWrapper>
       )
     } else {
       frameContents = (<EnterpriseOnlyFrame command={this.props.frame.cmd} />)

diff --git a/src/browser/modules/Stream/Queries/styled.jsx b/src/browser/modules/Stream/Queries/styled.jsx
@@ -51,6 +51,11 @@ export const StyledHeaderRow = styled.tr`
   border-top: ${props => props.theme.inFrameBorder};
   border-bottom: ${props => props.theme.inFrameBorder};
 `
+
+export const StatusbarWrapper = styled.div`
+  width: 100%;
+`
+
 export const StyledStatusBar = styled.div`
   min-height: 39px;
   line-height:  39px;

diff --git a/src/shared/services/bolt/bolt.js b/src/shared/services/bolt/bolt.js
@@ -226,6 +226,6 @@ export default {
     return mappings.extractPlan(result, calculateTotalDbHits)
   },
   retrieveFormattedUpdateStatistics: mappings.retrieveFormattedUpdateStatistics,
-  itemIntToNumber: (item) => mappings.itemIntToString(item, { intChecker: neo4j.isInt, intConverter: (val) => val.toNumber() }),
+  itemIntToNumber: (item) => mappings.itemIntToString(item, { intChecker: neo4j.isInt, intConverter: (val) => val.toNumber(), objectConverter: mappings.extractFromNeoObjects }),
   neo4j: neo4j
 }