Skip to content

Commit 60e9a40

Browse files
committed
Merge branch 'develop'
2 parents e2a03b5 + 5df34d1 commit 60e9a40

File tree

8 files changed

+180
-155
lines changed

8 files changed

+180
-155
lines changed

.github/workflows/cache-cleanup.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
echo "Deleting caches..."
3535
for cacheKey in $cacheKeysForPR
3636
do
37-
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
37+
gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
3838
done
3939
echo "Done"
4040
env:

.github/workflows/linters.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
uses: actions/checkout@v5
2626

2727
- name: Install Node.JS
28-
uses: actions/setup-node@v5
28+
uses: actions/setup-node@v6
2929

3030
- name: Cache modules
3131
uses: actions/cache@v4

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
password: ${{ secrets.DOCKERHUB_TOKEN }}
3636

3737
- name: Install Node.JS
38-
uses: actions/setup-node@v5
38+
uses: actions/setup-node@v6
3939

4040
- name: Checkout code
4141
uses: actions/checkout@v5

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# use amd64 for building .js and .css (which are platform agnostic),
33
# and then copy to platform-specific nginx image
44

5-
FROM --platform=linux/amd64 node:24.9.0 AS build
5+
FROM --platform=linux/amd64 node:25.0.0 AS build
66

77
WORKDIR /app
88

package-lock.json

Lines changed: 163 additions & 137 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "data-rentgen",
3-
"version": "0.4.1",
3+
"version": "0.4.2",
44
"private": true,
55
"type": "module",
66
"description": "Frontend for Data.Rentgen",
@@ -9,16 +9,16 @@
99
"@dagrejs/dagre": "^1.1.5",
1010
"@mui/icons-material": "^5.18.0",
1111
"@mui/material": "^5.18.0",
12-
"@xyflow/react": "^12.8.6",
12+
"@xyflow/react": "^12.9.0",
1313
"clsx": "^2.1.1",
1414
"date-fns": "^3.6.0",
1515
"inflection": "^3.0.2",
1616
"query-string": "^7.1.3",
17-
"ra-i18n-polyglot": "^5.11.4",
18-
"ra-language-english": "^5.11.4",
17+
"ra-i18n-polyglot": "^5.12.2",
18+
"ra-language-english": "^5.12.2",
1919
"ra-language-russian": "^5.4.4",
2020
"react": "^18.3.1",
21-
"react-admin": "^5.11.4",
21+
"react-admin": "^5.12.2",
2222
"react-dom": "^18.3.1",
2323
"react-router": "^6.30.1",
2424
"react-router-dom": "^6.30.1",
@@ -38,16 +38,16 @@
3838
},
3939
"devDependencies": {
4040
"@eslint/compat": "^1.4.0",
41-
"@eslint/js": "^9.37.0",
41+
"@eslint/js": "^9.38.0",
4242
"@rollup/plugin-alias": "^5.1.1",
4343
"@svgr/plugin-svgo": "^8.1.0",
4444
"@types/jest": "^29.5.14",
45-
"@types/node": "^20.19.17",
45+
"@types/node": "^20.19.23",
4646
"@types/react": "^18.3.18",
4747
"@types/react-dom": "^18.3.5",
4848
"@types/react-syntax-highlighter": "^15.5.13",
4949
"@vitejs/plugin-react": "^4.7.0",
50-
"eslint": "^9.37.0",
50+
"eslint": "^9.38.0",
5151
"eslint-plugin-compat": "^6.0.2",
5252
"eslint-plugin-react": "^7.37.4",
5353
"husky": "^9.1.7",
@@ -57,8 +57,8 @@
5757
"rollup-plugin-visualizer": "^5.14.0",
5858
"rollup-preserve-directives": "^1.1.3",
5959
"typescript": "^5.7.3",
60-
"typescript-eslint": "^8.44.1",
61-
"vite": "^6.3.6",
60+
"typescript-eslint": "^8.46.2",
61+
"vite": "^6.4.1",
6262
"vite-plugin-svgr": "^4.5.0",
6363
"vite-plugin-webfont-dl": "^3.11.1"
6464
},

src/components/job/JobRaListFilters.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
1-
import { FilterLiveForm, minLength, useTranslate } from "react-admin";
1+
import { FilterLiveForm, minLength } from "react-admin";
22

3-
import { Box, Button, InputAdornment } from "@mui/material";
3+
import { Box, InputAdornment } from "@mui/material";
44
import SearchIcon from "@mui/icons-material/Search";
55
import { TextInput } from "react-admin";
66
import JobTypeRaFilter from "./JobRaTypeFilter";
77
import { LocationRaTypeFilter } from "../location";
88

99
const JobRaListFilters = () => {
10-
const translate = useTranslate();
11-
1210
return (
1311
<FilterLiveForm>
1412
<Box display="flex" alignItems="flex-end">

src/components/run/RunRaListFilters.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ const filterKeys: RunRaListFilterKeys[] = [
3030
"status",
3131
"job_type",
3232
"started_by_user",
33+
"search_query",
3334
];
3435

3536
const RunRaListFilters = () => {

0 commit comments

Comments
 (0)