Skip to content

Commit 90b1122

Browse files
fakefeikfakefeik
committed
remove stylelint
1 parent 63bb442 commit 90b1122

File tree

15 files changed

+176
-730
lines changed

15 files changed

+176
-730
lines changed

‎cassandra-distributed-task-queue-ui/.storybook/main.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ module.exports = {
1717
exclude: /node_modules/,
1818
},
1919
{
20-
test: /\.(c|le)ss$/,
20+
test: /\.css$/,
2121
loaders: [
2222
require.resolve("style-loader"),
2323
{
@@ -28,7 +28,6 @@ module.exports = {
2828
},
2929
},
3030
},
31-
require.resolve("less-loader"),
3231
],
3332
},
3433
{

‎cassandra-distributed-task-queue-ui/.stylelintrc.json‎

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import ReactDom from "react-dom";
44
import { Switch, Redirect, Route } from "react-router";
55
import { BrowserRouter } from "react-router-dom";
66

7-
import { RtqMonitoringApiFake } from "./stories/Api/RtqMonitoringApiFake";
87
import { RemoteTaskQueueApplication, RtqMonitoringApi, ICustomRenderer } from "./src";
98
import { RtqMonitoringSearchRequest } from "./src/Domain/Api/RtqMonitoringSearchRequest";
109
import { RtqMonitoringTaskModel } from "./src/Domain/Api/RtqMonitoringTaskModel";
1110
import { TimeUtils } from "./src/Domain/Utils/TimeUtils";
1211
import { RangeSelector } from "./src/components/DateTimeRangePicker/RangeSelector";
12+
import { RtqMonitoringApiFake } from "./stories/Api/RtqMonitoringApiFake";
1313

1414
const rtqApiPrefix = "/remote-task-queue/";
1515

‎cassandra-distributed-task-queue-ui/package.json‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"build:clean": "rimraf dist",
2424
"build:tsc": "tsc --project tsconfig.prod.json",
2525
"build:patch": "node ./patch-version",
26-
"build:copy:src": "copyfiles --up 1 \"src/**/*.js\" \"src/**/*.less\" dist",
26+
"build:copy:src": "copyfiles --up 1 \"src/**/*.js\" dist",
2727
"build:copy:meta": "copyfiles --flat package.json \"../*.md\" ../LICENSE dist",
2828
"build:pack": "cd dist && npm pack",
2929
"build:types": "dotnet ts-gen --assembly ./../Cassandra.DistributedTaskQueue.Monitoring.TestService/bin/net5.0/SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TestService.dll --outputDir ./src/Domain/Api --nullabilityMode Pessimistic",
@@ -33,7 +33,6 @@
3333
"lint": "run-s \"lint:*\"",
3434
"lint:tsc": "tsc --noEmit",
3535
"lint:eslint": "eslint ./ --ext .js,.jsx,.ts,.tsx",
36-
"lint:stylelint": "stylelint \"./**/*.less\"",
3736
"test": "mocha **/*.test.ts"
3837
},
3938
"peerDependencies": {
@@ -90,8 +89,6 @@
9089
"eslint-plugin-import": "^2.22.1",
9190
"eslint-plugin-prettier": "^3.3.1",
9291
"eslint-plugin-react": "^7.22.0",
93-
"less": "^4.1.0",
94-
"less-loader": "^7.3.0",
9592
"mocha": "^8.2.1",
9693
"npm-run-all": "^4.1.5",
9794
"prettier": "^2.2.1",
@@ -103,9 +100,6 @@
103100
"rimraf": "^3.0.2",
104101
"storybook-react-router": "^1.0.8",
105102
"style-loader": "^2.0.0",
106-
"stylelint": "^13.9.0",
107-
"stylelint-config-css-modules": "^2.2.0",
108-
"stylelint-config-standard": "^20.0.0",
109103
"tslib": "^2.1.0",
110104
"typescript": "^4.1.3",
111105
"url-loader": "^4.1.1",

‎cassandra-distributed-task-queue-ui/src/components/TaskDetailsPage/TaskDetailsPage.styles.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,10 @@ export const jsStyles = {
2727
overflow-x: auto;
2828
`;
2929
},
30+
31+
modalText(t: Theme): string {
32+
return css`
33+
color: ${t.textColorDefault};
34+
`;
35+
},
3036
};

‎cassandra-distributed-task-queue-ui/src/components/TaskDetailsPage/TaskDetailsPage.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export function TaskDetailsPage({
4141
}: TaskDetailsPageProps): JSX.Element {
4242
const [openedModal, setOpenedModal] = React.useState(false);
4343
const [modalType, setModalType] = React.useState<"Cancel" | "Rerun">("Cancel");
44-
const theme = React.useContext(ThemeContext)
44+
const theme = React.useContext(ThemeContext);
4545

4646
const rerun = () => {
4747
setOpenedModal(true);
@@ -106,9 +106,11 @@ export function TaskDetailsPage({
106106
}
107107
return (
108108
<Modal onClose={closeModal} width={500} data-tid="ConfirmOperationModal">
109-
<Modal.Header>Нужно подтверждение</Modal.Header>
109+
<Modal.Header>
110+
<span className={jsStyles.modalText(theme)}>Нужно подтверждение</span>
111+
</Modal.Header>
110112
<Modal.Body>
111-
<span data-tid="ModalText">
113+
<span data-tid="ModalText" className={jsStyles.modalText(theme)}>
112114
{modalType === "Rerun"
113115
? "Уверен, что таску надо перезапустить?"
114116
: "Уверен, что таску надо остановить?"}

‎cassandra-distributed-task-queue-ui/src/components/TaskTable/TaskTable.styles.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,16 @@
11
import { css } from "@skbkontur/react-ui/lib/theming/Emotion";
2+
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
23

34
export const jsStyles = {
45
taskDetailsRow(): string {
56
return css`
67
margin-bottom: 5px;
78
`;
89
},
10+
11+
modalText(t: Theme): string {
12+
return css`
13+
color: ${t.textColorDefault};
14+
`;
15+
},
916
};

‎cassandra-distributed-task-queue-ui/src/components/TaskTable/TaskTable.tsx‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Fit, RowStack } from "@skbkontur/react-stack-layout";
2-
import { Button, Modal } from "@skbkontur/react-ui";
2+
import { ThemeContext, Button, Modal } from "@skbkontur/react-ui";
3+
import { Theme } from "@skbkontur/react-ui/lib/theming/Theme";
34
import { LocationDescriptor } from "history";
45
import _ from "lodash";
56
import React from "react";
@@ -30,6 +31,8 @@ export class TasksTable extends React.Component<TaskTableProps, TasksTableState>
3031
actionTask: "",
3132
};
3233

34+
private theme!: Theme;
35+
3336
public shouldComponentUpdate(nextProps: TaskTableProps, nextState: TasksTableState): boolean {
3437
return (
3538
!_.isEqual(this.props.taskInfos, nextProps.taskInfos) ||
@@ -44,10 +47,17 @@ export class TasksTable extends React.Component<TaskTableProps, TasksTableState>
4447
const { taskInfos } = this.props;
4548
const { openedModal } = this.state;
4649
return (
47-
<div>
48-
<div data-tid="Tasks">{taskInfos.map(item => this.renderRow(item))}</div>
49-
{openedModal && this.renderModal()}
50-
</div>
50+
<ThemeContext.Consumer>
51+
{theme => {
52+
this.theme = theme;
53+
return (
54+
<div>
55+
<div data-tid="Tasks">{taskInfos.map(item => this.renderRow(item))}</div>
56+
{openedModal && this.renderModal()}
57+
</div>
58+
);
59+
}}
60+
</ThemeContext.Consumer>
5161
);
5262
}
5363

@@ -73,9 +83,11 @@ export class TasksTable extends React.Component<TaskTableProps, TasksTableState>
7383

7484
return (
7585
<Modal onClose={() => this.closeModal()} width={500} data-tid="ConfirmOperationModal">
76-
<Modal.Header>Нужно подтверждение</Modal.Header>
86+
<Modal.Header>
87+
<span className={jsStyles.modalText(this.theme)}>Нужно подтверждение</span>
88+
</Modal.Header>
7789
<Modal.Body>
78-
<span data-tid="ModalText">
90+
<span data-tid="ModalText" className={jsStyles.modalText(this.theme)}>
7991
{modalType === "Rerun"
8092
? "Уверен, что таску надо перезапустить?"
8193
: "Уверен, что таску надо остановить?"}

‎cassandra-distributed-task-queue-ui/src/components/TaskTable/TasksModal.tsx‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
import { ColumnStack, Fit, RowStack } from "@skbkontur/react-stack-layout";
2+
import { Button, Input, Modal, ThemeContext } from "@skbkontur/react-ui";
3+
import React from "react";
4+
5+
import { numberToString } from "../../Domain/numberToString";
6+
import { jsStyles } from "../ErrorHandling/ErrorHandlingContainer.styles";
7+
8+
interface TasksModalProps {
9+
modalType: "Rerun" | "Cancel";
10+
counter: number;
11+
onCancelAll: () => void;
12+
onRerunAll: () => void;
13+
onCloseModal: () => void;
14+
}
15+
16+
export function TasksModal({
17+
modalType,
18+
counter,
19+
onCancelAll,
20+
onRerunAll,
21+
onCloseModal,
22+
}: TasksModalProps): JSX.Element {
23+
const [manyTaskConfirm, setManyTaskConfirm] = React.useState("");
24+
const theme = React.useContext(ThemeContext);
25+
26+
const confirmedRegExp = /б.*л.*я/i;
27+
28+
return (
29+
<Modal onClose={onCloseModal} width={500} data-tid="ConfirmMultipleOperationModal">
30+
<Modal.Header>
31+
<span className={jsStyles.modalText(theme)}>Нужно подтверждение</span>
32+
</Modal.Header>
33+
<Modal.Body>
34+
<ColumnStack gap={2} className={jsStyles.modalText(theme)}>
35+
<Fit>
36+
<span data-tid="ModalText">
37+
{modalType === "Rerun"
38+
? "Уверен, что все эти таски надо перезапустить?"
39+
: "Уверен, что все эти таски надо остановить?"}
40+
</span>
41+
</Fit>
42+
{counter > 100 && [
43+
<Fit key="text">
44+
Это действие может задеть больше 100 тасок, если это точно надо сделать, то напиши прописью
45+
количество тасок (их {counter}):
46+
</Fit>,
47+
<Fit key="input">
48+
<Input
49+
data-tid="ConfirmationInput"
50+
value={manyTaskConfirm}
51+
onValueChange={val => setManyTaskConfirm(val)}
52+
/>
53+
</Fit>,
54+
]}
55+
</ColumnStack>
56+
</Modal.Body>
57+
<Modal.Footer>
58+
<RowStack gap={2}>
59+
<Fit>
60+
{modalType === "Rerun" ? (
61+
<Button
62+
data-tid="RerunButton"
63+
use="success"
64+
disabled={
65+
counter > 100 &&
66+
!confirmedRegExp.test(manyTaskConfirm) &&
67+
manyTaskConfirm !== numberToString(counter)
68+
}
69+
onClick={onRerunAll}>
70+
Перезапустить все
71+
</Button>
72+
) : (
73+
<Button
74+
data-tid="CancelButton"
75+
use="danger"
76+
disabled={
77+
counter > 100 &&
78+
!confirmedRegExp.test(manyTaskConfirm) &&
79+
manyTaskConfirm !== numberToString(counter)
80+
}
81+
onClick={onCancelAll}>
82+
Остановить все
83+
</Button>
84+
)}
85+
</Fit>
86+
<Fit>
87+
<Button data-tid="CloseButton" onClick={onCloseModal}>
88+
Закрыть
89+
</Button>
90+
</Fit>
91+
</RowStack>
92+
</Modal.Footer>
93+
</Modal>
94+
);
95+
}

‎cassandra-distributed-task-queue-ui/src/containers/TaskDetailsPageContainer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export class TaskDetailsPageContainer extends React.Component<
4949
const { taskDetails, loading, notFoundError } = this.state;
5050
const { parentLocation, isSuperUser, customRenderer, path, useErrorHandlingContainer } = this.props;
5151
if (notFoundError) {
52-
return <TaskNotFoundPage parentLocation={parentLocation || path} />;
52+
return <TaskNotFoundPage />;
5353
}
5454

5555
return (

0 commit comments

Comments
 (0)