be-components 7.5.6 → 7.5.8

package/src/BetRouter/components/ContestLiquidity.tsx

@@ -67,6 +67,7 @@ const ContestLiquidity = ({
 
     const [selectedMarketId, setSelectedMarketId] = useState<string>('');
     const [selectedVariableId, setSelectedVariableId] = useState<string>('');
+    const [inverseVariableId, setInverseVariableId] = useState<string>('');
     const [selectedOpportunity, setSelectedOpportunity] = useState<BuyOpportunity | null>(null);
     const [modalVisible, setModalVisible] = useState(false);
 
@@ -144,7 +145,7 @@ const ContestLiquidity = ({
         // For spread markets, only show home side variables
         // For total markets, only show under side variables
         const linkedVariableIds = new Set<string>();
-        const uniqueVariableValues = new Map<number, string>(); // absolute value -> variable_id
+        const uniqueVariableValues = new Map<number, string>(); // variable value (with sign) -> variable_id
 
         // First, find the home side and under side for this market
         const homeSide = sides.find(s => s.side_key.toLowerCase() === 'home');
@@ -166,9 +167,10 @@ const ContestLiquidity = ({
                         : true;
 
                     if (isCorrectSide) {
-                        const absValue = Math.abs(variable.variable);
-                        if (!uniqueVariableValues.has(absValue)) {
-                            uniqueVariableValues.set(absValue, variable.router_market_variable_id);
+                        // Use the actual variable value (with sign) as the key to preserve both positive and negative values
+                        const variableValue = variable.variable;
+                        if (!uniqueVariableValues.has(variableValue)) {
+                            uniqueVariableValues.set(variableValue, variable.router_market_variable_id);
                         }
                     }
                 }
@@ -180,11 +182,30 @@ const ContestLiquidity = ({
             .map(id => data.router_market_variables.find(v => v.router_market_variable_id === id))
             .filter(v => v !== undefined) as RouterMarketVariableProps[];
 
+        // Sort variables ascending by value
+        variables.sort((a, b) => Number(a.variable) - Number(b.variable));
+
         // Auto-select first variable if not selected
         let currentVariableId = selectedVariableId;
+        let currentInverseVariableId = inverseVariableId;
         if (variables[0] && router_market.variable_required && variables.length > 0 && !currentVariableId) {
             currentVariableId = variables[0].router_market_variable_id;
             setSelectedVariableId(currentVariableId);
+
+            // For spread markets, find and store the inverse variable
+            const selectedVar = data.router_market_variables.find(v => v.router_market_variable_id === currentVariableId);
+            if (selectedVar && selectedVar.variable_type === 'spread') {
+                const inverseValue = -Number(selectedVar.variable);
+                const inverseVar = data.router_market_variables.find(v =>
+                    v.router_market_id === selectedMarketId &&
+                    Number(v.variable) === inverseValue &&
+                    v.variable_type === 'spread'
+                );
+                if (inverseVar) {
+                    currentInverseVariableId = inverseVar.router_market_variable_id;
+                    setInverseVariableId(currentInverseVariableId);
+                }
+            }
         }
 
         // Build partner rows
@@ -200,14 +221,27 @@ const ContestLiquidity = ({
                 const currentVariable = data.router_market_variables.find(v => v.router_market_variable_id === partner_market.router_market_variable_id);
 
                 if (selectedVariable && currentVariable) {
-                    // For spread markets, match both +/- versions (e.g., -7 and +7)
                     if (selectedVariable.variable_type === 'spread') {
-                        if (Math.abs(selectedVariable.variable) !== Math.abs(currentVariable.variable)) {
-                            return; // Different absolute values, skip
+                        // For spread markets, match using stored variable IDs
+                        // Get the side for this partner market
+                        const currentSide = sides.find(s => s.market_side_id === partner_market.market_side_id);
+                        const homeSide = sides.find(s => s.side_key.toLowerCase() === 'home');
+                        const isHomeSide = currentSide?.market_side_id === homeSide?.market_side_id;
+
+                        if (isHomeSide) {
+                            // For home side, must match selected variable ID
+                            if (partner_market.router_market_variable_id !== currentVariableId) {
+                                return;
+                            }
+                        } else {
+                            // For away side, must match inverse variable ID
+                            if (!currentInverseVariableId || partner_market.router_market_variable_id !== currentInverseVariableId) {
+                                return;
+                            }
                         }
                     } else {
-                        // For totals, must match exactly
-                        if (selectedVariable.variable !== currentVariable.variable) {
+                        // For totals and other markets, must match exactly by variable ID
+                        if (partner_market.router_market_variable_id !== currentVariableId) {
                             return;
                         }
                     }
@@ -217,6 +251,9 @@ const ContestLiquidity = ({
             const partner = data.partners.find(p => p.partner_id === partner_market.partner_id);
             if (!partner) return;
 
+            // Use the title from the liquidity object
+            const title = liq.title;
+
             if (!partnerRowsMap.has(partner.partner_id)) {
                 partnerRowsMap.set(partner.partner_id, {
                     partner,
@@ -226,7 +263,7 @@ const ContestLiquidity = ({
 
             partnerRowsMap.get(partner.partner_id)!.sidePrices.set(
                 partner_market.market_side_id,
-                { title: liq.title, price: liq.price, available: liq.available }
+                { title, price: liq.price, available: liq.available }
             );
         });
 
@@ -463,6 +500,7 @@ const ContestLiquidity = ({
                                             if (market) {
                                                 setSelectedMarketId(market.router_market_id);
                                                 setSelectedVariableId(''); // Reset variable selection
+                                                setInverseVariableId(''); // Reset inverse variable
                                             }
                                         }}
                                     />
@@ -499,7 +537,36 @@ const ContestLiquidity = ({
                                                         borderColor: isSelected ? Colors.text.success : Colors.borders.light,
                                                         backgroundColor: isSelected ? Colors.views.header : 'transparent'
                                                     }}
-                                                    onPress={() => setSelectedVariableId(variable.router_market_variable_id)}
+                                                    onPress={() => {
+                                                        console.log('Variable button clicked:', variable);
+                                                        setSelectedVariableId(variable.router_market_variable_id);
+
+                                                        // For spread markets, find and store the inverse variable
+                                                        if (variable.variable_type === 'spread' && data) {
+                                                            const inverseValue = -Number(variable.variable);
+                                                            console.log('Button click - Looking for inverse:', { selectedValue: variable.variable, inverseValue });
+                                                            console.log('Button click - All market variables:', data.router_market_variables.filter(v => v.router_market_id === variable.router_market_id).map(v => ({
+                                                                id: v.router_market_variable_id,
+                                                                value: v.variable,
+                                                                type: v.variable_type
+                                                            })));
+                                                            const inverseVar = data.router_market_variables.find(v =>
+                                                                v.router_market_id === variable.router_market_id &&
+                                                                Number(v.variable) === inverseValue &&
+                                                                v.variable_type === 'spread'
+                                                            );
+                                                            console.log('Button click - Found inverse var?', inverseVar);
+                                                            if (inverseVar) {
+                                                                console.log('Setting inverse variable ID:', inverseVar.router_market_variable_id);
+                                                                setInverseVariableId(inverseVar.router_market_variable_id);
+                                                            } else {
+                                                                console.warn('Button click - Inverse variable NOT found!');
+                                                                setInverseVariableId('');
+                                                            }
+                                                        } else {
+                                                            setInverseVariableId('');
+                                                        }
+                                                    }}
                                                 >
                                                     <Text
                                                         theme='h2'

package/src/BetRouter/components/admin/LeagueInfo.tsx

@@ -1,16 +1,19 @@
 import React, { useEffect, useState } from 'react';
 import { View, Text, Button } from "../../../Components/Themed";
-import { ActivityIndicator } from 'react-native';
+import { ActivityIndicator, Modal, ScrollView, TouchableOpacity } from 'react-native';
 import { useColors } from '../../../constants/useColors';
 import { getPartners, getContests, getParticipants } from '../../api';
 import { BetRouterApi } from '../../api';
+import { SearchBox } from '../../../Components';
+import Pagination from '../../../Components/Pagination';
 import type {
     RouterLeagueProps,
     RouterPartnerProps,
     RouterContestProps,
     RouterParticipantProps,
     //PartnerContestProps,
-    PartnerLeagueProps
+    PartnerLeagueProps,
+    RawLeagueProps
 } from '../../types';
 
 type LeagueInfoProps = {
@@ -23,8 +26,15 @@ const LeagueInfo = ({ league }: LeagueInfoProps) => {
     const [loading, setLoading] = useState(true);
     const [partners, setPartners] = useState<RouterPartnerProps[]>([]);
     const [partnerLeagues, setPartnerLeagues] = useState<PartnerLeagueProps[]>([]);
+    const [rawLeagues, setRawLeagues] = useState<RawLeagueProps[]>([]);
     const [contests, setContests] = useState<RouterContestProps[]>([]);
     const [participants, setParticipants] = useState<RouterParticipantProps[]>([]);
+    const [showLinkModal, setShowLinkModal] = useState(false);
+    const [selectedPartner, setSelectedPartner] = useState<RouterPartnerProps | null>(null);
+    const [selectedRawLeagues, setSelectedRawLeagues] = useState<string[]>([]);
+    const [linkModalSearch, setLinkModalSearch] = useState('');
+    const [linkModalPage, setLinkModalPage] = useState(0);
+    const ITEMS_PER_PAGE = 10;
 
     useEffect(() => {
         loadLeagueData();
@@ -52,6 +62,11 @@ const LeagueInfo = ({ league }: LeagueInfoProps) => {
                 setPartnerLeagues(filteredPartnerLeagues);
             }
 
+            // Store raw leagues
+            if (leaguesDataRes && leaguesDataRes.raw_leagues) {
+                setRawLeagues(leaguesDataRes.raw_leagues);
+            }
+
             if (Array.isArray(contestsRes)) {
                 setContests(contestsRes.filter(c => c.router_league_id === league.router_league_id));
             }
@@ -77,6 +92,48 @@ const LeagueInfo = ({ league }: LeagueInfoProps) => {
         }
     };
 
+    const openLinkModal = (partner: RouterPartnerProps) => {
+        setSelectedPartner(partner);
+        setShowLinkModal(true);
+        setSelectedRawLeagues([]);
+        setLinkModalSearch('');
+        setLinkModalPage(0);
+    };
+
+    const handleLinkLeagues = async () => {
+        if (!selectedPartner || selectedRawLeagues.length === 0) {
+            alert('Please select at least one league to link');
+            return;
+        }
+
+        try {
+            setLoading(true);
+            const result = await BetRouterApi.BetRouter.LeagueApi.linkLeague(
+                selectedRawLeagues,
+                league.router_league_id
+            );
+            alert(`Successfully linked ${result.partnerLeagues.length} league(s) for ${selectedPartner.name}`);
+            setShowLinkModal(false);
+            setSelectedRawLeagues([]);
+            // Reload to show updated counts
+            await loadLeagueData();
+        } catch (error) {
+            console.error('Failed to link leagues:', error);
+            alert('Error linking leagues: ' + (error as any).message);
+            setLoading(false);
+        }
+    };
+
+    const toggleRawLeagueSelection = (rawLeagueId: string) => {
+        setSelectedRawLeagues(prev => {
+            if (prev.includes(rawLeagueId)) {
+                return prev.filter(id => id !== rawLeagueId);
+            } else {
+                return [...prev, rawLeagueId];
+            }
+        });
+    };
+
     if (loading) {
         return (
             <View transparent style={{ padding: 40, alignItems: 'center' }}>
@@ -204,7 +261,7 @@ const LeagueInfo = ({ league }: LeagueInfoProps) => {
                                     <Button
                                         type='action'
                                         title='Link'
-                                        onPress={() => alert(`Link raw leagues for ${partner.name} - Coming soon!`)}
+                                        onPress={() => openLinkModal(partner)}
                                         style={{ paddingHorizontal: 12, paddingVertical: 6 }}
                                     />
                                 </View>
@@ -246,6 +303,177 @@ const LeagueInfo = ({ league }: LeagueInfoProps) => {
                     </View>
                 </View>
             </View>
+
+            {/* Link Leagues Modal */}
+            <Modal
+                visible={showLinkModal}
+                transparent
+                animationType="fade"
+                onRequestClose={() => setShowLinkModal(false)}
+            >
+                <View style={{ flex: 1, backgroundColor: 'rgba(0,0,0,0.5)', justifyContent: 'center', alignItems: 'center' }}>
+                    <View style={{ backgroundColor: Colors.views.body, borderRadius: 12, padding: 24, width: '90%', maxWidth: 600 }}>
+                        <Text theme="h1" size={20} style={{ marginBottom: 12 }}>
+                            Link Leagues - {selectedPartner?.name}
+                        </Text>
+                        <Text theme="description" size={14} style={{ marginBottom: 16 }}>
+                            Select raw leagues from {selectedPartner?.name} to link to {league.name}
+                        </Text>
+
+                        {/* Search Box */}
+                        <View transparent style={{ marginBottom: 16 }}>
+                            <SearchBox
+                                placeholder="Search leagues..."
+                                onChange={(text) => {
+                                    setLinkModalSearch(text);
+                                    setLinkModalPage(0); // Reset to first page on search
+                                }}
+                                hide_search_button
+                            />
+                        </View>
+
+                        {(() => {
+                            // Filter raw leagues by selected partner
+                            let partnerRawLeagues = rawLeagues.filter(rl => rl.partner_id === selectedPartner?.partner_id);
+
+                            // Apply search filter
+                            if (linkModalSearch) {
+                                partnerRawLeagues = partnerRawLeagues.filter(rl =>
+                                    rl.name.toLowerCase().includes(linkModalSearch.toLowerCase()) ||
+                                    rl.external_id.toLowerCase().includes(linkModalSearch.toLowerCase())
+                                );
+                            }
+
+                            if (partnerRawLeagues.length === 0) {
+                                return (
+                                    <View transparent style={{ padding: 40, alignItems: 'center' }}>
+                                        <Text theme="description" size={14}>
+                                            {linkModalSearch
+                                                ? `No leagues found matching "${linkModalSearch}"`
+                                                : `No raw leagues found for ${selectedPartner?.name}. Try loading raw leagues first from the partner.`
+                                            }
+                                        </Text>
+                                    </View>
+                                );
+                            }
+
+                            // Calculate pagination
+                            const totalPages = Math.ceil(partnerRawLeagues.length / ITEMS_PER_PAGE);
+                            const startIndex = linkModalPage * ITEMS_PER_PAGE;
+                            const endIndex = startIndex + ITEMS_PER_PAGE;
+                            const paginatedLeagues = partnerRawLeagues.slice(startIndex, endIndex);
+
+                            return (
+                                <>
+                                    <ScrollView style={{ maxHeight: 400 }}>
+                                        <View transparent style={{ gap: 8 }}>
+                                            {paginatedLeagues.map((rawLeague) => {
+                                        const isSelected = selectedRawLeagues.includes(rawLeague.raw_league_id);
+                                        const isAlreadyLinked = partnerLeagues.some(
+                                            pl => pl.raw_league_id === rawLeague.raw_league_id && pl.router_league_id === league.router_league_id
+                                        );
+
+                                        return (
+                                            <TouchableOpacity
+                                                key={rawLeague.raw_league_id}
+                                                onPress={() => !isAlreadyLinked && toggleRawLeagueSelection(rawLeague.raw_league_id)}
+                                                disabled={isAlreadyLinked}
+                                                style={{
+                                                    padding: 12,
+                                                    backgroundColor: isAlreadyLinked ? Colors.views.header : (isSelected ? Colors.views.body : Colors.views.header),
+                                                    borderRadius: 6,
+                                                    borderWidth: 2,
+                                                    borderColor: isAlreadyLinked ? Colors.borders.light : (isSelected ? Colors.views.body : Colors.borders.light),
+                                                    opacity: isAlreadyLinked ? 0.5 : 1,
+                                                    flexDirection: 'row',
+                                                    alignItems: 'center',
+                                                    justifyContent: 'space-between'
+                                                }}
+                                            >
+                                                <View transparent style={{ flex: 1 }}>
+                                                    <Text theme="h2" size={14}>
+                                                        {rawLeague.name}
+                                                    </Text>
+                                                    <Text theme="description" size={11} style={{ marginTop: 2 }}>
+                                                        {rawLeague.external_id}
+                                                    </Text>
+                                                </View>
+                                                {isAlreadyLinked && (
+                                                    <View
+                                                        transparent
+                                                        style={{
+                                                            paddingHorizontal: 8,
+                                                            paddingVertical: 4,
+                                                            borderRadius: 4,
+                                                            backgroundColor: Colors.text.success
+                                                        }}
+                                                    >
+                                                        <Text theme="h2" size={10} style={{ color: '#fff' }}>
+                                                            Already Linked
+                                                        </Text>
+                                                    </View>
+                                                )}
+                                                {isSelected && !isAlreadyLinked && (
+                                                    <View
+                                                        transparent
+                                                        style={{
+                                                            width: 20,
+                                                            height: 20,
+                                                            borderRadius: 10,
+                                                            backgroundColor: '#fff',
+                                                            justifyContent: 'center',
+                                                            alignItems: 'center'
+                                                        }}
+                                                    >
+                                                        <Text theme="h2" size={12}>✓</Text>
+                                                    </View>
+                                                )}
+                                            </TouchableOpacity>
+                                        );
+                                            })}
+                                        </View>
+                                    </ScrollView>
+
+                                    {/* Pagination */}
+                                    {totalPages > 1 && (
+                                        <View transparent style={{ marginTop: 16 }}>
+                                            <Pagination
+                                                offset={linkModalPage}
+                                                pages={totalPages}
+                                                onPrevious={() => setLinkModalPage(prev => Math.max(0, prev - 1))}
+                                                onNext={() => setLinkModalPage(prev => Math.min(totalPages - 1, prev + 1))}
+                                                onSelectPage={(page) => setLinkModalPage(page)}
+                                            />
+                                        </View>
+                                    )}
+
+                                    {/* Results count */}
+                                    <View transparent style={{ marginTop: 8, alignItems: 'center' }}>
+                                        <Text theme="description" size={12}>
+                                            Showing {startIndex + 1}-{Math.min(endIndex, partnerRawLeagues.length)} of {partnerRawLeagues.length} league(s)
+                                        </Text>
+                                    </View>
+                                </>
+                            );
+                        })()}
+
+                        <View transparent style={{ flexDirection: 'row', gap: 12, marginTop: 24 }}>
+                            <Button
+                                type="close"
+                                title="Cancel"
+                                onPress={() => setShowLinkModal(false)}
+                                style={{ flex: 1 }}
+                            />
+                            <Button
+                                type="success"
+                                title={`Link ${selectedRawLeagues.length} League(s)`}
+                                onPress={handleLinkLeagues}
+                                style={{ flex: 1 }}
+                            />
+                        </View>
+                    </View>
+                </View>
+            </Modal>
         </View>
     );
 };