From c52cf1fc3f73b30329986d4964783b1f8a761ee0 Mon Sep 17 00:00:00 2001 From: Matt Hill Date: Mon, 28 Nov 2022 19:20:07 -0700 Subject: [PATCH] remove community registry from FE defaults (#1988) * remove community registry from FE defaults * fix: Changes requested from matt (#1989) * fix: Changes requested from matt * chore: Remove more of the migration for the community Co-authored-by: J M <2364004+Blu-J@users.noreply.github.com> --- backend/src/version/v0_3_3.rs | 38 ------------------- frontend/patchdb-ui-seed.json | 3 +- .../modals/os-welcome/os-welcome.page.html | 1 - .../src/app/services/marketplace.service.ts | 2 +- .../src/app/services/patch-db/data-model.ts | 2 +- 5 files changed, 3 insertions(+), 43 deletions(-) diff --git a/backend/src/version/v0_3_3.rs b/backend/src/version/v0_3_3.rs index 4b89a2794..462159c1b 100644 --- a/backend/src/version/v0_3_3.rs +++ b/backend/src/version/v0_3_3.rs @@ -8,21 +8,6 @@ use crate::{COMMUNITY_MARKETPLACE, DEFAULT_MARKETPLACE}; const V0_3_3: emver::Version = emver::Version::new(0, 3, 3, 0); -lazy_static::lazy_static! { - static ref COMMUNITY_PACKAGES: Vec<&'static str> = vec![ - "robosats", - "syncthing", - "balanceofsatoshis", - "lightning-jet", - "mastodon", - "sphinx-relay", - "agora", - "lndg", - "synapse", - "thunderhub", - ]; -} - #[derive(Clone, Debug)] pub struct Version; @@ -68,7 +53,6 @@ impl VersionT for Version { } 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"); @@ -78,28 +62,6 @@ impl VersionT for Version { } ui.save(db).await?; - for package_id in crate::db::DatabaseModel::new() - .package_data() - .keys(db) - .await? - .iter() - { - let id: &str = &**package_id; - if COMMUNITY_PACKAGES.iter().find(|x| x == &&id).is_none() { - continue; - } - let mut package = crate::db::DatabaseModel::new() - .package_data() - .idx_model(package_id) - .and_then(|x| x.installed()) - .get_mut(db) - .await?; - if let Some(ref mut package) = *package { - package.marketplace_url = Some(MarketPlaceUrls::Community.url().parse().unwrap()); - } - package.save(db).await?; - } - Ok(()) } async fn down(&self, db: &mut Db) -> Result<(), Error> { diff --git a/frontend/patchdb-ui-seed.json b/frontend/patchdb-ui-seed.json index deb00df22..d816681ec 100644 --- a/frontend/patchdb-ui-seed.json +++ b/frontend/patchdb-ui-seed.json @@ -4,8 +4,7 @@ "marketplace": { "selected-url": "https://registry.start9.com/", "known-hosts": { - "https://registry.start9.com/": {}, - "https://community-registry.start9.com/": {} + "https://registry.start9.com/": {} } }, "dev": {}, diff --git a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html index eb23bcba6..121e927e9 100644 --- a/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html +++ b/frontend/projects/ui/src/app/modals/os-welcome/os-welcome.page.html @@ -26,7 +26,6 @@