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

Chart updates [B:708] #510

Draft
wants to merge 45 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
0c4a822
Removed extra dependencies and eslint
droberts-ctrlo Jan 2, 2025
9302204
Updated libraries and tooling
droberts-ctrlo Jan 2, 2025
e91d1b3
Upgraded react version
droberts-ctrlo Jan 2, 2025
c95be37
Refactoring React components - tests to follow
droberts-ctrlo Jan 7, 2025
05130f5
Package changes (should have been in previous commit)
droberts-ctrlo Jan 7, 2025
d0242cc
In retrospect, changes to the react components isn't necessary
droberts-ctrlo Jan 9, 2025
a67726e
Added Jest setup script rather than having to import every time
droberts-ctrlo Jan 9, 2025
5c90124
Further button tests
droberts-ctrlo Jan 13, 2025
4d6bccb
Working on BS4 - 5 migration
droberts-ctrlo Jan 13, 2025
32ab0c1
Update of files - *currently tests are broken due to BS5 setup*
droberts-ctrlo Jan 16, 2025
9a730bd
Updated Cypress tests
droberts-ctrlo Jan 16, 2025
d19ff93
Merge branch 'dev' into js-fixes
droberts-ctrlo Jan 20, 2025
98084a7
Cypress tests now pass
droberts-ctrlo Jan 20, 2025
022100c
Updated styling
droberts-ctrlo Jan 21, 2025
2f0f51f
Merged in current v2.6
droberts-ctrlo Jan 21, 2025
564b495
Update .gitignore
droberts-ctrlo Jan 21, 2025
821be46
Undo accidental staging of public directory
droberts-ctrlo Jan 21, 2025
4a65544
Merge remote-tracking branch 'origin/js-fixes' into js-fixes
droberts-ctrlo Jan 21, 2025
e93c7d3
Removed incorrect unit test
droberts-ctrlo Jan 21, 2025
640c270
Removed extra changes to webpack.config
droberts-ctrlo Jan 21, 2025
e91e5c1
Added definitions for jQuery and test to ensure it's defined correctly
droberts-ctrlo Jan 21, 2025
76e7bfc
Added build stage to Cypress tests
droberts-ctrlo Jan 21, 2025
5acf741
Updates to webdriver tests
droberts-ctrlo Jan 21, 2025
5f204da
`webpack.config` changes
droberts-ctrlo Jan 21, 2025
54a3674
Updated modal close button and added fileDrag component to code
droberts-ctrlo Jan 21, 2025
f064e8c
DataTables display fixes
droberts-ctrlo Jan 21, 2025
59cb863
Updated dashboard components
droberts-ctrlo Jan 23, 2025
4afd8c3
Updated view and removed logging from tests where it wasn't needed
droberts-ctrlo Jan 23, 2025
51a5bc0
Added tests to dashboard
droberts-ctrlo Jan 23, 2025
197a27f
Fixes for styling in react components
droberts-ctrlo Jan 24, 2025
2c553c9
Added further dashboard tests
droberts-ctrlo Jan 24, 2025
7590502
Merge branch 'dev' into js-fixes
droberts-ctrlo Jan 24, 2025
0e7a3ac
Removed edits from BS changes
droberts-ctrlo Jan 24, 2025
12887aa
Merge remote-tracking branch 'origin/js-fixes' into js-fixes
droberts-ctrlo Jan 24, 2025
bca6579
Test updates and fixes for Jest
droberts-ctrlo Jan 24, 2025
238930c
Moved across to `chart.js`
droberts-ctrlo Jan 28, 2025
3698fa5
Fix for header overflow causing excess page width
droberts-ctrlo Jan 29, 2025
bac916a
Merge branch 'js-fixes' into chart-updates
droberts-ctrlo Jan 29, 2025
c5e1f0a
Further changes
droberts-ctrlo Jan 29, 2025
5a85f41
Fixed header row
droberts-ctrlo Feb 24, 2025
86cd4c2
Updated view to align items correctly in edit
droberts-ctrlo Feb 24, 2025
b8537a4
Cleaned up sidebar
droberts-ctrlo Feb 24, 2025
eaadc19
Merge branch 'dev' into js-fixes
droberts-ctrlo Mar 14, 2025
ab8cda4
Merge branch 'dev' into js-fixes
droberts-ctrlo Mar 14, 2025
17ae4bf
Merge branch 'js-fixes' into chart-updates
droberts-ctrlo Mar 14, 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
11 changes: 0 additions & 11 deletions .eslintignore

