eslint fixes

Martin Anderson-Clutzrequested to merge
issue/color_field-3607054:3607054-resolve-eslint-issues into 3.1.x

Closes #3607054

Merge request reports