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

React 18 #1205 #1275

Draft
wants to merge 49 commits into
base: develop
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
8f80096
#1205 - Upgrade React to 18 and change render function
louise-davies Apr 5, 2023
f4d18e2
Add CssBaseline to theme provider
louise-davies Apr 25, 2023
b1c03f9
Change jwt & github auth provider URL paths to
louise-davies Apr 25, 2023
d139560
#1205 - fix unit tests for react 18 & OG compatibility changes
louise-davies Apr 26, 2023
bd5331c
#1205 - Fix e2e tests and fix bug where redirect after login stopped …
louise-davies Apr 26, 2023
82ad8db
Merge branch 'develop' into react-18-#1205
louise-davies Nov 10, 2023
4593885
Merge branch 'develop' into react-18-#1205
louise-davies Nov 13, 2023
c60ef0b
Merge branch 'develop' into react-18-#1205
louise-davies Nov 21, 2023
e94ac71
Merge branch 'develop' into react-18-#1205
VKTB Dec 5, 2023
b0160a9
Fix jwt auth token refresh storage for OG & IMS #1205
joelvdavies Feb 1, 2024
909a4cb
Merge branch 'develop' into react-18-#1205
joelvdavies Feb 1, 2024
03985b2
Add TokenRefreshed event on successful access token refresh #1205
joelvdavies Feb 7, 2024
493b967
Merge branch 'develop' into react-18-#1205
joelvdavies Feb 7, 2024
2ce569b
Merge branch 'develop' into react-18-#1205
joelvdavies Feb 28, 2024
7e904bf
add darkBlue colour to theming ral-facilities/inventory-management-sy…
joshuadkitenge Mar 1, 2024
578c1e7
increase toast functionality #355
joshuadkitenge Mar 1, 2024
d52b0b0
improve the if statement #355
joshuadkitenge Mar 1, 2024
7712995
Change accessibility page variable to be more genera' #356
joshuadkitenge Mar 1, 2024
bd34099
fix snapshot
joshuadkitenge Mar 1, 2024
5f4f431
Merge branch 'develop' into react-18-#1205
louise-davies Mar 4, 2024
03d1471
Fix bug where login redirect would leave plugins infinitely "loading"
louise-davies Mar 4, 2024
deb06f6
Tweak login referrer redirect to only happen after login
louise-davies Mar 5, 2024
2a6cabb
Fix fork-ts-checker-webpack-plugin errors
louise-davies Mar 5, 2024
4df6e62
Merge pull request #1375 from ral-facilities/add-darkBlue-colour-to-t…
joshuadkitenge Mar 5, 2024
c3b8e5a
Update src/pageContainer.component.tsx
joshuadkitenge Mar 5, 2024
566a4e4
address review comments
joshuadkitenge Mar 5, 2024
425e2f4
Update src/state/middleware/scigateway.middleware.tsx
joshuadkitenge Mar 6, 2024
8334509
Merge branch 'react-18-#1205' into increase-toast-functionailty-#355
joshuadkitenge Mar 6, 2024
f1ac27a
revert back
joshuadkitenge Mar 6, 2024
9c8af22
add e2e test
joshuadkitenge Mar 6, 2024
b4872d3
add assertion
joshuadkitenge Mar 6, 2024
e663688
add unit test
joshuadkitenge Mar 7, 2024
b51eecf
Merge pull request #1376 from ral-facilities/increase-toast-functiona…
joshuadkitenge Mar 7, 2024
92fe078
Merge branch 'develop' into react-18-#1205
VKTB Mar 22, 2024
012a736
Merge branch 'develop' into react-18-#1205
joelvdavies Mar 22, 2024
5603414
Hide app bar and footer and ensure scroll bar not used when printing …
joelvdavies Mar 25, 2024
d6e391d
Update snapshots ral-facilities/inventory-management-system#439
joelvdavies Mar 25, 2024
9b1a9de
Merge pull request #1385 from ral-facilities/print-improvement-for-ims
joelvdavies Mar 25, 2024
30d4ac1
Merge branch 'develop' into react-18-#1205
joelvdavies Apr 16, 2024
7ca0db2
Merge branch 'react-18-#1205' into remove-datgateway-from-the-varaiab…
joelvdavies Apr 23, 2024
bb8375e
Merge pull request #1377 from ral-facilities/remove-datgateway-from-t…
joelvdavies Apr 23, 2024
f5e88b4
Fix error colour inconsistency found on IMS ral-facilities/inventory-…
joelvdavies May 20, 2024
b9895ab
Merge pull request #1393 from ral-facilities/fix-error-colour-inconsi…
joelvdavies May 20, 2024
431ceef
Merge branch 'develop' into react-18-#1205
VKTB Jun 4, 2024
a20de6e
Merge branch 'develop' into react-18-#1205
joelvdavies Jun 20, 2024
f0c6d18
Ims maintenance endpoints (#1398)
MatteoGuarnaccia5 Jul 3, 2024
3dc8f2e
Merge branch 'develop' into react-18-#1205
joelvdavies Jul 8, 2024
2ec4e8e
Merge branch 'develop' into react-18-#1205
joelvdavies Sep 9, 2024
5f9dbde
Merge branch 'develop' into react-18-#1205
joelvdavies Sep 9, 2024
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
Prev Previous commit
Next Next commit
Update src/pageContainer.component.tsx
Co-authored-by: Joel Davies <90245114+joelvdavies@users.noreply.github.com>
  • Loading branch information
joshuadkitenge and joelvdavies authored Mar 5, 2024
commit c3b8e5ad10c51e82ad6f1c04e3b2a331688f54d3
1 change: 0 additions & 1 deletion src/pageContainer.component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,16 @@

React.useEffect(() => {
const clearToasts = (): void => {
toastr.clean();

Check warning on line 25 in src/pageContainer.component.tsx

View check run for this annotation

Codecov / codecov/patch

src/pageContainer.component.tsx#L25

Added line #L25 was not covered by tests
};

const handleKeyPress = (event: KeyboardEvent): void => {
if (event instanceof KeyboardEvent && event.key === 'Escape') {
clearToasts();

Check warning on line 30 in src/pageContainer.component.tsx

View check run for this annotation

Codecov / codecov/patch

src/pageContainer.component.tsx#L30

Added line #L30 was not covered by tests
}
};

// Add event listeners for keydown events

document.addEventListener('keydown', handleKeyPress);

// Clean up the event listeners when component unmounts
Expand Down
Loading