aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcrupest <crupest@outlook.com>2021-12-08 22:38:12 +0800
committerGitHub <noreply@github.com>2021-12-08 22:38:12 +0800
commit99b6193a04b1cb0144e5d1926a1a4a27ef4ca66d (patch)
treef34490a5839b35636866dac5d975afd5c5fb940a
parent770b4289de8a566e85814d82b0a5f80be9716a10 (diff)
parent7cb4b7578ac924ac552da2fb81941ee5d6ef9e8a (diff)
downloadtimeline-99b6193a04b1cb0144e5d1926a1a4a27ef4ca66d.tar.gz
timeline-99b6193a04b1cb0144e5d1926a1a4a27ef4ca66d.tar.bz2
timeline-99b6193a04b1cb0144e5d1926a1a4a27ef4ca66d.zip
Merge pull request #966 from crupest/dependabot/npm_and_yarn/FrontEnd/prettier-2.5.1
build(deps-dev): Bump prettier from 2.4.1 to 2.5.1 in /FrontEnd
-rw-r--r--FrontEnd/package.json2
-rw-r--r--FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx117
2 files changed, 60 insertions, 59 deletions
diff --git a/FrontEnd/package.json b/FrontEnd/package.json
index f43413d0..7be0e20a 100644
--- a/FrontEnd/package.json
+++ b/FrontEnd/package.json
@@ -64,7 +64,7 @@
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-react": "^7.27.1",
"eslint-plugin-react-hooks": "^4.3.0",
- "prettier": "^2.4.1",
+ "prettier": "^2.5.1",
"typescript": "^4.5.2",
"vite": "^2.7.1",
"vite-plugin-pwa": "^0.11.10"
diff --git a/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx b/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
index 64daa19b..cd5c46da 100644
--- a/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
+++ b/FrontEnd/src/views/timeline-common/TimelinePropertyChangeDialog.tsx
@@ -23,65 +23,66 @@ const labelMap: { [key in TimelineVisibility]: string } = {
Register: "timeline.visibility.register",
};
-const TimelinePropertyChangeDialog: React.FC<TimelinePropertyChangeDialogProps> =
- (props) => {
- const { timeline, onChange } = props;
+const TimelinePropertyChangeDialog: React.FC<
+ TimelinePropertyChangeDialogProps
+> = (props) => {
+ const { timeline, onChange } = props;
- return (
- <OperationDialog
- title={"timeline.dialogChangeProperty.title"}
- inputScheme={
- [
- {
- type: "text",
- label: "timeline.dialogChangeProperty.titleField",
- initValue: timeline.title,
- },
- {
- type: "select",
- label: "timeline.dialogChangeProperty.visibility",
- options: kTimelineVisibilities.map((v) => ({
- label: labelMap[v],
- value: v,
- })),
- initValue: timeline.visibility,
- },
- {
- type: "text",
- label: "timeline.dialogChangeProperty.description",
- initValue: timeline.description,
- },
- {
- type: "color",
- label: "timeline.dialogChangeProperty.color",
- initValue: timeline.color ?? null,
- canBeNull: true,
- },
- ] as const
+ return (
+ <OperationDialog
+ title={"timeline.dialogChangeProperty.title"}
+ inputScheme={
+ [
+ {
+ type: "text",
+ label: "timeline.dialogChangeProperty.titleField",
+ initValue: timeline.title,
+ },
+ {
+ type: "select",
+ label: "timeline.dialogChangeProperty.visibility",
+ options: kTimelineVisibilities.map((v) => ({
+ label: labelMap[v],
+ value: v,
+ })),
+ initValue: timeline.visibility,
+ },
+ {
+ type: "text",
+ label: "timeline.dialogChangeProperty.description",
+ initValue: timeline.description,
+ },
+ {
+ type: "color",
+ label: "timeline.dialogChangeProperty.color",
+ initValue: timeline.color ?? null,
+ canBeNull: true,
+ },
+ ] as const
+ }
+ open={props.open}
+ onClose={props.close}
+ onProcess={([newTitle, newVisibility, newDescription, newColor]) => {
+ const req: HttpTimelinePatchRequest = {};
+ if (newTitle !== timeline.title) {
+ req.title = newTitle;
}
- open={props.open}
- onClose={props.close}
- onProcess={([newTitle, newVisibility, newDescription, newColor]) => {
- const req: HttpTimelinePatchRequest = {};
- if (newTitle !== timeline.title) {
- req.title = newTitle;
- }
- if (newVisibility !== timeline.visibility) {
- req.visibility = newVisibility as TimelineVisibility;
- }
- if (newDescription !== timeline.description) {
- req.description = newDescription;
- }
- const nc = newColor ?? "";
- if (nc !== timeline.color) {
- req.color = nc;
- }
- return getHttpTimelineClient()
- .patchTimeline(timeline.name, req)
- .then(onChange);
- }}
- />
- );
- };
+ if (newVisibility !== timeline.visibility) {
+ req.visibility = newVisibility as TimelineVisibility;
+ }
+ if (newDescription !== timeline.description) {
+ req.description = newDescription;
+ }
+ const nc = newColor ?? "";
+ if (nc !== timeline.color) {
+ req.color = nc;
+ }
+ return getHttpTimelineClient()
+ .patchTimeline(timeline.name, req)
+ .then(onChange);
+ }}
+ />
+ );
+};
export default TimelinePropertyChangeDialog;