Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog

## v3.6.0 - 2026.06.03
- update icons & edi-ui to latest version

## v3.5.0 - 2025.09.19
- update react to v18

Expand Down
113 changes: 58 additions & 55 deletions cassandra-distributed-task-queue-ui/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,60 +1,63 @@
{
"env": {
"browser": true,
"es2020": true,
"node": true,
"mocha": true
},
"parser": "@typescript-eslint/parser",
"plugins": ["react", "import", "@typescript-eslint", "prettier"],
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
],
"rules": {
"react/react-in-jsx-scope": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-unused-vars": "warn",
"react/jsx-uses-react": "off",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/interface-name-prefix": "off",
"import/no-namespace": "error",
"import/newline-after-import": "error",
"import/order": [
"error",
{
"groups": ["builtin", "external", "internal", "parent", "sibling", "index"],
"alphabetize": { "order": "asc" },
"newlines-between": "always"
}
"env": {
"browser": true,
"es2020": true,
"node": true,
"mocha": true
},
"parser": "@typescript-eslint/parser",
"plugins": ["react", "import", "@typescript-eslint", "prettier"],
"extends": [
"eslint:recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:import/typescript",
"plugin:react/recommended",
"plugin:@typescript-eslint/recommended",
"plugin:prettier/recommended"
],
"@typescript-eslint/explicit-member-accessibility": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"react/no-deprecated": "warn",
"react/prop-types": "off",
"react/display-name": "warn"
},
"ignorePatterns": ["dist/", "react-selenium-testing.js"],
"settings": {
"import/resolver": {
"node": {
"paths": ["src"]
}
"rules": {
"react/react-in-jsx-scope": "off",
"@typescript-eslint/no-empty-object-type": "off",
"@typescript-eslint/no-unused-vars": "warn",
"react/jsx-uses-react": "off",
"@typescript-eslint/no-explicit-any": "warn",
"@typescript-eslint/interface-name-prefix": "off",
"import/no-namespace": "error",
"import/newline-after-import": "error",
"import/order": [
"error",
{
"groups": ["builtin", "external", "internal", "parent", "sibling", "index"],
"alphabetize": { "order": "asc" },
"newlines-between": "always"
}
],
"@typescript-eslint/explicit-member-accessibility": "error",
"@typescript-eslint/explicit-function-return-type": "off",
"react/no-deprecated": "warn",
"react/prop-types": "off",
"react/display-name": "warn"
},
"react": {
"version": "detect"
}
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
"ignorePatterns": ["dist/", "react-selenium-testing.js"],
"settings": {
"import/resolver": {
"typescript": true,
"node": {
"paths": ["src"],
"extensions": [".js", ".jsx", ".ts", ".tsx"]
}
},
"react": {
"version": "detect",
"runtime": "automatic"
}
},
"ecmaVersion": 11,
"sourceType": "module"
}
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 11,
"sourceType": "module"
}
}
11 changes: 6 additions & 5 deletions cassandra-distributed-task-queue-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@
"test": "vitest --run --reporter dot"
},
"peerDependencies": {
"@skbkontur/icons": ">=1 <2",
"@skbkontur/icons": ">=2 <3",
"@skbkontur/react-ui": ">=5 <6",
"react": ">=16 <=18",
"react-dom": ">=16 <=18",
"react-router-dom": ">=6"
},
"dependencies": {
"@skbkontur/edi-ui": "^0.4.0",
"@skbkontur/edi-ui": "^0.4.3",
"@skbkontur/react-stack-layout": "^1.0.3",
"date-fns": "^3.6.0",
"decimal.js": "^10.2.1",
"lodash": "^4.17.21",
"qs": "^6.11.2",
"lodash": "4.18.0",
"qs": "6.14.2",
"tslib": "^2.4.0",
"whatwg-fetch": "^3.5.0"
},
"devDependencies": {
"@skbkontur/icons": "^1.3.0",
"@skbkontur/icons": "^2.0.10",
"@skbkontur/react-ui": "^5.1.3",
"@storybook/addon-actions": "^8.6.14",
"@storybook/cli": "^8.6.14",
Expand All @@ -72,6 +72,7 @@
"eslint": "^8.50.0",
"eslint-config-prettier": "^9.0.0",
"eslint-import-resolver-node": "^0.3.4",
"eslint-import-resolver-typescript": "^4.4.5",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.24.0",
Expand Down
3 changes: 3 additions & 0 deletions cassandra-distributed-task-queue-ui/patch-version.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
/* eslint-disable @typescript-eslint/no-var-requires */

// eslint-disable-next-line @typescript-eslint/no-require-imports
/* eslint-disable @typescript-eslint/no-var-requires */

// eslint-disable-next-line @typescript-eslint/no-require-imports
const cp = require("child_process");

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { CopyToClipboardToast } from "@skbkontur/edi-ui";
import { CopyIcon16Regular } from "@skbkontur/icons/CopyIcon16Regular";
import { IconCopyRegular16 } from "@skbkontur/icons/IconCopyRegular16";
import { Fit, RowStack } from "@skbkontur/react-stack-layout";
import { Button, Link, Modal, ThemeContext } from "@skbkontur/react-ui";
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
Expand Down Expand Up @@ -86,7 +86,7 @@ export class ErrorHandlingContainerModal extends Component<
<h4 className={jsStyles.header()}>Client stack trace</h4>
</Fit>
<Fit>
<Link icon={<CopyIcon16Regular />} onClick={() => this.copyData(stack)}>
<Link icon={<IconCopyRegular16 />} onClick={() => this.copyData(stack)}>
Скопировать
</Link>
</Fit>
Expand All @@ -106,7 +106,7 @@ export class ErrorHandlingContainerModal extends Component<
</Fit>
<Fit>
<Link
icon={<CopyIcon16Regular />}
icon={<IconCopyRegular16 />}
onClick={() => this.copyData(serverStack)}>
Скопировать
</Link>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ArrowALeftIcon24Regular } from "@skbkontur/icons/ArrowALeftIcon24Regular";
import { IconArrowALeftRegular24 } from "@skbkontur/icons/IconArrowALeftRegular24";
import { Fill, Fit, RowStack } from "@skbkontur/react-stack-layout";
import { Loader, ThemeContext } from "@skbkontur/react-ui";
import type { CSSProperties, ReactElement, ReactNode } from "react";
Expand Down Expand Up @@ -77,7 +77,7 @@ CommonLayout.GoBack = function CommonLayoutGoBack({ to }: CommonLayoutGoBackProp
const theme = useContext(ThemeContext);
return (
<RouterLink data-tid="GoBack" to={to} className={jsStyles.backLink()}>
<ArrowALeftIcon24Regular align="none" className={jsStyles.backLinkIcon(theme)} />
<IconArrowALeftRegular24 align="none" className={jsStyles.backLinkIcon(theme)} />
</RouterLink>
);
};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { CheckAIcon16Regular } from "@skbkontur/icons/CheckAIcon16Regular";
import { QuestionSquareIcon16Regular } from "@skbkontur/icons/QuestionSquareIcon16Regular";
import { TimeClockIcon16Regular } from "@skbkontur/icons/TimeClockIcon16Regular";
import { XCircleIcon16Regular } from "@skbkontur/icons/XCircleIcon16Regular";
import { XIcon16Regular } from "@skbkontur/icons/XIcon16Regular";
import { IconCheckARegular16 } from "@skbkontur/icons/IconCheckARegular16";
import { IconQuestionSquareRegular16 } from "@skbkontur/icons/IconQuestionSquareRegular16";
import { IconTimeClockRegular16 } from "@skbkontur/icons/IconTimeClockRegular16";
import { IconXCircleRegular16 } from "@skbkontur/icons/IconXCircleRegular16";
import { IconXRegular16 } from "@skbkontur/icons/IconXRegular16";
import { ThemeContext } from "@skbkontur/react-ui";
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
import { useContext, ReactElement } from "react";
Expand Down Expand Up @@ -33,22 +33,22 @@ export function TaskStateIcon({ taskState }: TaskStateIconProps): ReactElement {

switch (taskState) {
case TaskState.Unknown:
return <QuestionSquareIcon16Regular color={getIconColor(theme, "warning")} />;
return <IconQuestionSquareRegular16 color={getIconColor(theme, "warning")} />;
case TaskState.New:
return <TimeClockIcon16Regular color={getIconColor(theme, "waiting")} />;
return <IconTimeClockRegular16 color={getIconColor(theme, "waiting")} />;
case TaskState.WaitingForRerun:
return <TimeClockIcon16Regular color={getIconColor(theme, "waiting")} />;
return <IconTimeClockRegular16 color={getIconColor(theme, "waiting")} />;
case TaskState.WaitingForRerunAfterError:
return <TimeClockIcon16Regular color={getIconColor(theme, "error")} />;
return <IconTimeClockRegular16 color={getIconColor(theme, "error")} />;
case TaskState.Finished:
return <CheckAIcon16Regular color={getIconColor(theme, "success")} />;
return <IconCheckARegular16 color={getIconColor(theme, "success")} />;
case TaskState.InProcess:
return <TimeClockIcon16Regular color={getIconColor(theme, "waiting")} />;
return <IconTimeClockRegular16 color={getIconColor(theme, "waiting")} />;
case TaskState.Fatal:
return <XCircleIcon16Regular color={getIconColor(theme, "error")} />;
return <IconXCircleRegular16 color={getIconColor(theme, "error")} />;
case TaskState.Canceled:
return <XIcon16Regular color={getIconColor(theme, "error")} />;
return <IconXRegular16 color={getIconColor(theme, "error")} />;
default:
return <CheckAIcon16Regular />;
return <IconCheckARegular16 />;
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Accordion } from "@skbkontur/edi-ui";
import { ArrowRoundTimeForwardIcon16Regular } from "@skbkontur/icons/ArrowRoundTimeForwardIcon16Regular";
import { TextAlignCenterJustifyIcon16Regular } from "@skbkontur/icons/TextAlignCenterJustifyIcon16Regular";
import { XIcon16Regular } from "@skbkontur/icons/XIcon16Regular";
import { IconArrowRoundTimeForwardRegular16 } from "@skbkontur/icons/IconArrowRoundTimeForwardRegular16";
import { IconTextAlignCenterJustifyRegular16 } from "@skbkontur/icons/IconTextAlignCenterJustifyRegular16";
import { IconXRegular16 } from "@skbkontur/icons/IconXRegular16";
import { ColumnStack, Fill, Fit, RowStack } from "@skbkontur/react-stack-layout";
import { Button, Link, Modal, ThemeContext } from "@skbkontur/react-ui";
import { useContext, useState, ReactElement } from "react";
Expand Down Expand Up @@ -78,15 +78,15 @@ export function TaskDetailsPage({
<RouterLink
data-tid="RelatedTaskTree"
to={`../Tree${searchRequestMapping.stringify(relatedTasksRequest)}`}>
<TextAlignCenterJustifyIcon16Regular />
<IconTextAlignCenterJustifyRegular16 />
{"\u00A0"}
View related tasks tree
</RouterLink>
</Fit>
)}
{canCancel && (
<Fit>
<Link icon={<XIcon16Regular />} use="danger" data-tid="CancelButton" onClick={cancel}>
<Link icon={<IconXRegular16 />} use="danger" data-tid="CancelButton" onClick={cancel}>
Cancel task
</Link>
</Fit>
Expand All @@ -95,7 +95,7 @@ export function TaskDetailsPage({
<Fit>
<Button
use="link"
icon={<ArrowRoundTimeForwardIcon16Regular />}
icon={<IconArrowRoundTimeForwardRegular16 />}
data-tid="RerunButton"
onClick={rerun}>
Rerun task
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ArrowShapeTriangleADownIcon16Regular } from "@skbkontur/icons/ArrowShapeTriangleADownIcon16Regular";
import { IconArrowShapeTriangleADownRegular16 } from "@skbkontur/icons/IconArrowShapeTriangleADownRegular16";
import { ColumnStack } from "@skbkontur/react-stack-layout";
import { Button, Checkbox, Tooltip } from "@skbkontur/react-ui";
import { ReactElement } from "react";
Expand Down Expand Up @@ -54,7 +54,7 @@ export const TaskStatesSelect = ({ value, onChange }: TaskStatesSelectProps) =>
<span data-tid="ButtonText" className={jsStyles.buttonText()}>
{value.length ? `Выбрано состояний: ${value.length}` : "Выбрать состояние"}
</span>
<ArrowShapeTriangleADownIcon16Regular />
<IconArrowShapeTriangleADownRegular16 />
</Button>
</Tooltip>
</span>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Timestamp, AllowCopyToClipboard, Ticks } from "@skbkontur/edi-ui";
import { ArrowRoundTimeForwardIcon16Regular } from "@skbkontur/icons/ArrowRoundTimeForwardIcon16Regular";
import { XIcon16Regular } from "@skbkontur/icons/XIcon16Regular";
import { IconArrowRoundTimeForwardRegular16 } from "@skbkontur/icons/IconArrowRoundTimeForwardRegular16";
import { IconXRegular16 } from "@skbkontur/icons/IconXRegular16";
import { ColumnStack, Fill, Fit, RowStack } from "@skbkontur/react-stack-layout";
import { Checkbox, Link, ThemeContext } from "@skbkontur/react-ui";
import { useContext, ReactElement } from "react";
Expand Down Expand Up @@ -96,7 +96,7 @@ export function TaskDetails(props: TaskDetailsProps): ReactElement {
data-tid="Cancel"
disabled={!canCancel}
onClick={onCancel}
icon={<XIcon16Regular />}>
icon={<IconXRegular16 />}>
Cancel
</Link>
</Fit>
Expand All @@ -105,7 +105,7 @@ export function TaskDetails(props: TaskDetailsProps): ReactElement {
data-tid="Rerun"
disabled={!canRerun}
onClick={onRerun}
icon={<ArrowRoundTimeForwardIcon16Regular />}>
icon={<IconArrowRoundTimeForwardRegular16 />}>
Rerun
</Link>
</Fit>
Expand Down
Loading
Loading