be-components 1.2.0 → 1.2.2

package/src/Squares/index.tsx

@@ -17,6 +17,7 @@ import OfferForm from "./components/OfferForm";
 import MySquaresCard from "./components/MySquaresCard";
 import { view_styles } from "../constants/styles";
 import MyStatsCard from "./components/MyStatsCard";
+import SquareOffersCard from "./components/SquareOffersCard";
 
 type SquaresModuleProps = {
     player_id?:string,
@@ -32,6 +33,9 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
     const [ needs_reload, setNeedsReload ] = useState(false);
     const [ module_size, setModuleSize ] = useState({ width:0, height:0 })
     const [ bid_form_expanded, setBidFormExpanded ] = useState(false);
+    const [ updated_from_bid, setUpdatedFromBid ]= useState<BuySquaresResponseProps>();
+    const [ updated_from_offer, setUpdatedFromOffer ]= useState<OfferResponseProps>();
+
     const [ module_data, setModuleData ] = useState<{
         loading:boolean,
         loaded:boolean,
@@ -69,8 +73,7 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
     const { square_bids, draft_square_offers, submit_ready } = board_data;
     const { loading, league, event, players, loaded, squares_competition, squares, squares_type, squares_payout_type, square_results, square_offers, player_square_history, player_squares } = module_data;
 
-    const squares_expected_value = SqauresHelpers.getMyExpectedValue(squares, player_squares.filter(ps => ps.status == 'active' && ps.player_id == player_id), squares_competition, player_id)
-
+    const squares_expected_value = SqauresHelpers.getMyExpectedValue(squares, [ ...player_squares.filter(ps => ps.status == 'active' && ps.player_id == player_id) ], squares_competition, player_id)
     const my_squares = player_squares.filter(ps => ps.status == 'active' && ps.player_id == player_id);
     const home_abbr = event?.home?.abbr??squares_competition?.event_backup?.home?.abbr
     const away_abbr = event?.away?.abbr??squares_competition?.event_backup?.away?.abbr
@@ -82,6 +85,16 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         getDataFromServer(sq_comp_id);
     },[sq_comp_id])
 
+    useEffect(() => {
+        if(!updated_from_bid?.squares_competition){ return }
+        handleUpdateBoardFromBuy(updated_from_bid)
+    },[updated_from_bid])
+
+    useEffect(() => {
+        if(!updated_from_offer?.squares_competition){ return }
+        handleUpdateBoardFromOffer(updated_from_offer)
+    },[updated_from_offer])
+
     const getDataFromServer = async(sq_comp_id:string, options?:any) => {
         if(!options || !options.ignore_load){ setModuleData({ ...module_data, loading: true }) }
         const d = await SquaresApi.getSquareCompetitionById(sq_comp_id);
@@ -126,8 +139,8 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         if(submit_ready.is_loading){ return } //Prevent button mashing
         //SUBMIT BIDS!
         setBoardData({ ...board_data, submit_ready: { ...submit_ready, is_loading:true } })
-        const resp = await SquaresApi.buySquares(squares_competition.sq_comp_id, square_bids)
-        if(needs_reload){ handleUpdateBoardFromBuy(resp) } //If we somehow got disconnected from the socket, we need to load it
+        await SquaresApi.buySquares(squares_competition.sq_comp_id, square_bids)
+        //if(needs_reload){ handleUpdateBoardFromBuy(resp) } //If we somehow got disconnected from the socket, we need to load it
         setBoardData({ ...board_data, square_bids:[], submit_ready:{ is_loading: false, is_ready: false } })
         setBidFormExpanded(false);
     }
@@ -145,8 +158,8 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
         //SUBMIT BIDS!
         
         setBoardData({ ...board_data, submit_ready: { ...submit_ready, is_loading:true } })
-        const resp = await SquaresApi.offserSquare(draft_square_offers[0])
-        if(needs_reload){ handleUpdateBoardFromOffer(resp) } //If we somehow got disconnected from the socket, we need to load it
+        await SquaresApi.offserSquare(draft_square_offers[0])
+        //if(needs_reload){ handleUpdateBoardFromOffer(resp) } //If we somehow got disconnected from the socket, we need to load it
         setBoardData({ ...board_data, draft_square_offers:[], submit_ready:{ is_loading: false, is_ready: false } })
     }
 
