Skip to content

Commit

Permalink
Merge branch 'develop' into redesign-landing-page-catalogue-items-#1022
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshuadkitenge
joshuadkitenge committed Oct 17, 2024
2 parents afeb65f + ad67418 commit cbac313
Show file tree
Hide file tree
Showing 18 changed files with 818 additions and 383 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/ci-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

- name: Setup Node.js
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

- name: Setup Node.js
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
Expand All @@ -63,7 +63,7 @@ jobs:

- name: Upload Cypress screenshots
if: failure()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: Inventory management system Screenshots
path: cypress/screenshots
Expand All @@ -74,7 +74,7 @@ jobs:

steps:
- name: Clone api repo
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871
with:
repository: ral-facilities/inventory-management-system-api
ref: develop
Expand Down Expand Up @@ -120,7 +120,7 @@ jobs:
harbor.stfc.ac.uk/inventory-management-system/ims-api:develop
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4

- name: Setup Node.js
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4
Expand All @@ -146,7 +146,7 @@ jobs:

- name: Upload Cypress screenshots
if: failure()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4
with:
name: Inventory management system (with api) Screenshots
path: cypress/screenshots
Expand Down
20 changes: 10 additions & 10 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"axios": "^1.7.2",
"browserslist": "^4.23.0",
"browserslist-to-esbuild": "^2.1.1",
"date-fns": "3.6.0",
"date-fns": "4.1.0",
"history": "^5.3.0",
"loglevel": "^1.9.1",
"lz-string": "^1.5.0",
Expand Down Expand Up @@ -67,10 +67,10 @@
],
"packageManager": "yarn@4.5.0",
"devDependencies": {
"@babel/eslint-parser": "7.25.1",
"@babel/eslint-parser": "7.25.8",
"@eslint/compat": "1.1.1",
"@eslint/js": "9.10.0",
"@tanstack/eslint-plugin-query": "5.53.0",
"@eslint/js": "9.12.0",
"@tanstack/eslint-plugin-query": "5.59.7",
"@testing-library/cypress": "10.0.2",
"@testing-library/dom": "10.4.0",
"@testing-library/jest-dom": "6.5.0",
Expand All @@ -81,15 +81,15 @@
"@types/react-router-dom": "5.3.3",
"@vitest/coverage-v8": "2.1.1",
"cross-env": "7.0.3",
"cypress": "13.14.2",
"eslint": "9.10.0",
"cypress": "13.15.0",
"eslint": "9.12.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-cypress": "3.5.0",
"eslint-plugin-cypress": "4.0.0",
"eslint-plugin-jsx-a11y": "6.10.0",
"eslint-plugin-no-only-tests": "3.3.0",
"eslint-plugin-prettier": "5.2.1",
"eslint-plugin-react": "7.36.1",
"eslint-plugin-react-hooks": "4.6.2",
"eslint-plugin-react": "7.37.1",
"eslint-plugin-react-hooks": "5.0.0",
"eslint-plugin-testing-library": "6.3.0",
"express": "4.21.0",
"globals": "15.9.0",
Expand All @@ -98,7 +98,7 @@
"serve": "14.2.3",
"serve-static": "1.16.2",
"start-server-and-test": "2.0.8",
"typescript-eslint": "8.5.0",
"typescript-eslint": "8.8.1",
"vitest": "2.1.1"
},
"msw": {
Expand Down
2 changes: 2 additions & 0 deletions src/admin/units/units.component.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ function Units() {
accessorFn: (row) => new Date(row.modified_time),
id: 'modified_time',
filterVariant: 'datetime-range',
filterFn: 'betweenInclusive',
size: 350,
enableGrouping: false,
Cell: ({ row }) =>
Expand All @@ -66,6 +67,7 @@ function Units() {
accessorFn: (row) => new Date(row.created_time),
id: 'created_time',
filterVariant: 'datetime-range',
filterFn: 'betweenInclusive',
size: 350,
enableGrouping: false,
enableHiding: true,
Expand Down
157 changes: 146 additions & 11 deletions src/admin/usageStatuses/__snapshots__/usageStatuses.component.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -364,13 +364,50 @@ exports[`Usage statuses > renders table correctly 1`] = `
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-jk1t0h-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedStart MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-standard MuiInputAdornment-sizeMedium css-ittuaa-MuiInputAdornment-root"
>
<span
class="notranslate"
>
​
</span>
<span
aria-label="Change filter mode"
class=""
data-mui-internal-clone-element="true"
>
<button
aria-label="Change filter mode"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeSmall css-1cyhbc3-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="FilterListIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M10 18h4v-2h-4zM3 6v2h18V6zm3 7h12v-2H6z"
/>
</svg>
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</span>
</div>
<input
aria-describedby=":r7:-helper-text"
aria-invalid="false"
aria-label="Filter by Value"
autocomplete="new-password"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedStart MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":r7:"
placeholder="Filter by Value"
title="Filter by Value"
Expand Down Expand Up @@ -407,6 +444,14 @@ exports[`Usage statuses > renders table correctly 1`] = `
</span>
</div>
</div>
<p
class="MuiFormHelperText-root MuiFormHelperText-sizeMedium css-jchqo4-MuiFormHelperText-root"
id=":r7:-helper-text"
>
<label>
Filter Mode: Fuzzy
</label>
</p>
</div>
</div>
</div>
Expand Down Expand Up @@ -527,14 +572,51 @@ exports[`Usage statuses > renders table correctly 1`] = `
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedStart MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-standard MuiInputAdornment-sizeMedium css-ittuaa-MuiInputAdornment-root"
>
<span
class="notranslate"
>
​
</span>
<span
aria-label="Change filter mode"
class=""
data-mui-internal-clone-element="true"
>
<button
aria-label="Change filter mode"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeSmall css-1cyhbc3-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="FilterListIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M10 18h4v-2h-4zM3 6v2h18V6zm3 7h12v-2H6z"
/>
</svg>
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</span>
</div>
<input
aria-describedby=":rd:-helper-text"
aria-invalid="false"
aria-label="Min"
autocomplete="new-password"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":rc:"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedStart MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":rd:"
inputmode="text"
placeholder="Min"
title="Min"
Expand Down Expand Up @@ -567,6 +649,14 @@ exports[`Usage statuses > renders table correctly 1`] = `
</button>
</div>
</div>
<p
class="MuiFormHelperText-root MuiFormHelperText-sizeMedium css-jchqo4-MuiFormHelperText-root"
id=":rd:-helper-text"
>
<label>
Filter Mode: Between Inclusive
</label>
</p>
</div>
<div
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root"
Expand All @@ -579,7 +669,7 @@ exports[`Usage statuses > renders table correctly 1`] = `
aria-label="Max"
autocomplete="new-password"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":re:"
id=":rg:"
inputmode="text"
placeholder="Max"
title="Max"
Expand Down Expand Up @@ -733,14 +823,51 @@ exports[`Usage statuses > renders table correctly 1`] = `
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root"
>
<div
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
class="MuiInputBase-root MuiInput-root MuiInput-underline MuiInputBase-colorPrimary MuiInputBase-fullWidth MuiInputBase-formControl MuiInputBase-adornedStart MuiInputBase-adornedEnd css-953pxc-MuiInputBase-root-MuiInput-root"
>
<div
class="MuiInputAdornment-root MuiInputAdornment-positionStart MuiInputAdornment-standard MuiInputAdornment-sizeMedium css-ittuaa-MuiInputAdornment-root"
>
<span
class="notranslate"
>
​
</span>
<span
aria-label="Change filter mode"
class=""
data-mui-internal-clone-element="true"
>
<button
aria-label="Change filter mode"
class="MuiButtonBase-root MuiIconButton-root MuiIconButton-sizeSmall css-1cyhbc3-MuiButtonBase-root-MuiIconButton-root"
tabindex="0"
type="button"
>
<svg
aria-hidden="true"
class="MuiSvgIcon-root MuiSvgIcon-fontSizeMedium css-i4bv87-MuiSvgIcon-root"
data-testid="FilterListIcon"
focusable="false"
viewBox="0 0 24 24"
>
<path
d="M10 18h4v-2h-4zM3 6v2h18V6zm3 7h12v-2H6z"
/>
</svg>
<span
class="MuiTouchRipple-root css-8je8zh-MuiTouchRipple-root"
/>
</button>
</span>
</div>
<input
aria-describedby=":rl:-helper-text"
aria-invalid="false"
aria-label="Min"
autocomplete="new-password"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":rj:"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedStart MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":rl:"
inputmode="text"
placeholder="Min"
title="Min"
Expand Down Expand Up @@ -773,6 +900,14 @@ exports[`Usage statuses > renders table correctly 1`] = `
</button>
</div>
</div>
<p
class="MuiFormHelperText-root MuiFormHelperText-sizeMedium css-jchqo4-MuiFormHelperText-root"
id=":rl:-helper-text"
>
<label>
Filter Mode: Between Inclusive
</label>
</p>
</div>
<div
class="MuiFormControl-root MuiFormControl-fullWidth MuiTextField-root css-1blq8rz-MuiFormControl-root-MuiTextField-root"
Expand All @@ -785,7 +920,7 @@ exports[`Usage statuses > renders table correctly 1`] = `
aria-label="Max"
autocomplete="new-password"
class="MuiInputBase-input MuiInput-input MuiInputBase-inputAdornedEnd css-929hxt-MuiInputBase-input-MuiInput-input"
id=":rl:"
id=":ro:"
inputmode="text"
placeholder="Max"
title="Max"
Expand Down Expand Up @@ -1180,7 +1315,7 @@ exports[`Usage statuses > renders table correctly 1`] = `
class="MuiInputBase-root MuiInput-root MuiInputBase-colorPrimary css-1mmm5cp-MuiInputBase-root-MuiInput-root-MuiSelect-root"
>
<div
aria-controls=":rn:"
aria-controls=":rq:"
aria-expanded="false"
aria-haspopup="listbox"
aria-label="Rows per page"
Expand Down
Loading

0 comments on commit cbac313

Please sign in to comment.