Skip to content

fix: show Helm tab when APIs are available but no instances exist #17145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sowmya-sl wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −36
Open

fix: show Helm tab when APIs are available but no instances exist #17145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 33 additions & 28 deletions frontend/packages/helm-plugin/src/providers/__tests__/helm-detection-provider.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@ import { renderHook, waitFor } from '@testing-library/react';
import { HttpError } from '@console/dynamic-plugin-sdk/src/utils/error/http-error';
import { k8sListResource } from '@console/dynamic-plugin-sdk/src/utils/k8s/k8s-resource';
import { settleAllPromises } from '@console/dynamic-plugin-sdk/src/utils/promise';
import type { K8sResourceKind } from '@console/internal/module/k8s';
import { useActiveNamespace } from '@console/shared/src/hooks/useActiveNamespace';
import { mockHelmChartRepositories } from '../../components/__tests__/helm-release-mock-data';
import { FLAG_OPENSHIFT_HELM } from '../../const';
import { HelmChartRepositoryModel, ProjectHelmChartRepositoryModel } from '../../models/helm';
import { hasEnabledHelmCharts, useDetectHelmChartRepositories } from '../helm-detection-provider';
import { useDetectHelmChartRepositories } from '../helm-detection-provider';

const ns: string = 'ns';

Expand All @@ -28,30 +27,6 @@ const settleAllPromisesMock = settleAllPromises as jest.Mock;
const useActiveNamespaceMock = useActiveNamespace as jest.Mock;
const k8sListResourceMock = k8sListResource as jest.Mock;

describe('hasEnabledHelmCharts', () => {
it('should return false if all chart repositories are disabled', () => {
const disabledHelmChartRepositories: K8sResourceKind[] = mockHelmChartRepositories.map(
(hcr) => ({ ...hcr, spec: { ...hcr.spec, disabled: true } }),
);
expect(hasEnabledHelmCharts(disabledHelmChartRepositories)).toBe(false);
});
it('should return true if any chart repository is not disabled', () => {
const helmChartRepositories: K8sResourceKind[] = mockHelmChartRepositories.map((hcr, index) => {
if (index === 0) {
return { ...hcr, spec: { ...hcr.spec, disabled: true } };
}
return hcr;
});
expect(hasEnabledHelmCharts(helmChartRepositories)).toBe(true);
});
it('should return false if helmChartRepositories is null or undefined', () => {
expect(hasEnabledHelmCharts(undefined)).toBe(false);
});
it('should return false if helmChartRepositories is an empty array', () => {
expect(hasEnabledHelmCharts([])).toBe(false);
});
});

describe('useDetectHelmChartRepositories', () => {
const setFeatureFlag = jest.fn();
// Dummy promise that resolves - actual return value doesn't matter since settleAllPromises is mocked
Expand Down Expand Up @@ -120,13 +95,43 @@ describe('useDetectHelmChartRepositories', () => {
expect(setFeatureFlag.mock.calls[0]).toEqual([FLAG_OPENSHIFT_HELM, true]);
});

it('should call setFeatureFlag with FLAG_OPENSHIFT_HELM flag and false if no CR helm chart repository is available', async () => {
it('should call setFeatureFlag with FLAG_OPENSHIFT_HELM flag and true if APIs are available but no CR helm chart repository instances exist', async () => {
settleAllPromisesMock.mockReturnValue(Promise.resolve([[[], []], [], []]));
renderHook(() => useDetectHelmChartRepositories(setFeatureFlag));
await waitFor(() => {
expect(setFeatureFlag).toHaveBeenCalledTimes(1);
});
expect(setFeatureFlag.mock.calls[0]).toEqual([FLAG_OPENSHIFT_HELM, false]);
expect(setFeatureFlag.mock.calls[0]).toEqual([FLAG_OPENSHIFT_HELM, true]);
});

it('should call setFeatureFlag with FLAG_OPENSHIFT_HELM flag and true if all chart repositories are disabled', async () => {
const disabledRepos = mockHelmChartRepositories.map((hcr) => ({
...hcr,
spec: { ...hcr.spec, disabled: true },
}));
settleAllPromisesMock.mockReturnValue(
Promise.resolve([[disabledRepos, disabledRepos], [], []]),
);
renderHook(() => useDetectHelmChartRepositories(setFeatureFlag));
await waitFor(() => {
expect(setFeatureFlag).toHaveBeenCalledTimes(1);
});
expect(setFeatureFlag.mock.calls[0]).toEqual([FLAG_OPENSHIFT_HELM, true]);
});

it('should call setFeatureFlag with FLAG_OPENSHIFT_HELM flag and true if one list call succeeds and the other fails', async () => {
const error500 = new HttpError('500', 500, {
status: 500,
} as Response);
// One fulfilled value (cluster-scoped succeeds), one rejected reason (project-scoped fails)
settleAllPromisesMock.mockReturnValue(
Promise.resolve([[mockHelmChartRepositories], [error500], []]),
);
renderHook(() => useDetectHelmChartRepositories(setFeatureFlag));
await waitFor(() => {
expect(setFeatureFlag).toHaveBeenCalledTimes(1);
});
expect(setFeatureFlag.mock.calls[0]).toEqual([FLAG_OPENSHIFT_HELM, true]);
});

it('should call setFeatureFlag with FLAG_OPENSHIFT_HELM flag and false if k8sListResource returns rejected promise for both cluster and project scoped helm chart repositories with atleast one of them being error 404', async () => {
Expand Down
11 changes: 3 additions & 8 deletions frontend/packages/helm-plugin/src/providers/helm-detection-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ import { usePoll } from '@console/shared/src/hooks/usePoll';
import { FLAG_OPENSHIFT_HELM } from '../const';
import { HelmChartRepositoryModel, ProjectHelmChartRepositoryModel } from '../models/helm';

export const hasEnabledHelmCharts = (helmChartRepositories: K8sResourceKind[]): boolean =>
helmChartRepositories?.some((hcr) => !hcr?.spec?.disabled) || false;

export const useDetectHelmChartRepositories = (setFeatureFlag: SetFeatureFlag) => {
const [namespace] = useActiveNamespace();
const [delay, setDelay] = useState<number>(10 * 1000);
Expand All @@ -26,17 +23,15 @@ export const useDetectHelmChartRepositories = (setFeatureFlag: SetFeatureFlag) =
}) as Promise<K8sResourceKind[]>,
];
settleAllPromises(helmChartRepos)
.then(([fulfilledValues, rejectedReasons]) => {
if (fulfilledValues.some((l) => hasEnabledHelmCharts(l))) {
setFeatureFlag(FLAG_OPENSHIFT_HELM, true);
} else if (rejectedReasons.length === helmChartRepos.length) {
.then(([, rejectedReasons]) => {
if (rejectedReasons.length === helmChartRepos.length) {
const notFound = rejectedReasons.some((e) => e?.response?.status === 404);
notFound
? setFeatureFlag(FLAG_OPENSHIFT_HELM, false)
: setFeatureFlag(FLAG_OPENSHIFT_HELM, undefined);
setDelay(null);
} else {
setFeatureFlag(FLAG_OPENSHIFT_HELM, false);
setFeatureFlag(FLAG_OPENSHIFT_HELM, true);
}
})
.catch((err) => {
Expand Down