From 7babbbd2b03cee7c0c0aa11a8ec68120d42cbbfb Mon Sep 17 00:00:00 2001
From: ndkazu <ndongmefane@gmail.com>
Date: Sat, 23 Mar 2024 16:56:48 +0900
Subject: [PATCH] Council Menu cards

---
 fs-dapp_2.0/src/components/pages/Council.tsx | 67 +++++++++++++++-----
 1 file changed, 51 insertions(+), 16 deletions(-)

diff --git a/fs-dapp_2.0/src/components/pages/Council.tsx b/fs-dapp_2.0/src/components/pages/Council.tsx
index c36754f4..67fb0561 100644
--- a/fs-dapp_2.0/src/components/pages/Council.tsx
+++ b/fs-dapp_2.0/src/components/pages/Council.tsx
@@ -11,14 +11,16 @@ import { Card, Col, Space } from 'antd';
 import Identicon from '@polkadot/react-identicon';
 import InfiniteScroll from "react-infinite-scroll-component";
 import { Avatar,  Divider, List, Skeleton } from "antd";
+import { Button } from 'flowbite-react';
 
 interface DataType {
-  name: string;
+  name: string|undefined;
   role: string;
-  address:string;  
+  address:string;
+  status:string;  
 }
 export default function Council() {
-  const { api, blocks, selectedAccount,  dispatch } = useAppContext();
+  const { api, blocks, selectedAccount,accounts,  dispatch } = useAppContext();
   const { role, balance, dispatch0 } = useAccountContext();
   const { session_closed,approved,role_in_session,nay,ayes,council_members,selectedProposal,proposals, dispatch1 } = useConcilSessionContext();
   
@@ -30,32 +32,53 @@ export default function Council() {
     api?.query.backgroundCouncil.proposalOf(
       
       hash,(data_acc:any)=>{
-      let acc = data_acc.toPrimitive().args.account as InjectedAccountWithMeta;    
+        let acc = data_acc.toPrimitive().args.account as InjectedAccountWithMeta;
+      let acc0 = data_acc.toPrimitive().args.account as string;
+      const acc1 = accounts.find((account) => account.address === acc0);
+      
+        
       let acc_list = proposals;
-      if (acc && !acc_list.includes(acc)){
-        acc_list.push(acc);                    
+      if (acc && !acc_list.includes(acc1 as InjectedAccountWithMeta) && acc1){
+        acc_list.push(acc1);                    
         dispatch1({type:`SET_PROPOSALS`,payload:acc_list}); 
-        api.query.rolesModule.requestedRoles(acc.address,(Prop_raw:any)=>{
+        
+        api.query.rolesModule.requestedRoles(acc1.address,(Prop_raw:any)=>{
           let Prop = Prop_raw.toHuman();
       if(!Prop) return;
       let r_session = Prop.role.toString();
-      let dtype:DataType={name:acc.meta.toString(),role:r_session,address:acc.address};
+      let status = Prop.approved.toString();
+      console.log(`infos:${Prop}`)
+      let dtype:DataType={name:acc1.meta.name,role:r_session,address:acc.address,status};
       let tdata=data;
       tdata.push(dtype);
       setData(tdata);
-        })
-        
+        })       
        
       }        
     }
     );
   }
+
+  function clear_proposal(){
+   
+    accounts.map((x)=>{
+      api?.query.rolesModule.requestedRoles(x.address,(Prop_raw:any)=>{
+        let Prop = Prop_raw.toHuman();
+        if (!Prop ||Prop.approved.toString()===`NO`||Prop.approved.toString()===`YES`){
+        let list = proposals;
+        list.filter((l)=>l!==x);
+        dispatch1({type:`SET_PROPOSALS`,payload:list}); 
+        }
+        
+
+      })
+    })
+  }
   function updateProposals(){
     api?.query.backgroundCouncil.proposals((hash: string[]) => {
       if (hash.length > 0) {
         hash.map((x)=>querryProposals(x));
-      }
-      
+      }    
     
     });
   }
@@ -65,9 +88,10 @@ export default function Council() {
    useEffect(() => {
     if (!api || !selectedAccount) return;
 
-    updateProposals()    
+    updateProposals()
+   
 
-  }, [selectedAccount, blocks, dispatch1, api]);
+  }, [dispatch1,selectedAccount,updateProposals,api]);
   return(<div id="scrollableDiv"
   style={{
     height: 400,
@@ -85,19 +109,30 @@ export default function Council() {
     >
        <List
           dataSource={data}
+          
           renderItem={item => (
+            <Card 
+            hoverable
+      style={{ width: 300 }}>
             <List.Item key={item.address}>
               <List.Item.Meta
                 title={<p>{item.name}</p>}
-                description={item.role}
+                description={<div><p>Requested Role: {item.role}</p><p>Request Status: {item.status}</p></div>}
               />
               <div>Content</div>
             </List.Item>
+            </Card>
           )}
+
         />
 
     </InfiniteScroll>
-    Council Page
+    <Button
+    type="primary"
+    className="bg-blue-600 text-white font-bold py-2 text-xl" 
+    onClick={clear_proposal}>
+            clear Proposals List
+    </Button>
   </div>);
 
   }
\ No newline at end of file