diff --git a/locales/en/translations.json b/locales/en/translations.json index 8c577397379778031030266df05db0ed997c1a17..27a1e9137c2ef6ca646f94227f0871f9b52ee971 100644 --- a/locales/en/translations.json +++ b/locales/en/translations.json @@ -192,7 +192,8 @@ "uuid": "Partner" }, "published": "Published", - "uom": "UOM" + "uom": "UOM", + "used": "Used" }, "accessions": { "crops": "Crop name", diff --git a/src/descriptors/ui/DashboardPage.tsx b/src/descriptors/ui/DashboardPage.tsx index 9cdbeec28f6c6dc6d75dc7c0b7c1fba772cdd2b6..6efd8525e4e58b63e3a178fec15619c067a98f7a 100644 --- a/src/descriptors/ui/DashboardPage.tsx +++ b/src/descriptors/ui/DashboardPage.tsx @@ -8,6 +8,7 @@ import {listMyDescriptors, approveDescriptor, deleteDescriptor, unpublishDescrip import {Descriptor} from 'model/descriptor.model'; import {DescriptorLink} from 'ui/catalog/Links'; import {PublishState} from 'model/common.model'; +import DashboardDescriptorFilters from './c/DashboardFilters'; const renderDataLink = ({row, children}) => ({ children }); @@ -29,6 +30,7 @@ class DashboardPage extends BaseMyDataPage { const mapStateToProps = (state, ownProps) => ({ paged: state.descriptors.dashboard.paged, tab: 'descriptors', + filterComponent: DashboardDescriptorFilters, }); const mapDispatchToProps = (dispatch) => bindActionCreators({ diff --git a/src/descriptors/ui/c/Filters.tsx b/src/descriptors/ui/c/Filters.tsx index bfad9b4d4ea44e569deed0c19806e53b07de88a2..170c2901ccd99a1a7b50aaccc23f6f5eb776e167 100644 --- a/src/descriptors/ui/c/Filters.tsx +++ b/src/descriptors/ui/c/Filters.tsx @@ -13,34 +13,25 @@ import {Descriptor} from 'model/descriptor.model'; import DescriptorListPicker from './DescriptorListPicker'; import PartnerFilter from 'partners/ui/c/PartnerFilter'; -// -// -// -// -// -// -// -// +const DescriptorFilters = ({ handleSubmit, initialize, ...other }) => ( + + + + + + + + + + - -const DescriptorFilters = ({handleSubmit, initialize, ...other}) => ( - - - - - - - - - - - - - - - - - + + + + + + + ); export default reduxForm({ diff --git a/src/ui/catalog/dashboard/MyDataPage.tsx b/src/ui/catalog/dashboard/MyDataPage.tsx index c11e3812d6e477cff8ebce07176a045e0725b91d..85fe4a57e7e4917680dc44b18bdd6c4b669903c8 100644 --- a/src/ui/catalog/dashboard/MyDataPage.tsx +++ b/src/ui/catalog/dashboard/MyDataPage.tsx @@ -19,6 +19,7 @@ import DashboardActionsButton from './c/DashboardActionsButton'; interface IDataPublishedContainerProps extends React.ClassAttributes { title: string; tab?: string; + filterComponent?: any; pagination: any; paged: Page; preFilter?: object; @@ -135,13 +136,14 @@ class BaseMyDataPage extends React.Component ({ interface IMyDataTableProps extends React.Props { classes?: any; tab: string; + filterComponent?: any; basePath: string; paged: Page; onPaginationChange: (page: number, results: number, sortBy: string, dir?: string) => void; @@ -59,6 +60,7 @@ const defaultSortOptions = { function MyDataTable({ classes, tab, + filterComponent, basePath, paged, onPaginationChange, @@ -107,6 +109,8 @@ function MyDataTable({ const query = pagination.filterCode ? `?filter=${pagination.filterCode}` : ''; // console.log(`DF initialValues ${query}`, filter); + const Filters = filterComponent ? filterComponent : DashboardFilters; + // TODO change `DashboardActionsArea` after merge tu genesys-ui return (
@@ -126,7 +130,7 @@ function MyDataTable({ - + { !paged ? :