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

Add filtering #458

Open
wants to merge 30 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 29 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
0a3ce10
Add datepickers
keiranjprice101 Feb 21, 2025
690f560
Remove 3 jobs pages
keiranjprice101 Feb 21, 2025
61e0de2
Move config settings to components
keiranjprice101 Feb 21, 2025
2babc70
create lib
keiranjprice101 Feb 21, 2025
97d0573
`Reorganize HomePage file structure and update imports`
keiranjprice101 Feb 21, 2025
edfdfcf
Rename and move InstrumentData to lib directory
keiranjprice101 Feb 21, 2025
9bcb440
Refactor Instruments component file structure.
keiranjprice101 Feb 21, 2025
801678d
Update Typography component to use "p" instead of deprecated "paragraph"
keiranjprice101 Feb 21, 2025
3a3666c
Add filters component for job queries
keiranjprice101 Feb 21, 2025
bbe0c1e
Add InstrumentSelector component for instrument selection
keiranjprice101 Feb 21, 2025
c73b5eb
Add JobTableHead component
keiranjprice101 Feb 21, 2025
99137f9
Add Row component for rendering job details in a table
keiranjprice101 Feb 21, 2025
30adbf9
Add JobTable component
keiranjprice101 Feb 21, 2025
2bd9557
Add JobsPage
keiranjprice101 Feb 21, 2025
fbf5593
Refactor routing and integrate date localization.
keiranjprice101 Feb 21, 2025
36744f4
Move JobQueryFilters interface from Filters.tsx to types.ts
keiranjprice101 Feb 21, 2025
432e532
Refactor import of JobQueryFilters in JobTable component
keiranjprice101 Feb 21, 2025
d361e8b
Add config button support for SANS2D instrument
keiranjprice101 Feb 21, 2025
5f89917
Refactor ValueEditor import paths for consistency.
keiranjprice101 Feb 21, 2025
74bef92
Add as_user toggle back in
keiranjprice101 Feb 21, 2025
298eb45
Update job counts on filter changes
keiranjprice101 Feb 21, 2025
c35a606
Adjust link colour
keiranjprice101 Feb 28, 2025
69d058b
Revert casing
keiranjprice101 Feb 28, 2025
3fb773e
Revert alignment to open issue
keiranjprice101 Feb 28, 2025
6a7b14b
Apply fixed height to table head
keiranjprice101 Feb 28, 2025
13448ed
Fix the vertical alignment of the multiple select
keiranjprice101 Feb 28, 2025
6e757ff
Adjust table height and add a padding
keiranjprice101 Feb 28, 2025
eff8aa6
Update link colour
keiranjprice101 Feb 28, 2025
28b9724
simplify bool
keiranjprice101 Feb 28, 2025
939f010
Clear inputs on clear
keiranjprice101 Mar 4, 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
2 changes: 1 addition & 1 deletion cypress/component/HomePage.cy.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react';
import { BrowserRouter } from 'react-router-dom';
import { mount } from '@cypress/react';
import HomePage from '../../src/HomePage';
import HomePage from '../../src/pages/HomePage';

describe('HomePage Component Tests', () => {
beforeEach(() => {
Expand Down
2 changes: 1 addition & 1 deletion cypress/component/Instruments.cy.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import Instruments from '../../src/Instruments';
import Instruments from '../../src/pages/Instruments';
import { mount } from '@cypress/react';

describe('<Instruments />', () => {
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
"@monaco-editor/react": "^4.6.0",
"@mui/icons-material": "6.1.9",
"@mui/material": "6.1.9",
"@mui/x-date-pickers": "^7.27.0",
"@types/jest": "29.5.14",
"@types/node": "22.10.0",
"@types/react": "17.0.39",
"@types/react-dom": "17.0.11",
"axios": "^1.7.7",
"dayjs": "^1.11.13",
"express": "4.21.1",
"express-ws": "5.0.2",
"i18next": "^24.0.2",
Expand Down
56 changes: 28 additions & 28 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import { BrowserRouter as Router, Route, Switch } from 'react-router-dom';
import ReactGA from 'react-ga4';

// Local data
import Instruments from './Instruments';
import JobsAll from './Jobs/JobsAll';
import JobsGeneral from './Jobs/JobsGeneral';
import HomePage from './HomePage';
import ValueEditor from './ValueEditor';
import Instruments from './pages/Instruments';
import HomePage from './pages/HomePage';
import ValueEditor from './pages/ValueEditor';
import GlobalStyles from './GlobalStyles';
import { clearFailedAuthRequestsQueue, retryFailedAuthRequests } from './api';
import { clearFailedAuthRequestsQueue, retryFailedAuthRequests } from './lib/api';
import 'dayjs/locale/en-gb';
import { LocalizationProvider } from '@mui/x-date-pickers';
import { AdapterDayjs } from '@mui/x-date-pickers/AdapterDayjs';
import JobsPage from './pages/JobsPage';

// Initialize Google Analytics with the given tracking ID
ReactGA.initialize('G-7XJBCP6P75');
Expand Down Expand Up @@ -55,28 +57,26 @@ const App: FC = () => {
}, []);

return (
<GlobalStyles>
<Router basename="/fia">
<Switch>
{/* Define application routes */}
<Route exact path="/">
<HomePage /> {/* Renders the HomePage component on the root path */}
</Route>
<Route path="/instruments">
<Instruments /> {/* Renders the Instruments page */}
</Route>
<Route path="/reduction-history/ALL">
<JobsAll /> {/* Displays all reduction jobs */}
</Route>
<Route path="/reduction-history/:instrumentName">
<JobsGeneral /> {/* Displays reduction jobs filtered by instrument name */}
</Route>
<Route path="/value-editor/:jobId">
<ValueEditor /> {/* Opens the ValueEditor for a specific job */}
</Route>
</Switch>
</Router>
</GlobalStyles>
<LocalizationProvider dateAdapter={AdapterDayjs} adapterLocale={'en-gb'}>
<GlobalStyles>
<Router basename="/fia">
<Switch>
<Route exact path="/">
<HomePage />
</Route>
<Route path="/instruments">
<Instruments />
</Route>
<Route path="/reduction-history/:instrumentName">
<JobsPage />
</Route>
<Route path="/value-editor/:jobId">
<ValueEditor />
</Route>
</Switch>
</Router>
</GlobalStyles>
</LocalizationProvider>
);
};

Expand Down
109 changes: 0 additions & 109 deletions src/Jobs/JobsAll.tsx

This file was deleted.

Loading
Loading