Skip to content

Commit 543a22c

Browse files
committed
CONSOLE-4841: Use usePluginInfo to get plugin info
Also remove `usePluginInfo` and `usePluginStore` from the barrel file so we can move towards removing the barrel file entirely
1 parent 6e7aafa commit 543a22c

File tree

6 files changed

+35
-47
lines changed

6 files changed

+35
-47
lines changed

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
import * as React from 'react';
22
import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
33
import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
4-
import { usePluginStore } from '@console/plugin-sdk/src/api/usePluginStore';
4+
import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
55
import { DASH } from '@console/shared/src/constants';
66

77
const ConsolePluginDescriptionDetail: React.FC<DetailsItemComponentProps> = ({ obj }) => {
8-
const pluginStore = usePluginStore();
98
const pluginName = React.useMemo(() => obj?.metadata?.name, [obj?.metadata?.name]);
109

10+
const [pluginInfoEntries] = usePluginInfo();
1111
const pluginInfo = React.useMemo(
1212
() =>
13-
pluginStore
14-
.getPluginInfo()
15-
.find((entry) =>
16-
isLoadedDynamicPluginInfo(entry)
17-
? entry.metadata.name === pluginName
18-
: entry.pluginName === pluginName,
19-
),
20-
[pluginStore, pluginName],
13+
pluginInfoEntries.find((entry) =>
14+
isLoadedDynamicPluginInfo(entry)
15+
? entry.metadata.name === pluginName
16+
: entry.pluginName === pluginName,
17+
),
18+
[pluginInfoEntries, pluginName],
2119
);
2220

2321
return isLoadedDynamicPluginInfo(pluginInfo) ? (

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,27 @@ import * as React from 'react';
22
import { DASH } from '@console/dynamic-plugin-sdk/src/app/constants';
33
import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
44
import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
5-
import { usePluginStore } from '@console/plugin-sdk/src/api/usePluginStore';
5+
import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
66
import {
77
ConsolePluginEnabledStatus,
88
developmentMode,
99
useConsoleOperatorConfigData,
1010
} from './ConsoleOperatorConfig';
1111

1212
const ConsolePluginEnabledStatusDetail: React.FC<DetailsItemComponentProps> = ({ obj }) => {
13-
const pluginStore = usePluginStore();
13+
const [pluginInfoEntries] = usePluginInfo();
1414
const { consoleOperatorConfig, consoleOperatorConfigLoaded } = useConsoleOperatorConfigData();
1515

1616
const pluginName = React.useMemo(() => obj?.metadata?.name, [obj?.metadata?.name]);
1717

1818
const pluginInfo = React.useMemo(
1919
() =>
20-
pluginStore
21-
.getPluginInfo()
22-
.find((entry) =>
23-
isLoadedDynamicPluginInfo(entry)
24-
? entry.metadata.name === pluginName
25-
: entry.pluginName === pluginName,
26-
),
27-
[pluginStore, pluginName],
20+
pluginInfoEntries.find((entry) =>
21+
isLoadedDynamicPluginInfo(entry)
22+
? entry.metadata.name === pluginName
23+
: entry.pluginName === pluginName,
24+
),
25+
[pluginInfoEntries, pluginName],
2826
);
2927
const enabledPlugins = React.useMemo<string[]>(() => consoleOperatorConfig?.spec?.plugins ?? [], [
3028
consoleOperatorConfig?.spec?.plugins,

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
import * as React from 'react';
22
import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
33
import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
4-
import { usePluginStore } from '@console/plugin-sdk/src/api/usePluginStore';
4+
import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
55
import { DASH } from '@console/shared/src/constants';
66
import { ConsolePluginStatus } from './ConsoleOperatorConfig';
77

88
const ConsolePluginStatusDetail: React.FC<DetailsItemComponentProps> = ({ obj }) => {
9-
const pluginStore = usePluginStore();
9+
const [pluginInfoEntries] = usePluginInfo();
1010
const pluginName = React.useMemo(() => obj?.metadata?.name, [obj?.metadata?.name]);
1111

1212
const pluginInfo = React.useMemo(
1313
() =>
14-
pluginStore
15-
.getPluginInfo()
16-
.find((entry) =>
17-
isLoadedDynamicPluginInfo(entry)
18-
? entry.metadata.name === pluginName
19-
: entry.pluginName === pluginName,
20-
),
21-
[pluginStore, pluginName],
14+
pluginInfoEntries.find((entry) =>
15+
isLoadedDynamicPluginInfo(entry)
16+
? entry.metadata.name === pluginName
17+
: entry.pluginName === pluginName,
18+
),
19+
[pluginInfoEntries, pluginName],
2220
);
2321

2422
return pluginInfo ? (

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
import * as React from 'react';
22
import { DetailsItemComponentProps } from '@console/dynamic-plugin-sdk/src/extensions/details-item';
33
import { isLoadedDynamicPluginInfo } from '@console/plugin-sdk/src';
4-
import { usePluginStore } from '@console/plugin-sdk/src/api/usePluginStore';
4+
import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
55
import { DASH } from '@console/shared/src/constants';
66

77
const ConsolePluginVersionDetail: React.FC<DetailsItemComponentProps> = ({ obj }) => {
8-
const pluginStore = usePluginStore();
8+
const [pluginInfoEntries] = usePluginInfo();
9+
910
const pluginName = React.useMemo(() => obj?.metadata?.name, [obj?.metadata?.name]);
1011

1112
const pluginInfo = React.useMemo(
1213
() =>
13-
pluginStore
14-
.getPluginInfo()
15-
.find((entry) =>
16-
isLoadedDynamicPluginInfo(entry)
17-
? entry.metadata.name === pluginName
18-
: entry.pluginName === pluginName,
19-
),
20-
[pluginStore, pluginName],
14+
pluginInfoEntries.find((entry) =>
15+
isLoadedDynamicPluginInfo(entry)
16+
? entry.metadata.name === pluginName
17+
: entry.pluginName === pluginName,
18+
),
19+
[pluginInfoEntries, pluginName],
2120
);
2221

2322
return isLoadedDynamicPluginInfo(pluginInfo) ? <>{pluginInfo.metadata.version}</> : <>{DASH}</>;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ export * from './store';
55
// React integrations
66
export * from './api/useExtensions';
77
export * from './api/withExtensions';
8-
export * from './api/usePluginInfo';
9-
export * from './api/usePluginStore';

frontend/public/components/notification-drawer.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import { useTranslation } from 'react-i18next';
44
import i18next from 'i18next';
55
import { useDispatch } from 'react-redux';
66
import { Link, NavigateFunction, useNavigate } from 'react-router-dom-v5-compat';
7-
import {
8-
isNotLoadedDynamicPluginInfo,
9-
usePluginInfo,
10-
DynamicPluginInfo,
11-
} from '@console/plugin-sdk';
7+
import { isNotLoadedDynamicPluginInfo, DynamicPluginInfo } from '@console/plugin-sdk';
8+
import { usePluginInfo } from '@console/plugin-sdk/src/api/usePluginInfo';
129
import * as UIActions from '@console/internal/actions/ui';
1310
import { resourcePath } from '@console/internal/components/utils';
1411
import { Timestamp } from '@console/shared/src/components/datetime/Timestamp';

0 commit comments

Comments
 (0)