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

Jump to bottom

[#1163] Remove Approval Instructions from Approved Tab #1164

Merged
merged 2 commits into from
Feb 12, 2024
Merged

[#1163] Remove Approval Instructions from Approved Tab #1164

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
1b3c43b
[#1163] Remove Approval Instructions from Approved Tab
abhishek-p-s Feb 12, 2024
11c5675
Merge branch 'develop' into feature/1163-remove-approval-instruction-…
dedenbangkit Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
35 changes: 20 additions & 15 deletions frontend/src/pages/approvals/ApprovalDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const ApprovalDetail = ({
setReload,
expandedParentKeys,
setExpandedParentKeys,
approvalTab,
}) => {
const [values, setValues] = useState([]);
const [rawValues, setRawValues] = useState([]);
Expand Down Expand Up @@ -582,21 +583,25 @@ const ApprovalDetail = ({
disabled={!approve}
/>
<Row justify="space-between">
<Col style={{ marginTop: "20px" }} span={24}>
<p>{record.form?.approval_instructions?.text}</p>
<Space direction="vertical">
{record.form?.approval_instructions?.action?.map((item, index) => (
<div key={index}>
<Checkbox
checked={checkedState[index]}
onChange={() => handleCheckboxChange(index)}
>
{item}
</Checkbox>
</div>
))}
</Space>
</Col>
{approvalTab !== "approved" && (
<Col style={{ marginTop: "20px" }} span={24}>
<p>{record.form?.approval_instructions?.text}</p>
<Space direction="vertical">
{record.form?.approval_instructions?.action?.map(
(item, index) => (
<div key={index}>
<Checkbox
checked={checkedState[index]}
onChange={() => handleCheckboxChange(index)}
>
{item}
</Checkbox>
</div>
)
)}
</Space>
</Col>
)}
<Col span={24}>
<Space style={{ marginTop: "20px", float: "right" }}>
<Button
Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/approvals/Approvals.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ const Approvals = () => {
readonly={
record.approver?.status_text === "Rejected" || false
}
approvalTab={approvalTab}
/>
);
},
Expand Down