Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-24 15:59:41 +02:00
Code Issues Releases Activity

feat(helm): add registry dropdown [r8s-340] (#779)

Browse source
This commit is contained in:
Ali 2025-06-09 20:08:50 +12:00 • committed by GitHub
parent c9e3717ce3
commit 1963edda66
16 changed files with 288 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.test.tsx
View file

@ -9,7 +9,7 @@ import { withUserProvider } from '@/react/test-utils/withUserProvider';
import {
useHelmRepoVersions,
ChartVersion,
} from '../../queries/useHelmRepositories';
} from '../../queries/useHelmRepoVersions';
import { HelmRelease } from '../../types';
import { openUpgradeHelmModal } from './UpgradeHelmModal';
@ -25,16 +25,18 @@ vi.mock('@/portainer/services/notifications', () => ({
notifySuccess: vi.fn(),
}));
// Mock the useHelmRepoVersions and useHelmRepositories hooks
vi.mock('../../queries/useHelmRepositories', () => ({
useHelmRepoVersions: vi.fn(),
useHelmRepositories: vi.fn(() => ({
vi.mock('../../queries/useHelmRegistries', () => ({
useHelmRegistries: vi.fn(() => ({
data: ['repo1', 'repo2'],
isInitialLoading: false,
isError: false,
})),
}));
vi.mock('../../queries/useHelmRepoVersions', () => ({
useHelmRepoVersions: vi.fn(),
}));
// Mock the useHelmRelease hook
vi.mock('../queries/useHelmRelease', () => ({
useHelmRelease: vi.fn(() => ({

14
app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeButton.tsx
View file

@ -13,11 +13,9 @@ import { Link } from '@@/Link';
import { HelmRelease, UpdateHelmReleasePayload } from '../../types';
import { useUpdateHelmReleaseMutation } from '../../queries/useUpdateHelmReleaseMutation';
import {
useHelmRepoVersions,
useHelmRepositories,
} from '../../queries/useHelmRepositories';
import { useHelmRepoVersions } from '../../queries/useHelmRepoVersions';
import { useHelmRelease } from '../queries/useHelmRelease';
import { useHelmRegistries } from '../../queries/useHelmRegistries';
import { openUpgradeHelmModal } from './UpgradeHelmModal';
@ -38,11 +36,11 @@ export function UpgradeButton({
const [useCache, setUseCache] = useState(true);
const updateHelmReleaseMutation = useUpdateHelmReleaseMutation(environmentId);
const repositoriesQuery = useHelmRepositories();
const registriesQuery = useHelmRegistries();
const helmRepoVersionsQuery = useHelmRepoVersions(
release?.chart.metadata?.name || '',
60 * 60 * 1000, // 1 hour
repositoriesQuery.data,
registriesQuery.data,
useCache
);
const versions = helmRepoVersionsQuery.data;
@ -50,8 +48,8 @@ export function UpgradeButton({
// Combined loading state
const isLoading =
repositoriesQuery.isInitialLoading || helmRepoVersionsQuery.isFetching; // use 'isFetching' for helmRepoVersionsQuery because we want to show when it's refetching
const isError = repositoriesQuery.isError || helmRepoVersionsQuery.isError;
registriesQuery.isInitialLoading || helmRepoVersionsQuery.isFetching; // use 'isFetching' for helmRepoVersionsQuery because we want to show when it's refetching
const isError = registriesQuery.isError || helmRepoVersionsQuery.isError;
const latestVersionQuery = useHelmRelease(
environmentId,
releaseName,

2
app/react/kubernetes/helm/HelmApplicationView/ChartActions/UpgradeHelmModal.tsx
View file

@ -3,7 +3,7 @@ import { ArrowUp } from 'lucide-react';
import { withReactQuery } from '@/react-tools/withReactQuery';
import { withCurrentUser } from '@/react-tools/withCurrentUser';
import { ChartVersion } from '@/react/kubernetes/helm/queries/useHelmRepositories';
import { ChartVersion } from '@/react/kubernetes/helm/queries/useHelmRepoVersions';
import { Modal, OnSubmit, openModal } from '@@/modals';
import { Button } from '@@/buttons';