From ffb29c97aff1ac121548644349d95e550409b8ab Mon Sep 17 00:00:00 2001 From: Sergio Betanzos Date: Fri, 25 Jun 2021 14:06:29 +0200 Subject: [PATCH] F OpenNebula/one#5422: Lint --- src/fireedge/.eslintrc | 1 - .../client/components/Table/EnhancedTable.js | 3 ++- .../Tables/Enhanced/Utils/GlobalFilter.js | 23 +------------------ .../Tables/Enhanced/Utils/GlobalSort.js | 8 +++---- .../client/components/Tables/Hosts/detail.js | 7 +++++- .../client/components/Tables/Images/detail.js | 5 ++++ .../client/components/Tables/Vms/detail.js | 5 ++++ .../client/features/One/marketplace/hooks.js | 2 +- src/fireedge/src/client/features/One/utils.js | 2 +- .../src/client/features/One/vnetwork/hooks.js | 2 +- .../features/One/vnetworkTemplate/hooks.js | 2 +- .../src/client/models/VirtualMachine.js | 4 ++-- 12 files changed, 29 insertions(+), 35 deletions(-) diff --git a/src/fireedge/.eslintrc b/src/fireedge/.eslintrc index 131af82668..22108bb5a8 100644 --- a/src/fireedge/.eslintrc +++ b/src/fireedge/.eslintrc @@ -8,7 +8,6 @@ "plugin:react/recommended", "standard" ], - "parser": "babel-eslint", "parserOptions": { "ecmaFeatures": { "jsx": true diff --git a/src/fireedge/src/client/components/Table/EnhancedTable.js b/src/fireedge/src/client/components/Table/EnhancedTable.js index 6ac1301035..c20f4990e8 100644 --- a/src/fireedge/src/client/components/Table/EnhancedTable.js +++ b/src/fireedge/src/client/components/Table/EnhancedTable.js @@ -1,3 +1,4 @@ +/* eslint-disable react/jsx-key */ import React from 'react' import PropTypes from 'prop-types' @@ -84,7 +85,7 @@ const EnhancedTable = ({ /> - {headerGroups.map(headerGroup => ( + {headerGroups.map((headerGroup) => ( {headerGroup.headers.map(column => ( { * @type {import('react-table').UseGlobalFiltersInstanceProps & * import('react-table').UseGlobalFiltersState} */ - const { preGlobalFilteredRows, globalFilter, setGlobalFilter } = props + const { globalFilter, setGlobalFilter } = props const classes = useStyles() - const count = preGlobalFilteredRows.length const [value, setValue] = React.useState(globalFilter) @@ -55,26 +54,6 @@ const GlobalFilter = props => { debounce(value => { setGlobalFilter(value || undefined) }, 200) ) - // Global filter only works with pagination from the first page. - // This may not be a problem for server side pagination when - // only the current page is downloaded. - - /* - - - - - */ - return (
diff --git a/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalSort.js b/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalSort.js index 01aef3980f..95ef807a1d 100644 --- a/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalSort.js +++ b/src/fireedge/src/client/components/Tables/Enhanced/Utils/GlobalSort.js @@ -13,7 +13,7 @@ const useStyles = makeStyles(theme => ({ flexWrap: 'wrap', gap: 6, alignItems: 'center' - }, + } })) const GlobalSort = props => { @@ -26,7 +26,7 @@ const GlobalSort = props => { */ const { headers, sortBy, setSortBy } = props - const headersNotSorted = React.useMemo(() => + const headersNotSorted = React.useMemo(() => headers.filter(({ isSorted, canSort, isVisible }) => !isSorted && canSort && isVisible ), [sortBy.length]) @@ -36,9 +36,9 @@ const GlobalSort = props => { } const handleDelete = removeId => { - setSortBy(sortBy.filter(({id}) => id !== removeId)) + setSortBy(sortBy.filter(({ id }) => id !== removeId)) } - + const handleToggle = (id, desc) => { setSortBy(sortBy.map(sort => sort.id === id ? ({ ...sort, desc }) : sort)) } diff --git a/src/fireedge/src/client/components/Tables/Hosts/detail.js b/src/fireedge/src/client/components/Tables/Hosts/detail.js index 2cdad16855..515afffccc 100644 --- a/src/fireedge/src/client/components/Tables/Hosts/detail.js +++ b/src/fireedge/src/client/components/Tables/Hosts/detail.js @@ -1,4 +1,5 @@ import React, { useEffect } from 'react' +import PropTypes from 'prop-types' import { LinearProgress } from '@material-ui/core' import Tabs from 'client/components/Tabs' @@ -30,7 +31,7 @@ const HostDetail = ({ id }) => { return
{error}
} - const { ID, NAME, IM_MAD, VM_MAD, VMS, CLUSTER } = data + const { ID, NAME, IM_MAD, VM_MAD /* VMS, CLUSTER */ } = data const { name: stateName, color: stateColor } = HostModel.getState(data) @@ -63,4 +64,8 @@ const HostDetail = ({ id }) => { ) } +HostDetail.propTypes = { + id: PropTypes.string.isRequired +} + export default HostDetail diff --git a/src/fireedge/src/client/components/Tables/Images/detail.js b/src/fireedge/src/client/components/Tables/Images/detail.js index 333cfaaf6a..f457e5389b 100644 --- a/src/fireedge/src/client/components/Tables/Images/detail.js +++ b/src/fireedge/src/client/components/Tables/Images/detail.js @@ -1,4 +1,5 @@ import React, { useEffect } from 'react' +import PropTypes from 'prop-types' import { LinearProgress } from '@material-ui/core' import Tabs from 'client/components/Tabs' @@ -76,4 +77,8 @@ const ImageDetail = ({ id }) => { ) } +ImageDetail.propTypes = { + id: PropTypes.string.isRequired +} + export default ImageDetail diff --git a/src/fireedge/src/client/components/Tables/Vms/detail.js b/src/fireedge/src/client/components/Tables/Vms/detail.js index 4fa27d3c78..0d28dfcaa7 100644 --- a/src/fireedge/src/client/components/Tables/Vms/detail.js +++ b/src/fireedge/src/client/components/Tables/Vms/detail.js @@ -1,4 +1,5 @@ import React, { useEffect } from 'react' +import PropTypes from 'prop-types' import { LinearProgress, Accordion, AccordionSummary, AccordionDetails } from '@material-ui/core' import Tabs from 'client/components/Tabs' @@ -192,4 +193,8 @@ const VmDetail = ({ id }) => { ) } +VmDetail.propTypes = { + id: PropTypes.string.isRequired +} + export default VmDetail diff --git a/src/fireedge/src/client/features/One/marketplace/hooks.js b/src/fireedge/src/client/features/One/marketplace/hooks.js index 12404a1b9a..cf852a2ddb 100644 --- a/src/fireedge/src/client/features/One/marketplace/hooks.js +++ b/src/fireedge/src/client/features/One/marketplace/hooks.js @@ -6,7 +6,7 @@ import * as actions from 'client/features/One/marketplace/actions' import { RESOURCES } from 'client/features/One/slice' export const useMarketplace = () => ( - useSelector(state => state.one.[RESOURCES.marketplace]) + useSelector(state => state.one[RESOURCES.marketplace]) ) export const useMarketplaceApi = () => { diff --git a/src/fireedge/src/client/features/One/utils.js b/src/fireedge/src/client/features/One/utils.js index fe179a099c..ce04627eaf 100644 --- a/src/fireedge/src/client/features/One/utils.js +++ b/src/fireedge/src/client/features/One/utils.js @@ -61,4 +61,4 @@ export const updateResourceList = (currentList, value) => { : [value, currentList] return updatedList -} \ No newline at end of file +} diff --git a/src/fireedge/src/client/features/One/vnetwork/hooks.js b/src/fireedge/src/client/features/One/vnetwork/hooks.js index 7dfe9e305f..ccbd5952a0 100644 --- a/src/fireedge/src/client/features/One/vnetwork/hooks.js +++ b/src/fireedge/src/client/features/One/vnetwork/hooks.js @@ -6,7 +6,7 @@ import * as actions from 'client/features/One/vnetwork/actions' import { RESOURCES } from 'client/features/One/slice' export const useVNetwork = () => ( - useSelector(state => state.one.[RESOURCES.vn]) + useSelector(state => state.one[RESOURCES.vn]) ) export const useVNetworkApi = () => { diff --git a/src/fireedge/src/client/features/One/vnetworkTemplate/hooks.js b/src/fireedge/src/client/features/One/vnetworkTemplate/hooks.js index 26af6ab54e..052bdaa2b8 100644 --- a/src/fireedge/src/client/features/One/vnetworkTemplate/hooks.js +++ b/src/fireedge/src/client/features/One/vnetworkTemplate/hooks.js @@ -6,7 +6,7 @@ import * as actions from 'client/features/One/vnetworkTemplate/actions' import { RESOURCES } from 'client/features/One/slice' export const useVNetworkTemplate = () => ( - useSelector(state => state.one.[RESOURCES.vntemplate]) + useSelector(state => state.one[RESOURCES.vntemplate]) ) export const useVNetworkTemplateApi = () => { diff --git a/src/fireedge/src/client/models/VirtualMachine.js b/src/fireedge/src/client/models/VirtualMachine.js index 2c6aa07151..61a113bcb0 100644 --- a/src/fireedge/src/client/models/VirtualMachine.js +++ b/src/fireedge/src/client/models/VirtualMachine.js @@ -1,6 +1,6 @@ import { STATES, VM_STATES, VM_LCM_STATES } from 'client/constants' -const EXTERNAL_IP_ATTRS = [ +/* const EXTERNAL_IP_ATTRS = [ 'GUEST_IP', 'GUEST_IP_ADDRESSES', 'AWS_IP_ADDRESS', @@ -8,7 +8,7 @@ const EXTERNAL_IP_ATTRS = [ 'AWS_PRIVATE_IP_ADDRESS', 'AZ_IPADDRESS', 'SL_PRIMARYIPADDRESS' -] +] */ const NIC_ALIAS_IP_ATTRS = [ 'IP',