Skip to content

Commit 1831b5e

Browse files
authored
Merge pull request #47 from skbkontur/semke/update-react-ui
Semke/update react UI
2 parents d29975d + 93335f5 commit 1831b5e

File tree

58 files changed

+3406
-7176
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+3406
-7176
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"skbkontur.typescript.contractgenerator.cli": {
6-
"version": "2.0.131",
6+
"version": "2.0.105",
77
"commands": [
88
"dotnet-ts-gen"
99
]

.github/workflows/actions.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,25 @@ env:
99
NPM_REGISTRY: https://registry.npmjs.org
1010
jobs:
1111
test:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-22.04
1313
strategy:
1414
matrix:
1515
es-version: [6.8.20, 7.17.4]
1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818
with:
1919
fetch-depth: 0
2020
- name: Setup .NET
2121
uses: actions/setup-dotnet@v3
2222
with:
2323
global-json-file: global.json
2424
- name: Setup node.js
25-
uses: actions/setup-node@v3
25+
uses: actions/setup-node@v4
2626
with:
2727
node-version: ${{ env.NODE_VERSION }}
2828
registry-url: ${{ env.NPM_REGISTRY }}
2929
- name: Install yarn
30-
run: corepack enable && corepack prepare yarn@4.0.0 --activate
30+
run: corepack enable && corepack prepare yarn@4.9.1 --activate
3131
- name: Install node dependencies
3232
run: corepack yarn --cwd cassandra-distributed-task-queue-ui --immutable
3333
- name: Restore dotnet tools
@@ -56,11 +56,11 @@ jobs:
5656
env:
5757
ES_VERSION: ${{ matrix.es-version }}
5858
publish:
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-22.04
6060
needs: test
6161
if: startsWith(github.event.ref, 'refs/tags/v')
6262
steps:
63-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v4
6464
with:
6565
fetch-depth: 0
6666
- name: Setup .NET
@@ -73,7 +73,7 @@ jobs:
7373
node-version: ${{ env.NODE_VERSION }}
7474
registry-url: ${{ env.NPM_REGISTRY }}
7575
- name: Install yarn
76-
run: corepack enable && corepack prepare yarn@4.0.0 --activate
76+
run: corepack enable && corepack prepare yarn@4.9.1 --activate
7777
- name: Install node dependencies
7878
run: corepack yarn --cwd cassandra-distributed-task-queue-ui --immutable
7979
- name: Restore dotnet tools
@@ -101,7 +101,7 @@ jobs:
101101
- name: Build front
102102
run: yarn --cwd cassandra-distributed-task-queue-ui build
103103
- name: Upload artifacts
104-
uses: actions/upload-artifact@v3
104+
uses: actions/upload-artifact@v4
105105
with:
106106
path: |
107107
**/*.nupkg

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v3.3.0 - 2025.05.28
4+
- Update react-ui
5+
- Update edi-ui
6+
37
## v3.2.0 - 2024.03.05
48
- always render task tree link; render action buttons based on server response
59
- add same logic to details cards in table

cassandra-distributed-task-queue-ui/.eslintrc.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,10 @@
1818
],
1919
"rules": {
2020
"react/react-in-jsx-scope": "off",
21+
"@typescript-eslint/no-empty-object-type": "off",
2122
"@typescript-eslint/no-unused-vars": "warn",
2223
"react/jsx-uses-react": "off",
2324
"@typescript-eslint/no-explicit-any": "warn",
24-
"@typescript-eslint/ban-types": [
25-
"error",
26-
{
27-
"types": {
28-
"object": false,
29-
"{}": false
30-
},
31-
"extendDefaults": true
32-
}
33-
],
3425
"@typescript-eslint/interface-name-prefix": "off",
3526
"import/no-namespace": "error",
3627
"import/newline-after-import": "error",
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
module.exports = {
1+
import type { StorybookConfig } from '@storybook/react-vite';
2+
3+
const config: StorybookConfig = {
24
stories: ["../stories/**/*.stories.tsx"],
35
addons: ["@storybook/addon-actions"],
46
framework: "@storybook/react-vite",
57
};
8+
9+
export default config;

cassandra-distributed-task-queue-ui/.storybook/preview.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import "../index.css";

cassandra-distributed-task-queue-ui/.yarn/releases/yarn-4.0.0.cjs

Lines changed: 0 additions & 893 deletions
This file was deleted.

cassandra-distributed-task-queue-ui/.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ networkConcurrency: 16
66

77
nodeLinker: node-modules
88

9-
npmRegistryServer: "https://registry.npmjs.org"
9+
npmRegistryServer: "https://registry.npmjs.org"

cassandra-distributed-task-queue-ui/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import "./react-selenium-testing";
2+
import type { ReactElement } from "react";
23
import ReactDom from "react-dom";
34
import { Route, Navigate, Routes, BrowserRouter } from "react-router-dom";
45

@@ -11,7 +12,7 @@ const rtqApiPrefix = "/remote-task-queue/";
1112
export const rtqMonitoringApi =
1213
process.env.API === "fake" ? new RtqMonitoringApiFake() : new RtqMonitoringApi(rtqApiPrefix);
1314

14-
const AdminRedirect = (): JSX.Element => {
15+
const AdminRedirect = (): ReactElement => {
1516
localStorage.setItem("isSuperUser", "true");
1617
return <Navigate to="../Tasks" replace />;
1718
};

0 commit comments

Comments
 (0)