Skip to content

Commit a53ba4e

Browse files
committed
CONSOLE-3769: Remove null checks from DynamicPluginInfo
because we know it will never be null
1 parent eeb122e commit a53ba4e

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ const DevPluginsPage: React.FCC<ConsoleOperatorConfigPageProps> = (props) => {
302302
const rows = React.useMemo<ConsolePluginTableRow[]>(
303303
() =>
304304
pluginInfo
305-
.filter((plugin) => plugin?.status === 'loaded')
305+
.filter((plugin) => plugin.status === 'loaded')
306306
.map((plugin) => ({
307307
name: plugin.metadata.name,
308308
version: plugin.metadata.version,
@@ -336,10 +336,10 @@ const PluginsPage: React.FC<ConsoleOperatorConfigPageProps> = (props) => {
336336
const pluginName = plugin?.metadata?.name;
337337
const enabled = enabledPlugins.includes(pluginName);
338338
const loadedPluginInfo = pluginInfo
339-
.filter((p) => p?.status === 'loaded')
339+
.filter((p) => p.status === 'loaded')
340340
.find((i) => i?.metadata?.name === pluginName);
341341
const notLoadedPluginInfo = pluginInfo
342-
.filter((p) => p?.status !== 'loaded')
342+
.filter((p) => p.status !== 'loaded')
343343
.find((i) => i?.pluginName === pluginName);
344344
if (loadedPluginInfo) {
345345
return {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ConsolePluginDescriptionDetail: React.FC<DetailsItemComponentProps> = ({ o
1010
const pluginInfo = React.useMemo(
1111
() =>
1212
pluginInfoEntries.find((entry) =>
13-
entry?.status === 'loaded'
13+
entry.status === 'loaded'
1414
? entry.metadata.name === pluginName
1515
: entry.pluginName === pluginName,
1616
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ const ConsolePluginEnabledStatusDetail: React.FC<DetailsItemComponentProps> = ({
1717
const pluginInfo = React.useMemo(
1818
() =>
1919
pluginInfoEntries.find((entry) =>
20-
entry?.status === 'loaded'
20+
entry.status === 'loaded'
2121
? entry.metadata.name === pluginName
2222
: entry.pluginName === pluginName,
2323
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const ConsolePluginStatusDetail: React.FC<DetailsItemComponentProps> = ({ obj })
1111
const pluginInfo = React.useMemo(
1212
() =>
1313
pluginInfoEntries.find((entry) =>
14-
entry?.status === 'loaded'
14+
entry.status === 'loaded'
1515
? entry.metadata.name === pluginName
1616
: entry.pluginName === pluginName,
1717
),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const ConsolePluginVersionDetail: React.FC<DetailsItemComponentProps> = ({ obj }
1111
const pluginInfo = React.useMemo(
1212
() =>
1313
pluginInfoEntries.find((entry) =>
14-
entry?.status === 'loaded'
14+
entry.status === 'loaded'
1515
? entry.metadata.name === pluginName
1616
: entry.pluginName === pluginName,
1717
),

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ const DynamicPluginsPopover: React.FC<DynamicPluginsPopoverProps> = ({ consolePl
1919
UI.get('pluginCSPViolations'),
2020
);
2121
const notLoadedDynamicPluginInfo = pluginInfoEntries.filter(
22-
(plugin) => plugin?.status !== 'loaded',
22+
(plugin) => plugin.status !== 'loaded',
2323
);
2424
const failedPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'failed');
2525
const pendingPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'pending');
26-
const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin?.status === 'loaded');
26+
const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin.status === 'loaded');
2727
const loadedPluginsWithCSPViolations = loadedPlugins.filter(
2828
(plugin) => cspViolations[plugin.metadata.name] ?? false,
2929
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ export const useCSPViolationDetector = () => {
103103
const pluginInfo = pluginStore
104104
.getPluginInfo()
105105
.find((entry) =>
106-
entry?.status === 'loaded'
106+
entry.status === 'loaded'
107107
? entry.metadata.name === pluginName
108108
: entry.pluginName === pluginName,
109109
);

frontend/public/components/about-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ const DynamicPlugins: React.FC = () => {
3636
const [items, setItems] = React.useState([]);
3737

3838
React.useEffect(() => {
39-
const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin?.status === 'loaded');
39+
const loadedPlugins = pluginInfoEntries.filter((plugin) => plugin.status === 'loaded');
4040
const sortedLoadedPlugins = loadedPlugins.sort((a, b) =>
4141
a.metadata.name.localeCompare(b.metadata.name),
4242
);

frontend/public/components/app-contents.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ const AppContents: React.FC<{}> = () => {
160160
const [pluginPageRoutes, inactivePluginPageRoutes] = usePluginRoutes();
161161

162162
const allPluginsProcessed = React.useMemo(
163-
() => pluginInfoEntries.every((i) => i?.status !== 'pending'),
163+
() => pluginInfoEntries.every((i) => i.status !== 'pending'),
164164
[pluginInfoEntries],
165165
);
166166

frontend/public/components/notification-drawer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ const getUpdateNotificationEntries = (
162162
const newerChannelVersion = splitClusterVersionChannel(newerChannel)?.version;
163163
const entries = [];
164164

165-
const failedPlugins = pluginInfoEntries.filter((plugin) => plugin?.status === 'failed');
165+
const failedPlugins = pluginInfoEntries.filter((plugin) => plugin.status === 'failed');
166166

167167
if (!_.isEmpty(updateData)) {
168168
entries.push(

0 commit comments

Comments
 (0)