From 3c94ba964b216d2486589a91d6d636b90740a375 Mon Sep 17 00:00:00 2001 From: Jorge Miguel Lobo Escalona Date: Wed, 25 Sep 2024 18:30:40 +0200 Subject: [PATCH] F #6718: Add data-cy for tests (#3246) --- .../src/client/components/MultipleTags/index.js | 2 +- .../src/client/components/Tables/ACLs/row.js | 2 +- .../src/client/components/Tables/AllImages/row.js | 3 ++- .../src/client/components/Tables/BackupJobs/row.js | 3 ++- .../src/client/components/Tables/Backups/row.js | 10 +++++++++- .../src/client/components/Tables/Clusters/row.js | 3 ++- .../src/client/components/Tables/Datastores/row.js | 11 ++++++++++- .../client/components/Tables/Enhanced/WrapperRow.js | 13 ++++++++++--- .../src/client/components/Tables/Enhanced/index.js | 6 ++++++ .../src/client/components/Tables/Hosts/row.js | 11 ++++++++++- .../src/client/components/Tables/Images/row.js | 10 +++++++++- .../src/client/components/Tables/Increments/row.js | 3 ++- .../client/components/Tables/MarketplaceApps/row.js | 3 ++- .../client/components/Tables/Marketplaces/row.js | 3 ++- .../client/components/Tables/SecurityGroups/row.js | 3 ++- .../components/Tables/ServiceTemplates/row.js | 3 ++- .../src/client/components/Tables/Services/row.js | 3 ++- .../src/client/components/Tables/Support/row.js | 3 ++- .../src/client/components/Tables/Users/row.js | 3 ++- .../components/Tables/VNetworkTemplates/row.js | 3 ++- .../src/client/components/Tables/VNetworks/row.js | 3 ++- .../components/Tables/VRouterTemplates/row.js | 3 ++- .../src/client/components/Tables/VRouters/row.js | 3 ++- .../components/Tables/VirtualDataCenters/row.js | 3 ++- .../src/client/components/Tables/VmDisks/row.js | 3 ++- .../src/client/components/Tables/VmGroups/row.js | 3 ++- .../src/client/components/Tables/VmTemplates/row.js | 3 ++- .../src/client/components/Tables/Vms/row.js | 11 ++++++++++- .../src/client/components/Tables/Wilds/row.js | 3 ++- .../src/client/components/Tables/Zombies/row.js | 3 ++- .../src/client/components/Tables/Zones/row.js | 3 ++- 31 files changed, 110 insertions(+), 32 deletions(-) diff --git a/src/fireedge/src/client/components/MultipleTags/index.js b/src/fireedge/src/client/components/MultipleTags/index.js index fb09ea2319..f0d2bfe355 100644 --- a/src/fireedge/src/client/components/MultipleTags/index.js +++ b/src/fireedge/src/client/components/MultipleTags/index.js @@ -116,7 +116,7 @@ MultipleTags.propTypes = { tags: PropTypes.any, limitTags: PropTypes.number, clipboard: PropTypes.bool, - truncateText: PropTypes.bool, + truncateText: PropTypes.number, } MultipleTags.displayName = 'MultipleTags' diff --git a/src/fireedge/src/client/components/Tables/ACLs/row.js b/src/fireedge/src/client/components/Tables/ACLs/row.js index 041ad18f86..91e26ebd23 100644 --- a/src/fireedge/src/client/components/Tables/ACLs/row.js +++ b/src/fireedge/src/client/components/Tables/ACLs/row.js @@ -26,7 +26,7 @@ import { ACL_TABLE_VIEWS } from 'client/constants' import PropTypes from 'prop-types' const Row = (viewType) => { - const aclRow = ({ original, value, headerList, ...props }) => { + const aclRow = ({ original, value, headerList, rowDataCy, ...props }) => { // Check what view show in the table cards if (viewType === ACL_TABLE_VIEWS.NAMES.type) { return diff --git a/src/fireedge/src/client/components/Tables/AllImages/row.js b/src/fireedge/src/client/components/Tables/AllImages/row.js index c662640bac..9198ecf6a1 100644 --- a/src/fireedge/src/client/components/Tables/AllImages/row.js +++ b/src/fireedge/src/client/components/Tables/AllImages/row.js @@ -35,7 +35,7 @@ import { T } from 'client/constants' import * as Helper from 'client/models/Helper' import * as ImageModel from 'client/models/Image' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, @@ -127,6 +127,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/BackupJobs/row.js b/src/fireedge/src/client/components/Tables/BackupJobs/row.js index a542e1d7da..1ea2f96047 100644 --- a/src/fireedge/src/client/components/Tables/BackupJobs/row.js +++ b/src/fireedge/src/client/components/Tables/BackupJobs/row.js @@ -23,7 +23,7 @@ import backupjobApi, { import { jsonToXml } from 'client/models/Helper' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateBackupJobMutation() const state = backupjobApi.endpoints.getBackupJobs.useQueryState( @@ -68,6 +68,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VirtualDataCenterRow' diff --git a/src/fireedge/src/client/components/Tables/Backups/row.js b/src/fireedge/src/client/components/Tables/Backups/row.js index f7ea261c7c..c0e82ee669 100644 --- a/src/fireedge/src/client/components/Tables/Backups/row.js +++ b/src/fireedge/src/client/components/Tables/Backups/row.js @@ -45,7 +45,14 @@ import { T } from 'client/constants' import * as Helper from 'client/models/Helper' import * as ImageModel from 'client/models/Image' -const Row = ({ original, value, onClickLabel, headerList, ...props }) => { +const Row = ({ + original, + value, + onClickLabel, + headerList, + rowDataCy, + ...props +}) => { const [update] = useUpdateImageMutation() const { labels: userLabels } = useAuth() @@ -188,6 +195,7 @@ Row.propTypes = { handleClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/Clusters/row.js b/src/fireedge/src/client/components/Tables/Clusters/row.js index 7078c8769d..1183521075 100644 --- a/src/fireedge/src/client/components/Tables/Clusters/row.js +++ b/src/fireedge/src/client/components/Tables/Clusters/row.js @@ -24,7 +24,7 @@ import { rowStyles } from 'client/components/Tables/styles' import { Tr } from 'client/components/HOC' import { T } from 'client/constants' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, NAME, HOSTS, DATASTORES, VNETS, PROVIDER_NAME } = value @@ -77,6 +77,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/Datastores/row.js b/src/fireedge/src/client/components/Tables/Datastores/row.js index b350277d41..f282db2ea5 100644 --- a/src/fireedge/src/client/components/Tables/Datastores/row.js +++ b/src/fireedge/src/client/components/Tables/Datastores/row.js @@ -23,7 +23,15 @@ import api, { } from 'client/features/OneApi/datastore' const Row = memo( - ({ original, value, onClickLabel, zone, headerList, ...props }) => { + ({ + original, + value, + onClickLabel, + zone, + headerList, + rowDataCy, + ...props + }) => { const [update] = useUpdateDatastoreMutation() const { data: datastores, @@ -73,6 +81,7 @@ Row.propTypes = { onClickLabel: PropTypes.func, zone: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'DatastoreRow' diff --git a/src/fireedge/src/client/components/Tables/Enhanced/WrapperRow.js b/src/fireedge/src/client/components/Tables/Enhanced/WrapperRow.js index 43a6c6e1aa..13365b5b47 100644 --- a/src/fireedge/src/client/components/Tables/Enhanced/WrapperRow.js +++ b/src/fireedge/src/client/components/Tables/Enhanced/WrapperRow.js @@ -35,19 +35,25 @@ const listStyles = makeStyles(({ palette }) => ({ */ const RowStyle = memo( ({ - original, - value, + original = {}, + value = {}, onClickLabel, onDeleteLabel, globalErrors, headerList = [], className, + rowDataCy = '', ...props }) => { + const { ID = '' } = original const styles = listStyles() return ( - + {headerList.map(({ id, accessor }) => { switch (typeof accessor) { case 'string': @@ -71,6 +77,7 @@ RowStyle.propTypes = { onDeleteLabel: PropTypes.func, globalErrors: PropTypes.array, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, className: PropTypes.string, } diff --git a/src/fireedge/src/client/components/Tables/Enhanced/index.js b/src/fireedge/src/client/components/Tables/Enhanced/index.js index 344459f32a..451be4d579 100644 --- a/src/fireedge/src/client/components/Tables/Enhanced/index.js +++ b/src/fireedge/src/client/components/Tables/Enhanced/index.js @@ -79,6 +79,7 @@ const DataListPerPage = memo( zoneId, cannotFilterByLabel, styles, + rootProps: rootPropsTable, }) => { if (!page.length) { return '' @@ -102,6 +103,7 @@ const DataListPerPage = memo( {...(messageValues.length && { globalErrors: messageValues, })} + rowDataCy={rootPropsTable?.['data-cy'] ?? ''} className={isSelected ? 'selected' : ''} {...(!cannotFilterByLabel && { onClickLabel: (label) => { @@ -165,6 +167,9 @@ DataListPerPage.propTypes = { zoneId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]), cannotFilterByLabel: PropTypes.any, styles: PropTypes.any, + rootProps: PropTypes.shape({ + 'data-cy': PropTypes.string, + }), } DataListPerPage.displayName = 'DataListPerPage' @@ -509,6 +514,7 @@ const EnhancedTable = ({ {/* DATALIST PER PAGE */} { + ({ + original, + value, + onClickLabel, + zone, + headerList, + rowDataCy, + ...props + }) => { const [update] = useUpdateHostMutation() const { @@ -72,6 +80,7 @@ Row.propTypes = { onClickLabel: PropTypes.func, zone: PropTypes.oneOfType([PropTypes.string, PropTypes.number]), headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'HostRow' diff --git a/src/fireedge/src/client/components/Tables/Images/row.js b/src/fireedge/src/client/components/Tables/Images/row.js index 95a6387b07..a76e0f6703 100644 --- a/src/fireedge/src/client/components/Tables/Images/row.js +++ b/src/fireedge/src/client/components/Tables/Images/row.js @@ -45,7 +45,14 @@ import { prettyBytes } from 'client/utils' import * as Helper from 'client/models/Helper' import * as ImageModel from 'client/models/Image' -const Row = ({ original, value, onClickLabel, headerList, ...props }) => { +const Row = ({ + original, + value, + onClickLabel, + headerList, + rowDataCy, + ...props +}) => { const [update] = useUpdateImageMutation() const { labels: userLabels } = useAuth() @@ -168,6 +175,7 @@ Row.propTypes = { handleClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/Increments/row.js b/src/fireedge/src/client/components/Tables/Increments/row.js index 9b390032b8..f5e27fdb56 100644 --- a/src/fireedge/src/client/components/Tables/Increments/row.js +++ b/src/fireedge/src/client/components/Tables/Increments/row.js @@ -31,7 +31,7 @@ import { prettyBytes } from 'client/utils' import * as Helper from 'client/models/Helper' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, TYPE, DATE, SIZE, SOURCE } = value @@ -79,6 +79,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/MarketplaceApps/row.js b/src/fireedge/src/client/components/Tables/MarketplaceApps/row.js index 46776219e6..56173d7e64 100644 --- a/src/fireedge/src/client/components/Tables/MarketplaceApps/row.js +++ b/src/fireedge/src/client/components/Tables/MarketplaceApps/row.js @@ -23,7 +23,7 @@ import api, { import { jsonToXml } from 'client/models/Helper' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateAppMutation() const state = api.endpoints.getMarketplaceApps.useQueryState(undefined, { @@ -65,6 +65,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'MarketplaceAppRow' diff --git a/src/fireedge/src/client/components/Tables/Marketplaces/row.js b/src/fireedge/src/client/components/Tables/Marketplaces/row.js index a26d8268f8..0e3219b1db 100644 --- a/src/fireedge/src/client/components/Tables/Marketplaces/row.js +++ b/src/fireedge/src/client/components/Tables/Marketplaces/row.js @@ -20,7 +20,7 @@ import { MarketplaceCard } from 'client/components/Cards' import marketplaceApi from 'client/features/OneApi/marketplace' const Row = memo( - ({ original, value, headerList, ...props }) => { + ({ original, value, headerList, rowDataCy, ...props }) => { const state = marketplaceApi.endpoints.getMarketplaces.useQueryState( undefined, { @@ -43,6 +43,7 @@ Row.propTypes = { className: PropTypes.string, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'MarketplaceRow' diff --git a/src/fireedge/src/client/components/Tables/SecurityGroups/row.js b/src/fireedge/src/client/components/Tables/SecurityGroups/row.js index ceb207d1ee..fbdd1671f3 100644 --- a/src/fireedge/src/client/components/Tables/SecurityGroups/row.js +++ b/src/fireedge/src/client/components/Tables/SecurityGroups/row.js @@ -22,7 +22,7 @@ import PropTypes from 'prop-types' import { memo, useCallback, useMemo } from 'react' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateSecGroupMutation() const { @@ -75,6 +75,7 @@ Row.propTypes = { handleClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'SecurityGroupRow' diff --git a/src/fireedge/src/client/components/Tables/ServiceTemplates/row.js b/src/fireedge/src/client/components/Tables/ServiceTemplates/row.js index 4c3320e648..90cc4646a6 100644 --- a/src/fireedge/src/client/components/Tables/ServiceTemplates/row.js +++ b/src/fireedge/src/client/components/Tables/ServiceTemplates/row.js @@ -22,7 +22,7 @@ import serviceTemplateApi, { } from 'client/features/OneApi/serviceTemplate' const Row = memo( - ({ original, value, headerList, ...props }) => { + ({ original, value, headerList, rowDataCy, ...props }) => { const [update] = useUpdateServiceTemplateMutation() const state = @@ -64,6 +64,7 @@ Row.propTypes = { className: PropTypes.string, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'ServiceTemplateRow' diff --git a/src/fireedge/src/client/components/Tables/Services/row.js b/src/fireedge/src/client/components/Tables/Services/row.js index d82cc87a29..b865132287 100644 --- a/src/fireedge/src/client/components/Tables/Services/row.js +++ b/src/fireedge/src/client/components/Tables/Services/row.js @@ -20,7 +20,7 @@ import { ServiceCard } from 'client/components/Cards' import serviceApi from 'client/features/OneApi/service' const Row = memo( - ({ original, value, headerList, ...props }) => { + ({ original, value, headerList, rowDataCy, ...props }) => { const state = serviceApi.endpoints.getServices.useQueryState(undefined, { selectFromResult: ({ data = [] }) => data.find((service) => +service.ID === +original.ID), @@ -40,6 +40,7 @@ Row.propTypes = { className: PropTypes.string, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'ServiceRow' diff --git a/src/fireedge/src/client/components/Tables/Support/row.js b/src/fireedge/src/client/components/Tables/Support/row.js index db55127a33..3aea1f1bd4 100644 --- a/src/fireedge/src/client/components/Tables/Support/row.js +++ b/src/fireedge/src/client/components/Tables/Support/row.js @@ -19,7 +19,7 @@ import { memo } from 'react' import { SupportCard } from 'client/components/Cards' const Row = memo( - ({ original, value, headerList, ...props }) => ( + ({ original, value, headerList, rowDataCy, ...props }) => ( ), (prev, next) => prev.className === next.className @@ -32,6 +32,7 @@ Row.propTypes = { className: PropTypes.string, onClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'SupportRow' diff --git a/src/fireedge/src/client/components/Tables/Users/row.js b/src/fireedge/src/client/components/Tables/Users/row.js index 8fa10525ed..1d7f7bd689 100644 --- a/src/fireedge/src/client/components/Tables/Users/row.js +++ b/src/fireedge/src/client/components/Tables/Users/row.js @@ -18,7 +18,7 @@ import PropTypes from 'prop-types' import { UserCard } from 'client/components/Cards' -const Row = ({ original, value, headerList, ...props }) => ( +const Row = ({ original, value, headerList, rowDataCy, ...props }) => ( ) @@ -28,6 +28,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js b/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js index ea37609c72..e30b7698ce 100644 --- a/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js +++ b/src/fireedge/src/client/components/Tables/VNetworkTemplates/row.js @@ -25,7 +25,7 @@ import { T } from 'client/constants' import * as Helper from 'client/models/Helper' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, NAME, UNAME, GNAME, LOCK, REGTIME, PROVISION_ID } = value @@ -69,6 +69,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/VNetworks/row.js b/src/fireedge/src/client/components/Tables/VNetworks/row.js index 565c6b8714..e0207c19c7 100644 --- a/src/fireedge/src/client/components/Tables/VNetworks/row.js +++ b/src/fireedge/src/client/components/Tables/VNetworks/row.js @@ -21,7 +21,7 @@ import { NetworkCard } from 'client/components/Cards' import api, { useUpdateVNetMutation } from 'client/features/OneApi/network' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateVNetMutation() const { data: vnetworks, @@ -70,6 +70,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VirtualNetworkRow' diff --git a/src/fireedge/src/client/components/Tables/VRouterTemplates/row.js b/src/fireedge/src/client/components/Tables/VRouterTemplates/row.js index b4b86b938c..15fdcfbac2 100644 --- a/src/fireedge/src/client/components/Tables/VRouterTemplates/row.js +++ b/src/fireedge/src/client/components/Tables/VRouterTemplates/row.js @@ -23,7 +23,7 @@ import vrouterTemplatesApi, { import { jsonToXml } from 'client/models/Helper' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateTemplateMutation() const state = @@ -69,6 +69,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VRouterTemplateRow' diff --git a/src/fireedge/src/client/components/Tables/VRouters/row.js b/src/fireedge/src/client/components/Tables/VRouters/row.js index d400959185..2da2a61d7a 100644 --- a/src/fireedge/src/client/components/Tables/VRouters/row.js +++ b/src/fireedge/src/client/components/Tables/VRouters/row.js @@ -24,7 +24,7 @@ import { rowStyles } from 'client/components/Tables/styles' import { Tr } from 'client/components/HOC' import { T } from 'client/constants' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, NAME, UNAME, GNAME, VMS, TEMPLATE_ID } = value @@ -66,6 +66,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/VirtualDataCenters/row.js b/src/fireedge/src/client/components/Tables/VirtualDataCenters/row.js index 2884213df5..842fd1d1cb 100644 --- a/src/fireedge/src/client/components/Tables/VirtualDataCenters/row.js +++ b/src/fireedge/src/client/components/Tables/VirtualDataCenters/row.js @@ -21,7 +21,7 @@ import vdcApi, { useUpdateVDCMutation } from 'client/features/OneApi/vdc' import { jsonToXml } from 'client/models/Helper' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateVDCMutation() const state = vdcApi.endpoints.getVDCs.useQueryState(undefined, { @@ -63,6 +63,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VirtualDataCenterRow' diff --git a/src/fireedge/src/client/components/Tables/VmDisks/row.js b/src/fireedge/src/client/components/Tables/VmDisks/row.js index 3fd155099e..dcc77fedbf 100644 --- a/src/fireedge/src/client/components/Tables/VmDisks/row.js +++ b/src/fireedge/src/client/components/Tables/VmDisks/row.js @@ -19,7 +19,7 @@ import { memo, useMemo } from 'react' import { DiskCard } from 'client/components/Cards' const Row = memo( - ({ original, value, headerList, ...props }) => { + ({ original, value, headerList, rowDataCy, ...props }) => { const memoDisk = useMemo(() => original, [original]) return @@ -34,6 +34,7 @@ Row.propTypes = { className: PropTypes.string, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VmDiskRow' diff --git a/src/fireedge/src/client/components/Tables/VmGroups/row.js b/src/fireedge/src/client/components/Tables/VmGroups/row.js index b533cadf84..871758353e 100644 --- a/src/fireedge/src/client/components/Tables/VmGroups/row.js +++ b/src/fireedge/src/client/components/Tables/VmGroups/row.js @@ -18,7 +18,7 @@ import PropTypes from 'prop-types' import { VmGroupCard } from 'client/components/Cards' -const Row = ({ original, value, headerList, ...props }) => ( +const Row = ({ original, value, headerList, rowDataCy, ...props }) => ( ) @@ -28,6 +28,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row diff --git a/src/fireedge/src/client/components/Tables/VmTemplates/row.js b/src/fireedge/src/client/components/Tables/VmTemplates/row.js index f354585a5f..faff40a1e8 100644 --- a/src/fireedge/src/client/components/Tables/VmTemplates/row.js +++ b/src/fireedge/src/client/components/Tables/VmTemplates/row.js @@ -23,7 +23,7 @@ import vmTemplateApi, { import { jsonToXml } from 'client/models/Helper' const Row = memo( - ({ original, value, onClickLabel, headerList, ...props }) => { + ({ original, value, onClickLabel, headerList, rowDataCy, ...props }) => { const [update] = useUpdateTemplateMutation() const state = vmTemplateApi.endpoints.getTemplates.useQueryState( @@ -68,6 +68,7 @@ Row.propTypes = { onClick: PropTypes.func, onClickLabel: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VmTemplateRow' diff --git a/src/fireedge/src/client/components/Tables/Vms/row.js b/src/fireedge/src/client/components/Tables/Vms/row.js index 4f0da2127a..c8527a5fc5 100644 --- a/src/fireedge/src/client/components/Tables/Vms/row.js +++ b/src/fireedge/src/client/components/Tables/Vms/row.js @@ -26,7 +26,15 @@ const { VNC, RDP, SSH, VMRC } = VM_ACTIONS const CONNECTION_TYPES = [VNC, RDP, SSH, VMRC] const Row = memo( - ({ original, value, onClickLabel, globalErrors, headerList, ...props }) => { + ({ + original, + value, + onClickLabel, + globalErrors, + headerList, + rowDataCy, + ...props + }) => { const [update] = useUpdateUserTemplateMutation() const state = vmApi.endpoints.getVms.useQueryState( @@ -84,6 +92,7 @@ Row.propTypes = { onClickLabel: PropTypes.func, globalErrors: PropTypes.array, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'VirtualMachineRow' diff --git a/src/fireedge/src/client/components/Tables/Wilds/row.js b/src/fireedge/src/client/components/Tables/Wilds/row.js index d2041a5457..2318383683 100644 --- a/src/fireedge/src/client/components/Tables/Wilds/row.js +++ b/src/fireedge/src/client/components/Tables/Wilds/row.js @@ -28,7 +28,7 @@ import { Row as RowType } from 'react-table' * @param {Function} props.handleClick - Action by click * @returns {ReactElement} - Table row */ -const Row = memo(({ original, headerList, ...props }) => { +const Row = memo(({ original, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { DEPLOY_ID, VM_NAME } = original @@ -53,6 +53,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'WildsRow' diff --git a/src/fireedge/src/client/components/Tables/Zombies/row.js b/src/fireedge/src/client/components/Tables/Zombies/row.js index 8b142f7bf7..52c09bd9e6 100644 --- a/src/fireedge/src/client/components/Tables/Zombies/row.js +++ b/src/fireedge/src/client/components/Tables/Zombies/row.js @@ -28,7 +28,7 @@ import { Row as RowType } from 'react-table' * @param {Function} props.handleClick - Action by click * @returns {ReactElement} - Table row */ -const Row = memo(({ original, headerList, ...props }) => { +const Row = memo(({ original, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { DEPLOY_ID, VM_NAME } = original @@ -50,6 +50,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } Row.displayName = 'ZombiesRow' diff --git a/src/fireedge/src/client/components/Tables/Zones/row.js b/src/fireedge/src/client/components/Tables/Zones/row.js index 0058c4ae70..7a0563b0ae 100644 --- a/src/fireedge/src/client/components/Tables/Zones/row.js +++ b/src/fireedge/src/client/components/Tables/Zones/row.js @@ -25,7 +25,7 @@ import { HomeShield } from 'iconoir-react' import * as ZoneModel from 'client/models/Zone' -const Row = ({ original, value, headerList, ...props }) => { +const Row = ({ original, value, headerList, rowDataCy, ...props }) => { const classes = rowStyles() const { ID, NAME, ENDPOINT } = value @@ -58,6 +58,7 @@ Row.propTypes = { isSelected: PropTypes.bool, handleClick: PropTypes.func, headerList: PropTypes.oneOfType([PropTypes.array, PropTypes.bool]), + rowDataCy: PropTypes.string, } export default Row