Merge pull request #129 from gnosis/issue-#121_remove_target

Add the ability to remove targets
gnosisguild · Jun 20, 2022 · c2309ab · c2309ab
2 parents f45394e + a3f0529
commit c2309ab
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/packages/app/src/components/views/Role/RoleTableRow.tsx b/packages/app/src/components/views/Role/RoleTableRow.tsx
@@ -51,12 +51,13 @@ const RoleTableRow = ({ role }: Props): React.ReactElement => {
   const { module } = useParams()
   const navigate = useNavigate()
   const handleNavigation = () => navigate(`/${module}/roles/${role.name}`)
+  const targets = role.targets.filter((target) => target.type !== "None")
 
   return (
     <TableRow key={role.id} className={classes.tableRow} onClick={handleNavigation}>
       <TableCell className={classes.tableCell}>{`Role #${role.name}`}</TableCell>
       <TableCell className={classes.tableCell}>{`${role.members.length} Members`}</TableCell>
-      <TableCell className={classes.tableCell}>{`${role.targets.length} Targets`}</TableCell>
+      <TableCell className={classes.tableCell}>{`${targets.length} Targets`}</TableCell>
       <TableCell className={classes.tableCell}>
         <Box display="flex" justifyContent="flex-end">
           <Box sx={{ mr: 1 }}>

diff --git a/packages/app/src/components/views/Role/targets/RoleTargets.tsx b/packages/app/src/components/views/Role/targets/RoleTargets.tsx
@@ -12,6 +12,7 @@ export const RoleTargets = () => {
   const handleOpenAddTargetModal = () => setAddTargetModalIsOpen(true)
 
   const targets = [...state.targets.list, ...state.targets.add]
+  const renderTarget = targets.filter((target) => target.type !== "None")
 
   const getStatus = (target: Target) => {
     if (state.targets.remove.includes(target.address)) return EntityStatus.REMOVE
@@ -26,7 +27,7 @@ export const RoleTargets = () => {
   return (
     <>
       <MenuEntity
-        list={targets}
+        list={renderTarget}
         name={{ singular: "Target", plural: "Targets" }}
         tutorialLink="https://gnosis.github.io/zodiac/docs/tutorial-modifier-roles/add-role#targets"
         onAdd={handleOpenAddTargetModal}

diff --git a/packages/app/src/services/rolesModifierContract.ts b/packages/app/src/services/rolesModifierContract.ts
@@ -133,6 +133,11 @@ export const updateRole = async (
   const removeMemberTxs = role.members.remove.map((member) =>
     rolesModifierContract.populateTransaction.assignRoles(member, [role.id], [false]),
   )
+  const removeTargetTxs = role.targets.remove.map((target) => {
+    console.log("[removeTargetTxs] revoke target", [role.id, target])
+    return rolesModifierContract.populateTransaction.revokeTarget(role.id, target)
+  })
+
   const txs = [...role.targets.list, ...role.targets.add].map(async (target) => {
     const updateEvents = role.getTargetUpdate(target.id)
 
@@ -263,7 +268,8 @@ export const updateRole = async (
   })
 
   const targetTxs = (await Promise.all([...txs])).flat()
-  const memberTxs = await Promise.all([...addMemberTxs, ...removeMemberTxs])
+  const targetActionsTxs = await Promise.all([...removeTargetTxs])
+  const memberTxs = await Promise.all([...addMemberTxs, ...removeMemberTxs, ...targetActionsTxs])
 
   console.log("txs", [...memberTxs, ...targetTxs])