Skip to content

Commit

Permalink
Merge branch 'develop' into renovate/mui-x-date-pickers-6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
louise-davies committed Nov 15, 2023
2 parents bb45fdb + 55b6c9a commit d144ca5
Show file tree
Hide file tree
Showing 97 changed files with 984 additions and 778 deletions.
837 changes: 469 additions & 368 deletions .pnp.cjs

Large diffs are not rendered by default.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
4 changes: 2 additions & 2 deletions .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.8.0-sdk",
"main": "./index.js",
"version": "3.0.1-sdk",
"main": "./index.cjs",
"type": "commonjs"
}
42 changes: 28 additions & 14 deletions cypress/e2e/search.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -778,8 +778,10 @@ describe('Search', () => {
// the shot number, timeframe and experiment id

cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand Down Expand Up @@ -909,8 +911,10 @@ describe('Search', () => {

it('searches within an experiment timeframe without the experiment id clearing', () => {
cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand All @@ -933,8 +937,10 @@ describe('Search', () => {

it('clears experiment id when it searches outside the given experiment id experiment timeframe', () => {
cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand All @@ -949,8 +955,10 @@ describe('Search', () => {
.should('not.exist');

cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand All @@ -967,8 +975,10 @@ describe('Search', () => {

it('searches within an experiment shot number range without the experiment id clearing', () => {
cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand Down Expand Up @@ -1011,8 +1021,10 @@ describe('Search', () => {

it('clears experiment id when it searches outside the given experiment id shot number range', () => {
cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand All @@ -1036,8 +1048,10 @@ describe('Search', () => {
.should('not.exist');

cy.findByLabelText('open experiment search box').click();
cy.findByRole('combobox').type('221');
cy.findByRole('combobox').type('{downArrow}{enter}');
cy.findByRole('combobox', { name: 'Select your experiment' }).type('221');
cy.findByRole('combobox', { name: 'Select your experiment' }).type(
'{downArrow}{enter}'
);
cy.findByLabelText('close experiment search box').click();
cy.findByLabelText('open experiment search box')
.contains('ID 22110007')
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"@emotion/react": "11.11.1",
"@emotion/styled": "11.11.0",
"@mui/base": "5.0.0-beta.12",
"@mui/icons-material": "5.11.0",
"@mui/material": "5.11.0",
"@mui/system": "5.11.0",
"@mui/icons-material": "5.14.16",
"@mui/material": "5.14.16",
"@mui/system": "5.14.16",
"@mui/x-date-pickers": "6.11.1",
"@reduxjs/toolkit": "1.9.0",
"@tanstack/react-query": "4.29.5",
Expand All @@ -22,7 +22,7 @@
"@types/react": "18.2.14",
"@types/react-beautiful-dnd": "13.1.2",
"@types/react-dom": "18.2.6",
"axios": "1.4.0",
"axios": "1.6.0",
"date-fns": "2.30.0",
"hacktimer": "1.1.3",
"history": "5.3.0",
Expand Down Expand Up @@ -128,13 +128,13 @@
"eslint-config-react-app": "7.0.1",
"eslint-plugin-cypress": "2.13.3",
"eslint-plugin-no-only-tests": "3.1.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-prettier": "5.0.0",
"express": "4.18.1",
"husky": "8.0.1",
"jest-canvas-mock": "2.5.0",
"lint-staged": "13.2.2",
"msw": "1.2.1",
"prettier": "2.8.0",
"prettier": "3.0.1",
"react-beautiful-dnd-test-utils": "4.1.1",
"serve": "14.2.0",
"serve-static": "1.15.0",
Expand Down
6 changes: 3 additions & 3 deletions src/api/records.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ export const useRecordsPaginated = (): UseQueryResult<
searchParams: SearchParams;
filters: string[];
projection: string[];
}
},
]
>(
[
Expand Down Expand Up @@ -405,7 +405,7 @@ export const usePlotRecords = (
searchParams: SearchParams;
filters: string[];
projection: string[];
}
},
]
>(
[
Expand Down Expand Up @@ -493,7 +493,7 @@ export const useThumbnails = (
sort: SortType;
searchParams: SearchParams;
filters: string[];
}
},
]
>(
[
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ exports[`Channel Breadcrumbs should render correctly for path 1`] = `
class="MuiBreadcrumbs-li"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1ps4owl-MuiTypography-root-MuiLink-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1xylxj1-MuiTypography-root-MuiLink-root"
href="#"
>
All Channels
Expand All @@ -39,7 +39,7 @@ exports[`Channel Breadcrumbs should render correctly for path 1`] = `
class="MuiBreadcrumbs-li"
>
<a
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1ps4owl-MuiTypography-root-MuiLink-root"
class="MuiTypography-root MuiTypography-inherit MuiLink-root MuiLink-underlineAlways css-1xylxj1-MuiTypography-root-MuiLink-root"
href="#"
>
test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ exports[`Channel Metadata Panel should render correctly for no channel selected
exports[`Channel Metadata Panel should render correctly for scalar channel with units selected 1`] = `
<DocumentFragment>
<div
class="css-3y1137-MuiStack-root"
class="MuiStack-root css-3y1137-MuiStack-root"
>
<h3
class="MuiTypography-root MuiTypography-body1 css-ndaqpv-MuiTypography-root"
Expand Down Expand Up @@ -183,7 +183,7 @@ exports[`Channel Metadata Panel should render correctly for scalar channel with
exports[`Channel Metadata Panel should render correctly for system channel 1`] = `
<DocumentFragment>
<div
class="css-3y1137-MuiStack-root"
class="MuiStack-root css-3y1137-MuiStack-root"
>
<h3
class="MuiTypography-root MuiTypography-body1 css-ndaqpv-MuiTypography-root"
Expand Down Expand Up @@ -232,7 +232,7 @@ exports[`Channel Metadata Panel should render correctly for system channel 1`] =
exports[`Channel Metadata Panel should render correctly for waveform channel with units selected 1`] = `
<DocumentFragment>
<div
class="css-3y1137-MuiStack-root"
class="MuiStack-root css-3y1137-MuiStack-root"
>
<h3
class="MuiTypography-root MuiTypography-body1 css-ndaqpv-MuiTypography-root"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
exports[`Channel Search should render correctly 1`] = `
<DocumentFragment>
<div
class="MuiAutocomplete-root MuiAutocomplete-fullWidth MuiAutocomplete-hasPopupIcon css-12szb0g-MuiAutocomplete-root"
class="MuiAutocomplete-root MuiAutocomplete-fullWidth MuiAutocomplete-hasPopupIcon css-f34qqq-MuiAutocomplete-root"
>
<div
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined css-1sumxir-MuiFormLabel-root-MuiInputLabel-root"
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined css-1jy569b-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":r0:"
id=":r0:-label"
Expand Down
10 changes: 5 additions & 5 deletions src/channels/__snapshots__/channelTree.component.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ exports[`Channel Tree should render correctly for root 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary Mui-disabled MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
tabindex="-1"
>
<input
Expand Down Expand Up @@ -69,7 +69,7 @@ exports[`Channel Tree should render correctly for root 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
tabindex="-1"
>
<input
Expand Down Expand Up @@ -129,7 +129,7 @@ exports[`Channel Tree should render correctly for sub node 1`] = `
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
tabindex="-1"
>
<input
Expand Down Expand Up @@ -179,7 +179,7 @@ exports[`Channel Tree should render correctly for sub node 1`] = `
class="MuiListItemIcon-root css-cveggr-MuiListItemIcon-root"
>
<span
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-root MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
>
<input
aria-labelledby="checkbox-list-label-CHANNEL_ABCDE"
Expand Down Expand Up @@ -230,7 +230,7 @@ exports[`Channel Tree should render correctly for sub node 1`] = `
class="MuiListItemIcon-root css-cveggr-MuiListItemIcon-root"
>
<span
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-checked MuiCheckbox-root MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-checked MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
>
<input
aria-labelledby="checkbox-list-label-CHANNEL_BCDEF"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`Channels Dialogue renders channels dialogue when dialogue is open 1`] =
>
<div
aria-hidden="true"
class="MuiBackdrop-root css-yiavyu-MuiBackdrop-root-MuiDialog-backdrop"
class="MuiBackdrop-root MuiModal-backdrop css-yiavyu-MuiBackdrop-root-MuiDialog-backdrop"
style="opacity: 1; webkit-transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms; transition: opacity 225ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;"
/>
<div
Expand Down Expand Up @@ -56,13 +56,13 @@ exports[`Channels Dialogue renders channels dialogue when dialogue is open 1`] =
class="MuiGrid-root MuiGrid-item MuiGrid-grid-xs-true css-n4yv6w-MuiGrid-root"
>
<div
class="MuiAutocomplete-root MuiAutocomplete-fullWidth MuiAutocomplete-hasPopupIcon css-12szb0g-MuiAutocomplete-root"
class="MuiAutocomplete-root MuiAutocomplete-fullWidth MuiAutocomplete-hasPopupIcon css-f34qqq-MuiAutocomplete-root"
>
<div
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-wb57ya-MuiFormControl-root-MuiTextField-root"
>
<label
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined css-1sumxir-MuiFormLabel-root-MuiInputLabel-root"
class="MuiFormLabel-root MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined MuiFormLabel-colorPrimary MuiInputLabel-root MuiInputLabel-formControl MuiInputLabel-animated MuiInputLabel-shrink MuiInputLabel-sizeSmall MuiInputLabel-outlined css-1jy569b-MuiFormLabel-root-MuiInputLabel-root"
data-shrink="true"
for=":r1:"
id=":r1:-label"
Expand Down Expand Up @@ -195,7 +195,7 @@ exports[`Channels Dialogue renders channels dialogue when dialogue is open 1`] =
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary Mui-disabled MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled MuiCheckbox-root MuiCheckbox-indeterminate MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
tabindex="-1"
>
<input
Expand Down Expand Up @@ -246,7 +246,7 @@ exports[`Channels Dialogue renders channels dialogue when dialogue is open 1`] =
>
<span
aria-disabled="true"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
class="MuiButtonBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled PrivateSwitchBase-root MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall Mui-disabled MuiCheckbox-root MuiCheckbox-colorPrimary MuiCheckbox-sizeSmall css-12wnr2w-MuiButtonBase-root-MuiCheckbox-root"
tabindex="-1"
>
<input
Expand Down Expand Up @@ -311,7 +311,7 @@ exports[`Channels Dialogue renders channels dialogue when dialogue is open 1`] =
</div>
</div>
<div
class="MuiDialogActions-root MuiDialogActions-spacing css-hlj6pa-MuiDialogActions-root"
class="MuiDialogActions-root MuiDialogActions-spacing css-knqc4i-MuiDialogActions-root"
>
<button
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium css-1e6y48t-MuiButtonBase-root-MuiButton-root"
Expand Down
Loading

0 comments on commit d144ca5

Please sign in to comment.