@@ -229,28 +242,31 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
 
     const handleUpdateBoardFromOffer = (data:OfferResponseProps) => {
         //First remove squares
-        let new_ps = player_squares.filter(ps => !data.removed_player_squares.find(nps => nps.sq_player_square_id == ps.sq_player_square_id))
+        //let new_ps = player_squares.filter(ps => !data.removed_player_squares.find(nps => nps.sq_player_square_id == ps.sq_player_square_id))
         //Now update squares
-        new_ps = new_ps.filter(ps => !data.saved_player_squares.find(nps => nps.sq_player_square_id == ps.sq_player_square_id)).concat(data.saved_player_squares);
-
+        let new_ps = SqauresHelpers.updatePlayerSquaresWithSavedSquares([ ...player_squares ], data.saved_player_squares)
+        new_ps = SqauresHelpers.updatePlayerSquaresWithRemovedSquares(new_ps, data.removed_player_squares);
         setModuleData({
             ...module_data,
-            player_squares: new_ps.filter(ps => ps.status == 'active'),
-            square_offers: square_offers.filter(o => !data.updated_offers.find(no => no.sq_offer_id == o.sq_offer_id)).concat(data.updated_offers)
+            squares_competition: data.squares_competition ? data.squares_competition : squares_competition,
+            player_squares: new_ps,
+            square_offers: SqauresHelpers.updateSquareOffersWithUpdatedOffers(square_offers, data.updated_offers)
         })
     }
 
     const handleUpdateBoardFromBuy = (data:BuySquaresResponseProps) => {
         //First remove squares
-        let new_ps = player_squares.filter(ps => !data.removed_player_squares.find(nps => nps.sq_player_square_id == ps.sq_player_square_id))
         //Now update squares
-        new_ps = new_ps.filter(ps => !data.saved_player_squares.find(nps => nps.sq_player_square_id == ps.sq_player_square_id)).concat(data.saved_player_squares);
-
+        let new_ps = SqauresHelpers.updatePlayerSquaresWithSavedSquares([ ...player_squares ], data.saved_player_squares)
+        new_ps = SqauresHelpers.updatePlayerSquaresWithRemovedSquares(new_ps, data.removed_player_squares);
+        let new_sq = SqauresHelpers.updateSquaresWithUpdatedSquares([ ...squares], data.updated_squares)
+        let new_ps_his = SqauresHelpers.updatePlayerSquareHistoryWithRemovedSquares([ ...player_square_history], data.removed_player_squares);
         setModuleData({
             ...module_data,
             squares_competition: data.squares_competition,
-            squares: squares.filter(s => !data.updated_squares.find(ns => ns.sq_square_id == s.sq_square_id)).concat(data.updated_squares),
-            player_squares: new_ps.filter(ps => ps.status == 'active')
+            squares: new_sq,
+            player_squares: new_ps,
+            player_square_history: new_ps_his
         })
     }
 
@@ -324,6 +340,17 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
                 onPlayerSelect={onPlayerSelect}
             />
             :<></>}
+            {square_offers.length > 0 ?
+            <SquareOffersCard
+                player_squares={player_squares}
+                square_offers={square_offers}
+                player_id={player_id}
+                squares={squares}
+                home_abbr={home_abbr}
+                away_abbr={away_abbr}
+                onRequestAuthenticate={() => onRequestAuthenticate(squares_competition.auth_strategy_id)}
+            />
+            :<></>}
             <View>
                 <SquaresBoard 
                     player_id={player_id}
@@ -389,8 +416,8 @@ const SquaresModule = ({ sq_comp_id, player_id, distinct_id, onRequestAuthentica
                         case 'V1_UPDATE_SQUARE_DETAILS':
                             let data = ev.data as BuySquaresResponseProps | OfferResponseProps
                             if(!data.squares_competition || data.squares_competition.sq_comp_id != squares_competition.sq_comp_id){ break } //This isn't this competition;
-                            if(ev.action == 'buy'){ handleUpdateBoardFromBuy(data as BuySquaresResponseProps) }
-                            if(ev.action == 'offer')[ handleUpdateBoardFromOffer(data as OfferResponseProps) ]
+                            if(ev.action == 'buy'){ setUpdatedFromBid(data as BuySquaresResponseProps) }
+                            if(ev.action == 'offer')[ setUpdatedFromOffer(data as OfferResponseProps) ]
                             break;
                         default: break;
                     }