Skip to content

Commit 2b6c87b

Browse files
logonofflogonoff
committed
CONSOLE-3769: Make plugin info status lowercase
to align with openshift/dynamic-plugin-sdk
1 parent f0cb82b commit 2b6c87b

File tree

11 files changed

+38
-38
lines changed

11 files changed

+38
-38
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
@@ -94,7 +94,7 @@ export const useConsoleOperatorConfigData = () => {
9494
export const ConsolePluginStatus: React.FC<ConsolePluginStatusProps> = ({
9595
status,
9696
errorMessage,
97-
}) => <Status status={status} title={status === 'Failed' ? errorMessage : undefined} />;
97+
}) => <Status status={status} title={status === 'failed' ? errorMessage : undefined} />;
9898

9999
export const ConsolePluginEnabledStatus: React.FC<ConsolePluginEnabledStatusProps> = ({
100100
pluginName,
@@ -362,9 +362,9 @@ const PluginsPage: React.FC<ConsoleOperatorConfigPageProps> = (props) => {
362362
enabled,
363363
status: notLoadedPluginInfo?.status,
364364
errorMessage:
365-
notLoadedPluginInfo?.status === 'Failed' ? notLoadedPluginInfo?.errorMessage : undefined,
365+
notLoadedPluginInfo?.status === 'failed' ? notLoadedPluginInfo?.errorMessage : undefined,
366366
errorCause:
367-
notLoadedPluginInfo?.status === 'Failed'
367+
notLoadedPluginInfo?.status === 'failed'
368368
? notLoadedPluginInfo?.errorCause?.toString()
369369
: undefined,
370370
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const ConsolePluginStatusDetail: React.FC<DetailsItemComponentProps> = ({ obj })
2222
return pluginInfo ? (
2323
<ConsolePluginStatus
2424
status={pluginInfo.status}
25-
errorMessage={pluginInfo.status === 'Failed' ? pluginInfo.errorMessage : undefined}
25+
errorMessage={pluginInfo.status === 'failed' ? pluginInfo.errorMessage : undefined}
2626
/>
2727
) : (
2828
<>{DASH}</>

‎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
@@ -20,8 +20,8 @@ const DynamicPluginsPopover: React.FC<DynamicPluginsPopoverProps> = ({ consolePl
2020
UI.get('pluginCSPViolations'),
2121
);
2222
const notLoadedDynamicPluginInfo = pluginInfoEntries.filter(isNotLoadedDynamicPluginInfo);
23-
const failedPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'Failed');
24-
const pendingPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'Pending');
23+
const failedPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'failed');
24+
const pendingPlugins = notLoadedDynamicPluginInfo.filter((plugin) => plugin.status === 'pending');
2525
const loadedPlugins = pluginInfoEntries.filter(isLoadedDynamicPluginInfo);
2626
const loadedPluginsWithCSPViolations = loadedPlugins.filter(
2727
(plugin) => cspViolations[plugin.metadata.name] ?? false,

‎frontend/packages/console-app/src/components/dashboards-page/dynamic-plugins-health-resource/status.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { pluginStore } from '@console/internal/plugins';
33

44
export const getDynamicPluginHealthState = (): SubsystemHealth => {
55
const dynamicPluginInfo = pluginStore.getPluginInfo();
6-
if (dynamicPluginInfo.some((plugin) => plugin.status === 'Failed')) {
6+
if (dynamicPluginInfo.some((plugin) => plugin.status === 'failed')) {
77
return { state: HealthState.ERROR };
88
}
9-
if (dynamicPluginInfo.some((plugin) => plugin.status === 'Pending')) {
9+
if (dynamicPluginInfo.some((plugin) => plugin.status === 'pending')) {
1010
return { state: HealthState.PROGRESS };
1111
}
12-
if (dynamicPluginInfo.every((plugin) => plugin.status === 'Loaded')) {
12+
if (dynamicPluginInfo.every((plugin) => plugin.status === 'loaded')) {
1313
return { state: HealthState.OK };
1414
}
1515
return { state: HealthState.UNKNOWN };

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export const useCSPViolationDetector = () => {
110110
);
111111

112112
const validPlugin = !!pluginInfo;
113-
const pluginIsLoaded = validPlugin && pluginInfo.status === 'Loaded';
113+
const pluginIsLoaded = validPlugin && pluginInfo.status === 'loaded';
114114

115115
// eslint-disable-next-line no-console
116116
console.warn(

‎frontend/packages/console-dynamic-plugin-sdk/src/runtime/__tests__/plugin-dependencies.spec.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ describe('resolvePluginDependencies', () => {
2828
const getLoadedDynamicPluginInfo = (
2929
manifest: StandardConsolePluginManifest,
3030
): LoadedDynamicPluginInfo => ({
31-
status: 'Loaded',
31+
status: 'loaded',
3232
pluginID: getPluginID(manifest),
3333
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
3434
enabled: true,
@@ -37,14 +37,14 @@ describe('resolvePluginDependencies', () => {
3737
const getPendingDynamicPluginInfo = (
3838
manifest: StandardConsolePluginManifest,
3939
): NotLoadedDynamicPluginInfo => ({
40-
status: 'Pending',
40+
status: 'pending',
4141
pluginName: manifest.name,
4242
});
4343

4444
const getFailedDynamicPluginInfo = (
4545
manifest: StandardConsolePluginManifest,
4646
): NotLoadedDynamicPluginInfo => ({
47-
status: 'Failed',
47+
status: 'failed',
4848
pluginName: manifest.name,
4949
errorMessage: `Test error message for plugin ${manifest.name}`,
5050
});

‎frontend/packages/console-dynamic-plugin-sdk/src/runtime/plugin-dependencies.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ export const resolvePluginDependencies = (
119119

120120
const unsubListener = subscribeToDynamicPlugins((entries) => {
121121
const loadedPlugins = entries.reduce<Record<string, string>>((acc, e) => {
122-
if (e.status === 'Loaded' && preloadPluginNames.includes(e.metadata.name)) {
122+
if (e.status === 'loaded' && preloadPluginNames.includes(e.metadata.name)) {
123123
acc[e.metadata.name] = e.metadata.version;
124124
}
125125
return acc;
126126
}, {});
127127

128128
const failedPluginNames = entries.reduce<string[]>((acc, e) => {
129-
if (e.status === 'Failed' && preloadPluginNames.includes(e.pluginName)) {
129+
if (e.status === 'failed' && preloadPluginNames.includes(e.pluginName)) {
130130
acc.push(e.pluginName);
131131
}
132132
return acc;

‎frontend/packages/console-plugin-sdk/src/__tests__/store.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -282,11 +282,11 @@ describe('PluginStore', () => {
282282
expect(store.getAllowedDynamicPluginNames()).toEqual(['TestA', 'TestB']);
283283
expect(store.getPluginInfo()).toEqual([
284284
{
285-
status: 'Pending',
285+
status: 'pending',
286286
pluginName: 'TestA',
287287
},
288288
{
289-
status: 'Pending',
289+
status: 'pending',
290290
pluginName: 'TestB',
291291
},
292292
]);
@@ -582,7 +582,7 @@ describe('PluginStore', () => {
582582
expect(store.getExtensions()).toEqual([]);
583583
expect(store.getPluginInfo()).toEqual([
584584
{
585-
status: 'Loaded',
585+
status: 'loaded',
586586
pluginID: '[email protected]',
587587
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
588588
enabled: false,
@@ -954,11 +954,11 @@ describe('PluginStore', () => {
954954

955955
expect(store.getPluginInfo()).toEqual([
956956
{
957-
status: 'Pending',
957+
status: 'pending',
958958
pluginName: 'TestA',
959959
},
960960
{
961-
status: 'Pending',
961+
status: 'pending',
962962
pluginName: 'TestB',
963963
},
964964
]);
@@ -967,13 +967,13 @@ describe('PluginStore', () => {
967967

968968
expect(store.getPluginInfo()).toEqual([
969969
{
970-
status: 'Loaded',
970+
status: 'loaded',
971971
pluginID: '[email protected]',
972972
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
973973
enabled: false,
974974
},
975975
{
976-
status: 'Pending',
976+
status: 'pending',
977977
pluginName: 'TestB',
978978
},
979979
]);
@@ -982,26 +982,26 @@ describe('PluginStore', () => {
982982

983983
expect(store.getPluginInfo()).toEqual([
984984
{
985-
status: 'Loaded',
985+
status: 'loaded',
986986
pluginID: '[email protected]',
987987
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
988988
enabled: true,
989989
},
990990
{
991-
status: 'Pending',
991+
status: 'pending',
992992
pluginName: 'TestB',
993993
},
994994
]);
995995

996996
expect(store.getPluginInfo()).toEqual([
997997
{
998-
status: 'Loaded',
998+
status: 'loaded',
999999
pluginID: '[email protected]',
10001000
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
10011001
enabled: true,
10021002
},
10031003
{
1004-
status: 'Pending',
1004+
status: 'pending',
10051005
pluginName: 'TestB',
10061006
},
10071007
]);
@@ -1010,13 +1010,13 @@ describe('PluginStore', () => {
10101010

10111011
expect(store.getPluginInfo()).toEqual([
10121012
{
1013-
status: 'Loaded',
1013+
status: 'loaded',
10141014
pluginID: '[email protected]',
10151015
metadata: _.omit(manifest, ['extensions', 'loadScripts', 'registrationMethod']),
10161016
enabled: true,
10171017
},
10181018
{
1019-
status: 'Failed',
1019+
status: 'failed',
10201020
pluginName: 'TestB',
10211021
errorMessage: 'Test error message',
10221022
errorCause: new Error('Boom'),

‎frontend/packages/console-plugin-sdk/src/api/usePluginInfo.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const usePluginInfo = (): [DynamicPluginInfo[], boolean] => {
3434
if (unsubscribeRef.current === null) {
3535
unsubscribeRef.current = subscribeToDynamicPlugins((pluginInfoEntries) => {
3636
pluginInfoEntriesRef.current = pluginInfoEntries;
37-
allPluginsProcessedRef.current = pluginInfoEntries.every((i) => i.status !== 'Pending');
37+
allPluginsProcessedRef.current = pluginInfoEntries.every((i) => i.status !== 'pending');
3838
isMountedRef.current && forceRender();
3939
});
4040
}

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@ export const getGatingFlagNames = (extensions: Extension[]): string[] =>
3333
]);
3434

3535
export const isLoadedDynamicPluginInfo = (i: DynamicPluginInfo): i is LoadedDynamicPluginInfo =>
36-
i?.status === 'Loaded';
36+
i?.status === 'loaded';
3737

3838
export const isNotLoadedDynamicPluginInfo = (
3939
i: DynamicPluginInfo,
40-
): i is NotLoadedDynamicPluginInfo => i.status === 'Failed' || i.status === 'Pending';
40+
): i is NotLoadedDynamicPluginInfo => i.status === 'failed' || i.status === 'pending';
4141

4242
/**
4343
* Provides access to Console plugins and their extensions.
@@ -245,7 +245,7 @@ export class PluginStore {
245245
const loadedPluginEntries = Array.from(this.loadedDynamicPlugins.entries()).reduce(
246246
(acc, [pluginID, plugin]) => {
247247
acc.push({
248-
status: 'Loaded',
248+
status: 'loaded',
249249
pluginID,
250250
metadata: _.omit(plugin.manifest, ['extensions', 'loadScripts', 'registrationMethod']),
251251
enabled: plugin.enabled,
@@ -258,7 +258,7 @@ export class PluginStore {
258258
const failedPluginEntries = Array.from(this.failedDynamicPlugins.entries()).reduce(
259259
(acc, [pluginName, plugin]) => {
260260
acc.push({
261-
status: 'Failed',
261+
status: 'failed',
262262
pluginName,
263263
errorMessage: plugin.errorMessage,
264264
errorCause: plugin.errorCause,
@@ -275,7 +275,7 @@ export class PluginStore {
275275
)
276276
.reduce((acc, pluginName) => {
277277
acc.push({
278-
status: 'Pending',
278+
status: 'pending',
279279
pluginName,
280280
});
281281
return acc;
@@ -327,19 +327,19 @@ type FailedDynamicPlugin = {
327327
};
328328

329329
export type LoadedDynamicPluginInfo = {
330-
status: 'Loaded';
330+
status: 'loaded';
331331
pluginID: string;
332332
metadata: DynamicPluginMetadata;
333333
enabled: boolean;
334334
};
335335

336336
export type NotLoadedDynamicPluginInfo =
337337
| {
338-
status: 'Pending';
338+
status: 'pending';
339339
pluginName: string;
340340
}
341341
| {
342-
status: 'Failed';
342+
status: 'failed';
343343
pluginName: string;
344344
errorMessage: string;
345345
errorCause?: unknown;

0 commit comments

Comments
 (0)