Skip to content

Commit 5eae744

Browse files
committed
fix: don't display links to nonexisting objects
1 parent fb8a676 commit 5eae744

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

src/sideMenu/module.jsx

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ ac(ti.Transform, (c, o) => {
399399
function bs(v) { return v ? $t.yes : $t.no }
400400

401401
ac(ti.CrystalDestroyable, (c, o) => {
402-
const v = meta.xpForCrystalSize[c.size] ?? '<Unknown>'
402+
const v = meta.xpForCrystalSize[c.size] ?? Unknown
403403
return <Props>
404404
<Prop>{$t.dropsxp + ':'}{bs(c.dropXp) + (c.dropXp ? ` (${v}xp)` : '')}</Prop>
405405
<Prop>{$t.size + ':'}{c.size}</Prop>
@@ -447,10 +447,10 @@ ac(ti.CircleCollider2D, (c, o) => {
447447
})
448448

449449
function Link({ index, obj }) {
450-
const referenceInfo = obj.referenceInfos[index] ?? []
451-
const displayName = referenceInfo[0] != null ? referenceInfo[0] || '<No name>' : '<Unknown>'
450+
const referenceInfo = obj.referenceInfos[index]
452451

453-
if(index != null) {
452+
if(referenceInfo != null) {
453+
const displayName = referenceInfo[0] || <i>{'<No name>'}</i>
454454
const url = new URL(window.location.href)
455455
if(referenceInfo[1] != null && referenceInfo[2] != null) {
456456
url.searchParams.set('posx', referenceInfo[1])
@@ -469,7 +469,7 @@ function Link({ index, obj }) {
469469
return <a href={url} onClick={onClick}>{displayName}</a>
470470
}
471471
else {
472-
return <span>{displayName}</span>
472+
return <span><i>{'<None>'}</i></span>
473473
}
474474
}
475475

@@ -500,7 +500,7 @@ ac(ti.Unlocker, (c, o) => {
500500
}
501501

502502
return <Props>
503-
<Prop>KeyUse:{keyUses[c.keyUse] ?? '<Unknown>'}</Prop>
503+
<Prop>KeyUse:{keyUses[c.keyUse] ?? Unknown}</Prop>
504504
<Prop>{$t.target + ':'}<Link index={c.target} obj={o}/></Prop>
505505
<Prop>Target bis (?):<Link index={c.targetBis} obj={o}/></Prop>
506506
<Prop>{$t.group + ':'}<Props>{gc}</Props></Prop>
@@ -586,23 +586,25 @@ const statsNames = [
586586
'PowerSlowLevel',
587587
]
588588

589+
const Unknown = <i>{'<Unknown'}</i>
590+
589591
ac(ti.ModulePickup, (c, o) => {
590592
return <Props>
591-
<Prop>{$t.name + ':'}{moduleNames[c.moduleId] ?? '<Unknown>'}</Prop>
593+
<Prop>{$t.name + ':'}{moduleNames[c.moduleId] ?? Unknown}</Prop>
592594
<Component comp={c._base} obj={o}/>
593595
</Props>
594596
});
595597

596598
ac(ti.SkillPickup, (c, o) => {
597599
return <Props>
598-
<Prop>{$t.name + ':'}{skillNames[c.skillId] ?? '<Unknown>'}</Prop>
600+
<Prop>{$t.name + ':'}{skillNames[c.skillId] ?? Unknown}</Prop>
599601
<Component comp={c._base} obj={o}/>
600602
</Props>
601603
});
602604

603605
ac(ti.StatsPickup, (c, o) => {
604606
return <Props>
605-
<Prop>{$t.name + ':'}{statsNames[c.statsId] ?? '<Unknown>'}</Prop>
607+
<Prop>{$t.name + ':'}{statsNames[c.statsId] ?? Unknown}</Prop>
606608
<Prop>{$t.level + ':'}{c.level}</Prop>
607609
<Component comp={c._base} obj={o}/>
608610
</Props>
@@ -621,7 +623,7 @@ ac(ti.Buyable, (c, o) => {
621623

622624
ac(ti.KeyUnique, (c, o) => {
623625
return <Props>
624-
<Prop>{$t.name + ':'}{keyUses[c.keyId] ?? '<Unknown>'}</Prop>
626+
<Prop>{$t.name + ':'}{keyUses[c.keyId] ?? Unknown}</Prop>
625627
<Component comp={c._base} obj={o}/>
626628
</Props>
627629
});

0 commit comments

Comments
 (0)