Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-04-04 14:29:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix/0.3.3 migration (#1922)

Browse Source 
* feat: Change migration to use empty name

* chore: Add in the default routes just in case

* Fix/remove merge with seed during init (#1917)

* fix kiosk

* chore: Remove the duplicate loggging information that is making usele… (#1912)

chore: Remove the duplicate loggging information that is making useless noise in the system.

* fix: Remove the init merge with seed

Co-authored-by: Aiden McClelland <me@drbonez.dev>

Co-authored-by: BluJ <mogulslayer@gmail.com>
Co-authored-by: J M <2364004+Blu-J@users.noreply.github.com>
This commit is contained in:
Aiden McClelland
2022-11-09 12:09:05 -07:00
parent d6bf52c11f
commit 0e82b6981f
3 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
backend/src/version/v0_3_3.rs
View File

@@ -58,13 +58,18 @@ impl VersionT for Version {
obj.remove("auto-check-updates");
}
let known_hosts = ui["marketplace"]["known-hosts"].take();
ui["marketplace"]["known-hosts"] = json!({});
if let Value::Object(known_hosts) = known_hosts {
for (_id, value) in known_hosts {
if let (Value::String(name), Value::String(url)) = (&value["name"], &value["url"]) {
ui["marketplace"]["known-hosts"][name] = json!(url);
if let Value::String(url) = &value["url"] {
ui["marketplace"]["known-hosts"][url] = json!({});
}
}
}
ui["marketplace"]["known-hosts"]["https://registry.start9.com/"] = json!({});
ui["marketplace"]["known-hosts"]["https://community-registry.start9.com/"] = json!({});
if let Some(Value::Object(ref mut obj)) = ui.get_mut("marketplace") {
obj.remove("selected-id");
}
@@ -105,10 +110,10 @@ impl VersionT for Version {
let known_hosts = ui["marketplace"]["known-hosts"].take();
ui["marketplace"]["known-hosts"] = json!({});
if let Value::Object(known_hosts) = known_hosts {
for (url, name) in known_hosts {
if let Value::String(name) = name {
for (url, obj) in known_hosts {
if let Value::String(name) = &obj["name"] {
let id = uuid::Uuid::new_v4().to_string();
if Some(&name) == selected_url.as_ref() {
if Some(name) == selected_url.as_ref() {
ui["marketplace"]["selected-id"] = Value::String(id.clone());
}
ui["marketplace"]["known-hosts"][id.as_str()] = json!({