Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
a03cd5d
Formatted test and config code and updated test files
droberts-ctrlo Jul 16, 2025
4d03162
Added editorconfig and upgraded ESLint to current version
droberts-ctrlo Jul 17, 2025
047bf3a
Formatted and changed code with ESLint fixes - functionality has not …
droberts-ctrlo Jul 17, 2025
b2574ca
Removed cjs from eslint - cjs are used for internal development files…
droberts-ctrlo Jul 17, 2025
936d49e
Created and updated JSDoc and TS typings where necessary
droberts-ctrlo Jul 25, 2025
f72fb54
Updated linting rules, and added comments where required
droberts-ctrlo Jul 29, 2025
cfa4a63
Updated documentation
droberts-ctrlo Jul 29, 2025
f32e850
Removed deprecated code and created some abstractions
droberts-ctrlo Jul 30, 2025
e65c462
Upgraded packages and set up new webpack config
droberts-ctrlo Jul 31, 2025
6246ac0
Merge branch 'dev' into js-formatting
droberts-ctrlo Aug 4, 2025
8b17ea8
Fixed formatting and code where this was broken on merge with current…
droberts-ctrlo Aug 4, 2025
ac965c6
Updated files due to merge issues
droberts-ctrlo Aug 4, 2025
37e2df5
Merge branch 'jsdoc' into js-refactor
droberts-ctrlo Aug 4, 2025
e98ffdf
Merge branch 'js-refactor' into upgrade-packages
droberts-ctrlo Aug 4, 2025
85e8d3a
Added fix for error on documentComponent
droberts-ctrlo Aug 4, 2025
4840ab1
Merge branch 'jsdoc' into js-refactor
droberts-ctrlo Aug 4, 2025
83d8709
Merge branch 'js-refactor' into upgrade-packages
droberts-ctrlo Aug 4, 2025
36de210
Fixed errors not found during initial upgrade
droberts-ctrlo Aug 4, 2025
4bb3718
Updated package.json to remove extra dependencies
droberts-ctrlo Aug 5, 2025
b7e3313
Updated and removed extra dependencies and exports where not required
droberts-ctrlo Aug 5, 2025
2a6d329
Further package changes and TSConfig updates
droberts-ctrlo Aug 5, 2025
5507e60
Removed knip
droberts-ctrlo Aug 5, 2025
eca8476
Merge branch 'js-refactor' into upgrade-packages
droberts-ctrlo Aug 5, 2025
53430fc
Removed extra unused dependencies
droberts-ctrlo Aug 5, 2025
390f04e
Merge branch 'dev' into jsdoc
droberts-ctrlo Aug 18, 2025
3cacb9c
Updated code files with changes as required where they were included …
droberts-ctrlo Aug 18, 2025
2c02cab
Revert "Removed deprecated code and created some abstractions"
droberts-ctrlo Aug 18, 2025
bb34593
Updated with changes within current dev
droberts-ctrlo Aug 19, 2025
e34d4a9
Merge branch 'dev' into js-refactor
droberts-ctrlo Aug 19, 2025
4b771a5
Removed npx call in tests after failure
droberts-ctrlo Aug 19, 2025
c66622c
Removed pretest as this was (ironically) breaking tests in GH
droberts-ctrlo Aug 19, 2025
0a188ad
Updated test as the versions of various files were not compatible wit…
droberts-ctrlo Aug 19, 2025
2ade1be
Updated file where missing function wasn't included
droberts-ctrlo Aug 19, 2025
66cc268
Merge branch 'jsdoc' into js-refactor
droberts-ctrlo Aug 20, 2025
a2cf871
Merge branch 'js-refactor' into upgrade-packages
droberts-ctrlo Aug 20, 2025
2a2e77d
Fixed error in markdown that was missed during upgrade
droberts-ctrlo Aug 20, 2025
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
28 changes: 28 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
root = true

[*]
indent_style = space
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[*.md]
trim_trailing_whitespace = false
insert_final_newline = false

