BL-10968 improvements

Author: hatton

package.json

@@ -34,7 +34,6 @@
         "@material-ui/styles": "^4.9.0",
         "@nivo/bar": "^0.62.0",
         "@sentry/browser": "^6.0.0",
-        "@types/lodash": "^4.14.178",
         "@use-hooks/axios": "^1.3.1",
         "axios-hooks": "^2.2.0",
         "contentful": "^7.14.4",
@@ -94,6 +93,7 @@
         "@types/file-saver": "^2.0.1",
         "@types/fs-extra": "^9.0.4",
         "@types/jest": "^25.1.2",
+        "@types/lodash": "^4.14.178",
         "@types/markdown-to-jsx": "^6.11.2",
         "@types/match-sorter": "^4.0.0",
         "@types/node": "12.7.2",

src/components/statistics/BookStatsReport.tsx

@@ -20,7 +20,7 @@ import { useProvideDataForExport } from "../../export/exportData";
 import { CachedTablesContext } from "../../model/CacheProvider";
 import { getDisplayNamesFromLanguageCode } from "../../model/Language";
 import { useIntl } from "react-intl";
-import { StatsGridWrapper } from "./GridWrapper";
+import { StatsGridWrapper } from "./StatsGridWrapper";
 
 export const BookStatsReport: React.FunctionComponent<IStatsProps> = (
     props

src/components/statistics/CollectionStatsPage.tsx

@@ -115,7 +115,7 @@ export const CollectionStatsPage: React.FunctionComponent<ICollectionStatsPagePr
         return x;
     }, [l10n]);
 
-    const [currentScreenIndex, setCurrentScreenIndex] = useState(4); // TODO do not commit
+    const [currentScreenIndex, setCurrentScreenIndex] = useState(0);
     const [exportDataFn, setExportDataFn] = useState<
         ExportDataFn | undefined
     >();

src/components/statistics/ComprehensionQuestionsReport.tsx

@@ -19,7 +19,7 @@ import { IStatsProps } from "./StatsInterfaces";
 import { useGetBookComprehensionEventStats } from "./useGetBookStats";
 import { useProvideDataForExport } from "../../export/exportData";
 import { useIntl } from "react-intl";
-import { StatsGridWrapper } from "./GridWrapper";
+import { StatsGridWrapper } from "./StatsGridWrapper";
 
 export const ComprehensionQuestionsReport: React.FunctionComponent<IStatsProps> = (
     props

src/components/statistics/GridWrapper.tsx src/components/statistics/StatsGridWrapper.tsx

@@ -22,7 +22,7 @@ import {
     DataTypeProvider,
 } from "@devexpress/dx-react-grid";
 import { IGridColumn } from "../Grid/GridColumns";
-import { StatsGridWrapper } from "./GridWrapper";
+import { StatsGridWrapper } from "./StatsGridWrapper";
 import { FormControl, MenuItem, Select } from "@material-ui/core";
 
 export const StatsLocationScreen: React.FunctionComponent<IStatsProps> = (