poi-plugin-item-improvement2-beta 1.0.0 → 1.0.2

package/.idea/workspace.xml

@@ -14,6 +14,12 @@
       <change beforePath="$PROJECT_DIR$/views/item-info-area.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/item-info-area.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/mat-row.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/mat-row.es" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/views/selectors.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/selectors.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/add-new-equip-view.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/control-panel.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/control-panel.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/equip-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/equip-view.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-modify-control.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/plan-view.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/plan-view.es" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/views/starcraft/utils.es" beforeDir="false" afterPath="$PROJECT_DIR$/views/starcraft/utils.es" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -127,7 +133,7 @@
       <workItem from="1768548645399" duration="890000" />
       <workItem from="1768577343916" duration="24825000" />
       <workItem from="1777260186359" duration="1000" />
-      <workItem from="1780066941937" duration="76803000" />
+      <workItem from="1780066941937" duration="78096000" />
     </task>
     <servers />
   </component>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "poi-plugin-item-improvement2-beta",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "use new data source",
   "main": "index.es",
   "scripts": {

package/views/selectors.js

@@ -120,21 +120,19 @@ const equipLevelStatSelector = (0, _reselect.createSelector)([_selectors.equipsS
 exports.equipLevelStatSelector = equipLevelStatSelector;
 const baseImprovementDataSelector = (0, _reselect.createSelector)([_selectors.constSelector, adjustedRemodelChainsSelector, shipUniqueMapSelector], $const => (0, _lodash.default)(LOCAL_ARSENAL).keys().map(itemId => {
   const item = LOCAL_ITEMS[itemId] || {};
-  const assistants = (0, _lodash.default)(_lodash.default.range(7).concat(-1)).map(day => {
+  const assistantsTextByDay = (0, _lodash.default)(_lodash.default.range(7).concat(-1)) //[0,1,2,3,4,5,6,-1]
+  .map(day => {
     const list = (0, _lodash.default)(item.improvementList || []).flatMap(improvement => {
       const shipWeek = improvement.shipWeekList || [];
-
-      if (day === -1 || (improvement.weekdays || []).includes(day)) {
-        return shipWeek.map(s => s.text);
-      }
-
-      return [];
+      const matchDay = day === -1 || improvement.weekdays[day];
+      if (!matchDay) return [];
+      return shipWeek.map(s => s.text);
     }).value();
     return [day, list.join('/')];
   }).fromPairs().value();
   return _extends({}, _lodash.default.get($const, ['$equips', item.id], {}), item, {
     priority: 0,
-    assistants
+    assistantsTextByDay
   });
 }).value());
 const improvementDataSelector = (0, _reselect.createSelector)([baseImprovementDataSelector, starCraftPlanSelector, equipLevelStatSelector], (data, plans, levels) => (0, _lodash.default)(data).map(item => {