Revert "Fix linting issues (7) — prefer-destructuring"

This reverts commit 2006fc8.

Author: axelboc

Diff for: ui/eslint.config.js

@@ -8,6 +8,7 @@ const config = defineConfig([
   ...createConfig(opts),
   {
     rules: {
+      'prefer-destructuring': 'off',
       'jsx-a11y/anchor-is-valid': 'off',
       'jsx-a11y/control-has-associated-label': 'off',
       'promise/always-return': 'off',

Diff for: ui/src/actions/sampleview.js

@@ -230,7 +230,7 @@ export function addShape(shapeData = {}, successCb = null) {
   return async (dispatch) => {
     try {
       const json = await sendAddOrUpdateShapes([shapeData]);
-      const [shape] = json.shapes;
+      const shape = json.shapes[0];
       dispatch(addShapeAction(shape));
 
       if (successCb) {

Diff for: ui/src/components/PeriodicTable/PeriodicTable.jsx

@@ -12,7 +12,7 @@ export default class PeriodicTable extends React.Component {
   onClickHandler(e) {
     if (e.target.id) {
       const el = document.querySelector(`#${this.state.selectedElement}`);
-      const [cell] = e.target.children;
+      const cell = e.target.children[0];
 
       if (el) {
         el.children[0].className = styles.element;

Diff for: ui/src/components/SSXChip/SSXChip.jsx

@@ -328,16 +328,20 @@ export default class SSXChip extends React.Component {
   initChipCanvas() {
     const currentChipLayout =
       this.props.chipLayoutList[this.props.currentLayoutName];
-    const [chipConfig] = currentChipLayout.sections;
+    const chipConfig = currentChipLayout.sections[0];
 
     const numRows = chipConfig.number_of_rows;
     const numCols = chipConfig.number_of_collumns;
-    const [blockSizeX, blockSizeY] = chipConfig.block_size;
+    const blockSizeX = chipConfig.block_size[0];
+    const blockSizeY = chipConfig.block_size[0];
     const rowLabels = chipConfig.row_labels;
     const colLabels = chipConfig.column_lables;
 
-    const [offset, spacing] = chipConfig.block_spacing;
-    const [numTargetsX, numTargetsY] = chipConfig.targets_per_block;
+    const offset = chipConfig.block_spacing[0];
+    const spacing = chipConfig.block_spacing[0];
+
+    const numTargetsX = chipConfig.targets_per_block[0];
+    const numTargetsY = chipConfig.targets_per_block[1];
 
     const canvasWidth = numCols * (blockSizeX + spacing) + offset + blockSizeX;
     const canvasHeight = numRows * (blockSizeY + spacing) + offset + blockSizeY;

Diff for: ui/src/components/SampleQueue/CharacterisationTaskItem.jsx

@@ -88,7 +88,7 @@ export default class TaskItem extends Component {
     if (tasks.length <= 1) {
       delete data.diffractionPlan[0].run_number;
       delete data.diffractionPlan[0].sampleID;
-      const [{ type, parameters }] = data.diffractionPlan;
+      const { type, parameters } = data.diffractionPlan[0];
 
       this.props.showForm(
         type,

Diff for: ui/src/components/SampleView/shapes.js

@@ -432,7 +432,8 @@ export function makeImageOverlay(iR, ppMm, bP, bSh, bSi, cCP, dP, canvas) {
     imageOverlay.push(...makeCross(point, iR, canvas.width, canvas.height));
   }
   if (dP.length === 2) {
-    const [point1, point2] = dP;
+    const point1 = dP[0];
+    const point2 = dP[1];
     imageOverlay.push(...makeDistanceLine(point1, point2, iR, ppMm, 'red', 2));
   }
   return imageOverlay;

Diff for: ui/src/components/Tasks/validate.js

@@ -65,7 +65,8 @@ function validate(values, props) {
   }
 
   if (props.acqParametersLimits.exposure_time) {
-    const [exptimemin, exptimemax] = props.acqParametersLimits.exposure_time;
+    const exptimemin = props.acqParametersLimits.exposure_time[0];
+    const exptimemax = props.acqParametersLimits.exposure_time[1];
     if (
       values.exp_time === '' ||
       Number.parseFloat(values.exp_time, 10) > exptimemax ||

Diff for: ui/src/containers/ConfirmCollectDialog.jsx

@@ -303,14 +303,14 @@ export class ConfirmCollectDialog extends React.Component {
             </thead>
             <tbody id="table-body">
               {tasks.map((task) => {
-                const { parameters } =
-                  task.type === 'Interleaved'
-                    ? task.parameters.wedges[0]
-                    : task;
-
+                let { parameters } = task;
                 const sample = this.props.sampleGrid.sampleList[task.sampleID];
                 const sampleName = `${sample.sampleName} - ${sample.proteinAcronym}`;
 
+                if (task.type === 'Interleaved') {
+                  parameters = task.parameters.wedges[0].parameters;
+                }
+
                 return (
                   <OverlayTrigger
                     key={task.queueID}

Diff for: ui/src/containers/GphlWorkflowParametersDialog.jsx

@@ -91,8 +91,8 @@ function GphlWorkflowParametersDialog(props) {
       dataDict[key] = removeExtraDecimal(value.default, value.type);
     });
     if (formData.ui_schema.indexing_solution) {
-      const [initIndex] =
-        formData.ui_schema.indexing_solution[uiOptions].select_cell;
+      const initIndex =
+        formData.ui_schema.indexing_solution[uiOptions].select_cell[0];
       setSelected([initIndex]);
       dataDict.indexing_solution =
         formData.ui_schema.indexing_solution[uiOptions].content[0][initIndex];

Diff for: ui/src/containers/SampleGridTableContainer.jsx

@@ -434,7 +434,7 @@ class SampleGridTableContainer extends React.Component {
       this.props.showGenericContextMenu(true, contextMenuID, e.pageX, e.pageY);
     }
 
-    const [selectedList] = this.getSampleListFilteredByCellPuck(cell, puck);
+    const selectedList = this.getSampleListFilteredByCellPuck(cell, puck)[0];
 
     this.sampleGridItemsSelectedHandler(e, selectedList);
     e.stopPropagation();
@@ -443,9 +443,11 @@ class SampleGridTableContainer extends React.Component {
   renderItemsControls(cell, puck) {
     let icon = <BsSquare size="0.9em" />;
     let pickSample = true;
-
     const filterList = this.getSampleListFilteredByCellPuck(cell, puck);
-    const [allPuckSample, allPuckSampleCheck, puckCode] = filterList;
+
+    const allPuckSample = filterList[0];
+    const allPuckSampleCheck = filterList[1];
+    const puckCode = filterList[2];
 
     if (allPuckSample.length === allPuckSampleCheck.length) {
       icon = <BsCheck2Square size="0.9em" />;