CONSOLE-3769: Remove isLoadedDynamicPluginInfo/isNotLoadedDynamicPluginInfo

Author: logonoff

frontend/packages/console-app/src/components/console-operator/ConsoleOperatorConfig.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { PluginInfoEntry } from '@openshift/dynamic-plugin-sdk';
 import { Alert, Button } from '@patternfly/react-core';
 import { PencilAltIcon } from '@patternfly/react-icons/dist/esm/icons/pencil-alt-icon';
 import {
@@ -39,11 +40,6 @@ import {
   referenceForModel,
 } from '@console/internal/module/k8s';
 import { RootState } from '@console/internal/redux';
-import {
-  isLoadedDynamicPluginInfo,
-  DynamicPluginInfo,
-  isNotLoadedDynamicPluginInfo,
-} from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import PaneBody from '@console/shared/src/components/layout/PaneBody';
 import { consolePluginModal } from '@console/shared/src/components/modals/ConsolePluginModal';
@@ -309,14 +305,16 @@ const DevPluginsPage: React.FCC<ConsoleOperatorConfigPageProps> = (props) => {
     () =>
       !pluginInfoLoaded
         ? []
-        : pluginInfo.filter(isLoadedDynamicPluginInfo).map((plugin) => ({
-            name: plugin.metadata.name,
-            version: plugin.metadata.version,
-            description: plugin.metadata?.customProperties?.console?.description,
-            enabled: plugin.enabled,
-            status: plugin.status,
-            hasCSPViolations: cspViolations[plugin.metadata.name] ?? false,
-          })),
+        : pluginInfo
+            .filter((plugin) => plugin?.status === 'loaded')
+            .map((plugin) => ({
+              name: plugin.metadata.name,
+              version: plugin.metadata.version,
+              description: plugin.metadata?.customProperties?.console?.description,
+              enabled: plugin.enabled,
+              status: plugin.status,
+              hasCSPViolations: cspViolations[plugin.metadata.name] ?? false,
+            })),
     [pluginInfo, pluginInfoLoaded, cspViolations],
   );
   return <ConsolePluginsTable {...props} rows={rows} loaded={pluginInfoLoaded} />;
@@ -342,10 +340,10 @@ const PluginsPage: React.FC<ConsoleOperatorConfigPageProps> = (props) => {
       const pluginName = plugin?.metadata?.name;
       const enabled = enabledPlugins.includes(pluginName);
       const loadedPluginInfo = pluginInfo
-        .filter(isLoadedDynamicPluginInfo)
+        .filter((p) => p?.status === 'loaded')
         .find((i) => i?.metadata?.name === pluginName);
       const notLoadedPluginInfo = pluginInfo
-        .filter(isNotLoadedDynamicPluginInfo)
+        .filter((p) => p?.status !== 'loaded')
         .find((i) => i?.pluginName === pluginName);
       if (loadedPluginInfo) {
         return {
@@ -443,7 +441,7 @@ type ConsolePluginsTableProps = ConsoleOperatorConfigPageProps & {
 };
 
 type ConsolePluginStatusProps = {
-  status: DynamicPluginInfo['status'];
+  status: PluginInfoEntry['status'];
   errorMessage?: string;
 };
 

frontend/packages/console-app/src/components/console-operator/ConsolePluginDescriptionDetail.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import { DASH } from '@console/shared/src/constants';
 
@@ -11,14 +10,14 @@ const ConsolePluginDescriptionDetail: React.FC<DetailsItemComponentProps> = ({ o
   const pluginInfo = React.useMemo(
     () =>
       pluginInfoEntries.find((entry) =>
-        isLoadedDynamicPluginInfo(entry)
+        entry?.status === 'loaded'
           ? entry.metadata.name === pluginName
           : entry.pluginName === pluginName,
       ),
     [pluginInfoEntries, pluginName],
   );
 
-  return isLoadedDynamicPluginInfo(pluginInfo) ? (
+  return pluginInfo?.status === 'loaded' ? (
     <>{pluginInfo.metadata.customProperties?.console?.description || DASH}</>
   ) : (
     <>{DASH}</>

frontend/packages/console-app/src/components/console-operator/ConsolePluginEnabledStatusDetail.tsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { DASH } from '@console/dynamic-plugin-sdk/src/app/constants';
 import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import {
   ConsolePluginEnabledStatus,
@@ -18,7 +17,7 @@ const ConsolePluginEnabledStatusDetail: React.FC<DetailsItemComponentProps> = ({
   const pluginInfo = React.useMemo(
     () =>
       pluginInfoEntries.find((entry) =>
-        isLoadedDynamicPluginInfo(entry)
+        entry?.status === 'loaded'
           ? entry.metadata.name === pluginName
           : entry.pluginName === pluginName,
       ),
@@ -28,12 +27,12 @@ const ConsolePluginEnabledStatusDetail: React.FC<DetailsItemComponentProps> = ({
     consoleOperatorConfig?.spec?.plugins,
   ]);
 
-  return consoleOperatorConfigLoaded ? (
+  return consoleOperatorConfigLoaded && pluginName ? (
     <ConsolePluginEnabledStatus
       pluginName={pluginName}
       enabled={
         developmentMode
-          ? (isLoadedDynamicPluginInfo(pluginInfo) && pluginInfo.enabled) ?? false
+          ? (pluginInfo?.status === 'loaded' && pluginInfo.enabled) ?? false
           : enabledPlugins.includes(pluginName) ?? false
       }
     />

frontend/packages/console-app/src/components/console-operator/ConsolePluginStatusDetail.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import { DASH } from '@console/shared/src/constants';
 import { ConsolePluginStatus } from './ConsoleOperatorConfig';
@@ -12,7 +11,7 @@ const ConsolePluginStatusDetail: React.FC<DetailsItemComponentProps> = ({ obj })
   const pluginInfo = React.useMemo(
     () =>
       pluginInfoEntries.find((entry) =>
-        isLoadedDynamicPluginInfo(entry)
+        entry?.status === 'loaded'
           ? entry.metadata.name === pluginName
           : entry.pluginName === pluginName,
       ),

frontend/packages/console-app/src/components/console-operator/ConsolePluginVersionDetail.tsx

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import { DASH } from '@console/shared/src/constants';
 
@@ -12,14 +11,14 @@ const ConsolePluginVersionDetail: React.FC<DetailsItemComponentProps> = ({ obj }
   const pluginInfo = React.useMemo(
     () =>
       pluginInfoEntries.find((entry) =>
-        isLoadedDynamicPluginInfo(entry)
+        entry?.status === 'loaded'
           ? entry.metadata.name === pluginName
           : entry.pluginName === pluginName,
       ),
     [pluginInfoEntries, pluginName],
   );
 
-  return isLoadedDynamicPluginInfo(pluginInfo) ? <>{pluginInfo.metadata.version}</> : <>{DASH}</>;
+  return pluginInfo?.status === 'loaded' ? <>{pluginInfo.metadata.version}</> : <>{DASH}</>;
 };
 
 export default ConsolePluginVersionDetail;

frontend/packages/console-app/src/components/dashboards-page/dynamic-plugins-health-resource/DynamicPluginsPopover.tsx

@@ -8,7 +8,6 @@ import { PluginCSPViolations } from '@console/internal/actions/ui';
 import { ConsoleOperatorConfigModel, ConsolePluginModel } from '@console/internal/models';
 import { ConsolePluginKind, referenceForModel } from '@console/internal/module/k8s';
 import { RootState } from '@console/internal/redux';
-import { isLoadedDynamicPluginInfo, isNotLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import { StatusPopupSection } from '@console/shared/src/components/dashboard/status-card/StatusPopup';
 import NotLoadedDynamicPlugins from './NotLoadedDynamicPlugins';
@@ -19,10 +18,12 @@ const DynamicPluginsPopover: React.FC<DynamicPluginsPopoverProps> = ({ consolePl
   const cspViolations = useSelector<RootState, PluginCSPViolations>(({ UI }) =>
     UI.get('pluginCSPViolations'),
   );
-  const notLoadedDynamicPluginInfo = pluginInfoEntries.filter(isNotLoadedDynamicPluginInfo);
+  const notLoadedDynamicPluginInfo = pluginInfoEntries.filter(
+    (plugin) => plugin?.status !== 'loaded',
+  );
   const failedPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'failed');
   const pendingPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'pending');
-  const loadedPlugins = pluginInfoEntries.filter(isLoadedDynamicPluginInfo);
+  const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin?.status === 'loaded');
   const loadedPluginsWithCSPViolations = loadedPlugins.filter(
     (plugin) => cspViolations[plugin.metadata.name] ?? false,
   );

frontend/packages/console-app/src/hooks/useCSPViolationDetector.tsx

@@ -5,7 +5,6 @@ import { useTranslation } from 'react-i18next';
 import { useDispatch, useSelector } from 'react-redux';
 import { setPluginCSPViolations, PluginCSPViolations } from '@console/internal/actions/ui';
 import { RootState } from '@console/internal/redux';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginStore } from '@console/plugin-sdk/src/api/usePluginStore';
 import { useToast } from '@console/shared/src/components/toast';
 import { IS_PRODUCTION } from '@console/shared/src/constants/common';
@@ -104,7 +103,7 @@ export const useCSPViolationDetector = () => {
         const pluginInfo = pluginStore
           .getPluginInfo()
           .find((entry) =>
-            isLoadedDynamicPluginInfo(entry)
+            entry?.status === 'loaded'
               ? entry.metadata.name === pluginName
               : entry.pluginName === pluginName,
           );

frontend/packages/console-plugin-sdk/src/store.ts

@@ -32,13 +32,6 @@ export const getGatingFlagNames = (extensions: Extension[]): string[] =>
     ..._.flatMap(extensions.map((e) => e.flags.disallowed)),
   ]);
 
-export const isLoadedDynamicPluginInfo = (i: DynamicPluginInfo): i is LoadedDynamicPluginInfo =>
-  i?.status === 'loaded';
-
-export const isNotLoadedDynamicPluginInfo = (
-  i: DynamicPluginInfo,
-): i is NotLoadedDynamicPluginInfo => i.status === 'failed' || i.status === 'pending';
-
 /**
  * Provides access to Console plugins and their extensions.
  *

frontend/public/components/about-modal.tsx

@@ -10,7 +10,6 @@ import { Trans, useTranslation } from 'react-i18next';
 import { useClusterVersion } from '@console/shared/src/hooks/version';
 import { BlueArrowCircleUpIcon } from '@console/shared/src/components/status/icons';
 import { useCanClusterUpgrade } from '@console/shared/src/hooks/useCanClusterUpgrade';
-import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
 import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
 import { getBrandingDetails, MASTHEAD_TYPE, useCustomLogoURL } from './utils/branding';
 import { ReleaseNotesLink } from './utils/release-notes-link';
@@ -37,7 +36,7 @@ const DynamicPlugins: React.FC = () => {
   const [items, setItems] = React.useState([]);
 
   React.useEffect(() => {
-    const loadedPlugins = pluginInfoEntries.filter(isLoadedDynamicPluginInfo);
+    const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin?.status === 'loaded');
     const sortedLoadedPlugins = loadedPlugins.sort((a, b) =>
       a.metadata.name.localeCompare(b.metadata.name),
     );