Merge branch 'TCORE-228_Refactor_Plugin_SQLite' into TCORE-228_Refact…

…or_Plugin_Others
tago-io · Oct 10, 2024 · 192a1f1 · 192a1f1
2 parents b5dd55a + c6201e0
commit 192a1f1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/packages/tcore-api/src/Plugins/Plugin/Plugin.ts b/packages/tcore-api/src/Plugins/Plugin/Plugin.ts
@@ -230,6 +230,9 @@ class Plugin {
   public static async returnFullDescription(folder: string, relativePath: string) {
     const fullPath = path.join(folder, relativePath);
     const data = fs.readFileSync(fullPath, "utf8");
+    if (!data) {
+      return "";
+    }
     return data;
   }
 }

diff --git a/packages/tcore-api/src/Services/Plugins.ts b/packages/tcore-api/src/Services/Plugins.ts
@@ -122,15 +122,16 @@ async function getInstalledInsidePlugins(plugins: string[], settings: ISettings)
     const fullPath = path.join(__dirname, "../../../..", "plugins", folder);
     const getPackage = await Plugin.getPackageAsync(fullPath).catch(() => null);
 
-    if (getPackage) {
-      const isInstalled = settings.installed_plugins?.includes(md5(getPackage.name));
-      const isInstalledDatabasePlugin = settings.database_plugin?.split(":")[0] === md5(getPackage.name);
-      const isDatabase = getPackage?.tcore?.types?.includes("database");
-      const isStore = getPackage?.tcore?.store;
-
-      if (isInstalled || isInstalledDatabasePlugin || (isDatabase && !settings.database_plugin) || isStore) {
-        plugins.push(fullPath);
-      }
+    if (!getPackage) {
+      continue;
+    }
+    const isInstalled = settings.installed_plugins?.includes(md5(getPackage.name));
+    const isInstalledDatabasePlugin = settings.database_plugin?.split(":")[0] === md5(getPackage.name);
+    const isDatabase = getPackage?.tcore?.types?.includes("database");
+    const isStore = getPackage?.tcore?.store;
+
+    if (isInstalled || isInstalledDatabasePlugin || (isDatabase && !settings.database_plugin) || isStore) {
+      plugins.push(fullPath);
     }
   }
 }

diff --git a/packages/tcore-console/src/Components/Sidebar/PluginButton/PluginButton.tsx b/packages/tcore-console/src/Components/Sidebar/PluginButton/PluginButton.tsx
@@ -122,13 +122,6 @@ function PluginButton(props: IPluginButtonProps) {
               <span>Disable Plugin</span>
             </div>
           ))}
-
-        {item.allow_uninstall && (
-          <div className="item" onClick={() => setModalUninstall(true)}>
-            <Icon icon={EIcon["trash-alt"]} />
-            <span>Remove Plugin</span>
-          </div>
-        )}
       </Style.Dropdown>
 
       {modalUninstall && (