Skip to content

Commit 9a59d2f

Browse files
committed
refacto get_allowed_objects
1 parent d58e508 commit 9a59d2f

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

components/ObjectSelector.vue

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,17 +66,20 @@
6666
const allowed_objects = ref({})
6767
const toggle_loading = useToggle(loading)
6868
69-
70-
function select_geode_object(object_map) {
69+
70+
function select_geode_object(object_map) {
7171
const object_keys = Object.keys(object_map)
7272
if (!object_keys.length) {
73-
return null
73+
return
74+
}
75+
if (object_keys.length === 1 && object_map[object_keys[0]].is_loadable > 0) {
76+
return object_keys[0]
7477
}
7578
const highest_load_score = Math.max(
7679
...object_keys.map((key) => object_map[key].is_loadable),
7780
)
7881
if (highest_load_score <= 0) {
79-
return null
82+
return
8083
}
8184
const best_score_objects = object_keys.filter(
8285
(key) => object_map[key].is_loadable === highest_load_score,
@@ -95,7 +98,7 @@
9598
if (highest_priority !== -Infinity && best_priority_objects.length === 1) {
9699
return best_priority_objects[0]
97100
}
98-
return null
101+
return
99102
}
100103
101104
@@ -126,14 +129,9 @@ async function get_allowed_objects() {
126129
}
127130
}
128131
allowed_objects.value = final_object
129-
let already_selected = false
130132
const selected_object = select_geode_object(final_object)
131133
if (selected_object) {
132134
set_geode_object(selected_object)
133-
already_selected = true
134-
}
135-
if (!already_selected && Object.keys(final_object).length === 1) {
136-
set_geode_object(Object.keys(final_object)[0])
137135
}
138136
toggle_loading()
139137
}

0 commit comments

Comments
 (0)