Merge pull request #166 from PublicHealthEngland/development

New feature and essential updates No conflict detected.
UKHSA-Internal · May 14, 2020 · 6c48579 · 6c48579
2 parents 1bf62b7 + d3714df
commit 6c48579
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "covid-public",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "private": true,
   "homepage": "https://coronavirus.data.gov.uk/",
   "dependencies": {

diff --git a/src/components/BarChart/BarChart.js b/src/components/BarChart/BarChart.js
@@ -30,17 +30,17 @@ const BarChart: ComponentType<Props> = ({ header, tooltipText, data }: Props) =>
                         labels: dataSorted.map(d => d.date),
                         datasets: [
                             // REMOVED PENDING FORMAL RELEASE
-                            // {
-                            //     label: "Rolling average",
-                            //     data: movingAverage(dataSorted.map(d => d.value), 7),
-                            //     type: 'line',
-                            //     fill: false,
-                            //     borderColor: "#323d13",
-                            //     backgroundColor: "#323d13",
-                            //     borderWidth: 2,
-                            //     order: 0,
-                            //     pointHoverRadius: 0
-                            // },
+                            {
+                                label: "Rolling average",
+                                data: movingAverage(dataSorted.map(d => d.value), 7),
+                                type: 'line',
+                                fill: false,
+                                borderColor: "#323d13",
+                                backgroundColor: "#323d13",
+                                borderWidth: 2,
+                                order: 0,
+                                pointHoverRadius: 0
+                            },
                             {
                                 label: "Daily deaths",
                                 backgroundColor: '#62a3b3',

diff --git a/src/components/StackedBarChart/StackedBarChart.js b/src/components/StackedBarChart/StackedBarChart.js
@@ -26,21 +26,21 @@ const getBarChartData = ({ previous, change }) => {
         labels: previousSorted.map(d => d.date),
         datasets: [
             // REMOVE PENDING FORMAL RELEASE
-            // {
-            //     label: "Rolling average of the total",
-            //     data: [
-            //         NaN, NaN, NaN, NaN, NaN, NaN,
-            //         ...movingAverage(sum, 7).slice(3, -3),
-            //         NaN, NaN, NaN
-            //     ],
-            //     type: 'line',
-            //     fill: false,
-            //     borderColor: "#323d13",
-            //     backgroundColor: "#323d13",
-            //     borderWidth: 2,
-            //     order: 0,
-            //     pointHoverRadius: 0
-            // },
+            {
+                label: "Rolling average of the total",
+                data: [
+                    NaN, NaN, NaN, NaN, NaN, NaN,
+                    ...movingAverage(sum, 7).slice(3, -3),
+                    NaN, NaN, NaN
+                ],
+                type: 'line',
+                fill: false,
+                borderColor: "#323d13",
+                backgroundColor: "#323d13",
+                borderWidth: 2,
+                order: 0,
+                pointHoverRadius: 0
+            },
             {
                 label: "Previously reported",
                 backgroundColor: '#62a3b3',

diff --git a/src/pages/About/About.js b/src/pages/About/About.js
@@ -14,6 +14,7 @@ import URLs from "common/urls";
 
 import type { AboutProps, AboutState } from './About.types';
 import * as Styles from './About.styles';
+import { win } from "leaflet/src/core/Browser";
 
 
 
@@ -47,6 +48,10 @@ export default class About extends Component<AboutProps, {}> {
 
         this.setState({ loading: true }, this.getData)
 
+        // ToDo: This should be done for every page in the "app.js".
+        const base = document.querySelector("head>base");
+        base.href = document.location.pathname;
+
     } // componentDidMount
 
     display() {

diff --git a/src/pages/Accessibility/Accessibility.js b/src/pages/Accessibility/Accessibility.js
@@ -47,6 +47,10 @@ export default class Accessibility extends Component<AccessibilityProps, {}> {
 
         this.setState({ loading: true }, this.getData)
 
+        // ToDo: This should be done for every page in the "app.js".
+        const base = document.querySelector("head>base");
+        base.href = document.location.pathname;
+
     } // componentDidMount
 
     display() {

diff --git a/src/pages/Archive/Archive.js b/src/pages/Archive/Archive.js
@@ -163,6 +163,10 @@ export default class Archive extends Component<ArchiveProps, {}> {
 
         this.setState({loading: true}, this.getData)
 
+        // ToDo: This should be done for every page in the "app.js".
+        const base = document.querySelector("head>base");
+        base.href = document.location.pathname;
+
     } // componentDidMount
 
     display() {

diff --git a/src/pages/Cookies/Cookies.js b/src/pages/Cookies/Cookies.js
@@ -28,6 +28,10 @@ const setCookies = () => {
 const Cookies: ComponentType<Props> = ({ }: Props) => {
     const [cookieState, setCookieState] = useState('unset');
 
+    // ToDo: This should be done for every page in the "app.js".
+    const base = document.querySelector("head>base");
+    base.href = document.location.pathname;
+
     const handleAccept = () => {
         const
             today = new Date(),

diff --git a/src/pages/MobileRegionTable/MobileRegionTable.js b/src/pages/MobileRegionTable/MobileRegionTable.js
@@ -16,6 +16,10 @@ import * as Styles from './MobileRegionTable.styles';
 const MobileRegionTable: ComponentType<Props> = ({ ...props }: Props) => {
     const data = useLoadData();
 
+    // ToDo: This should be done for every page in the "app.js".
+    const base = document.querySelector("head>base");
+    base.href = document.location.pathname;
+
     if ( !data ) return <MainLoading/>;
 
     return (