diff --git a/ui/.eslintrc.js b/ui/.eslintrc.js
index cc3a24467..80ade81c3 100644
--- a/ui/.eslintrc.js
+++ b/ui/.eslintrc.js
@@ -14,6 +14,7 @@ module.exports = createConfig({
incrementalAdoption: true, // turn everything into a warning
rules: {
'unicorn/consistent-destructuring': 'off', // too many failures in React class components
+ 'promise/catch-or-return': 'off', // requires deeper refactoring of fetching layer
// Ternaries are sometimes more readable when `true` branch is most significant branch
'no-negated-condition': 'off',
@@ -37,8 +38,12 @@ module.exports = createConfig({
createReactOverride({
...dependencies,
rules: {
+ 'react/no-unsafe': 'off', // requires non-trivial refactoring
'react/destructuring-assignment': 'off', // too many failures in React class components
'react/jsx-no-constructed-context-values': 'off', // too strict
+ 'react/static-property-placement': 'off', // will not be relevant after converting to functional components
+ 'jsx-a11y/anchor-is-valid': 'off', // requires non-trivial refactoring
+ 'jsx-a11y/no-static-element-interactions': 'off', // requires non-trivial refactoring
},
}),
createJestOverride({
diff --git a/ui/src/components/BeamlineCamera/BeamlineCamera.jsx b/ui/src/components/BeamlineCamera/BeamlineCamera.jsx
index a391c369c..c7e4c526e 100644
--- a/ui/src/components/BeamlineCamera/BeamlineCamera.jsx
+++ b/ui/src/components/BeamlineCamera/BeamlineCamera.jsx
@@ -65,7 +65,7 @@ const BeamlineCamera = ({
const video = (
{format != 'mp4' ? (
-
@@ -492,7 +492,7 @@ class PlateManipulator extends React.Component {
if (this.props.contents.children !== null) {
if (plate.type === 'square') {
cell = (
-
diff --git a/ui/src/components/Equipment/SampleChanger.js b/ui/src/components/Equipment/SampleChanger.js
index 41d572681..77c1aca33 100644
--- a/ui/src/components/Equipment/SampleChanger.js
+++ b/ui/src/components/Equipment/SampleChanger.js
@@ -72,7 +72,7 @@ export class SampleChangerTreeNode extends React.Component {
}
treeNodeCbxClick(e) {
- const treeNodeIcon = document.getElementById(`${e.target.id}icon`);
+ const treeNodeIcon = document.querySelector(`#${e.target.id}icon`);
if (treeNodeIcon) {
if (e.target.checked) {
treeNodeIcon.className = 'fa fa-minus';
@@ -116,6 +116,7 @@ export class SampleChangerTreeNode extends React.Component {
@@ -190,7 +190,7 @@ export class TaskItem extends React.Component {
} else if (!isUnCollected(task)) {
content = (
- Fetching data, please wait
+ Fetching data, please wait
);
}
diff --git a/ui/src/components/SampleQueue/QueueControl.js b/ui/src/components/SampleQueue/QueueControl.js
index 450bde274..b8a052c05 100644
--- a/ui/src/components/SampleQueue/QueueControl.js
+++ b/ui/src/components/SampleQueue/QueueControl.js
@@ -119,21 +119,7 @@ export default class QueueControl extends React.Component {
}
}
- renderSampleOptions(option) {
- return (
-
- );
- }
-
- renderOptions(option) {
+ renderOption(option) {
return (