Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Addressed the linting errors in your JSX files related to accessibility #165

Merged
merged 2 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion frontend/src/components/contents/presentations/Editor.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const Editor = ({
size="lg"
/>
</button> */}
<button className={command ? 'btn show-eraser' : 'btn hide-eraser'} type="button" id="eraser" onDoubleClick={() => clearCommand()}>
<button className={command ? 'btn show-eraser' : 'btn hide-eraser'} type="button" id="eraser" onDoubleClick={() => clearCommand()} aria-label="Clear Command">
<FontAwesomeIcon
icon={faTimesCircle}
size="1x"
Expand All @@ -171,6 +171,7 @@ const Editor = ({
type="button"
onClick={() => onClick()}
title="Run Query"
aria-label="Run Query"
>
<IconPlay />
</button>
Expand All @@ -190,6 +191,7 @@ const Editor = ({
} */
}}
title={(isActive) ? 'Hide' : 'Show'}
aria-label="toggleMenu"
>
<SideBarToggle isActive={isActive} />
</button>
Expand All @@ -198,6 +200,7 @@ const Editor = ({
type="button"
onClick={() => setLabel()}
title="Run Query"
aria-label="Run Query"
>
<FontAwesomeIcon
icon={isLabel ? faToggleOn : faToggleOff}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,15 @@ const CypherResultCytoscape = forwardRef((props, ref) => {
setLegendData(addedLegendData);
props.setChartLegend(addedLegendData);
};

const changeColorOnCytoscapeElements = (elementType, label, color) => {
const truncateLabel = (label) => {
const maxLenEnglish = 8;
const maxLenKorean = 6;
const koreanCharRegex = /[\u3131-\uD79D]/ugi;
const maxLength = koreanCharRegex.test(label) ? maxLenKorean : maxLenEnglish;
return label.length > maxLength ? `${label.substring(0, maxLength)}...` : label;
};
const changeColorOnCytoscapeElements = (elementType, originalLabel, color) => {
const label = truncateLabel(originalLabel);
const colorObject = Array.isArray(color) ? {
color: color[0],
borderColor: color[1],
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/components/cytoscape/CypherResultCytoscapeChart.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import {
faLockOpen,
faProjectDiagram,
faTrash,
faThumbtack,
} from '@fortawesome/free-solid-svg-icons';
import uuid from 'react-uuid';
import cxtmenu from '../../lib/cytoscape-cxtmenu';
Expand Down Expand Up @@ -243,6 +244,18 @@ const CypherResultCytoscapeCharts = ({
dispatch(addElementHistory(ele.id()));
},
},
{
content: ReactDOMServer.renderToString(
<FontAwesomeIcon icon={faThumbtack} size="lg" />,
),
select(ele) {
if (!ele.locked()) {
ele.lock();
} else {
ele.unlock();
}
},
},
{
content: ReactDOMServer.renderToString(<IconFilter size="lg" />),
select(ele) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className="frame-head-button btn btn-link px-3"
onClick={() => setFooterExpanded(!footerExpanded)}
aria-label="Set Footer Expanded"
>
<FontAwesomeIcon
icon={footerExpanded ? faAngleUp : faAngleDown}
Expand Down Expand Up @@ -170,6 +171,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className={`btn sizeSelector node ${footerData.data.size >= nodeSize ? ' selectedSize ' : ''}`}
style={{ width: `${size}px`, height: `${size}px` }}
aria-label="Update NodeLabel Size"
>
&nbsp;
</button>
Expand All @@ -186,6 +188,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className={`btn sizeSelector edge ${footerData.data.size >= edgeSize ? ' selectedSize ' : ''}`}
style={{ width: `${size + 18}px`, height: `${size}px` }}
aria-label="Update Edge Label Size"
>
&nbsp;
</button>
Expand All @@ -212,6 +215,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className={`btn colorSelector ${footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''}`}
style={{ backgroundColor: color.color }}
aria-label="Update Label Color"
>
&nbsp;
</button>
Expand All @@ -227,6 +231,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className={`btn colorSelector ${footerData.data.backgroundColor === color.color ? ' selectedColor ' : ''}`}
style={{ backgroundColor: color.color }}
aria-label="Update Label Color"
>
&nbsp;
</button>
Expand Down Expand Up @@ -293,6 +298,7 @@ const CypherResultCytoscapeFooter = ({
type="button"
className="frame-head-button btn btn-link px-3"
onClick={() => setFooterExpanded(!footerExpanded)}
aria-label="Set Footer Expanded"
>
<FontAwesomeIcon
icon={footerExpanded ? faAngleUp : faAngleDown}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ class CypherResultCytoscapeLegend extends Component {
type="button"
className="frame-head-button btn btn-link px-3"
onClick={() => this.setState({ nodeLegendExpanded: !nodeLegendExpanded })}
aria-label="Node Legend"
>
<FontAwesomeIcon
icon={nodeLegendExpanded ? faAngleUp : faAngleDown}
Expand All @@ -196,6 +197,7 @@ class CypherResultCytoscapeLegend extends Component {
type="button"
className="frame-head-button btn btn-link px-3"
onClick={() => this.setState({ edgeLegendExpanded: !edgeLegendExpanded })}
aria-label="Edge Legend"
>
<FontAwesomeIcon
icon={edgeLegendExpanded ? faAngleUp : faAngleDown}
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/components/sidebar/presentations/SidebarHome.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,7 @@ const SidebarHome = ({
className="frame-head-button refresh_button btn btn-link"
type="button"
onClick={() => refreshSidebarHome()}
aria-label="Refresh Button"
>
<FontAwesomeIcon
icon={faRedo}
Expand All @@ -456,6 +457,7 @@ const SidebarHome = ({
return false;
},
})}
aria-label="Close Button"
>
<FontAwesomeIcon
icon={faTimes}
Expand Down
Loading