Updated dependencies, fixed imports, updated db calls

Author: dragoni7

package-lock.json

@@ -10,6 +10,8 @@ import {
 import ArmorIcon from '../../components/ArmorIcon';
 import { STAT_HASH, STATS } from '../../lib/bungie_api/constants';
 import { getStatModByCost } from '../../lib/bungie_api/utils';
+import { ManifestArmorStatMod } from '../../types/manifest-types';
+import { db } from '../../store/db';
 
 interface StatsTableProps {
   permutations: FilteredPermutation[];
@@ -249,19 +251,15 @@ const StatsTable: React.FC<StatsTableProps> = ({ permutations, onPermutationClic
             onClick={() => {
               dispatch(resetLoadoutArmorMods());
               dispatch(updateLoadoutArmor(perm.permutation));
-              let requiredMods: Plug[] = [];
+              let requiredMods: ManifestArmorStatMod[] = [];
+
               Object.entries(perm.modsArray).forEach(([stat, costs]) => {
-                costs.forEach((cost: number) => {
-                  requiredMods.push({
-                    plugItemHash: String(
-                      getStatModByCost(
-                        cost,
-                        STAT_HASH[stat.toUpperCase() as keyof typeof STAT_HASH]
-                      )
-                    ),
-                    socketArrayType: 0,
-                    socketIndex: 0,
-                  });
+                costs.forEach(async (cost: number) => {
+                  const mod = await db.manifestArmorStatModDef
+                    .where(stat + 'Mod')
+                    .equals(cost)
+                    .first();
+                  if (mod !== undefined) requiredMods.push(mod);
                 });
               });
               dispatch(updateRequiredStatMods(requiredMods));

src/features/armor-optimization/StatsTable.tsx

@@ -4,9 +4,9 @@ import { useDispatch } from 'react-redux';
 import ArmorIcon from '../../../components/ArmorIcon';
 import { updateLoadoutArmorMods } from '../../../store/LoadoutReducer';
 import { DestinyArmor, Plug } from '../../../types/d2l-types';
-import ArmorModSelector from './armor-mod-selector';
+import ArmorModSelector from './ArmorModSelector';
 import { getSelectedModsBySlot, getModsBySlot } from '../util';
-import { ManifestArmorMod } from '../../../types/manifest-types';
+import { ManifestArmorMod, ManifestArmorStatMod } from '../../../types/manifest-types';
 
 interface ArmorConfigProps {
   armor: DestinyArmor;
@@ -33,7 +33,11 @@ const ArmorConfig: React.FC<ArmorConfigProps> = ({ armor, statMods, artificeMods
     );
   };
 
-  const onSelectMod = async (mod: ManifestArmorMod, slot: number, socketIndex: number) => {
+  const onSelectMod = async (
+    mod: ManifestArmorMod | ManifestArmorStatMod,
+    slot: number,
+    socketIndex: number
+  ) => {
     let totalCost = mod.energyCost;
 
     for (const key in selectedMods) {
@@ -57,11 +61,7 @@ const ArmorConfig: React.FC<ArmorConfigProps> = ({ armor, statMods, artificeMods
       updateLoadoutArmorMods({
         armorType: armor.type,
         slot: slot,
-        plug: {
-          plugItemHash: String(mod.itemHash),
-          socketArrayType: 0,
-          socketIndex: socketIndex,
-        },
+        plug: mod,
       })
     );
     setSelectedMods(getSelectedModsBySlot(armor.type));

src/features/armor/components/ArmorConfig.tsx

@@ -1,5 +1,6 @@
 import { Box } from '@mui/system';
-import { Plug, ManifestArmorMod } from '../../../types/d2l-types';
+import { Plug } from '../../../types/d2l-types';
+import { ManifestArmorMod } from '../../../types/manifest-types';
 
 interface ModSelectorProps {
   selected: Plug;

src/features/armor/components/armor-mod-selector.tsx renamed to src/features/armor/components/ArmorModSelector.tsx

@@ -16,12 +16,12 @@ const LoadoutArmor: React.FC = () => {
 
   useEffect(() => {
     const gatherMods = async () => {
-      const dbStatMods = await db.manifestArmorModDef
+      const dbStatMods = await db.manifestArmorStatModDef
         .where('category')
         .equals(PLUG_CATEGORY_HASH.ARMOR_MODS.STAT_ARMOR_MODS)
         .toArray();
 
-      const dbArtificeMods = await db.manifestArmorModDef
+      const dbArtificeMods = await db.manifestArmorStatModDef
         .where('category')
         .equals(PLUG_CATEGORY_HASH.ARMOR_MODS.ARTIFICE_ARMOR_MODS)
         .toArray();
@@ -50,7 +50,7 @@ const LoadoutArmor: React.FC = () => {
       let matches: ManifestArmorMod[] = [];
 
       for (const mod of requiredStatMods) {
-        const found = allStatMods.find((statMod) => String(statMod.itemHash) === mod.plugItemHash);
+        const found = allStatMods.find((statMod) => String(statMod.itemHash) === mod.itemHash);
         if (found) matches.push(found);
       }
 

src/features/armor/components/LoadoutArmor.tsx

@@ -1,5 +1,4 @@
-import styled from '@emotion/styled';
-import { Paper, Button, Typography } from '@mui/material';
+import { Paper, Button, Typography, styled } from '@mui/material';
 import { Box, Container } from '@mui/system';
 import React, { useCallback, useEffect, useState } from 'react';
 import { useSelector, useDispatch } from 'react-redux';