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

fixed boundary selection dropdown issue #1796

Merged
merged 2 commits into from
Nov 11, 2024
Merged

fixed boundary selection dropdown issue #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34bba7f
fixed boundary selection dropdown issue
Nov 11, 2024
351d7f2
fixed search juridiction dropdown
Nov 11, 2024
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
101 changes: 63 additions & 38 deletions ...icro-ui-internals/packages/modules/campaign-manager/src/components/MultiSelectDropdown.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const primaryIconColor = Colors.lightTheme.primary[1];
const dividerColor = Colors.lightTheme.generic.divider;
const background = Colors.lightTheme.paper.secondary;

const Wrapper = ({ boundaryOptions, setShowPopUp, alreadyQueuedSelectedState, onSelect, popUpOption ,hierarchyType ,frozenData , frozenType }) => {
const Wrapper = ({ boundaryOptions, setShowPopUp, alreadyQueuedSelectedState, onSelect, popUpOption, hierarchyType, frozenData, frozenType, onClose }) => {
const [dummySelected, setDummySelected] = useState(alreadyQueuedSelectedState);
const boundaryType = alreadyQueuedSelectedState.find((item) => item.propsData[1] !== null)?.propsData[1]?.type;
const { t } = useTranslation();
Expand Down Expand Up @@ -124,6 +124,7 @@ const Wrapper = ({ boundaryOptions, setShowPopUp, alreadyQueuedSelectedState, on
onClick={() => {
const selectedPropsData = dummySelected.map((item) => item.propsData);
onSelect(selectedPropsData);
onClose(selectedPropsData);
setShowPopUp(false);
}}
/>,
Expand All @@ -135,7 +136,7 @@ const Wrapper = ({ boundaryOptions, setShowPopUp, alreadyQueuedSelectedState, on
>
<LabelFieldPair>
<CardLabel>
{t((hierarchyType + "_" + boundaryType).toUpperCase())}
{t((hierarchyType + "_" + boundaryType).toUpperCase())}
nipunarora-eGov marked this conversation as resolved.
Show resolved Hide resolved
<span className="mandatory-span">*</span>
</CardLabel>
<div style={{ width: "100%" }}>
Expand Down Expand Up @@ -192,7 +193,7 @@ const Wrapper = ({ boundaryOptions, setShowPopUp, alreadyQueuedSelectedState, on
}, {})
).map(([parent, items]) => (
<div key={parent} className="parent-group">
<div className="parent">{t(parent)}</div>
<div className="parent">{t(parent)}</div>
<div className="digit-tag-container">
{items.map((value, index) => {
const translatedText = t(value.code);
Expand Down Expand Up @@ -250,6 +251,7 @@ const MultiSelectDropdown = ({
optionsKey,
selected = [],
onSelect,
onClose,
rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
defaultLabel = "",
defaultUnit = "",
props,
Expand All @@ -268,7 +270,7 @@ const MultiSelectDropdown = ({
popUpOption,
hierarchyType,
frozenType,
isSearchable=false,
isSearchable = false,
}) => {
const [active, setActive] = useState(false);
const [searchQuery, setSearchQuery] = useState();
Expand Down Expand Up @@ -307,7 +309,15 @@ const MultiSelectDropdown = ({
newState.map((e) => e.propsData),
getCategorySelectAllState(),
props
); // Update the form state here
);
if (onClose && !active) {
onClose(
newState.map((e) => e.propsData),
getCategorySelectAllState(),
props
);
}
// Update the form state here
rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
return newState;
case "REPLACE_COMPLETE_STATE":
return action.payload;
Expand Down Expand Up @@ -344,14 +354,22 @@ const MultiSelectDropdown = ({
getCategorySelectAllState(),
props
);
if (onClose) {
onClose(
alreadyQueuedSelectedState?.map((e) => e.propsData),
getCategorySelectAllState(),
props
);
}

}
}, [active]);

useEffect(() => {
const initialCategorySelectedState = options.reduce((acc, category) => {
if (category.options) {
var filteredCategoryOptions = category?.options;
if(searchQuery?.length>0){
if (searchQuery?.length > 0) {
filteredCategoryOptions = category?.options?.filter((option) => t(option?.code)?.toLowerCase()?.includes(searchQuery?.toLowerCase()));
}
rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
acc[category.code] = filteredCategoryOptions.every((option) =>
Expand Down Expand Up @@ -419,17 +437,17 @@ const MultiSelectDropdown = ({
const filtOptns =
searchQuery?.length > 0
? options?.filter(
(option) =>
t(option[optionsKey] && typeof option[optionsKey] == "string" && option[optionsKey].toUpperCase())
.toLowerCase()
.indexOf(searchQuery.toLowerCase()) >= 0
)
(option) =>
t(option[optionsKey] && typeof option[optionsKey] == "string" && option[optionsKey].toUpperCase())
.toLowerCase()
.indexOf(searchQuery.toLowerCase()) >= 0
)
: options;

useEffect(() => {
setOptionIndex(0);
}, [searchQuery]);

function onSearch(e) {
setSearchQuery(e.target.value);
}
Expand Down Expand Up @@ -460,13 +478,14 @@ const MultiSelectDropdown = ({
}
});
} else {

const isChecked = arguments[0].target.checked;
isChecked
? dispatch({ type: "ADD_TO_SELECTED_EVENT_QUEUE", payload: arguments })
: dispatch({
type: "REMOVE_FROM_SELECTED_EVENT_QUEUE",
payload: arguments,
});
type: "REMOVE_FROM_SELECTED_EVENT_QUEUE",
payload: arguments,
});
}
onSelect(
alreadyQueuedSelectedState?.map((e) => e.propsData),
Expand All @@ -486,6 +505,9 @@ const MultiSelectDropdown = ({
const handleClearAll = () => {
dispatch({ type: "REPLACE_COMPLETE_STATE", payload: [] });
onSelect([], getCategorySelectAllState(), props);
if (onClose) {
onClose([], getCategorySelectAllState(), props);
}
};

const openPopUp = (alreadyQueuedSelectedState) => {
Expand All @@ -501,17 +523,17 @@ const MultiSelectDropdown = ({
const payload =
variant === "nestedmultiselect"
? flattenedOptions
.filter((option) => !option.options)
.map((option) => ({
code: option.code,
name: option.name,
propsData: [null, option],
}))
: options.map((option) => ({
.filter((option) => !option.options)
.map((option) => ({
code: option.code,
name: option.name,
propsData: [null, option],
}));
}))
: options.map((option) => ({
code: option.code,
name: option.name,
propsData: [null, option],
}));
dispatch({
type: "REPLACE_COMPLETE_STATE",
payload: payload,
Expand Down Expand Up @@ -634,9 +656,9 @@ const MultiSelectDropdown = ({
}
};
const filteredOptions = searchQuery?.length > 0
? options?.map((option) => {
? options?.map((option) => {
if (option?.options && option.options.length > 0) {
const matchingNestedOptions = option.options.filter((nestedOption) =>
const matchingNestedOptions = option.options.filter((nestedOption) =>
t(nestedOption.code).toLowerCase().includes(searchQuery.toLowerCase())
);
if (matchingNestedOptions.length > 0) {
Expand All @@ -653,7 +675,7 @@ const MultiSelectDropdown = ({

return null;
}).filter(Boolean)
: options;
: options;


const parentOptionsWithChildren = filteredOptions.filter((option) => option.options && option.options.length > 0);
Expand Down Expand Up @@ -728,11 +750,9 @@ const MultiSelectDropdown = ({
return (
<div
key={index}
className={`digit-multiselectdropodwn-menuitem ${variant ? variant : ""} ${
alreadyQueuedSelectedState.find((selectedOption) => selectedOption.code === option.code) ? "checked" : ""
} ${index === optionIndex && !alreadyQueuedSelectedState.find((selectedOption) => selectedOption.code === option.code) ? "keyChange" : ""}${
isFrozen ? "frozen" : ""
}`}
className={`digit-multiselectdropodwn-menuitem ${variant ? variant : ""} ${alreadyQueuedSelectedState.find((selectedOption) => selectedOption.code === option.code) ? "checked" : ""
} ${index === optionIndex && !alreadyQueuedSelectedState.find((selectedOption) => selectedOption.code === option.code) ? "keyChange" : ""}${isFrozen ? "frozen" : ""
}`}
onMouseDown={() => setIsActive(true)}
onMouseUp={() => setIsActive(false)}
onMouseLeave={() => setIsActive(false)}
Expand Down Expand Up @@ -839,9 +859,8 @@ const MultiSelectDropdown = ({
style={props?.style}
>
<div
className={`digit-multiselectdropdown-master${active ? `-active` : ``} ${disabled ? "disabled" : ""} ${variant ? variant : ""} ${
isSearchable ? "serachable" : ""
}`}
className={`digit-multiselectdropdown-master${active ? `-active` : ``} ${disabled ? "disabled" : ""} ${variant ? variant : ""} ${isSearchable ? "serachable" : ""
}`}
>
<input
className="digit-cursorPointer"
Expand All @@ -867,8 +886,8 @@ const MultiSelectDropdown = ({
{selectedNumber
? `${selectedNumber} ${defaultUnit} Selected`
: alreadyQueuedSelectedState.length > 0
? `${alreadyQueuedSelectedState.length} ${defaultUnit} Selected`
: defaultLabel}
? `${alreadyQueuedSelectedState.length} ${defaultUnit} Selected`
: defaultLabel}
</p>
)}
<SVG.ArrowDropDown fill={disabled ? dividerColor : inputBorderColor} />
Expand Down Expand Up @@ -908,8 +927,12 @@ const MultiSelectDropdown = ({
variant === "treemultiselect"
? () => onSelectToAddToQueue([value])
: isPropsNeeded
? (e) => onSelectToAddToQueue(e, value, props)
: (e) => onSelectToAddToQueue(e, value)
? (e) => onSelectToAddToQueue(e, value, props)
: (e) => {

onSelectToAddToQueue(e, value);
}

rachana-egov marked this conversation as resolved.
Show resolved Hide resolved
}
hideClose={isClose}
className="multiselectdropdown-tag"
Expand All @@ -930,6 +953,7 @@ const MultiSelectDropdown = ({
setShowPopUp={setShowPopUp}
alreadyQueuedSelectedState={alreadyQueuedSelectedState}
onSelect={onSelect}
onClose={onClose}
popUpOption={popUpOption}
hierarchyType={hierarchyType}
frozenData={frozenData}
Expand Down Expand Up @@ -973,6 +997,7 @@ MultiSelectDropdown.propTypes = {
optionsKey: PropTypes.string.isRequired,
selected: PropTypes.array,
onSelect: PropTypes.func.isRequired,
onClose: PropTypes.func,
defaultLabel: PropTypes.string,
defaultUnit: PropTypes.string,
props: PropTypes.object,
Expand Down
Loading