1.1.6 Release Changes

Author: ckalgos

app/app.constants.js

@@ -26,3 +26,7 @@ export const idFillSBC = "elem_" + generateId(15);
 export const idSBCPlayersToBuy = "elem_" + generateId(15);
 export const idSBCBuyFutBinPercent = "elem_" + generateId(15);
 export const idSearchMinBin = "elem_" + generateId(15);
+export const idPackPlayersAction = "elem_" + generateId(15);
+export const idPackNonPlayersAction = "elem_" + generateId(15);
+export const idPackDuplicatesAction = "elem_" + generateId(15);
+export const idPacksCount = "elem_" + generateId(15);

app/function-overrides/cssoverrides.js

@@ -263,6 +263,10 @@ export const overrideStyle = () => {
       text-transform: uppercase;
       background-color: #171826;
     }
+    .packOpen {
+      margin-left: 0.5rem;
+      flex-basis: 50% !important;
+    }
     `;
   document.head.appendChild(style);
 };

app/function-overrides/index.js

@@ -13,6 +13,7 @@ import { popupOverride } from "./popup-override";
 import { binPopUpOverride } from "./binpopup-override";
 import { packItemOverride } from "./packitem-override";
 import { sideBarNavOverride } from "./sidebarnav-override";
+import { storeOverride } from "./store-override";
 
 export const initOverrides = () => {
   xmlRequestOverride();
@@ -29,5 +30,6 @@ export const initOverrides = () => {
   popupOverride();
   binPopUpOverride();
   sideBarNavOverride();
+  storeOverride();
   overrideStyle();
 };

app/function-overrides/sbcview-override.js

@@ -7,7 +7,7 @@ import {
 } from "../utils/commonUtil";
 import { getSbcPlayersInfoFromFUTBin } from "../services/futbin";
 import { sendPinEvents, sendUINotification } from "../utils/notificationUtil";
-import { getPlayersForSbc } from "../services/club";
+import { getSquadPlayerLookup } from "../services/club";
 import { generateButton } from "../utils/uiUtils/generateButton";
 import {
   idBuySBCPlayers,
@@ -23,6 +23,20 @@ import { getSellBidPrice, roundOffPrice } from "../utils/priceUtil";
 export const sbcViewOverride = () => {
   const squladDetailPanelView = UTSBCSquadDetailPanelView.prototype.render;
 
+  UTSBCService.prototype.loadChallengeData = function (r) {
+    var s = this,
+      a = new EAObservable();
+    return (
+      this.sbcDAO
+        .loadChallenge(r.id, r.isInProgress())
+        .observe(this, function (t, e) {
+          t.unobserve(s);
+          a.notify(e);
+        }),
+      a
+    );
+  };
+
   UTSBCSquadDetailPanelView.prototype.render = function (...params) {
     squladDetailPanelView.call(this, ...params);
     const sbcId = params.length ? params[0].id : "";
@@ -68,7 +82,7 @@ const buyPlayersPopUp = () => {
     .getCurrentViewController()
     .getCurrentController()._leftController;
 
-  const sbcPlayers = _squad.getPlayers();
+  const sbcPlayers = _squad.getFieldPlayers();
   const conceptPlayers = sbcPlayers.filter(({ _item }) => _item.concept);
 
   if (!conceptPlayers.length) {
@@ -227,8 +241,24 @@ const fillSquad = async (sbcId) => {
 
   showLoader();
 
-  const playerPositionIds = await getSbcPlayersInfoFromFUTBin(squadId);
-  const squadPlayers = await getPlayersForSbc(playerPositionIds);
+  const squadPlayersLookupPromise = getSquadPlayerLookup();
+  const futBinSquadPlayersInfoPromise = getSbcPlayersInfoFromFUTBin(squadId);
+  const [squadPlayersLookup, futBinSquadPlayersInfo] = await Promise.all([
+    squadPlayersLookupPromise,
+    futBinSquadPlayersInfoPromise,
+  ]);
+  const squadPlayers = futBinSquadPlayersInfo
+    .sort((a, b) => b.positionId - a.positionId)
+    .map((currItem) => {
+      const key = currItem.definitionId;
+      const clubPlayerInfo = squadPlayersLookup.get(key);
+      const playerEntity = new UTItemEntity();
+      playerEntity.id = clubPlayerInfo ? clubPlayerInfo.id : key;
+      playerEntity.definitionId = key;
+      playerEntity.concept = !clubPlayerInfo;
+      playerEntity.stackCount = 1;
+      return playerEntity;
+    });
   let squadTotal = 0;
 
   const { _squad, _challenge } = getAppMain()
@@ -237,56 +267,28 @@ const fillSquad = async (sbcId) => {
     .getCurrentViewController()
     .getCurrentController()._leftController;
 
-  const sbcSlots = _squad.getSBCSlots();
-
-  const positionIndexes = sbcSlots.reduce((acc, curr) => {
-    if (!curr.position) return acc;
-
-    if (!acc[curr.position.typeName]) {
-      acc[curr.position.typeName] = [];
-    }
-    acc[curr.position.typeName].push(curr.index);
-    return acc;
-  }, {});
+  _squad.setPlayers(squadPlayers, true);
 
-  const playersToAdd = [];
+  services.SBC.saveChallenge(_challenge).observe(
+    this,
+    async function (sender, data) {
+      services.SBC.loadChallengeData(_challenge).observe(
+        this,
+        async function (sender, { response: { squad } }) {
+          hideLoader();
 
-  const adjustPlayerPostion = (playerId, playerPosition) => {
-    if (positionIndexes[playerPosition]) {
-      if (positionIndexes[playerPosition].length) {
-        const positions = positionIndexes[playerPosition];
-        playersToAdd[parseInt(positions[0], 10)] = squadPlayers[playerId];
-        positions.splice(0, 1);
-      }
-      if (!positionIndexes[playerPosition].length) {
-        delete positionIndexes[playerPosition];
-      }
-      delete playerPositionIds[playerId];
+          setValue(sbcId, {
+            expiryTimeStamp: new Date(Date.now() + 15 * 60 * 1000),
+            value: squadTotal.toLocaleString(),
+          });
+          appendSquadTotal(squadTotal.toLocaleString());
+          const players = squad._players.map((player) => player._item);
+          _squad.setPlayers(players, true);
+          _challenge.onDataChange.notify({ squad });
+        }
+      );
     }
-  };
-
-  for (const playerId in playerPositionIds) {
-    const playerPosition = playerPositionIds[playerId];
-    squadTotal += parseInt(playerPosition.price, 10) || 0;
-    adjustPlayerPostion(playerId, playerPosition.position);
-  }
-
-  for (const playerId in playerPositionIds) {
-    const playerPosition = Object.keys(positionIndexes)[0];
-    adjustPlayerPostion(playerId, playerPosition);
-  }
-
-  _squad.setPlayers(playersToAdd, true);
-
-  services.SBC.saveChallenge(_challenge);
-
-  hideLoader();
-
-  setValue(sbcId, {
-    expiryTimeStamp: new Date(Date.now() + 15 * 60 * 1000),
-    value: squadTotal.toLocaleString(),
-  });
-  appendSquadTotal(squadTotal.toLocaleString());
+  );
 };
 
 const appendSquadTotal = (total) => {

app/function-overrides/store-override.js

@@ -0,0 +1,52 @@
+import {
+  purchasePopUpMessage,
+  validateFormAndOpenPack,
+} from "../utils/openPacksUtil";
+import { sendUINotification } from "../utils/notificationUtil";
+import { showPopUp } from "./popup-override";
+
+export const storeOverride = () => {
+  const setupBuyCoinsButton =
+    UTStorePackDetailsView.prototype.setupBuyCoinsButton;
+
+  const autoOpenPacks = function (e, t, i) {
+    let isHandled = false;
+    services.Store.getPacks().observe(this, function (sender, data) {
+      if (isHandled) return;
+      isHandled = true;
+      const pack = data.response.packs.find(
+        (item) => item.id === this.articleId
+      );
+      if (!pack) {
+        sendUINotification(
+          "Unable to find the pack",
+          UINotificationType.NEGATIVE
+        );
+        return;
+      }
+
+      showPopUp(
+        [
+          { labelEnum: enums.UIDialogOptions.OK },
+          { labelEnum: enums.UIDialogOptions.CANCEL },
+        ],
+        "Auto Open Packs",
+        purchasePopUpMessage,
+        (text) => {
+          text === 2 && validateFormAndOpenPack(pack);
+        }
+      );
+    });
+  };
+  UTStorePackDetailsView.prototype.setupBuyCoinsButton = function (...params) {
+    setupBuyCoinsButton.call(this, ...params);
+    this._btnOpenPacks && this.removeActionButton(this._btnOpenPacks);
+    this._btnOpenPacks = new UTCurrencyButtonControl();
+    this._btnOpenPacks.init();
+    this._btnOpenPacks.setText("Open pack");
+    this._btnOpenPacks.setSubText("Automatically");
+    this._btnOpenPacks.addClass("call-to-action packOpen");
+    this._btnOpenPacks.addTarget(this, autoOpenPacks, EventType.TAP);
+    this.appendActionButton(this._btnOpenPacks);
+  };
+};

app/services/club.js

@@ -22,6 +22,19 @@ export const getSquadPlayerIds = () => {
   });
 };
 
+export const getSquadPlayerLookup = () => {
+  return new Promise((resolve, reject) => {
+    const squadPlayersLookup = new Map();
+    getAllClubPlayers(true).then((squadMembers) => {
+      squadMembers.forEach((member) => {
+        if (member.loans < 0)
+          squadPlayersLookup.set(member.definitionId, member);
+      });
+      resolve(squadPlayersLookup);
+    });
+  });
+};
+
 export const getAllClubPlayers = function (filterLoaned, playerId) {
   return new Promise((resolve, reject) => {
     const searchCriteria = new UTBucketedItemSearchViewModel().searchCriteria;

app/services/futbin.js

@@ -109,13 +109,15 @@ export const getSbcPlayersInfoFromFUTBin = async (squadId) => {
           return resolve(null);
         }
 
-        const playersDetail = $(res.response).find(".cardetails");
+        const playersDetail = $(res.response).find(".card.cardnum");
 
         const platform = getUserPlatform();
         const futBinPlatform =
           platform === "ps" ? "Ps3" : platform === "xbox" ? "Xbl" : "Pc";
-        const playerIds = {};
-        playersDetail.each((_, player) => {
+        const playerIds = [];
+        playersDetail.each((_, playerWrapper) => {
+          const { dataset: cardDataSet } = playerWrapper;
+          const player = $(playerWrapper).find(".cardetails");
           if ($(player).hasClass("hide")) {
             return;
           }
@@ -124,9 +126,15 @@ export const getSbcPlayersInfoFromFUTBin = async (squadId) => {
           if (playerDetail.length) {
             const { dataset } = playerDetail[0];
             const definitionId = parseInt(dataset.resourceId, 10);
+            const positionId = parseInt(cardDataSet.cardid, 10);
             const playerPos = dataset.formposOriginal;
             const price = dataset[`price${futBinPlatform}`];
-            playerIds[definitionId] = { position: playerPos, price };
+            playerIds.push({
+              definitionId,
+              position: playerPos,
+              price,
+              positionId,
+            });
           }
         });
         resolve(playerIds);