vvzvlad/portainer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "feat(frontend): import CE code to EE" (#1557)

Browse Source
This commit is contained in:
Chaim Lev-Ari
2025-12-18 13:45:26 +02:00
committed by GitHub
parent 2f5b083c5c
commit bf8ccbcec6
1849 changed files with 6494 additions and 6602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/ActionsSection.tsx
+2 -2
View File
@@ -1,7 +1,7 @@
import { RefreshCw } from 'lucide-react';
import { FormSection } from '@@CE/form-components/FormSection';
import { LoadingButton } from '@@CE/buttons';
import { FormSection } from '@@/form-components/FormSection';
import { LoadingButton } from '@@/buttons';
interface Props {
isDirty: boolean;
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/AdvancedConfigurationSection.tsx
+8 -8
View File
@@ -2,15 +2,15 @@ import { MinusIcon, PlusIcon } from 'lucide-react';
import { useReducer } from 'react';
import { useFormikContext } from 'formik';
import { Stack } from '@CE/react/common/stacks/types';
import { AuthFieldset } from '@CE/react/portainer/gitops/AuthFieldset';
import { RefField } from '@CE/react/portainer/gitops/RefField';
import { RelativePathFieldset } from '@CE/react/portainer/gitops/RelativePathFieldset/RelativePathFieldset';
import { RelativePathModel } from '@CE/react/portainer/gitops/types';
import { RefFieldModel } from '@CE/react/portainer/gitops/RefField/types';
import { Stack } from '@/react/common/stacks/types';
import { AuthFieldset } from '@/react/portainer/gitops/AuthFieldset';
import { RefField } from '@/react/portainer/gitops/RefField';
import { RelativePathFieldset } from '@/react/portainer/gitops/RelativePathFieldset/RelativePathFieldset';
import { RelativePathModel } from '@/react/portainer/gitops/types';
import { RefFieldModel } from '@/react/portainer/gitops/RefField/types';
import { Icon } from '@@CE/Icon';
import { Button } from '@@CE/buttons';
import { Icon } from '@@/Icon';
import { Button } from '@@/buttons';
import { FormValues } from './types';
import { TLSVerificationField } from './TLSVerificationField';
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/InnerForm.tsx
+9 -9
View File
@@ -1,15 +1,15 @@
import { Form, useFormikContext } from 'formik';
import { Stack, StackType } from '@CE/react/common/stacks/types';
import { baseStackWebhookUrl } from '@CE/portainer/helpers/webhookHelper';
import { useApiVersion } from '@CE/react/docker/proxy/queries/useVersion';
import { useEnvironmentId } from '@CE/react/hooks/useEnvironmentId';
import { AutoUpdateFieldset } from '@CE/react/portainer/gitops/AutoUpdateFieldset';
import { InfoPanel } from '@CE/react/portainer/gitops/InfoPanel';
import { TimeWindowDisplay } from '@CE/react/portainer/gitops/TimeWindowDisplay';
import { Stack, StackType } from '@/react/common/stacks/types';
import { baseStackWebhookUrl } from '@/portainer/helpers/webhookHelper';
import { useApiVersion } from '@/react/docker/proxy/queries/useVersion';
import { useEnvironmentId } from '@/react/hooks/useEnvironmentId';
import { AutoUpdateFieldset } from '@/react/portainer/gitops/AutoUpdateFieldset';
import { InfoPanel } from '@/react/portainer/gitops/InfoPanel';
import { TimeWindowDisplay } from '@/react/portainer/gitops/TimeWindowDisplay';
import { FormSection } from '@@CE/form-components/FormSection';
import { StackEnvironmentVariablesPanel } from '@@CE/form-components/EnvironmentVariablesFieldset';
import { FormSection } from '@@/form-components/FormSection';
import { StackEnvironmentVariablesPanel } from '@@/form-components/EnvironmentVariablesFieldset';
import { FormValues } from './types';
import { AdvancedConfigurationSection } from './AdvancedConfigurationSection';
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/OptionsSection.tsx
+3 -3
View File
@@ -1,9 +1,9 @@
import { useFormikContext } from 'formik';
import { Stack, StackType } from '@CE/react/common/stacks/types';
import { Stack, StackType } from '@/react/common/stacks/types';
import { SwitchField } from '@@CE/form-components/SwitchField';
import { FormSection } from '@@CE/form-components/FormSection';
import { SwitchField } from '@@/form-components/SwitchField';
import { FormSection } from '@@/form-components/FormSection';
import { FormValues } from './types';
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/StackRedeployGitForm.test.tsx
+26 -29
View File
@@ -4,22 +4,19 @@ import { vi } from 'vitest';
import { HttpResponse } from 'msw';
import _ from 'lodash';
import { withTestQueryProvider } from '@CE/react/test-utils/withTestQuery';
import { withTestRouter } from '@CE/react/test-utils/withRouter';
import { confirmStackUpdate } from '@CE/react/common/stacks/common/confirm-stack-update';
import { confirmEnableTLSVerify } from '@CE/react/portainer/gitops/utils';
import { withTestQueryProvider } from '@/react/test-utils/withTestQuery';
import { withTestRouter } from '@/react/test-utils/withRouter';
import { confirmStackUpdate } from '@/react/common/stacks/common/confirm-stack-update';
import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils';
import {
baseStackWebhookUrl,
createWebhookId,
} from '@CE/portainer/helpers/webhookHelper';
import {
notifyError,
notifySuccess,
} from '@CE/portainer/services/notifications';
import { Stack } from '@CE/react/common/stacks/types';
import { withUserProvider } from '@CE/react/test-utils/withUserProvider';
import { useApiVersion } from '@CE/react/docker/proxy/queries/useVersion';
import { http, server } from '@CE/setup-tests/server';
} from '@/portainer/helpers/webhookHelper';
import { notifyError, notifySuccess } from '@/portainer/services/notifications';
import { Stack } from '@/react/common/stacks/types';
import { withUserProvider } from '@/react/test-utils/withUserProvider';
import { useApiVersion } from '@/react/docker/proxy/queries/useVersion';
import { http, server } from '@/setup-tests/server';
import { StackRedeployGitForm } from './StackRedeployGitForm';
@@ -37,20 +34,20 @@ vi.mock('@uirouter/react', async (importOriginal: () => Promise<object>) => ({
})),
}));
vi.mock('@CE/react/common/stacks/common/confirm-stack-update', () => ({
vi.mock('@/react/common/stacks/common/confirm-stack-update', () => ({
confirmStackUpdate: vi.fn(),
}));
vi.mock('@CE/react/portainer/gitops/utils', () => ({
vi.mock('@/react/portainer/gitops/utils', () => ({
confirmEnableTLSVerify: vi.fn(),
}));
vi.mock('@CE/portainer/helpers/webhookHelper', () => ({
vi.mock('@/portainer/helpers/webhookHelper', () => ({
baseStackWebhookUrl: vi.fn(),
createWebhookId: vi.fn(),
}));
vi.mock('@CE/react/portainer/gitops/AutoUpdateFieldset/utils', () => ({
vi.mock('@/react/portainer/gitops/AutoUpdateFieldset/utils', () => ({
parseAutoUpdateResponse: vi.fn(() => ({
RepositoryAutomaticUpdates: true,
RepositoryMechanism: 'Webhook',
@@ -69,23 +66,23 @@ vi.mock('@CE/react/portainer/gitops/AutoUpdateFieldset/utils', () => ({
}));
// Mock router hooks
vi.mock('@CE/react/hooks/useEnvironmentId', () => ({
vi.mock('@/react/hooks/useEnvironmentId', () => ({
useEnvironmentId: vi.fn(() => 1),
}));
vi.mock('@CE/react/hooks/useCurrentEnvironment', () => ({
vi.mock('@/react/hooks/useCurrentEnvironment', () => ({
useCurrentEnvironment: vi.fn(() => ({ Id: 1, Name: 'test' })),
}));
// Mock components that require router context
vi.mock('@CE/react/portainer/gitops/TimeWindowDisplay', () => ({
vi.mock('@/react/portainer/gitops/TimeWindowDisplay', () => ({
TimeWindowDisplay: vi.fn(() => (
<div data-testid="time-window-display">Time Window Display</div>
)),
}));
vi.mock(
'@CE/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel',
'@/react/components/form-components/EnvironmentVariablesFieldset/StackEnvironmentVariablesPanel',
() => ({
StackEnvironmentVariablesPanel: vi.fn(() => (
<div data-testid="environment-variables-panel">
@@ -95,7 +92,7 @@ vi.mock(
})
);
vi.mock('@CE/react/portainer/gitops/InfoPanel', () => ({
vi.mock('@/react/portainer/gitops/InfoPanel', () => ({
InfoPanel: vi.fn(({ url, configFilePath }) => (
<div data-testid="info-panel">
<span>{url}</span>
@@ -104,17 +101,17 @@ vi.mock('@CE/react/portainer/gitops/InfoPanel', () => ({
)),
}));
vi.mock('@CE/react/portainer/gitops/AutoUpdateFieldset', () => ({
vi.mock('@/react/portainer/gitops/AutoUpdateFieldset', () => ({
AutoUpdateFieldset: vi.fn(() => (
<div data-testid="auto-update-fieldset">Auto Update Fieldset</div>
)),
}));
vi.mock('@CE/react/portainer/gitops/RefField', () => ({
vi.mock('@/react/portainer/gitops/RefField', () => ({
RefField: vi.fn(() => <div data-testid="ref-field">Ref Field</div>),
}));
vi.mock('@CE/react/portainer/gitops/AuthFieldset', async (importOriginal) => ({
vi.mock('@/react/portainer/gitops/AuthFieldset', async (importOriginal) => ({
...(await importOriginal()),
AuthFieldset: vi.fn(() => (
<div data-testid="auth-fieldset">
@@ -124,7 +121,7 @@ vi.mock('@CE/react/portainer/gitops/AuthFieldset', async (importOriginal) => ({
}));
vi.mock(
'@CE/react/portainer/gitops/RelativePathFieldset/RelativePathFieldset',
'@/react/portainer/gitops/RelativePathFieldset/RelativePathFieldset',
() => ({
RelativePathFieldset: vi.fn(() => (
<div data-testid="relative-path-fieldset">Relative Path Fieldset</div>
@@ -132,7 +129,7 @@ vi.mock(
})
);
vi.mock('@@CE/form-components/MultiRegistrySelectFieldset', () => ({
vi.mock('@@/form-components/MultiRegistrySelectFieldset', () => ({
MultiRegistrySelectFieldset: vi.fn(
({
options,
@@ -149,12 +146,12 @@ vi.mock('@@CE/form-components/MultiRegistrySelectFieldset', () => ({
),
}));
vi.mock('@CE/portainer/services/notifications', () => ({
vi.mock('@/portainer/services/notifications', () => ({
notifySuccess: vi.fn(),
notifyError: vi.fn(),
}));
vi.mock('@CE/react/docker/proxy/queries/useVersion', () => ({
vi.mock('@/react/docker/proxy/queries/useVersion', () => ({
useApiVersion: vi.fn(),
}));
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/StackRedeployGitForm.tsx
+7 -14
View File
@@ -2,23 +2,16 @@ import { Formik, FormikHelpers } from 'formik';
import { useState } from 'react';
import { useRouter } from '@uirouter/react';
import {
GitStackPayload,
Stack,
StackType,
} from '@CE/react/common/stacks/types';
import { createWebhookId } from '@CE/portainer/helpers/webhookHelper';
import {
notifyError,
notifySuccess,
} from '@CE/portainer/services/notifications';
import { confirmStackUpdate } from '@CE/react/common/stacks/common/confirm-stack-update';
import { GitStackPayload, Stack, StackType } from '@/react/common/stacks/types';
import { createWebhookId } from '@/portainer/helpers/webhookHelper';
import { notifyError, notifySuccess } from '@/portainer/services/notifications';
import { confirmStackUpdate } from '@/react/common/stacks/common/confirm-stack-update';
import {
parseAutoUpdateResponse,
transformAutoUpdateViewModel,
} from '@CE/react/portainer/gitops/AutoUpdateFieldset/utils';
import { useUpdateGitStack } from '@CE/react/portainer/gitops/queries/useUpdateGitStack';
import { useUpdateGitStackSettings } from '@CE/react/portainer/gitops/queries/useUpdateGitStackSettings';
} from '@/react/portainer/gitops/AutoUpdateFieldset/utils';
import { useUpdateGitStack } from '@/react/portainer/gitops/queries/useUpdateGitStack';
import { useUpdateGitStackSettings } from '@/react/portainer/gitops/queries/useUpdateGitStackSettings';
import { useValidationSchema } from './useValidationSchema';
import { FormValues } from './types';
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/TLSVerificationField.tsx
+2 -2
View File
@@ -1,6 +1,6 @@
import { confirmEnableTLSVerify } from '@CE/react/portainer/gitops/utils';
import { confirmEnableTLSVerify } from '@/react/portainer/gitops/utils';
import { SwitchField } from '@@CE/form-components/SwitchField';
import { SwitchField } from '@@/form-components/SwitchField';
interface Props {
value: boolean;
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/types.ts
+2 -5
View File
@@ -1,9 +1,6 @@
import {
GitAuthModel,
AutoUpdateModel,
} from '@CE/react/portainer/gitops/types';
import { GitAuthModel, AutoUpdateModel } from '@/react/portainer/gitops/types';
import { EnvVarValues } from '@@CE/form-components/EnvironmentVariablesFieldset';
import { EnvVarValues } from '@@/form-components/EnvironmentVariablesFieldset';
export interface FormValues {
refName: string;
app/react/docker/stacks/ItemView/StackInfoTab/StackRedeployGitForm/useValidationSchema.ts
+5 -5
View File
@@ -1,11 +1,11 @@
import { array, boolean, number, object, SchemaOf, string } from 'yup';
import { useCurrentUser } from '@CE/react/hooks/useUser';
import { useGitCredentials } from '@CE/react/portainer/account/git-credentials/git-credentials.service';
import { gitAuthValidation } from '@CE/react/portainer/gitops/AuthFieldset';
import { autoUpdateValidation } from '@CE/react/portainer/gitops/AutoUpdateFieldset/validation';
import { useCurrentUser } from '@/react/hooks/useUser';
import { useGitCredentials } from '@/react/portainer/account/git-credentials/git-credentials.service';
import { gitAuthValidation } from '@/react/portainer/gitops/AuthFieldset';
import { autoUpdateValidation } from '@/react/portainer/gitops/AutoUpdateFieldset/validation';
import { envVarValidation } from '@@CE/form-components/EnvironmentVariablesFieldset';
import { envVarValidation } from '@@/form-components/EnvironmentVariablesFieldset';
import { FormValues } from './types';