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

FWF-3818 [bugifx] fixed modal issues #2317

Merged
merged 3 commits into from
Oct 30, 2024
Merged

FWF-3818 [bugifx] fixed modal issues #2317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8784a04
FWF-3818 [bugifx] fixed modal issues
shuhaib-aot Oct 29, 2024
9a008da
Changed function name
shuhaib-aot Oct 29, 2024
ecb9916
used data instead of res.data
shuhaib-aot Oct 30, 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
13 changes: 9 additions & 4 deletions forms-flow-web/src/apiManager/services/processServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import { StorageService } from "@formsflow/service";
import { toast } from "react-toastify";
import { Translation } from "react-i18next";
import { setFormStatusLoading } from "../../actions/processActions";
import { setFormAuthorizationDetails } from "../../actions/formActions";
export const getProcessStatusList = (processId, taskId) => {
return (dispatch) => {
dispatch(setProcessStatusLoading(true));
Expand Down Expand Up @@ -418,10 +419,14 @@ export const saveFormProcessMapperPut = (data, ...rest) => {
RequestService.httpPUTRequest(`${API.FORM}/${data.mapper.id}`, data)
.then(async (res) => {
if (res.data) {
dispatch(getApplicationCount(res.data.mapper.id));
dispatch(setFormPreviosData(res.data.mapper));
dispatch(setFormProcessesData(res.data.mapper));
done(null, res.data);
const {data} = res;
dispatch(getApplicationCount(data.mapper.id));
dispatch(setFormPreviosData(data.mapper));
dispatch(setFormProcessesData(data.mapper));
if(data.authorizations){
dispatch(setFormAuthorizationDetails(data.authorizations));
}
done(null, data);
} else {
dispatch(setFormProcessesData([]));
dispatch(setFormPreviosData([]));
Expand Down
3 changes: 2 additions & 1 deletion forms-flow-web/src/components/CustomComponents/MultiSelect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { ListGroup } from "react-bootstrap";
import { CustomPill } from "@formsflow/components";
import PropTypes from 'prop-types';

const RoleSelector = ({ allRoles = [], selectedRoles = [], setSelectedRoles }) => {
const RoleSelector = ({ allRoles = [], selectedRoles = [], setSelectedRoles }) => {
const [roleInput, setRoleInput] = useState("");
const [filteredRoles, setFilteredRoles] = useState([]);
const [isDropdownOpen, setIsDropdownOpen] = useState(false); // To control dropdown visibility
Expand Down Expand Up @@ -82,6 +82,7 @@ const RoleSelector = ({ allRoles = [], selectedRoles = [], setSelectedRoles }) =
<ListGroup>
{filteredRoles.map((role, index) => (
<ListGroup.Item
action={true}
key={role + index}
onClick={() => handleRoleSelect(role)}
>
Expand Down
17 changes: 5 additions & 12 deletions forms-flow-web/src/components/Form/EditForm/FlowEdit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,7 @@ const FlowEdit = forwardRef(({isPublished = false}, ref) => {
const [showDiscardModal, setShowDiscardModal] = useState(false);
// handle history modal
const handleHistoryModal = () => setHistoryModalShow(!historyModalShow);
const handleHanldeDisacardModal = () => setShowDiscardModal(!showDiscardModal);



const handleDiscardModal = () => setShowDiscardModal(!showDiscardModal);

const saveFlow = async () => {
try{
Expand Down Expand Up @@ -56,18 +53,14 @@ const FlowEdit = forwardRef(({isPublished = false}, ref) => {
if(bpmnRef.current){
//import the existing process data to bpmn
bpmnRef.current?.handleImport(processData?.processData);
handleHanldeDisacardModal();
handleDiscardModal();
}
};



useImperativeHandle(ref, () => ({
saveFlow,
}));



return (
<Card>
<ConfirmModal
Expand All @@ -76,10 +69,10 @@ const FlowEdit = forwardRef(({isPublished = false}, ref) => {
message={t("Are you sure you want to discard all the changes of the Flow?")}
messageSecondary={t("This action cannot be undone.")}
primaryBtnAction={handleDiscardConfirm}
onClose={handleHanldeDisacardModal}
onClose={handleDiscardModal}
primaryBtnText={t("Discard Changes")}
secondaryBtnText={t("Cancel")}
secondayBtnAction={handleHanldeDisacardModal}
secondayBtnAction={handleDiscardModal}
size="sm"
/>
<Card.Header>
Expand Down Expand Up @@ -124,7 +117,7 @@ const FlowEdit = forwardRef(({isPublished = false}, ref) => {
variant="secondary"
size="md"
label={t("Discard Changes")}
onClick={handleHanldeDisacardModal}
onClick={handleDiscardModal}
dataTestid="discard-flow-changes-testid"
ariaLabel={t("Discard Flow Changes")}
/>
Expand Down
96 changes: 37 additions & 59 deletions forms-flow-web/src/components/Form/EditForm/FormSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,14 @@ const FormSettings = forwardRef((props, ref) => {

/* --------------------------- useState Variables --------------------------- */
const [userRoles, setUserRoles] = useState([]);
const [copied, setCopied] = useState(false);
const [editIndexValue, setEditIndexValue] = useState(0);
const [createIndexValue, setCreateIndexValue] = useState(0);
const [viewIndexValue, setViewIndexValue] = useState(0);
const [copied, setCopied] = useState(false);
const [formDetails, setFormDetails] = useState({
title: processListData.formName,
path: path,
description: processListData.description,
display: display,
});
const [isAnonymous, setIsAnonymous] = useState(processListData.anonymous);
const [isAnonymous, setIsAnonymous] = useState(processListData.anonymous || false);
const [errors, setErrors] = useState({
name: "",
path: "",
Expand All @@ -66,22 +63,22 @@ const FormSettings = forwardRef((props, ref) => {
);

const publicUrlPath = `${window.location.origin}/public/form/`;

const setSelectedOption = (roles, option)=> roles.length ? "specifiedRoles" : option;
/* ------------------------- authorization variables ------------------------ */
const [rolesState, setRolesState] = useState({
DESIGN: {
selectedRoles: formAuthorization.DESIGNER?.roles,
selectedOption: "onlyYou",
selectedOption: setSelectedOption(formAuthorization.DESIGNER?.roles,"onlyYou"),
},
FORM: {
roleInput: "",
selectedRoles: formAuthorization.FORM?.roles,
selectedOption: "registeredUsers",
selectedOption: setSelectedOption(formAuthorization.FORM?.roles,"registeredUsers"),
},
APPLICATION: {
roleInput: "",
selectedRoles: formAuthorization.APPLICATION?.roles,
selectedOption: "submitter",
selectedOption: setSelectedOption(formAuthorization.APPLICATION?.roles, "submitter"),
},
});

Expand Down Expand Up @@ -238,7 +235,7 @@ const FormSettings = forwardRef((props, ref) => {
<Form.Check
data-testid="form-edit-wizard-display"
type="checkbox"
id="createCheckbox"
id="formDisplaychange"
label={t("Allow adding multiple pages in this form")}
checked={formDetails.display === "wizard"}
name="display"
Expand All @@ -259,26 +256,22 @@ const FormSettings = forwardRef((props, ref) => {
items={[
{
label: t("Only You"),
onClick: () => {
handleRoleStateChange(DESIGN, "selectedOption", "onlyYou");
setEditIndexValue(0);
},
value:"onlyYou",
},
{
label: t("You and specified roles"),
onClick: () => {
handleRoleStateChange(
DESIGN,
"selectedOption",
"specifiedRoles"
);
setEditIndexValue(1);
},
value: "specifiedRoles",
},
]}
dataTestid="edit-submission-role"
ariaLabel={t("Edit Submission Role")}
indexValue={editIndexValue}
onChange={
(value) => {
handleRoleStateChange(DESIGN, "selectedOption", value);
}
}
dataTestid="who-can-edit-this-form"
id="who-can-edit-this-form"
ariaLabel={t("Edit Submission Role")}
selectedValue={rolesState.DESIGN.selectedOption}
/>

{rolesState.DESIGN.selectedOption === "onlyYou" && (
Expand All @@ -299,7 +292,7 @@ const FormSettings = forwardRef((props, ref) => {
</Form.Label>
<Form.Check
type="checkbox"
id="createCheckbox"
id="anonymouseCheckbox"
label={t("Anonymous users")}
checked={isAnonymous}
onChange={() => {
Expand All @@ -312,28 +305,22 @@ const FormSettings = forwardRef((props, ref) => {
items={[
{
label: t("Registered users"),
onClick: () => {
handleRoleStateChange(
FORM,
"selectedOption",
"registeredUsers"
);

setCreateIndexValue(0);
// Set index value for Registered users
},
value:"registeredUsers",
},
{
label: t("Specific roles"),
onClick: () => {
handleRoleStateChange(FORM, "selectedOption", "specifiedRoles");
setCreateIndexValue(1); // Set index value for Specific roles
},
value:"specifiedRoles"
},
]}
id="who-can-create-submission"
dataTestid="create-submission-role"
ariaLabel={t("Create Submission Role")}
indexValue={createIndexValue}
onChange={
(value) => {
handleRoleStateChange(FORM, "selectedOption", value);
}
}
selectedValue={rolesState.FORM.selectedOption}
/>
{rolesState.FORM.selectedOption === "registeredUsers" && (
<FormInput disabled={true} />
Expand All @@ -355,31 +342,22 @@ const FormSettings = forwardRef((props, ref) => {
items={[
{
label: t("Submitter"),
onClick: () => {
handleRoleStateChange(
APPLICATION,
"selectedOption",
"submitter"
);

setViewIndexValue(0); // Set index value for Submitter
},
value:"submitter"
},
{
label: t("Submitter and specified roles"),
onClick: () => {
handleRoleStateChange(
APPLICATION,
"selectedOption",
"specifiedRoles"
);
setViewIndexValue(0);
},
value:"specifiedRoles"
},
]}
id="who-can-view-submission"
dataTestid="view-submission-role"
ariaLabel={t("View Submission Role")}
indexValue={viewIndexValue}
onChange={
(value) => {
handleRoleStateChange(APPLICATION, "selectedOption", value);
}
}
selectedValue={rolesState.APPLICATION.selectedOption}
/>

{rolesState.APPLICATION.selectedOption === "submitter" && (
Expand Down
Loading