Skip to content

Commit 4cfad60

Browse files
committed
small fixes
1 parent f9cf33e commit 4cfad60

File tree

4 files changed

+225
-161
lines changed

4 files changed

+225
-161
lines changed

.github/workflows/DotNET-build.yml

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,24 @@ on:
2929
jobs:
3030
ubuntu-latest:
3131
name: ubuntu-latest
32-
runs-on: ubuntu-latest
33-
34-
steps:
35-
- name: Setup dotnet 6
36-
uses: actions/setup-dotnet@v4
37-
with:
32+
runs-on: ubuntu-latest
33+
34+
steps:
35+
# temporary from here...
36+
- name: Setup dotnet 6
37+
uses: actions/setup-dotnet@v4
38+
with:
3839
dotnet-version: '6.0.x'
39-
- name: Setup dotnet 7
40-
uses: actions/setup-dotnet@v4
41-
with:
42-
dotnet-version: '7.0.x'
43-
- name: Setup dotnet 8
44-
uses: actions/setup-dotnet@v4
45-
with:
40+
- name: Setup dotnet 7
41+
uses: actions/setup-dotnet@v4
42+
with:
43+
dotnet-version: '7.0.x'
44+
- name: Setup dotnet 8
45+
uses: actions/setup-dotnet@v4
46+
with:
4647
dotnet-version: '8.0.x'
48+
# ...to here
49+
4750
- uses: actions/setup-java@v4
4851
with:
4952
distribution: 'temurin'

src/Serilog.Ui.Web/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@
1515
},
1616
"dependencies": {
1717
"@fontsource/mononoki": "^5.2.5",
18-
"@mantine/core": "^7.17.1",
19-
"@mantine/dates": "^7.17.1",
20-
"@mantine/hooks": "^7.17.1",
21-
"@mantine/notifications": "^7.17.1",
18+
"@mantine/core": "^7.17.2",
19+
"@mantine/dates": "^7.17.2",
20+
"@mantine/hooks": "^7.17.2",
21+
"@mantine/notifications": "^7.17.2",
2222
"@tabler/icons-react": "^3.31.0",
23-
"@tanstack/react-query": "^5.67.2",
23+
"@tanstack/react-query": "^5.68.0",
2424
"dayjs": "^1.11.13",
25-
"jose": "^6.0.8",
25+
"jose": "^6.0.10",
2626
"react": "^18.3.1",
2727
"react-dom": "^18.3.1",
2828
"react-hook-form": "^7.54.2",
@@ -54,20 +54,20 @@
5454
"eslint-plugin-testing-library": "^7.1.1",
5555
"eslint-plugin-vitest": "^0.5.4",
5656
"eslint-plugin-vitest-globals": "^1.5.0",
57-
"happy-dom": "^17.4.3",
57+
"happy-dom": "^17.4.4",
5858
"msw": "^2.7.3",
5959
"postcss": "^8.5.3",
6060
"postcss-preset-mantine": "^1.17.0",
6161
"postcss-simple-vars": "^7.0.1",
6262
"prettier": "^3.5.3",
6363
"prettier-plugin-organize-imports": "^4.1.0",
64-
"shiki": "^2.3.2",
64+
"shiki": "^3.2.1",
6565
"testing-library-selector": "^0.3.1",
6666
"typescript": "^5.8.2",
67-
"typescript-eslint": "^8.26.0",
68-
"vite": "^6.2.1",
67+
"typescript-eslint": "^8.26.1",
68+
"vite": "^6.2.2",
6969
"vite-plugin-checker": "^0.9.0",
70-
"vite-plugin-mkcert": "^1.17.7",
70+
"vite-plugin-mkcert": "^1.17.8",
7171
"vite-tsconfig-paths": "^5.1.4",
7272
"vitest": "^3.0.8",
7373
"vitest-sonar-reporter": "^2.0.0"

src/Serilog.Ui.Web/src/app/components/Search/Search.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,17 @@ const SelectDbKeyInput = memo(() => {
105105
const { control } = useSearchForm();
106106
const { data: queryTableKeys } = useQueryTableKeys(true);
107107
const { field } = useController({ ...control, name: 'table' });
108-
const isTableDisabled = !queryTableKeys?.length;
108+
const queryKeys = queryTableKeys?.map((d) => ({ value: d, label: d })) ?? [];
109+
const isTableDisabled = !queryKeys.length;
109110

110111
return (
111112
<Grid.Col span={dbKeySpan} order={dbKeyOrder}>
112113
<Select
113-
label="Table"
114-
data={queryTableKeys?.map((d) => ({ value: d, label: d })) ?? []}
115114
allowDeselect={false}
116-
{...field}
115+
data={queryKeys}
117116
disabled={isTableDisabled}
117+
label="Table"
118+
{...field}
118119
></Select>
119120
</Grid.Col>
120121
);

0 commit comments

Comments
 (0)