Skip to content

Commit

Permalink
frontend: Fix imports so they have full path, not just common 4/x
Browse files Browse the repository at this point in the history
Signed-off-by: René Dudfield <[email protected]>
  • Loading branch information
illume committed May 8, 2024
1 parent 7577e8b commit 0cfabe9
Show file tree
Hide file tree
Showing 22 changed files with 37 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@ import helpers from '../../../helpers';
import { useFilterFunc } from '../../../lib/util';
import { PluginInfo, reloadPage, setPluginSettings } from '../../../plugin/pluginsSlice';
import { useTypedSelector } from '../../../redux/reducers/reducers';
import { Link as HeadlampLink, SectionBox, SimpleTable } from '../../common';
import HeadlampLink from '../../common/Link';
import SectionBox from '../../common/SectionBox';
import SectionFilterHeader from '../../common/SectionFilterHeader';
import SimpleTable from '../../common/SimpleTable';

/**
* Interface of the component's props structure.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import { ConfigStore } from '../../../plugin/configStore';
import { PluginInfo, reloadPage } from '../../../plugin/pluginsSlice';
import { useTypedSelector } from '../../../redux/reducers/reducers';
import NotFoundComponent from '../../404';
import { SectionBox } from '../../common';
import { ConfirmDialog } from '../../common/Dialog';
import ErrorBoundary from '../../common/ErrorBoundary';
import SectionBox from '../../common/SectionBox';

const PluginSettingsDetailsInitializer = (props: { plugin: PluginInfo }) => {
const { plugin } = props;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/App/Settings/SettingsCluster.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import helpers, { ClusterSettings } from '../../../helpers';
import { useCluster, useClustersConf } from '../../../lib/k8s';
import { deleteCluster } from '../../../lib/k8s/apiProxy';
import { setConfig } from '../../../redux/configSlice';
import { Link } from '../../common';
import ConfirmButton from '../../common/ConfirmButton';
import Link from '../../common/Link';
import NameValueTable from '../../common/NameValueTable/NameValueTable';
import SectionBox from '../../common/SectionBox';

Expand Down
4 changes: 3 additions & 1 deletion frontend/src/components/App/Settings/SettingsClusters.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import { useTranslation } from 'react-i18next';
import { useClustersConf } from '../../../lib/k8s';
import { Link, SectionBox, SimpleTable } from '../../common';
import Link from '../../common/Link';
import SectionBox from '../../common/SectionBox';
import SimpleTable from '../../common/SimpleTable';

export default function SettingsClusters() {
const clusterConf = useClustersConf();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from 'react';
import { Provider } from 'react-redux';
import { useDispatch } from 'react-redux';
import { MemoryRouter } from 'react-router-dom';
import { SectionBox } from '../common';
import SectionBox from '../common/SectionBox';
import DetailsViewSection, { DetailsViewSectionProps } from './DetailsViewSection';
import { setDetailsView } from './detailsViewSectionSlice';

Expand Down
5 changes: 2 additions & 3 deletions frontend/src/components/common/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ const avoidCheck = [
'ErrorBoundary',
'LogViewer',
'Terminal',
];

const checkExports = [
'ActionButton',
'BackLink',
'Chart',
Expand Down Expand Up @@ -44,6 +41,8 @@ const checkExports = [
'ObjectEventList',
];

const checkExports: string[] = [];

function getFilesToVerify() {
const filesToVerify: string[] = [];
fs.readdirSync(__dirname).forEach(file => {
Expand Down
16 changes: 9 additions & 7 deletions frontend/src/components/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
// export * from './Label';
// export * from './LabelListItem';
// export { default as LabelListItem } from './LabelListItem';
export * from './Link';
export { default as Link } from './Link';
// export * from './Link';
// export { default as Link } from './Link';
// export * from './Loader';
// export { default as Loader } from './Loader';
// export * from './NameValueTable';
Expand All @@ -23,15 +23,15 @@ export { default as Link } from './Link';
// export * as Resource from './Resource';
// export * from './Resource/EditorDialog';
// export { default as EditorDialog } from './Resource/EditorDialog';
export * from './SectionBox';
// export * from './SectionBox';
// export * from './SectionFilterHeader';
// export { default as SectionFilterHeader } from './SectionFilterHeader';
export * from './SectionHeader';
export { default as SectionHeader } from './SectionHeader';
// export * from './SectionHeader';
// export { default as SectionHeader } from './SectionHeader';
// export * from './ShowHideLabel';
// export { default as ShowHideLabel } from './ShowHideLabel';
export * from './SimpleTable';
export { default as SimpleTable } from './SimpleTable';
// export * from './SimpleTable';
// export { default as SimpleTable } from './SimpleTable';
// export * from './Tabs';
// export { default as Tabs } from './Tabs';
// export * from './TileChart';
Expand All @@ -46,3 +46,5 @@ export { default as SimpleTable } from './SimpleTable';
// export * from './ConfirmButton';
// export { default as ConfirmButton } from './ConfirmButton';
// export * from './NamespacesAutocomplete';

export {};
2 changes: 1 addition & 1 deletion frontend/src/components/crd/List.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next';
import CRD from '../../lib/k8s/crd';
import { Link } from '../common';
import Link from '../common/Link';
import ResourceListView from '../common/Resource/ResourceListView';

export default function CustomResourceDefinitionList() {
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/daemonset/Details.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import DaemonSet from '../../lib/k8s/daemonSet';
import { SectionBox, SimpleTable } from '../common';
import {
ContainersSection,
DetailsGrid,
MetadataDictGrid,
OwnedPodsSection,
} from '../common/Resource';
import SectionBox from '../common/SectionBox';
import SimpleTable from '../common/SimpleTable';

interface TolerationsSection {
resource: DaemonSet;
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/components/endpoints/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ import { useTranslation } from 'react-i18next';
import { useLocation, useParams } from 'react-router-dom';
import { ResourceClasses } from '../../lib/k8s';
import Endpoints, { KubeEndpoint } from '../../lib/k8s/endpoints';
import { Link, SectionHeader } from '../common';
import Empty from '../common/EmptyContent';
import Link from '../common/Link';
import { DetailsGrid } from '../common/Resource';
import { SectionBox } from '../common/SectionBox';
import SectionHeader from '../common/SectionHeader';
import SimpleTable from '../common/SimpleTable';

export default function EndpointDetails() {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/horizontalPodAutoscaler/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Chip } from '@mui/material';
import { styled } from '@mui/system';
import { useTranslation } from 'react-i18next';
import HPA from '../../lib/k8s/hpa';
import { Link } from '../common';
import Link from '../common/Link';
import ResourceListView from '../common/Resource/ResourceListView';

const RootDiv = styled('div')(({ theme }) => ({
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/limitRange/List.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useTranslation } from 'react-i18next';
import { ApiError } from '../../lib/k8s/apiProxy';
import { LimitRange } from '../../lib/k8s/limitRange';
import { SimpleTableProps } from '../common';
import ResourceListView from '../common/Resource/ResourceListView';
import { SimpleTableProps } from '../common/SimpleTable';

export interface LimitRangeProps {
limitRanges: LimitRange[] | null;
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/namespace/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
import helpers from '../../helpers';
import { useCluster } from '../../lib/k8s';
import Namespace from '../../lib/k8s/namespace';
import { Link } from '../common';
import { StatusLabel } from '../common/Label';
import Link from '../common/Link';
import ResourceListView from '../common/Resource/ResourceListView';
import {
ResourceTableFromResourceClassProps,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/resourceQuota/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { styled } from '@mui/system';
import { useTranslation } from 'react-i18next';
import { ApiError } from '../../lib/k8s/apiProxy';
import ResourceQuota from '../../lib/k8s/resourceQuota';
import { SimpleTableProps } from '../common';
import ResourceListView from '../common/Resource/ResourceListView';
import { SimpleTableProps } from '../common/SimpleTable';

const WrappingBox = styled(Box)(({ theme }) => ({
display: 'flex',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/role/BindingDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import ClusterRoleBinding from '../../lib/k8s/clusterRoleBinding';
import RoleBinding from '../../lib/k8s/roleBinding';
import { Link } from '../common';
import Link from '../common/Link';
import { DetailsGrid } from '../common/Resource';
import { SectionBox } from '../common/SectionBox';
import SimpleTable from '../common/SimpleTable';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/role/BindingList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { useTranslation } from 'react-i18next';
import ClusterRoleBinding from '../../lib/k8s/clusterRoleBinding';
import RoleBinding, { KubeRoleBinding } from '../../lib/k8s/roleBinding';
import { useErrorState, useFilterFunc } from '../../lib/util';
import { Link } from '../common';
import LabelListItem from '../common/LabelListItem';
import Link from '../common/Link';
import ResourceListView from '../common/Resource/ResourceListView';

interface RoleBindingDict {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/service/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import Endpoints from '../../lib/k8s/endpoints';
import Service from '../../lib/k8s/service';
import { Link } from '../common';
import Empty from '../common/EmptyContent';
import { ValueLabel } from '../common/Label';
import Link from '../common/Link';
import { DetailsGrid, MetadataDictGrid } from '../common/Resource';
import PortForward from '../common/Resource/PortForward';
import { SectionBox } from '../common/SectionBox';
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/serviceaccount/Details.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import ServiceAccount from '../../lib/k8s/serviceAccount';
import { Link } from '../common';
import Link from '../common/Link';
import { DetailsGrid } from '../common/Resource';

export default function ServiceAccountDetails() {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/storage/ClaimDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import PersistentVolumeClaim from '../../lib/k8s/persistentVolumeClaim';
import { Link } from '../common';
import Link from '../common/Link';
import { DetailsGrid } from '../common/Resource';
import { StatusLabelByPhase } from './utils';

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/storage/ClaimList.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from 'react-i18next';
import PersistentVolumeClaim from '../../lib/k8s/persistentVolumeClaim';
import { Link } from '../common';
import LabelListItem from '../common/LabelListItem';
import Link from '../common/Link';
import ResourceListView from '../common/Resource/ResourceListView';
import { makePVCStatusLabel } from './ClaimDetails';

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/storage/VolumeDetails.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useTranslation } from 'react-i18next';
import { useParams } from 'react-router-dom';
import PersistentVolume from '../../lib/k8s/persistentVolume';
import { Link } from '../common';
import Link from '../common/Link';
import { DetailsGrid } from '../common/Resource';
import { StatusLabelByPhase } from './utils';

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/verticalPodAutoscaler/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { Link, Paper, Typography } from '@mui/material';
import { useEffect, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import VPA from '../../lib/k8s/vpa';
import { SectionBox } from '../common';
import Empty from '../common/EmptyContent';
import ResourceListView from '../common/Resource/ResourceListView';
import SectionBox from '../common/SectionBox';

export default function VpaList() {
const { t } = useTranslation(['glossary', 'translation']);
Expand Down

0 comments on commit 0cfabe9

Please sign in to comment.