Skip to content

Fix workflow filter updating issue #4

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

Closed
Malith-19 wants to merge 3 commits into from
Closed

Fix workflow filter updating issue #4

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
77a1537
Fix the filter value not updating issue.
Malith-19 Jul 9, 2025
2316b59
Fix approval status response schema changes.
Malith-19 Jul 9, 2025
86dce7f
Fix the lint issue.
Malith-19 Jul 9, 2025
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
6 changes: 6 additions & 0 deletions .changeset/beige-rats-march.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@wso2is/admin.workflow-approvals.v1": patch
"@wso2is/console": patch
---

Fix the filter not updating issue in the workflow and approval task status schema changes.
16 changes: 9 additions & 7 deletions features/admin.workflow-approvals.v1/components/approvals-list.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export const ApprovalsList: FunctionComponent<ApprovalsListPropsInterface> = (
selectedApprovalTask = {
...selectedApprovalTask,
createdTimeInMillis: approval.createdTimeInMillis,
taskStatus: approval?.status
taskStatus: approval?.approvalStatus
};
setApproval(selectedApprovalTask);
})
Expand Down Expand Up @@ -290,8 +290,9 @@ export const ApprovalsList: FunctionComponent<ApprovalsListPropsInterface> = (
{
"data-testid": `${ testId }-item-claim-button`,
hidden: (approval: ApprovalTaskListItemInterface): boolean =>
approval?.status === ApprovalStatus.COMPLETED || approval?.status === ApprovalStatus.RESERVED ||
approval?.status === ApprovalStatus.BLOCKED,
approval?.approvalStatus === ApprovalStatus.COMPLETED ||
approval?.approvalStatus === ApprovalStatus.RESERVED ||
approval?.approvalStatus === ApprovalStatus.BLOCKED,
icon: (): SemanticICONS => "hand pointer outline",
onClick: (e: SyntheticEvent, approval: ApprovalTaskListItemInterface): void =>
updateApprovalStatus(approval?.id, ApprovalStatus.CLAIM),
Expand All @@ -301,8 +302,9 @@ export const ApprovalsList: FunctionComponent<ApprovalsListPropsInterface> = (
{
"data-testid": `${ testId }-item-release-button`,
hidden: (approval: ApprovalTaskListItemInterface): boolean =>
approval?.status === ApprovalStatus.COMPLETED|| approval?.status === ApprovalStatus.READY ||
approval?.status === ApprovalStatus.BLOCKED,
approval?.approvalStatus === ApprovalStatus.COMPLETED||
approval?.approvalStatus === ApprovalStatus.READY ||
approval?.approvalStatus === ApprovalStatus.BLOCKED,
icon: (): SemanticICONS => "paper plane",
onClick: (e: SyntheticEvent, approval: ApprovalTaskListItemInterface): void =>
updateApprovalStatus(approval?.id, ApprovalStatus.RELEASE),
Expand Down Expand Up @@ -377,8 +379,8 @@ export const ApprovalsList: FunctionComponent<ApprovalsListPropsInterface> = (
circular
size="mini"
className="micro mr-2 ml-0 vertical-aligned-baseline"
color={ resolveApprovalTagColor(approval.status) } />
{ approval.status }
color={ resolveApprovalTagColor(approval.approvalStatus) } />
{ approval.approvalStatus }
</div>
</Header.Subheader>
</Header.Content>
Expand Down
2 changes: 1 addition & 1 deletion features/admin.workflow-approvals.v1/models/approvals.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export interface ApprovalTaskListItemInterface {
/**
* Status of the Approval Task
*/
status: ApprovalStatus.READY | ApprovalStatus.RESERVED | ApprovalStatus.COMPLETED | ApprovalStatus.BLOCKED;
approvalStatus: ApprovalStatus.READY | ApprovalStatus.RESERVED | ApprovalStatus.COMPLETED | ApprovalStatus.BLOCKED;
/**
* Priority of the Approval task
*/
Expand Down
6 changes: 3 additions & 3 deletions features/admin.workflow-approvals.v1/pages/approvals.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ const ApprovalsPage: FunctionComponent<ApprovalsPageInterface> = (
approvalsFromState.forEach((fromState: ApprovalTaskListItemInterface) => {
approvalsFromResponse.forEach((fromResponse: ApprovalTaskListItemInterface) => {
if (fromState.id === fromResponse.id) {
fromState.status = fromResponse.status;
fromState.approvalStatus = fromResponse.approvalStatus;
filteredApprovals.push(fromState);
}
});
Expand Down Expand Up @@ -339,9 +339,9 @@ const ApprovalsPage: FunctionComponent<ApprovalsPageInterface> = (
(<Dropdown
data-testid={ `${ testId }-status-filter-dropdown` }
selection
options={ APPROVAL_OPTIONS && APPROVAL_OPTIONS }
options={ APPROVAL_OPTIONS }
onChange={ handleFilterStatusChange }
defaultValue={ ApprovalStatus.ALL }
value={ filterStatus }
/>)
}
leftActionPanel={
Expand Down
Loading