Skip to content

Commit cf4cb18

Browse files
committed
aksd: Extract shared components from CreateAKSProject
Signed-off-by: Evangelos Skopelitis <eskopelitis@microsoft.com>
1 parent 70c6ddf commit cf4cb18

11 files changed

Lines changed: 15 additions & 15 deletions

File tree

plugins/aks-desktop/src/components/CreateAKSProject/CreateAKSProject.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
import React from 'react';
55
import { useHistory } from 'react-router-dom';
66
import AzureAuthGuard from '../AzureAuth/AzureAuthGuard';
7+
import { ComputeStep } from '../shared/ComputeStep';
8+
import { NetworkingStep } from '../shared/NetworkingStep';
79
import { AccessStep } from './components/AccessStep';
810
import { BasicsStep } from './components/BasicsStep';
9-
import { ComputeStep } from './components/ComputeStep';
1011
import CreateAKSProjectPure from './components/CreateAKSProjectPure';
11-
import { NetworkingStep } from './components/NetworkingStep';
1212
import { ReviewStep } from './components/ReviewStep';
1313
import { useCreateAKSProjectWizard } from './hooks/useCreateAKSProjectWizard';
1414

plugins/aks-desktop/src/components/CreateAKSProject/components/BasicsStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import React, { useEffect, useRef, useState } from 'react';
1616
import { useAzureAuth } from '../../../hooks/useAzureAuth';
1717
import type { ClusterCapabilities } from '../../../types/ClusterCapabilities';
1818
import { registerAKSCluster } from '../../../utils/azure/aks';
19+
import { FormField } from '../../shared/FormField';
1920
import type { BasicsStepProps } from '../types';
2021
import { ClusterConfigurePanel } from './ClusterConfigurePanel';
21-
import { FormField } from './FormField';
2222
import { SearchableSelect, SearchableSelectOption } from './SearchableSelect';
2323
import { ValidationAlert } from './ValidationAlert';
2424

plugins/aks-desktop/src/components/CreateAKSProject/components/ComputeStep.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import { Meta, StoryFn } from '@storybook/react';
55
import React from 'react';
6+
import { ComputeStep } from '../../shared/ComputeStep';
67
import type { ComputeStepProps } from '../types';
7-
import { ComputeStep } from './ComputeStep';
88

99
const BASE_FORM_DATA = {
1010
projectName: 'azure-microservices-demo',

plugins/aks-desktop/src/components/CreateAKSProject/components/CreateAKSProjectPure.guidepup.test.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ vi.mock('@iconify/react', () => ({
115115
Icon: ({ icon, ...props }: any) => <span data-icon={icon} {...props} />,
116116
}));
117117

118+
import { ComputeStep } from '../../shared/ComputeStep';
119+
import { FormField } from '../../shared/FormField';
120+
import { NetworkingStep } from '../../shared/NetworkingStep';
118121
import type {
119122
BreadcrumbProps,
120123
ComputeStepProps,
@@ -125,11 +128,8 @@ import type {
125128
import { STEPS } from '../types';
126129
import { AccessStep } from './AccessStep';
127130
import { Breadcrumb } from './Breadcrumb';
128-
import { ComputeStep } from './ComputeStep';
129131
import type { CreateAKSProjectPureProps } from './CreateAKSProjectPure';
130132
import CreateAKSProjectPure from './CreateAKSProjectPure';
131-
import { FormField } from './FormField';
132-
import { NetworkingStep } from './NetworkingStep';
133133
import { ReviewStep } from './ReviewStep';
134134
import type { SearchableSelectProps } from './SearchableSelect';
135135
import { SearchableSelect } from './SearchableSelect';

plugins/aks-desktop/src/components/CreateAKSProject/components/FormField.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import { Meta, StoryFn } from '@storybook/react';
55
import React from 'react';
6+
import { FormField } from '../../shared/FormField';
67
import type { FormFieldProps } from '../types';
7-
import { FormField } from './FormField';
88

99
const BASE_PROPS: FormFieldProps = {
1010
label: 'Project Name',

plugins/aks-desktop/src/components/CreateAKSProject/components/NetworkingStep.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import { Meta, StoryFn } from '@storybook/react';
55
import React from 'react';
6+
import { NetworkingStep } from '../../shared/NetworkingStep';
67
import type { NetworkingStepProps } from '../types';
7-
import { NetworkingStep } from './NetworkingStep';
88

99
const BASE_FORM_DATA = {
1010
projectName: 'azure-microservices-demo',

plugins/aks-desktop/src/components/CreateNamespace/CreateNamespace.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ import { useHistory } from 'react-router-dom';
2020
import { createNamespaceAsProject } from '../../utils/kubernetes/namespaceUtils';
2121
import { getClusterSettings, setClusterSettings } from '../../utils/shared/clusterSettings';
2222
import { Breadcrumb } from '../CreateAKSProject/components/Breadcrumb';
23-
import { FormField } from '../CreateAKSProject/components/FormField';
2423
import {
2524
SearchableSelect,
2625
SearchableSelectOption,
2726
} from '../CreateAKSProject/components/SearchableSelect';
27+
import { FormField } from '../shared/FormField';
2828

2929
const STEPS = ['Basics', 'Review'] as const;
3030

plugins/aks-desktop/src/components/CreateAKSProject/components/ComputeStep.tsx renamed to plugins/aks-desktop/src/components/shared/ComputeStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Icon } from '@iconify/react';
55
import { useTranslation } from '@kinvolk/headlamp-plugin/lib';
66
import { Box, Grid, Typography } from '@mui/material';
77
import React from 'react';
8-
import type { ComputeStepProps } from '../types';
8+
import type { ComputeStepProps } from '../CreateAKSProject/types';
99
import { FormField } from './FormField';
1010
import { ResourceCard } from './ResourceCard';
1111

plugins/aks-desktop/src/components/CreateAKSProject/components/FormField.tsx renamed to plugins/aks-desktop/src/components/shared/FormField.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { InputAdornment, TextField } from '@mui/material';
55
import { useTheme } from '@mui/material/styles';
66
import React from 'react';
7-
import type { FormFieldProps } from '../types';
7+
import type { FormFieldProps } from '../CreateAKSProject/types';
88

99
/**
1010
* Reusable form field component with consistent styling

plugins/aks-desktop/src/components/CreateAKSProject/components/NetworkingStep.tsx renamed to plugins/aks-desktop/src/components/shared/NetworkingStep.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { useTranslation } from '@kinvolk/headlamp-plugin/lib';
55
import { TextField } from '@mui/material';
66
import { Box, MenuItem, Typography } from '@mui/material';
77
import React from 'react';
8-
import type { NetworkingStepProps } from '../types';
9-
import { EGRESS_OPTIONS, INGRESS_OPTIONS } from '../types';
8+
import type { NetworkingStepProps } from '../CreateAKSProject/types';
9+
import { EGRESS_OPTIONS, INGRESS_OPTIONS } from '../CreateAKSProject/types';
1010

1111
/**
1212
* Networking step component for ingress and egress policy configuration

0 commit comments

Comments
 (0)