From fd9ca352f8f2ece4a70242f4083c84a9869a0ace Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Mon, 6 May 2024 10:00:55 +0200 Subject: [PATCH] refactor: Table uses named exports --- src/main/frontend/src/clusterrolebindings/List.js | 3 +-- src/main/frontend/src/clusterroles/List.js | 3 +-- src/main/frontend/src/clusterroles/RuleList.js | 2 +- src/main/frontend/src/components/ResourceList.js | 2 +- src/main/frontend/src/components/Table.js | 4 +--- src/main/frontend/src/components/index.js | 1 + src/main/frontend/src/configmaps/List.js | 3 +-- src/main/frontend/src/containers/ContainerList.js | 3 +-- src/main/frontend/src/cronjobs/List.js | 3 +-- src/main/frontend/src/customresourcedefinitions/List.js | 3 +-- src/main/frontend/src/customresources/List.js | 3 +-- src/main/frontend/src/daemonsets/List.js | 3 +-- src/main/frontend/src/deploymentconfigs/List.js | 3 +-- src/main/frontend/src/deployments/List.js | 3 +-- src/main/frontend/src/endpoints/EndpointsDetailPage.js | 3 +-- src/main/frontend/src/endpoints/List.js | 3 +-- src/main/frontend/src/events/List.js | 3 +-- src/main/frontend/src/horizontalpodautoscalers/List.js | 3 +-- src/main/frontend/src/ingresses/List.js | 3 +-- src/main/frontend/src/jobs/List.js | 3 +-- src/main/frontend/src/namespaces/List.js | 3 +-- src/main/frontend/src/nodes/List.js | 3 +-- src/main/frontend/src/persistentvolumeclaims/List.js | 3 +-- src/main/frontend/src/persistentvolumes/List.js | 3 +-- src/main/frontend/src/pods/List.js | 3 +-- src/main/frontend/src/replicasets/List.js | 3 +-- src/main/frontend/src/replicationcontrollers/List.js | 3 +-- src/main/frontend/src/roles/List.js | 3 +-- src/main/frontend/src/routes/List.js | 3 +-- src/main/frontend/src/secrets/List.js | 3 +-- src/main/frontend/src/serviceaccounts/List.js | 3 +-- src/main/frontend/src/services/List.js | 3 +-- src/main/frontend/src/services/PortList.js | 3 +-- src/main/frontend/src/statefulsets/List.js | 3 +-- 34 files changed, 34 insertions(+), 65 deletions(-) diff --git a/src/main/frontend/src/clusterrolebindings/List.js b/src/main/frontend/src/clusterrolebindings/List.js index 909c09e..bc14fab 100644 --- a/src/main/frontend/src/clusterrolebindings/List.js +++ b/src/main/frontend/src/clusterrolebindings/List.js @@ -24,9 +24,8 @@ import { uid } from '../metadata'; import {api, selectors} from './'; -import {Age, Icon, Link} from '../components'; +import {Age, Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/clusterroles/List.js b/src/main/frontend/src/clusterroles/List.js index b977a5a..4cd5b7c 100644 --- a/src/main/frontend/src/clusterroles/List.js +++ b/src/main/frontend/src/clusterroles/List.js @@ -22,9 +22,8 @@ import { uid } from '../metadata'; import {api} from './'; -import {Age, Icon, Link} from '../components'; +import {Age, Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/clusterroles/RuleList.js b/src/main/frontend/src/clusterroles/RuleList.js index 6fc06d0..d1bd934 100644 --- a/src/main/frontend/src/clusterroles/RuleList.js +++ b/src/main/frontend/src/clusterroles/RuleList.js @@ -16,7 +16,7 @@ */ import React from 'react'; import {selectors} from './'; -import Table from '../components/Table'; +import {Table} from '../components'; const headers = [ 'Resources', diff --git a/src/main/frontend/src/components/ResourceList.js b/src/main/frontend/src/components/ResourceList.js index 22a2b09..a15207d 100644 --- a/src/main/frontend/src/components/ResourceList.js +++ b/src/main/frontend/src/components/ResourceList.js @@ -18,7 +18,7 @@ import React from 'react'; import {connect} from 'react-redux'; import {bindActionCreators} from 'redux'; import {crudDelete, resourcesBy} from '../redux'; -import Table from './Table'; +import {Table} from './'; const Content = ({headers, resources, loading, children}) => { if (resources?.length > 0) { diff --git a/src/main/frontend/src/components/Table.js b/src/main/frontend/src/components/Table.js index 73b9bba..b3860c7 100644 --- a/src/main/frontend/src/components/Table.js +++ b/src/main/frontend/src/components/Table.js @@ -18,7 +18,7 @@ import React from 'react'; import {deletionTimestamp} from '../metadata'; import {Card, Icon, Link, Spinner} from './'; -const Table = ({title, titleVariant, className, children, ...props}) => ( +export const Table = ({title, titleVariant, className, children, ...props}) => ( {title && {title}} {children}
@@ -108,5 +108,3 @@ Table.DeleteButton = ({...props}) => ( {...props} /> ); - -export default Table; diff --git a/src/main/frontend/src/components/index.js b/src/main/frontend/src/components/index.js index a42d729..c3179a5 100644 --- a/src/main/frontend/src/components/index.js +++ b/src/main/frontend/src/components/index.js @@ -31,6 +31,7 @@ export {ResourceDetailPage} from './ResourceDetailPage'; export {Spinner} from './Spinner'; export {StatusCard} from './StatusCard'; export {Switch} from './Switch'; +export {Table} from './Table'; export {Tag} from './Tag'; export {Textfield} from './Textfield'; export {Tooltip} from './Tooltip'; diff --git a/src/main/frontend/src/configmaps/List.js b/src/main/frontend/src/configmaps/List.js index a5f14df..bb17b35 100644 --- a/src/main/frontend/src/configmaps/List.js +++ b/src/main/frontend/src/configmaps/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/containers/ContainerList.js b/src/main/frontend/src/containers/ContainerList.js index 4fd8ed9..b2a8a22 100644 --- a/src/main/frontend/src/containers/ContainerList.js +++ b/src/main/frontend/src/containers/ContainerList.js @@ -16,8 +16,7 @@ */ import React from 'react'; import {bytesToHumanReadable} from '../metrics'; -import {Icon} from '../components'; -import Table from '../components/Table'; +import {Icon, Table} from '../components'; const containerHeaders = [ diff --git a/src/main/frontend/src/cronjobs/List.js b/src/main/frontend/src/cronjobs/List.js index 061ebc0..9e1d791 100644 --- a/src/main/frontend/src/cronjobs/List.js +++ b/src/main/frontend/src/cronjobs/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/customresourcedefinitions/List.js b/src/main/frontend/src/customresourcedefinitions/List.js index 1845e0f..2142417 100644 --- a/src/main/frontend/src/customresourcedefinitions/List.js +++ b/src/main/frontend/src/customresourcedefinitions/List.js @@ -18,9 +18,8 @@ import React from 'react'; import {connect} from 'react-redux'; import {name, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors, GroupLink} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/customresources/List.js b/src/main/frontend/src/customresources/List.js index 5102bca..48c9ed1 100644 --- a/src/main/frontend/src/customresources/List.js +++ b/src/main/frontend/src/customresources/List.js @@ -21,9 +21,8 @@ import {crudDelete} from '../redux'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; import {selectors as crdSelectors} from '../customresourcedefinitions'; -import {Icon, Link, ResourceEditModal} from '../components'; +import {Icon, Link, ResourceEditModal, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = customResourceDefinition => { const ret = [ diff --git a/src/main/frontend/src/daemonsets/List.js b/src/main/frontend/src/daemonsets/List.js index 4dbe140..b87a9e1 100644 --- a/src/main/frontend/src/daemonsets/List.js +++ b/src/main/frontend/src/daemonsets/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/deploymentconfigs/List.js b/src/main/frontend/src/deploymentconfigs/List.js index 98aa97c..1207c9a 100644 --- a/src/main/frontend/src/deploymentconfigs/List.js +++ b/src/main/frontend/src/deploymentconfigs/List.js @@ -19,9 +19,8 @@ import {connect} from 'react-redux'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import dc from './'; import {resourcesBy} from '../redux'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/deployments/List.js b/src/main/frontend/src/deployments/List.js index 9caad64..3d23af2 100644 --- a/src/main/frontend/src/deployments/List.js +++ b/src/main/frontend/src/deployments/List.js @@ -19,9 +19,8 @@ import {connect} from 'react-redux'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; import {resourcesBy} from '../redux'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/endpoints/EndpointsDetailPage.js b/src/main/frontend/src/endpoints/EndpointsDetailPage.js index 5f95ba3..95fcf34 100644 --- a/src/main/frontend/src/endpoints/EndpointsDetailPage.js +++ b/src/main/frontend/src/endpoints/EndpointsDetailPage.js @@ -19,8 +19,7 @@ import {connect} from 'react-redux'; import {withParams} from '../router'; import {api, selectors} from './'; import {Details} from '../metadata'; -import {Card, Form, Link, ResourceDetailPage} from '../components'; -import Table from '../components/Table'; +import {Card, Form, Link, ResourceDetailPage, Table} from '../components'; const mapStateToProps = ({endpoints}) => ({ endpoints diff --git a/src/main/frontend/src/endpoints/List.js b/src/main/frontend/src/endpoints/List.js index ae8b55e..68402ee 100644 --- a/src/main/frontend/src/endpoints/List.js +++ b/src/main/frontend/src/endpoints/List.js @@ -23,9 +23,8 @@ import { sortByCreationTimeStamp, uid } from '../metadata'; -import {Age, Icon, Link} from '../components'; +import {Age, Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/events/List.js b/src/main/frontend/src/events/List.js index a6ab1ec..94cb4a0 100644 --- a/src/main/frontend/src/events/List.js +++ b/src/main/frontend/src/events/List.js @@ -18,8 +18,7 @@ import React from 'react'; import {connect} from 'react-redux'; import {uid} from '../metadata'; import {selectors} from './'; -import {Age, Icon, Link} from '../components'; -import Table from '../components/Table'; +import {Age, Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; const headers = [ diff --git a/src/main/frontend/src/horizontalpodautoscalers/List.js b/src/main/frontend/src/horizontalpodautoscalers/List.js index 7ebae4b..61bb48b 100644 --- a/src/main/frontend/src/horizontalpodautoscalers/List.js +++ b/src/main/frontend/src/horizontalpodautoscalers/List.js @@ -16,9 +16,8 @@ */ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; import {api, selectors} from './'; const headers = [ diff --git a/src/main/frontend/src/ingresses/List.js b/src/main/frontend/src/ingresses/List.js index 8af2430..b289137 100644 --- a/src/main/frontend/src/ingresses/List.js +++ b/src/main/frontend/src/ingresses/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/jobs/List.js b/src/main/frontend/src/jobs/List.js index b7d0ab8..50c9c93 100644 --- a/src/main/frontend/src/jobs/List.js +++ b/src/main/frontend/src/jobs/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/namespaces/List.js b/src/main/frontend/src/namespaces/List.js index ad5415f..db40a23 100644 --- a/src/main/frontend/src/namespaces/List.js +++ b/src/main/frontend/src/namespaces/List.js @@ -23,9 +23,8 @@ import { uid } from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/nodes/List.js b/src/main/frontend/src/nodes/List.js index bd7d039..d40a2a3 100644 --- a/src/main/frontend/src/nodes/List.js +++ b/src/main/frontend/src/nodes/List.js @@ -24,9 +24,8 @@ import { uid } from '../metadata'; import {selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/persistentvolumeclaims/List.js b/src/main/frontend/src/persistentvolumeclaims/List.js index 30dd00c..a8d174d 100644 --- a/src/main/frontend/src/persistentvolumeclaims/List.js +++ b/src/main/frontend/src/persistentvolumeclaims/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import pvc from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/persistentvolumes/List.js b/src/main/frontend/src/persistentvolumes/List.js index 5b24f99..2f107cd 100644 --- a/src/main/frontend/src/persistentvolumes/List.js +++ b/src/main/frontend/src/persistentvolumes/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, sortByCreationTimeStamp, uid} from '../metadata'; import {api, selectors} from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/pods/List.js b/src/main/frontend/src/pods/List.js index 825fc57..4b92cef 100644 --- a/src/main/frontend/src/pods/List.js +++ b/src/main/frontend/src/pods/List.js @@ -19,9 +19,8 @@ import PropTypes from 'prop-types'; import {connect} from 'react-redux'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import p from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/replicasets/List.js b/src/main/frontend/src/replicasets/List.js index 00e5ce0..37fff59 100644 --- a/src/main/frontend/src/replicasets/List.js +++ b/src/main/frontend/src/replicasets/List.js @@ -18,9 +18,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import rs from './'; -import {Icon} from '../components'; +import {Icon, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/replicationcontrollers/List.js b/src/main/frontend/src/replicationcontrollers/List.js index df27f0c..65ee0a9 100644 --- a/src/main/frontend/src/replicationcontrollers/List.js +++ b/src/main/frontend/src/replicationcontrollers/List.js @@ -18,9 +18,8 @@ import React from 'react'; import PropTypes from 'prop-types'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import rc from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '', diff --git a/src/main/frontend/src/roles/List.js b/src/main/frontend/src/roles/List.js index 0d79bdc..67f94d4 100644 --- a/src/main/frontend/src/roles/List.js +++ b/src/main/frontend/src/roles/List.js @@ -23,9 +23,8 @@ import { uid } from '../metadata'; import r from './'; -import {Icon, Link, Tooltip} from '../components'; +import {Icon, Link, Tooltip, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/routes/List.js b/src/main/frontend/src/routes/List.js index 7253103..e8f7a69 100644 --- a/src/main/frontend/src/routes/List.js +++ b/src/main/frontend/src/routes/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import r from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/secrets/List.js b/src/main/frontend/src/secrets/List.js index 46af3bc..473fdb3 100644 --- a/src/main/frontend/src/secrets/List.js +++ b/src/main/frontend/src/secrets/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import s from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/serviceaccounts/List.js b/src/main/frontend/src/serviceaccounts/List.js index dd593e8..469d032 100644 --- a/src/main/frontend/src/serviceaccounts/List.js +++ b/src/main/frontend/src/serviceaccounts/List.js @@ -25,9 +25,8 @@ import { uid } from '../metadata'; import {api} from './'; +import {Age, Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; -import {Age, Icon, Link} from '../components'; const headers = [ diff --git a/src/main/frontend/src/services/List.js b/src/main/frontend/src/services/List.js index 297464c..50602fc 100644 --- a/src/main/frontend/src/services/List.js +++ b/src/main/frontend/src/services/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import svc from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ diff --git a/src/main/frontend/src/services/PortList.js b/src/main/frontend/src/services/PortList.js index ebc6d86..c4c2707 100644 --- a/src/main/frontend/src/services/PortList.js +++ b/src/main/frontend/src/services/PortList.js @@ -15,8 +15,7 @@ * */ import React from 'react'; -import {Icon} from '../components'; -import Table from '../components/Table'; +import {Icon, Table} from '../components'; const headers = [ diff --git a/src/main/frontend/src/statefulsets/List.js b/src/main/frontend/src/statefulsets/List.js index 1d00a63..3e1b8ae 100644 --- a/src/main/frontend/src/statefulsets/List.js +++ b/src/main/frontend/src/statefulsets/List.js @@ -17,9 +17,8 @@ import React from 'react'; import {name, namespace, sortByCreationTimeStamp, uid} from '../metadata'; import sts from './'; -import {Icon, Link} from '../components'; +import {Icon, Link, Table} from '../components'; import ResourceList from '../components/ResourceList'; -import Table from '../components/Table'; const headers = [ '',