fix: label as prop

dhis2 · Mar 23, 2020 · e5338b8 · e5338b8
1 parent 53841cb
commit e5338b8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/components/CheckboxList/CheckboxList.js b/src/components/CheckboxList/CheckboxList.js
@@ -5,6 +5,7 @@ import { Checkbox, InputField, MenuItem, Radio } from '@dhis2/ui-core';
 import s from './CheckboxList.module.css';
 
 const CheckboxList = ({
+    label,
     selected,
     select,
     onSelectAll,
@@ -22,7 +23,7 @@ const CheckboxList = ({
                 <div className={s.filter}>
                     <InputField
                         name="filter"
-                        label={i18n.t('filter data sets by name')}
+                        label={label}
                         value={filter}
                         onChange={e => setFilter(e.target.value)}
                         dense

diff --git a/src/components/CheckboxList/CheckboxList.module.css b/src/components/CheckboxList/CheckboxList.module.css
@@ -1,5 +1,4 @@
 .body {
-    width: 95%;
     height: 250px;
     overflow: scroll;
     overflow-x: hidden;
@@ -19,13 +18,11 @@
     padding: 0 !important;
 }
 .filter {
-    width: 95%;
     margin: 0 0 5px 0;
 }
 .actions {
     display: flex;
     flex-direction: row;
-    width: 95%;
     margin: 5px 0;
 }
 .action {

diff --git a/src/components/DataSetPicker/DataSetPicker.js b/src/components/DataSetPicker/DataSetPicker.js
@@ -17,7 +17,13 @@ const dataSetQuery = {
     },
 };
 
-const DataSetPicker = ({ selected, setSelected, multiSelect = true }) => {
+const DataSetPicker = ({
+    selected,
+    setSelected,
+    multiSelect = true,
+    withFilter = true,
+    withActions = true,
+}) => {
     const [list, setList] = useState([]);
     const { loading, error, data } = useDataQuery(dataSetQuery);
 
@@ -60,14 +66,15 @@ const DataSetPicker = ({ selected, setSelected, multiSelect = true }) => {
                 {loading && <CircularLoader />}
                 {data && (
                     <CheckboxList
+                        label={i18n.t('Filter data sets by name')}
                         selected={selected}
                         select={onSelect}
                         onSelectAll={onSelectAll}
                         onClearAll={onClearAll}
                         multiSelect={multiSelect}
                         list={list}
-                        withFilter
-                        withActions
+                        withFilter={withFilter}
+                        withActions={withActions}
                     />
                 )}
             </div>