[*.{yml,yaml}]
indent_size = 2

[*.{ts,js,jsx,tsx}]
quote_type = double
continuation_indent_size = 2
curly_brace_next_line = false
indent_brace_style = BSD
spaces_around_operators = true
spaces_around_brackets = true

[*.{pl,pm,t,PL}]
max_line_length = off
continuation_indent_size = 4
11 changes: 0 additions & 11 deletions .eslintignore

This file was deleted.

46 changes: 0 additions & 46 deletions .eslintrc.js

This file was deleted.

11 changes: 5 additions & 6 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 'GADS Tests'
on:
on:
push:
branches:
- master
Expand Down Expand Up @@ -106,7 +106,7 @@ jobs:
run: '${{ matrix.browser.command }}'
- name: 'Run the Webdriver tests'
run: prove -lmrsv webdriver/t

cypress_tests:
name: 'Cypress Tests for ${{ matrix.browser.name }}'
runs-on: '${{ matrix.browser.os }}'
Expand All @@ -118,7 +118,7 @@ jobs:
browser:
- name: 'chrome'
os: 'ubuntu-22.04'

services:
postgres:
image: postgres
Expand Down Expand Up @@ -181,13 +181,13 @@ jobs:
perl bin/app.pl &
- name: 'Run the Cypress tests'
run: yarn cypress run --browser ${{ matrix.browser.name }}

js_tests:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x, 20.x, 22.x]
node-version: [20.x, 22.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand All @@ -197,6 +197,5 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npx update-browserslist-db@latest
- run: yarn
- run: yarn jest --passWithNoTests
45 changes: 45 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import js from "@eslint/js";
import globals from "globals";
import tseslint from "typescript-eslint";
import pluginReact from "eslint-plugin-react";
import css from "@eslint/css";
import { defineConfig } from "eslint/config";
import stylistic from "@stylistic/eslint-plugin";
import jsdoc from "eslint-plugin-jsdoc";

export default defineConfig([
{ settings: { react: { version: "detect" } } },
{ ignores: ["*.cjs", "eslint.config.mjs", "**/public/**", "**/node_modules/**", "**/cypress/**", "cypress.config.ts", ".stylelintrc.js", "src/frontend/testing/**", "src/frontend/css/stylesheets/external/**", "src/frontend/components/dashboard/lib/react/polyfills/**", "babel.config.js", "webpack.config.js", "jest.config.js", "tsconfig.json", "src/frontend/js/lib/jqplot/**", "src/frontend/js/lib/jquery/**", "src/frontend/js/lib/plotly/**", "src/frontend/components/timeline/**", "fengari-web.js"] },
{ files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], plugins: { js }, extends: ["js/recommended"] },
{ files: ["**/*.{js,mjs,cjs,ts,mts,cts,jsx,tsx}"], languageOptions: { globals: { ...globals.browser, ...globals.jquery, ...globals.jest } } },
tseslint.configs.recommended,
pluginReact.configs.flat.recommended,
{ files: ["**/*.css"], plugins: { css }, language: "css/css", extends: ["css/recommended"] },
{ plugins: {'@stylistic': stylistic, jsdoc} },
{
rules: {
"@typescript-eslint/no-explicit-any": "off",
'react/prop-types': 'off',
'react/no-deprecated': 'off', // We are currently using deprecated React features, so we disable this rule - this will change in the future
'@stylistic/quotes': ['error', 'single'],
'@stylistic/no-extra-semi': 'error',
'@stylistic/semi': ['error', 'always'],
'@stylistic/curly-newline': 'error',
'@stylistic/newline-per-chained-call': 'error',
'@stylistic/indent': ['error', 4],
'@stylistic/comma-dangle': ['error', 'never'],
"jsdoc/require-jsdoc": [
"error",
{
require: {
FunctionDeclaration: true,
MethodDefinition: true,
ClassDeclaration: true,
ArrowFunctionExpression: false,
FunctionExpression: false
}
}
],
}
}
]);
Loading