Skip to content

Commit

Permalink
fix: fissure notification options
Browse files Browse the repository at this point in the history
fix: synth portraits
  • Loading branch information
TobiTenno committed Feb 5, 2025
1 parent 3fd290a commit 7967510
Show file tree
Hide file tree
Showing 15 changed files with 1,479 additions and 1,480 deletions.
2 changes: 1 addition & 1 deletion components/SynthesisImg.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default {
render() {
return (
<HubImg
src={this.$props.src}
src={this.src}
name={this.$props.name}
title={this.$props.name}
height={this.$props.height}
Expand Down
3 changes: 2 additions & 1 deletion components/modalDialogs/Filters/ComponentsFilter.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ export default {
value: this.componentState[component].key,
};
})
.filter((c) => c);
.filter((c) => c)
.sort((a, b) => a.text.localeCompare(b.text));
},
},
render() {
Expand Down
2 changes: 1 addition & 1 deletion components/modalDialogs/Filters/FissureFilters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
options={this.fissureStates}
switches
stacked
class="settings-group fissure-setting-group"
class={'settings-group fissure-setting-group'}
></b-form-checkbox-group>
</b-form-group>
</div>
Expand Down
3 changes: 2 additions & 1 deletion components/modalDialogs/Filters/NotificationFilters.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export default {
fissureStates() {
return Object.keys(this.trackableState.eventTypes)
.filter((k) => k.includes('fissures'))
.map((k) => this.trackableState.eventTypes[k]);
.map((k) => this.trackableState.eventTypes[k])
.sort((a, b) => a.value.localeCompare(b.value));
},
arbiStates() {
return Object.keys(this.trackableState.eventTypes)
Expand Down
6 changes: 5 additions & 1 deletion components/panels/FissuresPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,11 @@ export default {
return (pState.length > 0 ? !isFiltered : true) && include;
})
.sort((a, b) => {
return a.isStorm && !b.isStorm ? 1 : !a.isStorm && b.isStorm ? -1 : a.tierNum - b.tierNum;
if (a.tierNum < b.tierNum) return -1;
if (a.tierNum > b.tierNum) return 1;
if (a.isStorm && !b.isStorm) return 1;
if (!a.isStorm && b.isStorm) return -1;
return 0;
});
},
},
Expand Down
Loading

0 comments on commit 7967510

Please sign in to comment.