-
Notifications
You must be signed in to change notification settings - Fork 96
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4261 from vibratious/4208-refactor-nextwork-domain
Refactor the Network domain to match the proposed architecture - Closes #4208
- Loading branch information
Showing
25 changed files
with
445 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
.mapWrapper { | ||
padding: 0 !important; | ||
margin-bottom: 15px; | ||
min-height: 0 !important; | ||
} | ||
|
||
.map { | ||
width: 100%; | ||
height: 285px; | ||
box-sizing: border-box; | ||
position: relative; | ||
z-index: 1; | ||
|
||
& .wrapper { | ||
width: 100%; | ||
height: 100%; | ||
background-color: var(--color-platinum); | ||
border-radius: var(--border-radius-box); | ||
overflow: hidden; | ||
|
||
& > div { | ||
width: 100%; | ||
height: 100%; | ||
} | ||
} | ||
} | ||
|
||
:global .mapboxWatermark { | ||
width: 40px; | ||
margin-bottom: -2px; | ||
} | ||
|
||
:global .markerCluster { | ||
display: block; | ||
width: 42px; | ||
height: 42px; | ||
line-height: 42px; | ||
border: 0; | ||
background-image: url('../../../setup/react/assets/images/marker-group.svg'); | ||
text-align: center; | ||
color: var(--color-strong-mystic); | ||
font-size: 13px; | ||
} | ||
|
||
:global .leaflet-marker-icon { | ||
border: 0; | ||
background: transparent; | ||
} | ||
|
||
:global .leaflet-bar { | ||
box-shadow: none !important; | ||
border: 0 !important; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import { compose } from 'redux'; | ||
import { getPeers } from "@network/utilities/api"; | ||
import withData from "@common/utilities/withData"; | ||
import { DEFAULT_LIMIT } from '@views/configuration'; | ||
import { withTranslation } from "react-i18next"; | ||
import withLocalSort from "@common/utilities/withLocalSort"; | ||
import { sortByVersion } from '../../utilities/helpers'; | ||
import NodeList from "./manager"; | ||
import { tokenMap } from '@token/configuration/tokens'; | ||
|
||
export default compose( | ||
withData({ | ||
peers: { | ||
apiUtil: (network, params) => getPeers({ network, params }, tokenMap.LSK.key), | ||
getApiParams: () => ({ | ||
limit: DEFAULT_LIMIT, | ||
}), | ||
defaultData: [], | ||
autoload: true, | ||
transformResponse: (response, peers, urlSearchParams) => ( | ||
urlSearchParams.offset | ||
? [...peers, ...response.data] | ||
: response.data | ||
), | ||
}, | ||
}), | ||
withLocalSort('peers', 'height:desc', { networkVersion: sortByVersion }), | ||
withTranslation(), | ||
)(NodeList); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
import React from 'react'; | ||
import Box from '@basics/box'; | ||
import BoxContent from '@basics/box/content'; | ||
import Table from '@basics/table'; | ||
import styles from './nodeList.css'; | ||
import header from './tableHeader'; | ||
import Map from '../../map'; | ||
import PeerRow from '../row'; | ||
|
||
export const NodeList = ({ | ||
peers, t, changeSort, sort, | ||
}) => { | ||
/* istanbul ignore next */ | ||
const handleLoadMore = () => { | ||
peers.loadData({ offset: peers.data.length }); | ||
}; | ||
const canLoadMore = peers.meta ? peers.data.length < peers.meta.total : false; | ||
|
||
return ( | ||
<> | ||
<Box className="map-box"> | ||
<BoxContent className={styles.mapWrapper}> | ||
<Map peers={peers.data} /> | ||
</BoxContent> | ||
</Box> | ||
<Box main isLoading={peers.isLoading} className="peers-box"> | ||
<BoxContent className={styles.content}> | ||
<Table | ||
data={peers.data} | ||
isLoading={peers.isLoading} | ||
row={PeerRow} | ||
loadData={handleLoadMore} | ||
header={header(changeSort, t)} | ||
currentSort={sort} | ||
error={peers.error} | ||
canLoadMore={canLoadMore} | ||
/> | ||
</BoxContent> | ||
</Box> | ||
</> | ||
); | ||
}; | ||
|
||
export default NodeList; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import React from 'react'; | ||
import { mount, shallow } from 'enzyme'; | ||
import NodeList from "./manager"; | ||
import peers from '@tests/constants/peers'; | ||
|
||
describe('Network Monitor Page', () => { | ||
const loadData = jest.fn(); | ||
const clearData = jest.fn(); | ||
const urlSearchParams = {}; | ||
const emptyPeers = { | ||
isLoading: false, | ||
data: [], | ||
loadData, | ||
clearData, | ||
urlSearchParams, | ||
}; | ||
const fullPeers = { | ||
isLoading: false, | ||
data: peers, | ||
meta: { total: peers.length }, | ||
loadData, | ||
clearData, | ||
urlSearchParams, | ||
}; | ||
const t = key => key; | ||
const lodingProps = { | ||
t, | ||
peers: { | ||
isLoading: true, | ||
data: [], | ||
meta: {}, | ||
loadData, | ||
clearData, | ||
urlSearchParams, | ||
}, | ||
}; | ||
it('renders the empty state if no peers passed', () => { | ||
const wrapper = mount(<NodeList {...{ t, peers: emptyPeers }} />); | ||
expect(wrapper.find('.empty-state')).toHaveLength(1); | ||
}); | ||
|
||
it('shows loading overlay while the API call is being processed', () => { | ||
const wrapper = shallow(<NodeList {...lodingProps} />); | ||
expect(wrapper.html().match(/loadingOverlay/)).toHaveLength(1); | ||
}); | ||
|
||
it('renders 20 peers', () => { | ||
const wrapper = shallow(<NodeList {...{ t, peers: fullPeers }} />); | ||
expect(wrapper.html().match(/peer-row/gm)).toHaveLength(20); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
.content { | ||
padding: 0 !important; | ||
} | ||
|
||
.contentHeader { | ||
display: inline-block; | ||
} | ||
|
||
.height { | ||
padding-right: 20px; | ||
} | ||
|
||
.mapWrapper { | ||
padding: 0 !important; | ||
margin-bottom: 15px; | ||
min-height: 0 !important; | ||
} | ||
|
||
.map { | ||
width: 100%; | ||
height: 285px; | ||
box-sizing: border-box; | ||
position: relative; | ||
z-index: 1; | ||
|
||
& .wrapper { | ||
width: 100%; | ||
height: 100%; | ||
background-color: var(--color-platinum); | ||
border-radius: var(--border-radius-box); | ||
overflow: hidden; | ||
|
||
& > div { | ||
width: 100%; | ||
height: 100%; | ||
} | ||
} | ||
} | ||
|
||
:global .mapboxWatermark { | ||
width: 40px; | ||
margin-bottom: -2px; | ||
} | ||
|
||
:global .markerCluster { | ||
display: block; | ||
width: 42px; | ||
height: 42px; | ||
line-height: 42px; | ||
border: 0; | ||
background-image: url('../../../../setup/react/assets/images/marker-group.svg'); | ||
text-align: center; | ||
color: var(--color-strong-mystic); | ||
font-size: 13px; | ||
} | ||
|
||
:global .leaflet-marker-icon { | ||
border: 0; | ||
background: transparent; | ||
} | ||
|
||
:global .leaflet-bar { | ||
box-shadow: none !important; | ||
border: 0 !important; | ||
} |
2 changes: 1 addition & 1 deletion
2
...s/managers/monitor/network/tableHeader.js → .../network/nodesList/manager/tableHeader.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import { act } from 'react-dom/test-utils'; | ||
import React from 'react'; | ||
import { mount } from 'enzyme'; | ||
import Row from './index'; | ||
|
||
describe('Peer Row', () => { | ||
const props = { | ||
data: { | ||
ip: '192.168.0.1', | ||
height: 12000, | ||
location: { | ||
countryCode: 49, | ||
}, | ||
networkVersion: '3.0', | ||
port: 8080, | ||
}, | ||
className: 'customTestClassNames', | ||
}; | ||
|
||
it('renders the data properly', () => { | ||
const wrapper = mount(<Row {...props} />); | ||
expect(wrapper.find('span').at(0)).toHaveText('192.168.0.1'); | ||
expect(wrapper.find('span').at(1)).toHaveText('8080'); | ||
expect(wrapper.find('.network-span')).toHaveText('3.0'); | ||
}); | ||
|
||
it('does not re-render if height or ip do not change', () => { | ||
const wrapper = mount(<Row {...props} />); | ||
expect(wrapper.find('span').at(0)).toHaveText('192.168.0.1'); | ||
wrapper.setProps({ | ||
data: { | ||
...props.data, | ||
networkVersion: '4.0', | ||
}, | ||
}); | ||
act(() => { | ||
wrapper.update(); | ||
}); | ||
expect(wrapper.find('.network-span').at(0)).toHaveText('3.0'); | ||
wrapper.setProps({ | ||
data: { | ||
...props.data, | ||
ip: '192.168.0.2', | ||
}, | ||
}); | ||
act(() => { | ||
wrapper.update(); | ||
}); | ||
expect(wrapper.find('span').at(0)).toHaveText('192.168.0.2'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
import { compose } from 'redux'; | ||
import withData from "@common/utilities/withData"; | ||
import { withTranslation } from "react-i18next"; | ||
import Statistics from './statistics'; | ||
import { getNetworkStatistics } from '@network/utilities/api'; | ||
import { tokenMap } from '@token/configuration/tokens'; | ||
|
||
export default compose( | ||
withData({ | ||
networkStatistics: { | ||
apiUtil: network => getNetworkStatistics({ network }, tokenMap.LSK.key), | ||
defaultData: {}, | ||
autoload: true, | ||
transformResponse: response => response.data, | ||
}, | ||
}), | ||
withTranslation(), | ||
)(Statistics); |
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
...ers/monitor/network/overview/overview.css → packages/network/statistics/statistics.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.