Skip to content

Commit 4922eb4

Browse files
committed
Even prettier
1 parent 7926786 commit 4922eb4

10 files changed

Lines changed: 60 additions & 64 deletions

File tree

backend/src/controllers/rating-controller.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
import { Authorized, JsonController, CurrentUser, Get, Post, Body, Param } from "routing-controllers";
1+
import {
2+
Authorized,
3+
JsonController,
4+
CurrentUser,
5+
Get,
6+
Post,
7+
Body,
8+
Param,
9+
} from "routing-controllers";
210
import { Inject } from "typedi";
311
import { UserRole } from "../entities/user-role";
412
import { RatingServiceToken, IRatingService } from "../services/rating-service";

backend/src/services/rating-service.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
import {
2-
ForbiddenError,
3-
NotFoundError,
4-
} from "routing-controllers";
1+
import { ForbiddenError, NotFoundError } from "routing-controllers";
52
import { Inject, Service, Token } from "typedi";
63
import { Repository } from "typeorm";
74
import { IService } from ".";

backend/test/controllers/rating-controller.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ describe("RatingController", () => {
2525
ratingService = new MockRatingService();
2626
settingsService = new MockSettingsService();
2727
controller = new RatingController(
28-
settingsService.instance,
2928
ratingService.instance,
3029
);
3130
});
@@ -85,7 +84,6 @@ describe("RatingController", () => {
8584
get(target: Function) {
8685
if (target === RatingController) {
8786
return new RatingController(
88-
settingsService.instance,
8987
ratingService.instance,
9088
);
9189
}

frontend/src/components/base/flex.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ export const FlexRowColumnContainer = styled.div`
6262
/**
6363
* A column in a flex row.
6464
*/
65-
export const BigFlexRowColumnContainer = (props: { children?: React.ReactNode; style?: React.CSSProperties }) => (
65+
export const BigFlexRowColumnContainer = (props: {
66+
children?: React.ReactNode;
67+
style?: React.CSSProperties;
68+
}) => (
6669
<FlexRowColumnContainer {...props} style={{ ...props.style, flexGrow: 2 }}>
6770
{props.children}
6871
</FlexRowColumnContainer>

frontend/src/components/pages/projects.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ const arraySum = (array: number[]) => {
3131
* for each project.
3232
*/
3333
const RatingResults = () => {
34-
const [ratingResults, setRatingResults] = useState<ProjectRatingResultDTO[]>([]);
34+
const [ratingResults, setRatingResults] = useState<ProjectRatingResultDTO[]>(
35+
[],
36+
);
3537
const [criteria, setCriteria] = React.useState<CriterionDTO[]>([]);
3638

3739
useEffect(() => {

frontend/src/components/pages/rating-form.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ interface IRatingFormProps {
2323
* Component that allows users to submit and edit ratings for projects.
2424
* Only for one criterion, use multiple of this to cover all of them.
2525
*/
26-
export const RatingForm = ({ rating, criterion, project }: IRatingFormProps) => {
26+
export const RatingForm = ({
27+
rating,
28+
criterion,
29+
project,
30+
}: IRatingFormProps) => {
2731
const loginState = useLoginContext();
2832
const { user } = loginState;
2933

frontend/src/components/pages/read-only-project.tsx

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
import * as React from "react";
2-
import {
3-
FlexRowContainer,
4-
Spacer,
5-
} from "../base/flex";
2+
import { FlexRowContainer, Spacer } from "../base/flex";
63
import { Page } from "./page";
74
import { RoundedImage } from "../base/image";
85
import { api } from "../../hooks/use-api";
96
import { PageHeader } from "../base/page-header";
107
import { RatingForm } from "./rating-form";
11-
import {
12-
CriterionDTO,
13-
RatingDTO,
14-
ProjectDTO,
15-
} from "../../api/types/dto";
8+
import { CriterionDTO, RatingDTO, ProjectDTO } from "../../api/types/dto";
169

1710
/**
1811
* A settings dashboard to configure all parts of tilt.

frontend/src/components/pages/read-only-team.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import * as React from "react";
2-
import {
3-
FlexRowContainer,
4-
Spacer,
5-
} from "../base/flex";
2+
import { FlexRowContainer, Spacer } from "../base/flex";
63
import { Page } from "./page";
74
import { Button } from "../base/button";
85
import { RoundedImage } from "../base/image";

frontend/src/components/pages/view-project.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ import * as React from "react";
22
import { Page } from "./page";
33
import { TextInput, TextInputType } from "../base/text-input";
44
import { api, useApi } from "../../hooks/use-api";
5-
import {
6-
Switch,
7-
FormControlLabel,
8-
} from "@mui/material";
5+
import { Switch, FormControlLabel } from "@mui/material";
96
import { useLoginContext } from "../../contexts/login-context";
107
import { Message } from "../base/message";
118
import { UserRole } from "../../api/types/enums";
@@ -81,11 +78,6 @@ const EditProject = ({ project }: { project: ProjectDTO }) => {
8178
[id, title, description, image, allowRating],
8279
);
8380

84-
const { value: _allUsers } = useApi(
85-
async (apiClient) => apiClient.getAllUsers(),
86-
[],
87-
);
88-
8981
const handleSubmit = React.useCallback((event: React.SyntheticEvent) => {
9082
event.preventDefault();
9183
}, []);

frontend/src/components/settings/project-rating/rating-criteria-settings.tsx

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -28,39 +28,41 @@ interface ICriterionEditorProps {
2828
/**
2929
* Edit or delete a single criteria
3030
**/
31-
const CriterionEditor = React.memo(({ criterion, onSave, onDelete }: ICriterionEditorProps) => {
32-
// Use react.memo to avoid rerendering the component every time a character is typed
33-
const [title, setTitle] = useState(criterion.title);
34-
const [description, setDescription] = useState(criterion.description);
31+
const CriterionEditor = React.memo(
32+
({ criterion, onSave, onDelete }: ICriterionEditorProps) => {
33+
// Use react.memo to avoid rerendering the component every time a character is typed
34+
const [title, setTitle] = useState(criterion.title);
35+
const [description, setDescription] = useState(criterion.description);
3536

36-
return (
37-
<Stack direction={{ sm: "column", md: "row" }} spacing={{ xs: 1, sm: 2 }}>
38-
<TextField
39-
value={title}
40-
onChange={(event) => setTitle(event.target.value)}
41-
placeholder="title"
42-
rows={1}
43-
/>
44-
<TextField
45-
value={description}
46-
onChange={(event) => setDescription(event.target.value)}
47-
placeholder="Description"
48-
rows={1}
49-
sx={{ flex: 1 }}
50-
/>
51-
<Button
52-
fullWidth={false}
53-
variant="contained"
54-
onClick={() => onSave({ ...criterion, title, description })}
55-
>
56-
Save
57-
</Button>
58-
<Button variant="contained" onClick={() => onDelete(criterion)}>
59-
Delete
60-
</Button>
61-
</Stack>
62-
);
63-
});
37+
return (
38+
<Stack direction={{ sm: "column", md: "row" }} spacing={{ xs: 1, sm: 2 }}>
39+
<TextField
40+
value={title}
41+
onChange={(event) => setTitle(event.target.value)}
42+
placeholder="title"
43+
rows={1}
44+
/>
45+
<TextField
46+
value={description}
47+
onChange={(event) => setDescription(event.target.value)}
48+
placeholder="Description"
49+
rows={1}
50+
sx={{ flex: 1 }}
51+
/>
52+
<Button
53+
fullWidth={false}
54+
variant="contained"
55+
onClick={() => onSave({ ...criterion, title, description })}
56+
>
57+
Save
58+
</Button>
59+
<Button variant="contained" onClick={() => onDelete(criterion)}>
60+
Delete
61+
</Button>
62+
</Stack>
63+
);
64+
},
65+
);
6466

6567
/**
6668
* A component to edit criteria for rating projects.

0 commit comments

Comments
 (0)