This file was deleted.

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

This file was deleted.

2 changes: 2 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -157,9 +157,11 @@ jobs:
echo '*:*:*:postgres:postgrespassword' > ~/.pgpass
chmod 600 ~/.pgpass
- name: 'Install YARN dependencies'
# If the code isn't built (public dir) then the tests will fail
run: |
sudo apt-get install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libnss3 libxss1 libasound2 libxtst6 xauth xvfb
yarn
yarn build --no-watch
- name: 'Start the application'
env:
DANCER_CONFDIR: 'webdriver'
Expand Down
1 change: 0 additions & 1 deletion .gitigore

This file was deleted.

22 changes: 0 additions & 22 deletions .jshintrc

This file was deleted.

233 changes: 0 additions & 233 deletions .stylelintrc.js

This file was deleted.

4 changes: 2 additions & 2 deletions cypress/e2e/functionality/06-tables-and-wizard.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('Another Test Suite', () => {

//attempt save with incorrect (fails)
it.skip('should fail to save new table with invalid shortname ', () => {
cy.get('[data-target="#newTableModal"]').click();
cy.get('[data-bs-target="#newTableModal"]').click();
cy.get('#shortName').type('This value wont $4v£');
cy.get("#name").type("table to fail");
cy.get('.btn-js-next').eq(0).click();
Expand All @@ -19,7 +19,7 @@ describe('Another Test Suite', () => {
});

it('should save a new table successfully', () => {
cy.get('[data-target="#newTableModal"]').click();
cy.get('[data-bs-target="#newTableModal"]').click();
cy.get('#shortName').type('1-test_table');
cy.get("#name").type("1-test-table");
cy.get('.btn-js-next').eq(0).click();
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/builders/layout/LayoutBuilder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class CurvalLayoutBuilder extends LayoutBuilderBase implements ICurvalLayoutBuil
cy.get("label")
.contains(this.field)
.click();
cy.get("button.btn-xs[data-delete='rule']")
cy.get("button.btn-sm[data-delete='rule']")
.eq(1)
.click();
//Someone owes me a drink!
Expand Down
1 change: 0 additions & 1 deletion cypress/support/commands.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-namespace */
/// <reference types="cypress" />

import { IBuildable } from "./builders/layout/interfaces";
Expand Down
3 changes: 2 additions & 1 deletion jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ const config = {
"^components/(.*)$": "<rootDir>/src/frontend/components/$1",
"^set-field-values$": "<rootDir>/src/frontend/js/lib/set-field-values",
"^guid$": "<rootDir>/src/frontend/js/lib/guid",
"^testing/(.*)$": "<rootDir>/src/frontend/testing/$1",
},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
Expand Down Expand Up @@ -141,7 +142,7 @@ const config = {
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],
setupFiles: ['./src/frontend/testing/setup.ts'],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
// setupFilesAfterEnv: [],
Expand Down
4 changes: 2 additions & 2 deletions lib/GADS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ get '/' => require_login sub {
dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params),
page => 'index',
'content_block_main_custom_classes' => 'pt-0',
'content_block_custom_classes' => 'pl-0'
'content_block_custom_classes' => 'ps-0'
};

if (my $download = param('download'))
Expand Down Expand Up @@ -2129,7 +2129,7 @@ prefix '/:layout_name' => sub {
dashboards_json => schema->resultset('Dashboard')->dashboards_json(%params),
page => 'table_index',
header_type => "table_tabs",
content_block_custom_classes => "pl-0",
content_block_custom_classes => "ps-0",
content_block_main_custom_classes => "pt-0",
header_back_url => "${base_url}table",
layout_obj => $layout,
Expand Down
Loading
Loading