From c5124db29fd14a23a679068764ef7519b23ad3f6 Mon Sep 17 00:00:00 2001 From: MotorTruck1221 Date: Sun, 27 Oct 2024 05:03:17 -0600 Subject: [PATCH] Whoops, forgot that shit --- src/components/catalog/InstalledPlugins.svelte | 5 +++-- src/pages/[lang]/catalog/package/[...packageName].astro | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/catalog/InstalledPlugins.svelte b/src/components/catalog/InstalledPlugins.svelte index 045933d..fce23a5 100644 --- a/src/components/catalog/InstalledPlugins.svelte +++ b/src/components/catalog/InstalledPlugins.svelte @@ -19,7 +19,8 @@ async function getAssets() { const items = JSON.parse(localStorage.getItem(Settings.PluginSettings.plugins)) || []; const promises = items.map(getItem); const dataArray = await Promise.all(promises); - const accumulatedData = dataArray.filter((data) => data !== null); + let accumulatedData = dataArray.filter((data) => data !== null); + accumulatedData = accumulatedData.filter(({ remove }) => remove === true); console.log(JSON.stringify(accumulatedData)); return accumulatedData; } @@ -37,7 +38,7 @@ let compRef = [];
{asset.title}
-
{settings.marketPlaceSettings.uninstall(asset.type, asset.name); compRef[key].$destroy()}}> +
{settings.marketPlaceSettings.uninstall(asset.type === "page" ? "plugin-page" : "plugin-sw", asset.package_name); compRef[key].$destroy()}}> diff --git a/src/pages/[lang]/catalog/package/[...packageName].astro b/src/pages/[lang]/catalog/package/[...packageName].astro index 4a4889c..8e4f787 100644 --- a/src/pages/[lang]/catalog/package/[...packageName].astro +++ b/src/pages/[lang]/catalog/package/[...packageName].astro @@ -58,7 +58,7 @@ import type { SWPagePlugin } from "@utils/settings/types"; const cssItemExists = cssItems.indexOf(packageName) !== -1; const pluginItems = JSON.parse(localStorage.getItem(Settings.PluginSettings.plugins) as string) || []; //@ts-ignore - const pluginItemExists = pluginItems.find(({ name }) => name === packageName); + const pluginItemExists = pluginItems.find(({ name, remove }) => name === packageName && remove !== true); const installButton = document.getElementById("install") as HTMLButtonElement; const uninstallButton = document.getElementById("uninstall") as HTMLButtonElement; const payload = assetsJson ? JSON.parse(assetsJson) : undefined;