diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91dd94b92..3e3f166ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
- Ability to invite users to sites with different roles plausible/analytics#1122
- Option to configure a custom name for the script file
- Add Conversion Rate to Top Sources, Top Pages Devices, Countries when filtered by a goal plausible/analytics#1299
+- Add list view for countries report in dashboard plausible/analytics#1381
- Add ability to view more than 100 custom goal properties plausible/analytics#1353
### Fixed
diff --git a/assets/js/dashboard/historical.js b/assets/js/dashboard/historical.js
index 1d90bb1d6..a4b3b4b21 100644
--- a/assets/js/dashboard/historical.js
+++ b/assets/js/dashboard/historical.js
@@ -7,7 +7,7 @@ import CurrentVisitors from './stats/current-visitors'
import VisitorGraph from './stats/visitor-graph'
import Sources from './stats/sources'
import Pages from './stats/pages'
-import Countries from './stats/countries'
+import Locations from './stats/locations';
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import { withPinnedHeader } from './pinned-header-hoc';
@@ -47,7 +47,7 @@ class Historical extends React.Component {
-
+
{ this.renderConversions() }
diff --git a/assets/js/dashboard/realtime.js b/assets/js/dashboard/realtime.js
index d343390e1..ed124a746 100644
--- a/assets/js/dashboard/realtime.js
+++ b/assets/js/dashboard/realtime.js
@@ -6,7 +6,7 @@ import Filters from './filters'
import VisitorGraph from './stats/visitor-graph'
import Sources from './stats/sources'
import Pages from './stats/pages'
-import Countries from './stats/countries'
+import Locations from './stats/locations'
import Devices from './stats/devices'
import Conversions from './stats/conversions'
import { withPinnedHeader } from './pinned-header-hoc';
@@ -45,7 +45,7 @@ class Realtime extends React.Component {
-
+
diff --git a/assets/js/dashboard/stats/locations/countries.js b/assets/js/dashboard/stats/locations/countries.js
new file mode 100644
index 000000000..8e8e77137
--- /dev/null
+++ b/assets/js/dashboard/stats/locations/countries.js
@@ -0,0 +1,118 @@
+import React from 'react';
+import { Link } from 'react-router-dom'
+import FlipMove from 'react-flip-move';
+import Datamap from 'datamaps'
+
+import FadeIn from '../../fade-in'
+import Bar from '../bar'
+import MoreLink from '../more-link'
+import numberFormatter from '../../number-formatter'
+import * as api from '../../api'
+import * as url from '../../url'
+import LazyLoader from '../../lazy-loader'
+
+export default class Countries extends React.Component {
+ constructor(props) {
+ super(props)
+ this.state = {loading: true}
+ this.onVisible = this.onVisible.bind(this)
+ }
+
+ componentDidUpdate(prevProps) {
+ if (this.props.query !== prevProps.query) {
+ this.setState({loading: true, countries: null})
+ this.fetchCountries()
+ }
+ }
+
+ onVisible() {
+ this.fetchCountries()
+ if (this.props.timer) this.props.timer.onTick(this.fetchCountries.bind(this))
+ }
+
+ showConversionRate() {
+ return !!this.props.query.filters.goal
+ }
+
+ fetchCountries() {
+ api.get(`/api/stats/${encodeURIComponent(this.props.site.domain)}/countries`, this.props.query)
+ .then((res) => this.setState({loading: false, countries: res}))
+ }
+
+ label() {
+ if (this.showConversionRate()) {
+ return 'Conversions'
+ }
+
+ return 'Visitors'
+ }
+
+ renderCountry(country) {
+ const maxWidthDeduction = this.showConversionRate() ? "10rem" : "5rem"
+ const allCountries = Datamap.prototype.worldTopo.objects.world.geometries;
+ const thisCountry = allCountries.find((c) => c.id === country.name) || {properties: {name: country.name}};
+ const countryFullName = thisCountry.properties.name
+
+ return (
+
+ )
+ }
+}
diff --git a/assets/js/dashboard/stats/countries.js b/assets/js/dashboard/stats/locations/map.js
similarity index 83%
rename from assets/js/dashboard/stats/countries.js
rename to assets/js/dashboard/stats/locations/map.js
index 2c06ae684..8dc82d49c 100644
--- a/assets/js/dashboard/stats/countries.js
+++ b/assets/js/dashboard/stats/locations/map.js
@@ -3,15 +3,15 @@ import Datamap from 'datamaps'
import { withRouter } from 'react-router-dom'
import * as d3 from "d3"
-import numberFormatter from '../number-formatter'
-import FadeIn from '../fade-in'
-import LazyLoader from '../lazy-loader'
-import MoreLink from './more-link'
-import * as api from '../api'
-import { navigateToQuery } from '../query'
-import { withThemeConsumer } from '../theme-consumer-hoc';
-
-class Countries extends React.Component {
+import numberFormatter from '../../number-formatter'
+import FadeIn from '../../fade-in'
+import LazyLoader from '../../lazy-loader'
+import MoreLink from '../more-link'
+import * as api from '../../api'
+import { navigateToQuery } from '../../query'
+import { withThemeConsumer } from '../../theme-consumer-hoc';
+
+class CountriesMap extends React.Component {
constructor(props) {
super(props)
this.resizeMap = this.resizeMap.bind(this)
@@ -137,8 +137,7 @@ class Countries extends React.Component {
if (this.state.countries) {
return (
-
Countries
-
+
{ this.geolocationDbNotice() }
@@ -148,18 +147,14 @@ class Countries extends React.Component {
render() {
return (
-