be-components 6.6.3 → 6.6.5

package/src/Group/api/index.ts

@@ -1,9 +1,10 @@
 import axios from "axios";
 import { APIOverrides } from "../../ApiOverrides"
-import type { CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionTypeProps, GroupMessageProps, GroupPlayerProps, GroupProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PostProps, PublicPlayerProps } from "../../types";
+import type { BracketCompetitionProps, CompetitionPayoutTypeProps, CompetitionPlayerProps, CompetitionProps, CompetitionRecordProps, CompetitionResultProps, CompetitionResultTypeProps, CompetitionSeasonProps, CompetitionTypeProps, EventProps, GroupMessageProps, GroupPlayerProps, GroupProps, NewOverallAnalytics, OrderAnalyticsProps, OrderProps, PollCampaignProps, PostProps, PublicPlayerProps, SquaresCompetitionProps } from "../../types";
+import type { Moment } from "moment-mini";
+import moment from "moment-mini";
 
-
-//let EVENT_SVC_API = ''
+let EVENT_SVC_API = ''
 let AUTH_SVC_API = ''
 let MK_SVC_API = ''
 let SOCIAL_SVC_API = ''
@@ -14,7 +15,7 @@ export { GroupApi, GroupHelpers }
 const GroupApi = {
     setEnvironment: () => {
         const endpoints = APIOverrides.getEndpoints();
-        //EVENT_SVC_API = endpoints['EVENT_SVC_API'] as string;
+        EVENT_SVC_API = endpoints['EVENT_SVC_API'] as string;
         MK_SVC_API = endpoints['MK_SVC_API'] as string;
         TP_SVC_API = endpoints['TP_SVC_API'] as string;
         AUTH_SVC_API = endpoints['AUTH_SVC_API'] as string;
@@ -37,6 +38,22 @@ const GroupApi = {
             return undefined
         }
     },
+    uninvitePlayer: async(group_player_id:string):Promise<GroupPlayerProps|undefined> => {
+        try {
+            const resp = await axios.post(`${SOCIAL_SVC_API}/v2/groups/player/uninvite`, { group_player_id });
+            return resp.data.group_player
+        } catch (e) {
+            return undefined
+        }
+    },
+    bootPlayer: async(group_player_id:string):Promise<GroupPlayerProps|undefined> => {
+        try {
+            const resp = await axios.post(`${SOCIAL_SVC_API}/v2/groups/player/boot`, { group_player_id });
+            return resp.data.group_player
+        } catch (e) {
+            return undefined
+        }
+    },
     declineInvite:async(group_player_id:string):Promise<GroupPlayerProps | undefined> => {
         try {
             const resp = await axios.post(`${SOCIAL_SVC_API}/v2/groups/player/decline`, { group_player_id });
@@ -82,7 +99,6 @@ const GroupApi = {
     getGroupAnalytics: async(group_id:string, to:number, from:number):Promise<OrderAnalyticsProps[]> => {
         try {
             const resp = await axios.get(`${MK_SVC_API}/v1/analytics/group/details/${group_id}?to=${to}&from=${from}`);
-            console.log(resp.data)
             return resp.data.analytics
         } catch (e) {
             return []
@@ -110,6 +126,47 @@ const GroupApi = {
             return { competition_players:[], competition_records:[], competition_results:[], competitions:[] }
         }
     },
+    getActivePolls: async(group_id:string):Promise<PollCampaignProps[]> => {
+        try {
+            const resp = await axios.get(`${AUTH_SVC_API}/v1/polls/group/active/${group_id}`);
+            return resp.data.poll_campaigns
+        } catch (e) {
+            return []
+        }
+    },
+    getHistoryPolls: async(group_id:string, offset:number):Promise<PollCampaignProps[]> => {
+        try {
+            const resp = await axios.get(`${AUTH_SVC_API}/v1/polls/group/history/${group_id}?offset=${offset}`);
+            return resp.data.poll_campaigns
+        } catch (e) {
+            return []
+        }
+    },
+    getActiveSquares: async(group_id:string):Promise<SquaresCompetitionProps[]> => {
+        try {
+            const resp = await axios.get(`${TP_SVC_API}/v1/squares/group/active/${group_id}`);
+            return resp.data.squares_competitions
+        } catch (e) {
+            return []
+        }
+    },
+    getHistorySquares: async(group_id:string, offset:number):Promise<SquaresCompetitionProps[]> => {
+        try {
+            const resp = await axios.get(`${TP_SVC_API}/v1/squares/group/history/${group_id}?offset=${offset}`);
+            return resp.data.squares_competitions
+        } catch (e) {
+            return []
+        }
+    },
+    getEventsByIds: async(event_ids:string[]):Promise<EventProps[]> => {
+        try {
+            if(event_ids.length == 0){ return [] }
+            const resp = await axios.post(`${EVENT_SVC_API}/v1/events/bulk/get`, { attribute:'event_id', values: event_ids });
+            return resp.data.events
+        } catch (e) {
+            return []
+        }
+    },
     getPostsByGroupId: async(group_id:string, offset:number):Promise<PostProps[]> => {
         try {
             const resp = await axios.get(`${SOCIAL_SVC_API}/v1/posts/group/${group_id}?offset=${offset}`);
@@ -132,19 +189,32 @@ const GroupApi = {
 
 
 const GroupHelpers = {
-    sortMembers: (group_players:GroupPlayerProps[], order_analytics:OrderAnalyticsProps[]) => {
+    sortMembers: (group_players:GroupPlayerProps[], order_analytics:OrderAnalyticsProps[], active_stat?:string) => {
         let player_analytics: { [key:string]: NewOverallAnalytics } = {}
         group_players.map(p => {
             let my_analytics = order_analytics.filter(oa => oa.player_id == p.player_id);
             player_analytics[p.player_id] = GroupHelpers.aggregateAnalytics(my_analytics);
         });
 
-        let sorted_players = group_players.filter(gp => gp.status == 'active').sort((a,b) => {
-            let a_analytics = player_analytics[a.player_id]?.roi_pct ?? 0
-            let b_analytcs = player_analytics[b.player_id]?.roi_pct ?? 0
-            return b_analytcs - a_analytics
+        let sorted_players = group_players.filter(gp => gp.status != 'inactive').sort((a,b) => {
+            let a_active = a.status == 'active' ? 1 : 0
+            let b_active = b.status == 'active' ? 1 : 0
+            let a_analytics = player_analytics[a.player_id]
+            let b_analytcs = player_analytics[b.player_id]
+            let a_analytic = a_analytics ? a_analytics[active_stat as keyof NewOverallAnalytics] ?? 0 : 0
+            let b_analytic = b_analytcs ? b_analytcs[active_stat as keyof NewOverallAnalytics] ?? 0 : 0
+            return b_active - a_active || parseFloat(b_analytic as string) - parseFloat(a_analytic as string)
         });
         return { sorted_players, player_analytics }
+    },
+    sortCompetitionAction: ( seasons:CompetitionSeasonProps[], competitions:CompetitionProps[], bracket_competitions:BracketCompetitionProps[], squares_competitions:SquaresCompetitionProps[], poll_campaigns:PollCampaignProps[] ):{ id:string, type:string, scheduled_datetime:Moment }[] => {
+        let data:{ id: string, type: string, scheduled_datetime:Moment }[] = []
+        seasons.map(s => data.push({ id: s.competition_season_id, type: 'season', scheduled_datetime: moment(s.scheduled_datetime) }));
+        competitions.map(c => data.push({ id:c.competition_id, type: 'competition', scheduled_datetime: moment(c.scheduled_datetime) }));
+        bracket_competitions.map(bc => data.push({ id: bc.bracket_competition_id, type: 'bracket', scheduled_datetime: moment(bc.scheduled_datetime) }));
+        squares_competitions.map(sc => data.push({ id: sc.sq_comp_id, type: 'squares', scheduled_datetime: moment(sc.begin_datetime) }));
+        poll_campaigns.map(pc => data.push({ id: pc.poll_campaign_id, type: 'poll_campaign', scheduled_datetime: moment(pc.create_datetime) }));
+        return data.sort((a,b) => a.scheduled_datetime.unix() - b.scheduled_datetime.unix())
     },
      aggregateAnalytics: (analytics:OrderAnalyticsProps[]):NewOverallAnalytics => {
         const wins = analytics.reduce((a,b) => a + b.wins, 0);
@@ -155,7 +225,7 @@ const GroupHelpers = {
         const original_stake = analytics.reduce((a,b) => a + b.original_stake, 0);
         const cash_rcvd = analytics.reduce((a,b) => a + b.cash_rcvd, 0);
         
-        const win_pct = (wins + (draws / 2)) / fulfilled_positions
+        const win_pct = fulfilled_positions > 0 ? (wins + (draws / 2)) / fulfilled_positions : 0
         const earnings = (winnings + cash_rcvd) - original_stake
         const roi_pct = original_stake > 0 ? earnings / original_stake : 0
         return {

package/src/Group/components/GroupCTAButton.tsx

@@ -5,10 +5,12 @@ import type { GroupMessageProps, GroupPlayerProps, GroupProps, PublicPlayerProps
 import { useColors } from "../../constants/useColors"
 import { Button, Text, View } from "../../Components/Themed"
 import { Icons } from '../../Components';
-import { Image } from 'react-native';
+import { Image, type ViewStyle } from 'react-native';
 
 type GroupCTAButtonProps = {
     group:GroupProps,
+    style?:ViewStyle,
+    hide_from_player?:boolean,
     message_length?:number,
     group_messages:GroupMessageProps[],
     players:PublicPlayerProps[],
@@ -16,7 +18,7 @@ type GroupCTAButtonProps = {
     onSelectChat:(group:GroupProps) => void
 }
 
-const GroupCTAButton = ({ group, players, message_length, group_messages, onSelectChat }:GroupCTAButtonProps) => {
+const GroupCTAButton = ({ group, style, players, hide_from_player, message_length, group_messages, onSelectChat }:GroupCTAButtonProps) => {
     const Colors = useColors();
 
     useEffect(( ) => {
@@ -30,25 +32,25 @@ const GroupCTAButton = ({ group, players, message_length, group_messages, onSele
     if(last_message?.message){ cta_message = `${last_message.message.slice(0, message_length ?? 15)}...` }
     const last_player = players.find(p => p.player_id == last_message?.player_id)
     return (
-        <View transparent>
-            <Button transparent style={{ flexDirection:'row', alignItems:'center', padding:2 }} onPress={() => onSelectChat(group)}>
+        <View float style={{ ...style }}>
+            <Button transparent style={{ padding:0, flexDirection:'row', alignItems:'center' }} onPress={() => onSelectChat(group)}>
+                <View transparent style={{ padding:10, flexDirection:'row', alignItems:'center' }}>
+                    <Icons.ChatIcon size={16} color={Colors.text.h1}/>
+                </View>
                 {last_player ?
                 <Image
                     source={{ uri: last_player.profile_pic }}
-                    style={{ height:30, width:30, borderRadius:100 }}
+                    style={{ height:22, width:22, borderRadius:100 }}
                     resizeMode='contain'
                 />
                 :<></>}
                 <View transparent style={{ flex:1, marginLeft:10, marginRight:10 }}>
                     <Text theme='h2'>{cta_message}</Text>
-                    {last_player ?
+                    {last_player && !hide_from_player ?
                     <Text theme='description' style={{ marginTop:3 }}>@{last_player.username}</Text>
                     :<></>}
                 </View>
-                 <View float style={{ padding:10, flexDirection:'row', alignItems:'center' }}>
-                    <Icons.ChatIcon size={16} color={Colors.text.h1}/>
-                    <Text theme='h2' size={12}> Chat</Text>
-                </View>
+                 
             </Button>
         </View>