@@ -340,31 +344,34 @@ describe('Toggling display of the sidebar', () => {
});
it('should call the sidebar toggle function for RAPID editor', async () => {
- const restartMock = jest.fn();
+ // Testing the resize call cannot be done currently, due to the following reasons:
+ // 1. Jest cannot mock/spy on the function call
+ // 2. The test environment doesn't have width/height information
+ // 3. The resize call in Rapid cannot be mocked since it is difficult to (a) get the context and (b) mock the call prior to full initialization.
+ // const resizeMock = jest.fn();
+ // expect(resizeMock).toHaveBeenCalledTimes(1); // This should be at the end of the test
const user = userEvent.setup();
- const context = {
- ui: jest.fn().mockReturnValue({
- restart: restartMock,
- }),
- };
- act(() => {
- store.dispatch({ type: 'SET_RAPIDEDITOR', context: context });
- });
- const setShowSidebarMock = jest.fn();
- render(
+ const { getByRole, queryByRole } = renderWithRouter(
-
+
,
);
await user.click(
- screen.getByRole('button', {
- name: /hide sidebar/i,
+ getByRole('button', {
+ name: 'Hide sidebar',
}),
);
- expect(setShowSidebarMock).toHaveBeenCalledTimes(1);
- expect(restartMock).toHaveBeenCalledTimes(1);
+ expect(getByRole('generic', { name: 'Show sidebar' })).toBeVisible();
+ expect(queryByRole('button', { name: 'Hide sidebar' })).toBeNull();
});
});
diff --git a/frontend/src/components/teamsAndOrgs/featureStats.js b/frontend/src/components/teamsAndOrgs/featureStats.js
index 6b6e8f9968..ffeeb5bd31 100644
--- a/frontend/src/components/teamsAndOrgs/featureStats.js
+++ b/frontend/src/components/teamsAndOrgs/featureStats.js
@@ -2,20 +2,25 @@ import React, { useEffect, useState } from 'react';
import axios from 'axios';
import { FormattedMessage } from 'react-intl';
+import messages from './messages';
import userDetailMessages from '../userDetail/messages';
-import { HOMEPAGE_STATS_API_URL } from '../../config';
+import { OHSOME_STATS_BASE_URL } from '../../config';
import { RoadIcon, HomeIcon, WavesIcon, MarkerIcon } from '../svgIcons';
import { StatsCard } from '../statsCard';
+import StatsTimestamp from '../statsTimestamp';
export const FeatureStats = () => {
const [stats, setStats] = useState({ edits: 0, buildings: 0, roads: 0, pois: 0, waterways: 0 });
const getStats = async () => {
try {
- const response = await axios.get(HOMEPAGE_STATS_API_URL);
+ const response = await axios.get(
+ `${OHSOME_STATS_BASE_URL}/stats/hotosm-project-%2A`,
+ );
+ const { edits, buildings, roads } = response.data.result;
setStats({
- edits: response.data.edits,
- buildings: response.data.building_count_add,
- roads: response.data.road_km_add,
+ edits,
+ buildings,
+ roads,
pois: response.data.poi_count_add,
waterways: response.data.waterway_km_add,
});
@@ -32,31 +37,39 @@ export const FeatureStats = () => {
const iconStyle = { height: '45px' };
return (
-
- }
- description={}
- value={stats.buildings || 0}
- className={'w-25-l w-50-m w-100 mv1'}
- />
- }
- description={}
- value={stats.roads || 0}
- className={'w-25-l w-50-m w-100 mv1'}
- />
- }
- description={}
- value={stats.pois || 0}
- className={'w-25-l w-50-m w-100 mv1'}
- />
- }
- description={}
- value={stats.waterways || 0}
- className={'w-25-l w-50-m w-100 mv1'}
- />
-
+ <>
+
+
+
+
+
+
+
+ }
+ description={}
+ value={stats.buildings || 0}
+ className={'w-25-l w-50-m w-100 mv1'}
+ />
+ }
+ description={}
+ value={stats.roads || 0}
+ className={'w-25-l w-50-m w-100 mv1'}
+ />
+ }
+ description={}
+ value={stats.pois || 0}
+ className={'w-25-l w-50-m w-100 mv1'}
+ />
+ }
+ description={}
+ value={stats.waterways || 0}
+ className={'w-25-l w-50-m w-100 mv1'}
+ />
+
+
);
};
diff --git a/frontend/src/components/teamsAndOrgs/messages.js b/frontend/src/components/teamsAndOrgs/messages.js
index 74e77d5834..ace6caf287 100644
--- a/frontend/src/components/teamsAndOrgs/messages.js
+++ b/frontend/src/components/teamsAndOrgs/messages.js
@@ -553,4 +553,8 @@ export default defineMessages({
id: 'management.stats.overview',
defaultMessage: 'Overview',
},
+ totalFeatures: {
+ id: 'management.stats.features',
+ defaultMessage: 'Total features',
+ },
});
diff --git a/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js b/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js
index 0562cf4cdf..1dae46c965 100644
--- a/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js
+++ b/frontend/src/components/teamsAndOrgs/tests/featureStats.test.js
@@ -23,6 +23,7 @@ test('FeatureStats renders the correct values and labels', async () => {
expect(screen.getByText('Km waterways mapped')).toBeInTheDocument();
await waitFor(() => expect(screen.getByText('2,380,562')).toBeInTheDocument());
expect(screen.getByText('101,367,027')).toBeInTheDocument();
- expect(screen.getByText('183,011')).toBeInTheDocument();
- expect(screen.getByText('350,906')).toBeInTheDocument();
+ // Uncomment the following when POIs and waterways become available
+ // expect(screen.getByText('183,011')).toBeInTheDocument();
+ // expect(screen.getByText('350,906')).toBeInTheDocument();
});
diff --git a/frontend/src/components/userDetail/editsByNumbers.js b/frontend/src/components/userDetail/editsByNumbers.js
index 67720a8583..45546d9ec5 100644
--- a/frontend/src/components/userDetail/editsByNumbers.js
+++ b/frontend/src/components/userDetail/editsByNumbers.js
@@ -15,13 +15,13 @@ const EditsByNumbers = ({ osmStats }) => {
let reference = [
{
label: intl.formatMessage(typesMessages.buildings),
- field: 'total_building_count_add',
+ field: 'buildings',
backgroundColor: CHART_COLOURS.red,
borderColor: CHART_COLOURS.white,
},
{
label: intl.formatMessage(typesMessages.roads),
- field: 'total_road_km_add',
+ field: 'roads',
backgroundColor: CHART_COLOURS.green,
borderColor: CHART_COLOURS.white,
},
diff --git a/frontend/src/components/userDetail/elementsMapped.js b/frontend/src/components/userDetail/elementsMapped.js
index f8cebf460f..72c9a58126 100644
--- a/frontend/src/components/userDetail/elementsMapped.js
+++ b/frontend/src/components/userDetail/elementsMapped.js
@@ -1,6 +1,5 @@
import React from 'react';
import humanizeDuration from 'humanize-duration';
-import ReactTooltip from 'react-tooltip';
import { FormattedMessage } from 'react-intl';
import messages from './messages';
@@ -10,11 +9,11 @@ import {
HomeIcon,
WavesIcon,
MarkerIcon,
- QuestionCircleIcon,
MappedIcon,
ValidatedIcon,
} from '../svgIcons';
import { StatsCard } from '../statsCard';
+import StatsTimestamp from '../statsTimestamp';
export const TaskStats = ({ userStats, username }) => {
const {
@@ -137,35 +136,26 @@ export const ElementsMapped = ({ userStats, osmStats }) => {
}
description={}
- value={osmStats.total_building_count_add || 0}
+ value={osmStats.buildings || 0}
/>
}
description={}
- value={osmStats.total_road_km_add || 0}
+ value={osmStats.roads || 0}
/>
}
description={}
- value={osmStats.total_poi_count_add || 0}
+ value={osmStats.total_poi_count_add || '-'}
/>
}
description={}
- value={osmStats.total_waterway_km_add || 0}
+ value={osmStats.total_waterway_km_add || '-'}
/>