Skip to content

FWF-4820: [BugFix] Button count down & validations updated #627

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

Merged
merged 1 commit into from
Jun 21, 2025
Merged

FWF-4820: [BugFix] Button count down & validations updated #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
74 changes: 46 additions & 28 deletions forms-flow-review/src/components/AttributeFilterModal/AttributeFIlterModalBody.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
InputDropdown,
SaveIcon,
UpdateIcon,
useSuccessCountdown,
} from "@formsflow/components";
import { useEffect, useMemo, useState } from "react";
import { Modal } from "react-bootstrap";
Expand Down Expand Up @@ -45,6 +46,12 @@ const AttributeFilterModalBody = ({ onClose, toggleUpdateModal, updateSuccess, t
if (deleteSuccess.showSuccess) {
deleteButtonVariant = "success";
}

const {
successState: saveSuccess,
startSuccessCountdown: setSaveSuccess,
} = useSuccessCountdown();


const limit = useSelector((state: any) => state.task.limit);
const selectedFilter = useSelector((state: any) => state.task.selectedFilter);
Expand All @@ -60,7 +67,6 @@ const AttributeFilterModalBody = ({ onClose, toggleUpdateModal, updateSuccess, t
(state: any) => state.task.attributeFilterToEdit
);
const [filterName, setFilterName] = useState(attributeFilter?.name || "");
const saveIconColor = getIconColor(isUnsavedFilter || !filterName || filterNameError || deleteSuccess?.showSuccess);
const deleteIconColor = getIconColor(updateSuccess?.showSuccess);
const { data: userList } = useSelector(
(state: any) => state.task.userList
Expand Down Expand Up @@ -107,8 +113,10 @@ const AttributeFilterModalBody = ({ onClose, toggleUpdateModal, updateSuccess, t
SAME_AS_TASKS: 'SAME_AS_TASK_FILTER',
};

const [shareAttrFilter, setShareAttrFilter] = useState(FILTER_SHARE_OPTIONS.PRIVATE); // need to handle in edit stage

const [shareAttrFilter, setShareAttrFilter] = useState(FILTER_SHARE_OPTIONS.PRIVATE);
const saveIconColor = getIconColor(isUnsavedFilter || !filterName || filterNameError|| !shareAttrFilter || deleteSuccess?.showSuccess);


/* ---------------------------- access management --------------------------- */

const isCreator =
Expand Down Expand Up @@ -366,21 +374,26 @@ const createFilterShareOption = (labelKey, value) => ({
}
const noFieldChanged = isUnsavedFilter ? false : isEqual(selectedAttributeFilter, createAttributeFilterPayload());
const saveFilterAttributes = async () => {
try {

const filterToSave = createAttributeFilterPayload();
const response = await createFilter(filterToSave );
// need to update selected attribute filter in redux
dispatch(setSelectedBpmAttributeFilter(response.data));
const newAttributeFilterList = [...attributeFilterList,response.data]
dispatch(setAttributeFilterList(newAttributeFilterList));
dispatch(fetchServiceTaskList(filterToSave, null, 1, limit));
// setShowUpdateModal(false);
} catch (error) {
console.error("Failed to save filter attributes:", error);
}
onClose();
};
try {
const filterToSave = createAttributeFilterPayload();
const response = await createFilter(filterToSave);

setSaveSuccess(() => {
onClose();
}, 2);

// need to update selected attribute filter in redux
dispatch(setSelectedBpmAttributeFilter(response.data));
const newAttributeFilterList = [...attributeFilterList, response.data];
dispatch(setAttributeFilterList(newAttributeFilterList));
dispatch(fetchServiceTaskList(filterToSave, null, 1, limit));
} catch (error) {
console.error("Failed to save filter attributes:", error);
}
};

const saveButtonVariant = saveSuccess.showSuccess ? "success" : "secondary";


const handleUpdateModalClick =()=>{
dispatch(setAttributeFilterToEdit(createAttributeFilterPayload()))
Expand Down Expand Up @@ -409,7 +422,7 @@ const createFilterShareOption = (labelKey, value) => ({
null: <UpdateIcon color={saveIconColor} />}
dataTestId="save-attribute-filter"
ariaLabel={t("Update This Filter")}
disabled={deleteSuccess.showSuccess ||noFieldChanged}
disabled={deleteSuccess.showSuccess || noFieldChanged || !shareAttrFilter}
/>
<CustomButton
variant={deleteButtonVariant}
Expand All @@ -434,15 +447,20 @@ const createFilterShareOption = (labelKey, value) => ({
return (
<div className="pt-4">
<CustomButton
variant="secondary"
size="md"
label={t("Save This Filter")}
onClick={saveFilterAttributes}
icon={<SaveIcon color={saveIconColor}/>}
dataTestId="save-attribute-filter"
ariaLabel={t("Save Attribute Filter")}
disabled={isUnsavedFilter || filterNameError || noFieldChanged || !filterName}
/>
variant={saveButtonVariant}
size="md"
label={
saveSuccess.showSuccess
? `${t("Saved!")} (${saveSuccess.countdown})`
: t("Save This Filter")
}
onClick={saveFilterAttributes}
icon={saveSuccess.showSuccess ? null : <SaveIcon color={saveIconColor} />}
dataTestId="save-attribute-filter"
ariaLabel={t("Save Attribute Filter")}
disabled={isUnsavedFilter || filterNameError || noFieldChanged || !filterName}
/>

</div>
);
}
Expand Down
4 changes: 2 additions & 2 deletions forms-flow-review/src/components/TaskFilterModal/SaveFilterTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const SaveFilterTab = ({
const [filterNameError, setFilterNameError] = useState("");
const getIconColor = (disabled) => (disabled ? whiteColor : baseColor);
const saveIconColor = getIconColor(
createAndUpdateFilterButtonDisabled || filterNameError || deleteSuccess?.showSuccess
createAndUpdateFilterButtonDisabled || filterNameError || deleteSuccess?.showSuccess || !shareFilter|| (shareFilter === SPECIFIC_USER_OR_GROUP && !shareFilterForSpecificRole)
);
const { createFilters,manageAllFilters } = userRoles();
const deleteIconColor = getIconColor(successState?.showSuccess);
Expand Down Expand Up @@ -189,7 +189,7 @@ const SaveFilterTab = ({
}
dataTestId="save-task-filter"
ariaLabel={t("Update This Filter")}
disabled={deleteSuccess?.showSuccess || createAndUpdateFilterButtonDisabled || filterNameError}
disabled={deleteSuccess?.showSuccess || createAndUpdateFilterButtonDisabled || filterNameError ||!shareFilter || (shareFilter === SPECIFIC_USER_OR_GROUP && !shareFilterForSpecificRole) }
/>
<CustomButton
variant={deleteButtonVariant}
Expand Down
Loading