Skip to content

Commit

Permalink
Fix/remove indices from test ids (#42)
Browse files Browse the repository at this point in the history 
* fix: remove indices from tests ids

* fix: add test ids to tables and individual cells in profiles, groups and inventory
  • Loading branch information
@wojtekzyla
wojtekzyla committed Aug 14, 2023
1 parent 401193a commit b954c4e
Show file tree
Hide file tree
Showing 12 changed files with 201 additions and 201 deletions.
26 changes: 13 additions & 13 deletions frontend/packages/manager/src/components/groups/AddDeviceModal.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import Button from '@splunk/react-ui/Button';
import Modal from '@splunk/react-ui/Modal';
import Select from '@splunk/react-ui/Select';
import Text from '@splunk/react-ui/Text';
import GroupContext from "../../store/group-contxt";
import axios from "axios";
import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
import InventoryDevicesValidationContxt from "../../store/inventory-devices-validation-contxt";
import { createDOMID } from '@splunk/ui-utils/id';
import P from '@splunk/react-ui/Paragraph';
import GroupContext from "../../store/group-contxt";
import validateInventoryAndGroup from "../validation/ValidateInventoryAndGroup";
import InventoryDevicesValidationContxt from "../../store/inventory-devices-validation-contxt";
import { validationMessage } from "../../styles/ValidationStyles";
import { backendHost } from "../../host";
import { StyledControlGroup, StyledModalBody, StyledModalHeader } from "../../styles/inventory/InventoryStyle";
Expand Down Expand Up @@ -124,14 +124,14 @@ function AddDeviceModal(){
<StyledModalBody>
<StyledControlGroup labelWidth={140} label="IP address">
<ValidationGroup>
<Text data-test='sc4snmp:form:ip-input' value={GrCtx.address} onChange={handleChangeAddress} error={((ValCtx.addressErrors) ? true : false)}/>
{((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el, i) => <P data-test={`sc4snmp:ip-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
<Text data-test='sc4snmp:form:ip-input' value={GrCtx.address} onChange={handleChangeAddress} error={(!!(ValCtx.addressErrors))}/>
{((ValCtx.addressErrors) ? ValCtx.addressErrors.map((el) => <P data-test="sc4snmp:ip-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</StyledControlGroup>
<StyledControlGroup labelWidth={140} label="Port" >
<ValidationGroup>
<Text data-test="sc4snmp:form:port-input" value={GrCtx.port} onChange={handleChangePort} error={((ValCtx.portErrors) ? true : false)}/>
{((ValCtx.portErrors) ? ValCtx.portErrors.map((el, i) => <P data-test={`sc4snmp:port-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
<Text data-test="sc4snmp:form:port-input" value={GrCtx.port} onChange={handleChangePort} error={(!!(ValCtx.portErrors))}/>
{((ValCtx.portErrors) ? ValCtx.portErrors.map((el) => <P data-test="sc4snmp:port-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</StyledControlGroup>

Expand All @@ -150,22 +150,22 @@ function AddDeviceModal(){

<StyledControlGroup labelWidth={140} label="Community">
<ValidationGroup>
<Text data-test="sc4snmp:form:community-input" value={GrCtx.community} onChange={handleChangeCommunity} error={((ValCtx.communityErrors) ? true : false)}/>
{((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el, i) => <P data-test={`sc4snmp:community-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
<Text data-test="sc4snmp:form:community-input" value={GrCtx.community} onChange={handleChangeCommunity} error={(!!(ValCtx.communityErrors))}/>
{((ValCtx.communityErrors) ? ValCtx.communityErrors.map((el) => <P data-test="sc4snmp:community-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</StyledControlGroup>

<StyledControlGroup labelWidth={140} label="Secret">
<ValidationGroup>
<Text data-test="sc4snmp:form:secret-input" value={GrCtx.secret} onChange={handleChangeSecret} error={((ValCtx.secretErrors) ? true : false)}/>
{((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el, i) => <P data-test={`sc4snmp:secret-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
<Text data-test="sc4snmp:form:secret-input" value={GrCtx.secret} onChange={handleChangeSecret} error={(!!(ValCtx.secretErrors))}/>
{((ValCtx.secretErrors) ? ValCtx.secretErrors.map((el) => <P data-test="sc4snmp:secret-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</StyledControlGroup>

<StyledControlGroup labelWidth={140} label="Security Engine">
<ValidationGroup>
<Text data-test="sc4snmp:form:security-engine-input" value={GrCtx.securityEngine} onChange={handleChangeSecurityEngine} error={((ValCtx.securityEngineErrors) ? true : false)}/>
{((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el, i) => <P data-test={`sc4snmp:security-engine-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
<Text data-test="sc4snmp:form:security-engine-input" value={GrCtx.securityEngine} onChange={handleChangeSecurityEngine} error={(!!(ValCtx.securityEngineErrors))}/>
{((ValCtx.securityEngineErrors) ? ValCtx.securityEngineErrors.map((el) => <P data-test="sc4snmp:security-engine-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</StyledControlGroup>

Expand Down
2 changes: 1 addition & 1 deletion frontend/packages/manager/src/components/groups/AddGroupModal.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function AddGroupModal() {
<ControlGroup label="Group Name">
<ValidationGroup>
<Text data-test="sc4snmp:form:group-name-input" value={GrCtx.groupName} onChange={handleGroupNameChange} error={(!!(ValCtx.groupNameErrors))}/>
{((ValCtx.groupNameErrors) ? ValCtx.groupNameErrors.map((el, i) => <P data-test={`sc4snmp:group-name-error-${i}`} key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
{((ValCtx.groupNameErrors) ? ValCtx.groupNameErrors.map((el) => <P data-test="sc4snmp:group-name-error" key={createDOMID()} style={validationMessage}>{el}</P>) : <P/>)}
</ValidationGroup>
</ControlGroup>
</Modal.Body>
Expand Down
42 changes: 21 additions & 21 deletions frontend/packages/manager/src/components/groups/GroupsList.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,15 +224,15 @@ function GroupsList() {
}
};

const groupsList = groups.map((group, i) => (
<SingleGroup data-test={`sc4snmp:group-${i}`} onClick={(event) => (clickGroupHandler(event, group._id, group.groupName, 1))} style={{ backgroundColor: (selectedGroup[group._id]) ? "#E1E6EB" : "#FFFFF" }} key={createDOMID()}>
const groupsList = groups.map((group) => (
<SingleGroup data-test="sc4snmp:group" onClick={(event) => (clickGroupHandler(event, group._id, group.groupName, 1))} style={{ backgroundColor: (selectedGroup[group._id]) ? "#E1E6EB" : "#FFFFF" }} key={createDOMID()}>
<P>
{group.groupName}
</P>
<div>
<Button data-test={`sc4snmp:group-${i}:new-device-button`} style={{ margin: "0" }} onClick={() => (newDevicenHandler(group._id, group.groupName))} appearance="pill" icon={<Plus />} />
<Button data-test={`sc4snmp:group-${i}:edit-group-button`} style={{ margin: "0" }} onClick={() => (editGroupHandler(group._id, group.groupName))} appearance="pill" icon={<Pencil />} />
<Button data-test={`sc4snmp:group-${i}:delete-group-button`} style={{ margin: "0" }} onClick={() => (groupDeleteHandler(group._id, group.groupName, group.groupInInventory))} appearance="pill" icon={<Trash />} />
<Button data-test="sc4snmp:group:new-device-button" style={{ margin: "0" }} onClick={() => (newDevicenHandler(group._id, group.groupName))} appearance="pill" icon={<Plus />} />
<Button data-test="sc4snmp:group:edit-group-button" style={{ margin: "0" }} onClick={() => (editGroupHandler(group._id, group.groupName))} appearance="pill" icon={<Pencil />} />
<Button data-test="sc4snmp:group:delete-group-button" style={{ margin: "0" }} onClick={() => (groupDeleteHandler(group._id, group.groupName, group.groupInInventory))} appearance="pill" icon={<Trash />} />
</div>
</SingleGroup>
));
Expand All @@ -255,10 +255,10 @@ function GroupsList() {
<Select data-test="sc4snmp:group-pagination" appearance="pill" suffixLabel="group items per page"
value={devicesPerPage} onChange={devicesPerPageHandler}
defaultValue="20">
<Select.Option data-test="sc4snmp:group-pagination-10" label="10" value="10" />
<Select.Option data-test="sc4snmp:group-pagination-20" label="20" value="20" />
<Select.Option data-test="sc4snmp:group-pagination-50" label="50" value="50" />
<Select.Option data-test="sc4snmp:group-pagination-100" label="100" value="100" />
<Select.Option data-test="sc4snmp:group-pagination-option" label="10" value="10" />
<Select.Option data-test="sc4snmp:group-pagination-option" label="20" value="20" />
<Select.Option data-test="sc4snmp:group-pagination-option" label="50" value="50" />
<Select.Option data-test="sc4snmp:group-pagination-option" label="100" value="100" />
</Select>
<Paginator
onChange={(event, { page }) => (paginationHandler(page, openedGroupId))}
Expand All @@ -267,7 +267,7 @@ function GroupsList() {
totalPages={totalPages}
/>
</Pagination>
<Table stripeRows resizableFillLayout>
<Table data-test="sc4snmp:group-table" stripeRows resizableFillLayout>
<Table.Head>
{columns.map((headData) => (
<Table.HeadCell key={createDOMID()} width={headData.label === "Actions" ? 100 : "auto"}>
Expand All @@ -277,17 +277,17 @@ function GroupsList() {
</Table.Head>
<Table.Body>
{GrCtx.devices
.map((row, i) => (
<Table.Row data-test={`sc4snmp:group-row-${i}`} key={createDOMID()} >
<Table.Cell>{row.address}</Table.Cell>
<Table.Cell>{(row.port === '') ? GrCtx.inventoryConfig.port : row.port}</Table.Cell>
<Table.Cell>{(row.version === '') ? GrCtx.inventoryConfig.version : row.version}</Table.Cell>
<Table.Cell>{(row.community === '') ? GrCtx.inventoryConfig.community : row.community}</Table.Cell>
<Table.Cell>{(row.secret === '') ? GrCtx.inventoryConfig.secret : row.secret}</Table.Cell>
<Table.Cell>{(row.securityEngine === '') ? GrCtx.inventoryConfig.securityEngine : row.securityEngine}</Table.Cell>
<Table.Cell>
<Button data-test={`sc4snmp:group-row-edit-${i}`} onClick={() => deviceEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
<Button data-test={`sc4snmp:group-row-delete-${i}`} onClick={() => deviceDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
.map((row) => (
<Table.Row data-test="sc4snmp:group-row" key={createDOMID()} >
<Table.Cell data-test="sc4snmp:host-address" >{row.address}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-port" >{(row.port === '') ? GrCtx.inventoryConfig.port : row.port}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-version" >{(row.version === '') ? GrCtx.inventoryConfig.version : row.version}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-community" >{(row.community === '') ? GrCtx.inventoryConfig.community : row.community}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-secret" >{(row.secret === '') ? GrCtx.inventoryConfig.secret : row.secret}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-security-engine" >{(row.securityEngine === '') ? GrCtx.inventoryConfig.securityEngine : row.securityEngine}</Table.Cell>
<Table.Cell data-test="sc4snmp:host-actions" >
<Button data-test="sc4snmp:group-row-edit" onClick={() => deviceEditHandler(JSON.parse(JSON.stringify(row)))} icon={<Pencil />} />
<Button data-test="sc4snmp:group-row-delete" onClick={() => deviceDeleteHandler(JSON.parse(JSON.stringify(row)))} icon={<Trash />} />
</Table.Cell>
</Table.Row>
))}
Expand Down
Loading

0 comments on commit b954c4e

Please sign in to comment.