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.

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

OM-91: adjust worker picker to enable fetching previous workers #9

Merged
merged 1 commit into from
Dec 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/components/AcquirementSpecificWorkerForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function AcquirementSpecificWorkerForm({
classes={classes}
value={edited?.workers ?? []}
onChange={(workers) => onEditedChange({ ...edited, workers })}
previousWorkers
previousWorkersCheckbox
/>
</Grid>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/components/AssignmentVoucherForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function AssignmentVoucherForm({
classes={classes}
value={edited?.workers ?? []}
onChange={(workers) => onEditedChange({ ...edited, workers })}
previousWorkers
previousWorkersCheckbox
/>
</Grid>
</Grid>
Expand Down
71 changes: 40 additions & 31 deletions src/pickers/WorkerMultiplePicker.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import React, { useState } from 'react';
import React, { useState, useMemo } from 'react';

import { Checkbox, FormControlLabel } from '@material-ui/core';

import {
useGraphqlQuery, useTranslations, Autocomplete, useModulesManager, parseData,
} from '@openimis/fe-core';
import { MODULE_NAME, WORKER_THRESHOLD } from '../constants';
import { MODULE_NAME, USER_ECONOMIC_UNIT_STORAGE_KEY, WORKER_THRESHOLD } from '../constants';

function WorkerMultiplePicker({
readOnly,
Expand All @@ -14,39 +14,48 @@ function WorkerMultiplePicker({
required,
multiple = true,
filterSelectedOptions,
previousWorkers,
previousWorkersCheckbox,
}) {
const modulesManager = useModulesManager();
const { formatMessage } = useTranslations(MODULE_NAME, modulesManager);
const [previousWorkersChecked, setPreviousWorkersChecked] = useState(false);
const [searchString, setSearchString] = useState('');
const storedUserEconomicUnit = localStorage.getItem(USER_ECONOMIC_UNIT_STORAGE_KEY);
const userEconomicUnit = JSON.parse(storedUserEconomicUnit);

// TODO: Add possibility to fetch only workers employer was working with - after BE implementation
const { isLoading, data: allWorkers, error } = useGraphqlQuery(
const {
isLoading,
data,
error,
} = useGraphqlQuery(
`
{
insurees {
edges {
node {
id
uuid
chfId
lastName
otherNames
dob
}
}
query WorkerMultiplePicker($economicUnitCode: String!, $fetchPreviousWorkers: Boolean!) {
allInsurees: insurees @skip(if: $fetchPreviousWorkers) {
edges {
node ${modulesManager.getProjection('insuree.InsureePicker.projection')}
}
}
previousInsurees: previousWorkers(economicUnitCode: $economicUnitCode) @include(if: $fetchPreviousWorkers) {
edges {
node ${modulesManager.getProjection('insuree.InsureePicker.projection')}
}
}
}
}
`,
{ },
{ skip: previousWorkersChecked },
{
economicUnitCode: userEconomicUnit?.code || '',
fetchPreviousWorkers: previousWorkersChecked,
},
);

const workers = parseData(allWorkers?.insurees);
const workers = useMemo(() => {
const currentWorkersData = previousWorkersChecked ? data?.previousInsurees : data?.allInsurees;

const filtersOptions = (options) => {
if (!searchString || searchString.length < WORKER_THRESHOLD) {
return parseData(currentWorkersData);
}, [previousWorkersChecked, data]);

const filterOptions = (options) => {
if (!searchString || (!previousWorkersChecked && searchString.length < WORKER_THRESHOLD)) {
return [];
}

Expand All @@ -67,16 +76,18 @@ function WorkerMultiplePicker({
label={formatMessage('workerVoucher.workers')}
readOnly={readOnly}
placeholder={formatMessage('workerVoucher.WorkerMultiplePicker.placeholder')}
noOptionsText={searchString.length < WORKER_THRESHOLD
? formatMessage('workerVoucher.WorkerMultiplePicker.underThreshold')
: formatMessage('workerVoucher.WorkerMultiplePicker.noOptions')}
filterOptions={filtersOptions}
noOptionsText={
(!previousWorkersChecked && searchString.length < WORKER_THRESHOLD)
? formatMessage('workerVoucher.WorkerMultiplePicker.underThreshold')
: formatMessage('workerVoucher.WorkerMultiplePicker.noOptions')
}
filterOptions={filterOptions}
getOptionLabel={({ chfId, lastName, otherNames }) => `${chfId} ${lastName} ${otherNames}`}
filterSelectedOptions={filterSelectedOptions}
onInputChange={() => {}}
setCurrentString={setSearchString}
/>
{previousWorkers && (
{previousWorkersCheckbox && (
<FormControlLabel
control={(
<Checkbox
Expand All @@ -88,10 +99,8 @@ function WorkerMultiplePicker({
setSearchString('');
}
}}
// TODO: Enable when BE will be ready
disabled
/>
)}
)}
label={formatMessage('workerVoucher.WorkerMultiplePicker.checkbox.label')}
/>
)}
Expand Down
2 changes: 1 addition & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"workerVoucher.vouchers.required": "You need to fill out all required fields to continue",
"workerVoucher.WorkerMultiplePicker.placeholder": "Search for Worker",
"workerVoucher.WorkerMultiplePicker.underThreshold": "Enter at least 3 characters of National ID",
"workerVoucher.WorkerMultiplePicker.noOptions": "Worker not found",
"workerVoucher.WorkerMultiplePicker.noOptions": "No results",
"workerVoucher.WorkerMultiplePicker.checkbox.label": "Show only workers I've previously worked with",
"workerVoucher.WorkerDateRangePicker.startDate": "Start Date",
"workerVoucher.WorkerDateRangePicker.endDate": "End Date",
Expand Down
Loading