Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CM-71: Create frontend to allow creation of custom filters - FE #9

Merged
merged 15 commits into from
Jun 15, 2023
Merged

CM-71: Create frontend to allow creation of custom filters - FE #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
adf25f7
CM-71: apply custom filter on search level
sniedzielski Jun 6, 2023
b1d8e4b
CM-71: remove redundant button
sniedzielski Jun 7, 2023
533e0ea
CM-71: added applying custom filters in searcher
sniedzielski Jun 7, 2023
3d757d2
CM-71: fixed estlint
sniedzielski Jun 13, 2023
5457e2b
CM-71: fixed estlint part 2
sniedzielski Jun 13, 2023
8e969a9
CM-71: fixed estlint part 3
sniedzielski Jun 13, 2023
c1a26dc
CM-71: missing semicolon
sniedzielski Jun 13, 2023
12d7573
CM-71: fixing estling errors
sniedzielski Jun 13, 2023
4b0c76d
CM-71: fixing estling errors
sniedzielski Jun 13, 2023
58c74f4
CM-71: fixing estling errors
sniedzielski Jun 13, 2023
1660060
CM-71: added adjustment and improvements
sniedzielski Jun 13, 2023
91dc0c7
CM-71: merged from develop
sniedzielski Jun 13, 2023
b40569e
CM-71: fixed style in div indendations
sniedzielski Jun 13, 2023
26dedb8
CM-71: fixed style estlint
sniedzielski Jun 13, 2023
bb1a546
CM-71: fixed style estlint
sniedzielski Jun 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions src/components/BenefitPlanBeneficiariesSearcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ import React, {
} from 'react';
import { injectIntl } from 'react-intl';
import {
formatMessage, formatMessageWithValues, Searcher, downloadExport,
formatMessage,
formatMessageWithValues,
Searcher,
downloadExport,
CLEARED_STATE_FILTER,
} from '@openimis/fe-core';
import { bindActionCreators } from 'redux';
import { connect } from 'react-redux';
Expand All @@ -14,7 +18,12 @@ import {
DialogTitle,
} from '@material-ui/core';
import { fetchBeneficiaries, downloadBeneficiaries } from '../actions';
import { DEFAULT_PAGE_SIZE, ROWS_PER_PAGE_OPTIONS } from '../constants';
import {
DEFAULT_PAGE_SIZE,
ROWS_PER_PAGE_OPTIONS,
MODULE_NAME,
BENEFIT_PLAN_LABEL,
} from '../constants';
import BenefitPlanBeneficiariesFilter from './BenefitPlanBeneficiariesFilter';

function BenefitPlanBeneficiariesSearcher({
Expand All @@ -33,6 +42,27 @@ function BenefitPlanBeneficiariesSearcher({
beneficiaryExport,
errorBeneficiaryExport,
}) {
const applyNumberCircle = (number) => (
<div style={{
color: '#ffffff',
backgroundColor: '#006273',
borderRadius: '50%',
padding: '5px',
minWidth: '40px',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
fontWeight: 'bold',
fontSize: '12px',
width: '20px',
height: '45px',
marginTop: '7px',
}}
>
{number}
</div>
);

const fetch = (params) => fetchBeneficiaries(params);

const headers = () => [
Expand Down Expand Up @@ -78,6 +108,8 @@ function BenefitPlanBeneficiariesSearcher({
};

const [failedExport, setFailedExport] = useState(false);
const [appliedCustomFilters, setAppliedCustomFilters] = useState([CLEARED_STATE_FILTER]);
const [appliedFiltersRowStructure, setAppliedFiltersRowStructure] = useState([CLEARED_STATE_FILTER]);

useEffect(() => {
setFailedExport(true);
Expand All @@ -98,6 +130,11 @@ function BenefitPlanBeneficiariesSearcher({
readOnly={readOnly}
/>
);

useEffect(() => {
// refresh when appliedCustomFilters is changed
}, [appliedCustomFilters]);

return (
!!benefitPlan?.id && (
<div>
Expand Down Expand Up @@ -138,6 +175,15 @@ function BenefitPlanBeneficiariesSearcher({
defaultPageSize={DEFAULT_PAGE_SIZE}
defaultFilters={defaultFilters()}
cacheFiltersKey="benefitPlanBeneficiaryFilterCache"
isCustomFiltering
objectForCustomFiltering={benefitPlan}
moduleName={MODULE_NAME}
objectType={BENEFIT_PLAN_LABEL}
appliedCustomFilters={appliedCustomFilters}
setAppliedCustomFilters={setAppliedCustomFilters}
appliedFiltersRowStructure={appliedFiltersRowStructure}
setAppliedFiltersRowStructure={setAppliedFiltersRowStructure}
applyNumberCircle={applyNumberCircle}
/>
{failedExport && (
<Dialog fullWidth maxWidth="sm">
Expand Down
2 changes: 2 additions & 0 deletions src/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ export const BENEFICIARY_STATUS = {
SUSPENDED: 'SUSPENDED',
};

export const MODULE_NAME = 'social_protection';
export const BENEFIT_PLAN_LABEL = 'BenefitPlan';
export const BENEFICIARY_STATUS_LIST = [
BENEFICIARY_STATUS.POTENTIAL, BENEFICIARY_STATUS.ACTIVE, BENEFICIARY_STATUS.GRADUATED, BENEFICIARY_STATUS.SUSPENDED];

Expand Down