Merge pull request #934 from clinwiki-org/presearch-bugs

Presearch bugs

Author: hifilorau

.vscode/settings.json

@@ -3,5 +3,8 @@
   "ruby.specCommand": "bundle exec rspec",
   "prettier.configPath": "./front/.prettierrc",
   "prettier.packageManager": "yarn",
-  "editor.defaultFormatter": "esbenp.prettier-vscode"
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  }
 }

front/src/containers/AggDropDown/AggDropDown.tsx

@@ -28,27 +28,11 @@ import { FieldDisplay } from 'types/globalTypes';
 import './AggDropDownStyle.css';
 import { PresentSiteFragment, PresentSiteFragment_siteView } from 'types/PresentSiteFragment';
 import SortKind from './SortKind';
-import BucketsPanel from './BucketsPanel';
-import Filter from './Filter';
 import SearchPageCrowdAggBucketsQuery from 'queries/SearchPageCrowdAggBucketsQuery';
 import SearchPageAggBucketsQuery from 'queries/SearchPageAggBucketsQuery';
-import RangeSelector from './RangeSelector';
-import TwoLevelPieChart from './TwoLevelPieChart';
-import BarChartComponent from './BarChart'
-import AllowMissingCheckbox from './AllowMissingCheckbox';
 import { ApolloClient }  from '@apollo/client';
 import { capitalize } from 'utils/helpers';
-import {
-  ThemedPresearchCard,
-  ThemedPresearchHeader,
-  PresearchTitle,
-  PresearchFilter,
-  PresearchPanel,
-  PresearchContent,
-} from 'components/StyledComponents';
 import {withPresentSite2} from "../PresentSiteProvider/PresentSiteProvider";
-import BucketsDropDown from './BucketsDropDown';
-import LocationAgg from './LocationAgg';
 import CustomDropDown from './CustomDrop';
 import AggFilterInputUpdater from 'containers/SearchPage/components/AggFilterInputUpdater';
 import { withAggContext } from 'containers/SearchPage/components/AggFilterUpdateContext';

front/src/containers/AggDropDown/AggKeyValuePairsDropDown.tsx

@@ -30,24 +30,9 @@ import './AggDropDownStyle.css';
 import { PresentSiteFragment, PresentSiteFragment_siteView } from 'types/PresentSiteFragment';
 import SortKind from './SortKind';
 import BucketsKeyValuePanel from './BucketsKeyValuePanel';
-import Filter from './Filter';
 import SearchPageCrowdAggBucketsQuery from 'queries/SearchPageCrowdAggBucketsQuery';
 import SearchPageAggBucketsQuery from 'queries/SearchPageAggBucketsQuery';
-import RangeSelector from './RangeSelector';
-import TwoLevelPieChart from './TwoLevelPieChart';
-import BarChartComponent from './BarChart'
-import AllowMissingCheckbox from './AllowMissingCheckbox';
-import { capitalize } from 'utils/helpers';
-import {
-  ThemedPresearchCard,
-  ThemedPresearchHeader,
-  PresearchTitle,
-  PresearchFilter,
-  PresearchPanel,
-  PresearchContent,
-} from 'components/StyledComponents';
 import {withPresentSite2} from "../PresentSiteProvider/PresentSiteProvider";
-import BucketsDropDown from './BucketsDropDown';
 
 const PAGE_SIZE = 25;
 

…ers/AggDropDown/AllowMissingCheckbox.tsx …AggDropDown/AllowMissingDropDownItem.tsxfront/src/containers/AggDropDown/AllowMissingCheckbox.tsx renamed to front/src/containers/AggDropDown/AllowMissingDropDownItem.tsx front/src/containers/AggDropDown/AllowMissingCheckbox.tsx renamed to front/src/containers/AggDropDown/AllowMissingDropDownItem.tsx

@@ -1,16 +1,15 @@
 import * as React from 'react';
 import { withAggContext } from 'containers/SearchPage/components/AggFilterUpdateContext';
 import AggFilterInputUpdater from 'containers/SearchPage/components/AggFilterInputUpdater';
-import { Checkbox } from 'react-bootstrap';
 import { AggBucket } from '../SearchPage/Types';
 import bucketKeyIsMissing from 'utils/aggs/bucketKeyIsMissing';
 
-interface AllowMissingCheckboxProps {
+interface AllowMissingDropDownItemProps {
   buckets: AggBucket[] | null;
   updater: AggFilterInputUpdater;
 }
 
-function AllowMissingCheckbox(props: AllowMissingCheckboxProps) {
+function AllowMissingDropDownItem(props: AllowMissingDropDownItemProps) {
   const { buckets, updater } = props;
   let totalMissing: number = 0;
   (buckets || []).forEach(bucket => {
@@ -19,12 +18,10 @@ function AllowMissingCheckbox(props: AllowMissingCheckboxProps) {
     }
   });
   return (
-    <Checkbox
-      checked={updater.allowsMissing()}
-      onChange={() =>
-        updater.toggleAllowMissing()
-      }>{`Allow Missing (${totalMissing})`}</Checkbox>
+    <div 
+      className="item-content"
+      >{`Allow Missing (${totalMissing})`}</div>
   );
 }
 
-export default withAggContext(AllowMissingCheckbox);
+export default withAggContext(AllowMissingDropDownItem);