Open IuliiaHerets opened 2 days ago
melvin-bot[bot]
commented
2 days ago Triggered auto assignment to @strepanier03 (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.
IuliiaHerets
commented
2 days ago @strepanier03 FYI I haven't added the External label as I wasn't 100% sure about this issue. Please take a look and add the label if you agree it's a bug and can be handled by external contributors
huult
commented
2 days ago Edited by proposal-police: This proposal was edited at 2024-10-09 09:27:42 UTC.
In edit approval workflow, in offline approver selected is not greyed out
We haven't handled the case for greying out the edit approval workflow yet
We need to wrap the component rendering members and approver with OfflineWithFeedback, something like this
+ const approvalWorkflowPendingUpdate = approvalWorkflow.pendingAction;
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L136
+ <OfflineWithFeedback pendingAction={approvalWorkflowPendingUpdate>
<MenuItemWithTopDescription
....
/>
+ </OfflineWithFeedback>
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L151
+ <OfflineWithFeedback pendingAction={approvalWorkflowPendingUpdate}>
<MenuItemWithTopDescription
....
/>
+ </OfflineWithFeedback>
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L198
+ <OfflineWithFeedback pendingAction={approvalWorkflowPendingUpdate}>
<MenuItemWithTopDescription
....
/>
+ </OfflineWithFeedback>If we want to gray out only the edited parts, you need to check which members or approver changed and then gray them out. Some thing like that:
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L103
// get list employee pending update
+ const [listEmployeePending, setListEmployeePending] = useState<[]>();
+ const getFieldPending = useCallback(async () => {
+ try {
+ const persistedRequests = await PersistedRequests.getAll();
+ const updateWorkspaceApprovalRequests = persistedRequests.filter(({command}) => command === WRITE_COMMANDS.UPDATE_WORKSPACE_APPROVAL);
+ const employeesPending = updateWorkspaceApprovalRequests.flatMap((item) => {
+ const employees = JSON.parse(item.data.employees);
+ return employees.filter((employee) => employee.pendingAction === 'update');
+ });
+ setListEmployeePending(employeesPending);
+ } catch (error) {
+ console.error('****** error ******', error);
+ }
+ }, []);
+ useEffect(() => {
+ getFieldPending();
+ }, [getFieldPending]);
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L173
// We check if this approver's pendingAction is 'update' or not
+ const isApproverPending = (listEmployeePending || []).some((item) => {
+ return item.email === approver?.email;
+ });
// .src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx#L178
// Update condition to show grayed out
+ <OfflineWithFeedback pendingAction={isApproverPending ? approvalWorkflowPendingUpdate : undefined}>
<MenuItemWithTopDescription
....
nkdengineer
commented
3 hours ago In edit approval workflow, in offline approver selected is not greyed out.
We don't add OfflineWithFeedback here
pendingFields of each updated employeeupdatedEmployeeList[approver.email] = {
email: approver.email,
forwardsTo,
pendingAction,
pendingFields: {
forwardsTo: pendingAction,
},
};updatedEmployeeList[email] = {
...(updatedEmployeeList[email] ? updatedEmployeeList[email] : {email}),
submitsTo,
pendingAction,
pendingFields: {
submitsTo: pendingAction,
},
};pendingFields herependingAction for each approver. For the first approver, it's pending if any member in the workflow has pendingFields.submitsTo. For each other approver, it's pending if the previous approver has pendingFields.forwardsTo because if this approver is updated the forwardsTo of the previous approver will be updatedconst getApprovalPendingAction = useCallback(
(index: number) => {
let pendingAction: PendingAction | undefined;
if (index === 0) {
approvalWorkflow?.members?.forEach((member) => {
pendingAction = pendingAction ?? member.pendingFields?.submitsTo;
});
return pendingAction;
}
const previousApprover = approvalWorkflow?.approvers.at(index - 1);
const previousMember = approvalWorkflow?.members?.find((member) => member?.email === previousApprover?.email);
return previousMember?.pendingFields?.forwardsTo;
},
[approvalWorkflow],
);<OfflineWithFeedback pendingAction={getApprovalPendingAction(approverIndex)}>We can wrap OfflineWithFeedback for each approver with pendingAction is approvalWorkflow.pendingAction
If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!
Version Number: v9.0.46-3 Reproducible in staging?: Y Reproducible in production?: Y Issue reported by: Applause Internal Team
Action Performed:
Pre-condition:
Expected Result:
In edit approval workflow, in offline approver selected must be greyed out.
Actual Result:
In edit approval workflow, in offline approver selected is not greyed out.
Workaround:
Unknown
Platforms:
Screenshots/Videos
https://github.com/user-attachments/assets/6f5d6065-22a3-4a83-8d11-32a640e5f860
View all open jobs on GitHub