M-Labs
/
web2019
5
0
Fork 2
Code Issues 18 Pull Requests Releases Wiki Activity

Start adding the warnings 

Signed-off-by: Egor Savkin <es@m-labs.hk>
pull/113/head
Egor Savkin 2023-12-08 17:36:12 +08:00
parent 94f321ecf7
commit 9bdaca2ca9
4 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/shop/CrateList.jsx
View File

@ -2,16 +2,16 @@ import React from 'react'
import {Accordion} from "react-bootstrap";
import {Crate} from "./Crate.jsx";
export function CrateList({crates, isMobile, isTouch, onAddCrate, onDeleteCrate, onModeChange}) {
export function CrateList({crates, active_crate, isMobile, isTouch, onAddCrate, onDeleteCrate, onModeChange, onCrateSelect}) {
const onClickAdd = (_) => {
onAddCrate("crate" + Object.entries(crates).length);
}
return (
<Accordion defaultActiveKey="0">
<Accordion defaultActiveKey={active_crate}>
{Object.entries(crates).map(([crate_id, crate], index) =>
<Accordion.Item eventKey={`${index}`} key={`crate${index}`}>
<Accordion.Header>Crate #{`${index}`}</Accordion.Header>
<Accordion.Item eventKey={crate_id} key={`crate${index}`} >
<Accordion.Header onClick={() => onCrateSelect(crate_id)}>Crate #{`${index}`}</Accordion.Header>
<Accordion.Body>
<Crate
data={{id: crate_id, ...crate}}

56
static/js/shop/Shop.jsx
View File

@ -11,7 +11,7 @@ import {Backlog} from "./Backlog.jsx";
import {OrderPanel} from "./OrderPanel.jsx";
import {OrderSummary} from "./OrderSummary.jsx";
import {OrderForm} from "./OrderForm.jsx";
import {TriggerWarnings} from "./warnings";
import {TriggerCrateWarnings, TriggerWarnings} from "./warnings";
import {FillResources} from "./count_resources";
import {CrateList} from "./CrateList.jsx";
@ -51,6 +51,7 @@ export class Shop extends PureComponent {
this.onAddCrate = this.onAddCrate.bind(this);
this.onDeleteCrate = this.onDeleteCrate.bind(this);
this.onCrateModeChange = this.onCrateModeChange.bind(this);
this.onCrateSelected = this.onCrateSelected.bind(this);
this.timer = null;
this.timer_remove = null;
@ -107,6 +108,13 @@ export class Shop extends PureComponent {
clearTimeout(this.timer);
}
onCrateChanged(crate_id) {
// kinda silly that hover over cards triggers checkAlerts
this.checkAlerts(crate_id)
}
handleCardsUpdated() {
this.checkAlerts(this.state.columns.cart.items);
}
@ -405,6 +413,7 @@ export class Shop extends PureComponent {
)}}
}
});
this.onCrateChanged(destination.droppableId);
break;
case 'backlog':
this.setState({
@ -423,6 +432,7 @@ export class Shop extends PureComponent {
)}}
}
});
this.onCrateChanged(destination.droppableId);
break;
default:
this.setState({
@ -450,18 +460,12 @@ export class Shop extends PureComponent {
});
}
checkAlerts(newItems) {
checkAlerts(crate_id) {
console.log('--- START CHECKING CRATE WARNING ---');
return;
const {
currentMode,
crateModeSlots,
crateRules,
} = this.state;
let itemsCloned = Array.from(this.state.columns.crates[crate_id].items);
let itemsCloned = Array.from(newItems);
const rules = {};
const crate_warnings = TriggerCrateWarnings(this.state.columns.crates[crate_id]);
itemsCloned.forEach((elem, idx) => {
if (!(idx in itemsCloned)) itemsCloned[idx] = elem;
@ -473,27 +477,20 @@ export class Shop extends PureComponent {
itemsCloned = FillResources(itemsCloned);
itemsCloned = TriggerWarnings(itemsCloned);
// check number of slot in crate
const nbrOccupied = nbrOccupiedSlotsInCrate(newItems);
if (nbrOccupied > crateModeSlots[currentMode]) {
rules[crateRules.maxSlot.type] = {...crateRules.maxSlot};
} else if (crateModeSlots[currentMode] === 21 && nbrOccupied <= 10) {
rules[crateRules.compactSlot.type] = {...crateRules.compactSlot};
}
// update state with rules
this.setState({
...this.state,
columns: {
...this.state.columns,
cart: {
...this.state.columns.cart,
itemsData: itemsCloned,
crates: {
...this.state.columns.crates,
[crate_id]: {
...this.state.columns.crates[crate_id],
items: itemsCloned,
warnings: crate_warnings
},
}
},
rules: {
...rules,
},
}
});
}
@ -525,6 +522,13 @@ export class Shop extends PureComponent {
this.setState(new_state);
}
onCrateSelected(id) {
console.log(id)
this.setState({
active_crate: id
})
}
onCrateModeChange(crate_id, new_mode) {
let new_state = {
...this.state,
@ -604,6 +608,8 @@ export class Shop extends PureComponent {
onAddCrate={this.onAddCrate}
onDeleteCrate={this.onDeleteCrate}
onModeChange={this.onCrateModeChange}
onCrateSelect={this.onCrateSelected}
active_crate={this.state.active_crate}
/>
}
summaryPrice={

33
static/js/shop/warnings.js
View File

@ -5,7 +5,8 @@
* Second - resources indicator should be separate component
*/
import {item_occupied_counters} from "./count_resources";
import {crate_type_to_hp, item_occupied_counters, resource_counters} from "./count_resources";
import {data as shared_data} from "./utils";
const Levels = {
"reminder": {priority: 1, icon: '/images/shop/icon-reminder.svg'},
@ -120,4 +121,34 @@ export function MaxLevel(warnings) {
if (Levels[warning.level].priority > mx.priority) mx = Levels[warning.level];
}
return mx;
}
const crate_warnings = {
"overfit": {
message: "You have reached the maximum number of slots allowed for this crate. Consider removing cards.",
level: "warning",
trigger: (crate, occupied) => {
const nbrHP = crate_type_to_hp(crate.crate_type);
return occupied > nbrHP;
}
},
"underfit_rack": {
message: "The selected cards fit in a 42hp desktop crate, consider switching to it for a more compact system",
level: "reminder",
trigger: (crate, occupied) => {
const nbrHPDesktop = shared_data.crateModes.desktop.hp;
return crate.crate_type === shared_data.crateModes.rack.id && occupied < nbrHPDesktop;
}
}
}
export function TriggerCrateWarnings(crate) {
const nbrOccupied = resource_counters.hp(crate.items, -1);
let warnings = [];
Object.entries(crate_warnings).forEach(([id, warning], _) => {
if (warning.trigger(crate, nbrOccupied)) warnings.push({...warning, id: id, trigger: undefined});
})
return warnings;
}

3
static/js/shop_data.js
View File

@ -1188,7 +1188,8 @@ const shop_data = {
"crates": {
"crate0": {
crate_type: "rack",
items: []
items: [],
warnings: []
}
}