releaseb releaseа blitz related fixes

Sammers21 · Sep 17, 2024 · 50a56f3 · 50a56f3
1 parent 012d4d1
commit 50a56f3
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 32 deletions.
diff --git a/frontend/src/components/DataTable/index.tsx b/frontend/src/components/DataTable/index.tsx
@@ -7,7 +7,7 @@ import TableFilter from '@/components/TableFilter';
 
 import getTableColumns from './useColumns';
 import { getLadder } from '@/services/stats.service';
-import { getActivityFromUrl } from '@/utils/urlparts';
+import {getActivityFromUrl, getBracket, getRegion} from '@/utils/urlparts';
 
 import { BRACKETS } from '@/constants/pvp-activity';
 import { REGION } from '@/constants/region';
@@ -24,7 +24,7 @@ interface IProps {
 }
 
 const DataList = ({ data: statistics }: IProps) => {
- const { region = REGION.eu, bracket = BRACKETS['3v3'] } = useParams();
+ const { region = getRegion(), bracket = getBracket() } = useParams();
  const activity = getActivityFromUrl();
  const [searchParams] = useSearchParams();
  const breakpoint = useBreakpoint();

diff --git a/frontend/src/components/TableFilter/CutOffRating.tsx b/frontend/src/components/TableFilter/CutOffRating.tsx
@@ -1,12 +1,12 @@
-import { getRatingColor, getSeasonRankImageFromRating } from "@/utils/table";
-import { useSearchParams } from "react-router-dom";
-import { getFromSearchParams } from "../DataTable";
-import { useEffect, useState } from "react";
+import {getRatingColor, getSeasonRankImageFromRating} from "@/utils/table";
+import {useSearchParams} from "react-router-dom";
+import {getFromSearchParams} from "../DataTable";
+import {useEffect, useState} from "react";
 import {
  SEARCH_PARAM_TO_FULL_SPEC,
  SEARCH_PARAM_TO_SPEC,
 } from "@/constants/filterSchema";
-import { title } from "process";
+import {title} from "process";
 
 interface IProps {
  bracket: string;
@@ -18,7 +18,7 @@ const ratingRewardMap = {
  rbg: "BATTLEGROUNDS/alliance",
 };
 
-const CutOffText = ({ bracket, stats }: IProps) => {
+const CutOffText = ({bracket, stats}: IProps) => {
  const [searchParams] = useSearchParams();
  const [selectedSpecs, setSelectedSpecs] = useState(
  getFromSearchParams(searchParams, "specs")
@@ -32,7 +32,7 @@ const CutOffText = ({ bracket, stats }: IProps) => {
  setSelectedSpecs(getFromSearchParams(searchParams, "specs"));
  }, [searchParams]);
 
- const ssnName = "Draconic";
+ const ssnName = "Forged";
  if (bracket === "rbg" || bracket === "3v3") {
  const cutOffRating = rewards?.[ratingRewardMap[bracket]];
  const spotsWithNoAlts = spotWithNoAlts?.[ratingRewardMap[bracket]];
@@ -48,7 +48,7 @@ const CutOffText = ({ bracket, stats }: IProps) => {
  return (
  <span
  className="text-xs sm:text-lg font-light"
- style={{ color: rankOneTitleColor }}
+ style={{color: rankOneTitleColor}}
  >
  {text}
  </span>
@@ -69,25 +69,25 @@ const CutOffText = ({ bracket, stats }: IProps) => {
  return (
  <span
  className="text-xs sm:text-lg font-light"
- style={{ color: rankOneTitleColor }}
+ style={{color: rankOneTitleColor}}
  >
  {text}
  </span>
  );
- } else if (bracket === "shuffle" && selectedSpecs.length == 0) {
+ } else if ((bracket === "shuffle" || bracket === "blitz") && selectedSpecs.length == 0) {
  return (
  <span
  className="text-xs sm:text-lg font-light"
- style={{ color: rankOneTitleColor }}
+ style={{color: rankOneTitleColor}}
  >
  Select the spec filter to see the cutoff rating
  </span>
  );
- } else if (bracket === "shuffle" && selectedSpecs.length > 1) {
+ } else if ((bracket === "shuffle" || bracket === "blitz") && selectedSpecs.length > 1) {
  return (
  <span
  className="text-xs sm:text-lg font-light"
- style={{ color: rankOneTitleColor }}
+ style={{color: rankOneTitleColor}}
  >
  Select only one spec to see the cutoff rating
  </span>
@@ -97,25 +97,24 @@ const CutOffText = ({ bracket, stats }: IProps) => {
  }
 };
 
-const CutOffRating = ({ bracket, stats }: IProps) => {
+const CutOffRating = ({bracket, stats}: IProps) => {
  if (
  !stats?.cutoffs?.rewards?.ARENA_3v3 ||
- !["shuffle", "rbg", "3v3"].includes(bracket)
+ !["shuffle", "rbg", "3v3", "blitz"].includes(bracket)
  ) {
  return <div></div>;
  }
- return <div></div>;
-
- // return (
- // <div className="flex items-center mr-2">
- // <img
- // className="w-7 h-7 mr-2"
- // src={getSeasonRankImageFromRating(0, true)}
- // alt="Season Rank"
- // />
- // <CutOffText stats={stats} bracket={bracket} />
- // </div>
- // );
+ // return <div></div>;
+ return (
+ <div className="flex items-center mr-2">
+ <img
+ className="w-7 h-7 mr-2"
+ src={getSeasonRankImageFromRating(0, true)}
+ alt="Season Rank"
+ />
+ <CutOffText stats={stats} bracket={bracket}/>
+ </div>
+ );
 };
 
 export default CutOffRating;
diff --git a/src/io/github/sammers/pla/blizzard/WowAPICharacter.java b/src/io/github/sammers/pla/blizzard/WowAPICharacter.java
@@ -335,7 +335,8 @@ public WowAPICharacter updatePvpBracketData(CharAndDiff diff, BracketType bracke
  );
  } else if (BracketType.fromType(pvpBracket.bracketType()).equals(bracket) && (bracket.equals(BracketType.SHUFFLE) | bracket.equals(BracketType.BLITZ))) {
  String fullSpec = diff.character().fullSpec();
- if (fullSpec.contains(pvpBracket.bracketType().split("-")[1])) {
+ String[] split = pvpBracket.bracketType().split("-");
+ if (split.length > 1 && fullSpec.contains(split[1])) {
  log.debug("Updating bracket " + pvpBracket.bracketType() + " with diff " + diff.toJson().encodePrettily());
  res = new PvpBracket(
  pvpBracket.bracketType(),

diff --git a/src/io/github/sammers/pla/logic/Calculator.java b/src/io/github/sammers/pla/logic/Calculator.java
@@ -387,7 +387,7 @@ public static Meta calculateMeta(SnapshotDiff snapshot, String role, String brac
  List<CharAndDiff> totalSortedRoleList = snapshot.chars().stream()
  .filter((CharAndDiff character) -> acceptedSpecs.contains(character.character().fullSpec()))
  .sorted(Comparator.comparing((CharAndDiff o) -> o.character().rating()).reversed()).toList();
- if (bracket.equals("shuffle")) {
+ if (bracket.equals("shuffle") || bracket.equals("blitz")) {
  int maxMinRating = totalSortedRoleList.stream().collect(Collectors.groupingBy(character -> character.character().fullSpec(), Collectors.toList()))
  .entrySet().stream()
  .collect(Collectors.toMap(Map.Entry::getKey, entry -> entry.getValue().stream().mapToLong(c -> c.character().rating()).min().orElse(0)))

diff --git a/src/io/github/sammers/pla/logic/Ladder.java b/src/io/github/sammers/pla/logic/Ladder.java
@@ -457,7 +457,7 @@ public Single<List<Character>> ladderTraditional(String bracket, Integer page, S
  private Completable calculateMeta(String region) {
  String realRegion = realRegion(region);
  return Completable.defer(() -> {
- List<Completable> res = List.of(TWO_V_TWO, THREE_V_THREE, RBG, SHUFFLE).stream().flatMap(bracket -> {
+ List<Completable> res = List.of(TWO_V_TWO, THREE_V_THREE, RBG, SHUFFLE, BLITZ).stream().flatMap(bracket -> {
  log.info("Calculating meta for bracket=" + bracket + " region=" + region);
  Snapshot now = refs.refByBracket(bracket, region).get();
  if (now == null) {