PluginDrawer now fetches plugin details itself. (#12703)

src/frontend/src/components/plugins/PluginDrawer.tsx

@@ -1,7 +1,7 @@
 import { t } from '@lingui/core/macro';
 import { Accordion, Alert, Card, Stack, Text } from '@mantine/core';
 import { IconExclamationCircle } from '@tabler/icons-react';
-import { useMemo } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useParams } from 'react-router-dom';
 
 import { StylishText } from '@lib/components/StylishText';
@@ -17,10 +17,10 @@ import PluginSettingsPanel from './PluginSettingsPanel';
  */
 export default function PluginDrawer({
   pluginKey,
-  pluginInstance
+  onPluginLoaded
 }: Readonly<{
-  pluginKey?: string;
+  pluginKey: string;
-  pluginInstance: PluginInterface;
+  onPluginLoaded?: (plugin: PluginInterface) => void;
 }>) {
   const { id } = useParams();
 
@@ -28,6 +28,15 @@ export default function PluginDrawer({
     return pluginKey || id || '';
   }, [pluginKey, id]);
 
+  const {
+    instance: plugin,
+    instanceQuery: { isFetching, error }
+  } = useInstance<PluginInterface>({
+    endpoint: ApiEndpoints.plugin_list,
+    hasPrimaryKey: true,
+    pk: pluginPrimaryKey
+  });
+
   const { instance: pluginAdmin } = useInstance({
     endpoint: ApiEndpoints.plugin_admin,
     pathParams: { key: pluginPrimaryKey },
@@ -36,11 +45,21 @@ export default function PluginDrawer({
     refetchOnMount: true
   });
 
-  const hasSettings: boolean = useMemo(() => {
+  useEffect(() => {
-    return !!pluginInstance?.mixins?.settings;
+    if (plugin) {
-  }, [pluginInstance]);
+      onPluginLoaded?.(plugin);
+    }
+  }, [plugin, onPluginLoaded]);
 
-  if (!pluginInstance.active) {
+  const hasSettings: boolean = useMemo(() => {
+    return !!plugin?.mixins?.settings;
+  }, [plugin]);
+
+  if (isFetching || !plugin) {
+    return null;
+  }
+
+  if (!plugin.active) {
     return (
       <Alert
         color='red'
@@ -63,42 +82,38 @@ export default function PluginDrawer({
             <Card withBorder>
               <Stack gap='md'>
                 <Stack pos='relative' gap='xs'>
-                  <InfoItem
+                  <InfoItem type='text' name={t`Name`} value={plugin?.name} />
-                    type='text'
-                    name={t`Name`}
-                    value={pluginInstance?.name}
-                  />
                   <InfoItem
                     type='text'
                     name={t`Description`}
-                    value={pluginInstance?.meta.description}
+                    value={plugin?.meta.description}
                   />
                   <InfoItem
                     type='text'
                     name={t`Author`}
-                    value={pluginInstance?.meta.author}
+                    value={plugin?.meta.author}
                   />
                   <InfoItem
                     type='text'
                     name={t`Date`}
-                    value={pluginInstance?.meta.pub_date}
+                    value={plugin?.meta.pub_date}
                   />
                   <InfoItem
                     type='text'
                     name={t`Version`}
-                    value={pluginInstance?.meta.version}
+                    value={plugin?.meta.version}
                   />
                   <InfoItem
                     type='boolean'
                     name={t`Active`}
-                    value={pluginInstance?.active}
+                    value={plugin?.active}
                   />
-                  {pluginInstance?.meta.website && (
+                  {plugin?.meta.website && (
                     <InfoItem
                       type='text'
                       name={t`Website`}
-                      value={pluginInstance?.meta.website}
+                      value={plugin?.meta.website}
-                      link={pluginInstance?.meta.website}
+                      link={plugin?.meta.website}
                     />
                   )}
                 </Stack>
@@ -107,27 +122,27 @@ export default function PluginDrawer({
             <Card withBorder>
               <Stack gap='md'>
                 <Stack pos='relative' gap='xs'>
-                  {pluginInstance?.is_package && (
+                  {plugin?.is_package && (
                     <InfoItem
                       type='text'
                       name={t`Package Name`}
-                      value={pluginInstance?.package_name}
+                      value={plugin?.package_name}
                     />
                   )}
                   <InfoItem
                     type='text'
                     name={t`Installation Path`}
-                    value={pluginInstance?.meta.package_path}
+                    value={plugin?.meta.package_path}
                   />
                   <InfoItem
                     type='boolean'
                     name={t`Builtin`}
-                    value={pluginInstance?.is_builtin}
+                    value={plugin?.is_builtin}
                   />
                   <InfoItem
                     type='boolean'
                     name={t`Package`}
-                    value={pluginInstance?.is_package}
+                    value={plugin?.is_package}
                   />
                 </Stack>
               </Stack>

src/frontend/src/tables/plugin/PluginListTable.tsx

@@ -151,7 +151,6 @@ export default function PluginListTable() {
     ];
   }, []);
 
-  const [selectedPlugin, setSelectedPlugin] = useState<any>({});
   const [selectedPluginKey, setSelectedPluginKey] = useState<string>('');
   const [activate, setActivate] = useState<boolean>(false);
 
@@ -266,6 +265,7 @@ export default function PluginListTable() {
   );
 
   const [pluginPackage, setPluginPackage] = useState<string>('');
+  const [pluginName, setPluginName] = useState('');
 
   const activatePluginModal = useEditApiFormModal({
     title: activate ? t`Activate Plugin` : t`Deactivate Plugin`,
@@ -358,6 +358,10 @@ export default function PluginListTable() {
       });
   }, []);
 
+  const handlePluginLoaded = useCallback((plugin: PluginInterface) => {
+    setPluginName(plugin.name);
+  }, []);
+
   // Custom table actions
   const tableActions = useMemo(() => {
     if (
@@ -397,14 +401,15 @@ export default function PluginListTable() {
       {deletePluginModal.modal}
       {activatePluginModal.modal}
       <DetailDrawer
-        title={`${t`Plugin Detail`} - ${selectedPlugin?.name}`}
+        title={`${t`Plugin Detail`} - ${pluginName}`}
         size={'65%'}
         renderContent={(pluginKey) => {
           if (!pluginKey) return;
+
           return (
             <PluginDrawer
               pluginKey={pluginKey}
-              pluginInstance={selectedPlugin}
+              onPluginLoaded={handlePluginLoaded}
             />
           );
         }}
@@ -417,7 +422,6 @@ export default function PluginListTable() {
           enableDownload: false,
           rowActions: rowActions,
           onRowClick: (plugin) => {
-            setSelectedPlugin(plugin);
             navigate(`${plugin.key}/`);
           },
           tableActions: tableActions,