Skip to content

Commit

Permalink
Update various dependencies (#346)
Browse files Browse the repository at this point in the history
* Update typescript, eslint, prettier, babel dependencies (#342)

* Update babel eslint package

* Modify eslint rules

* Minor prettier reformatting

* Bump loader-utils from 1.4.0 to 1.4.2 (#344)

Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.0 to 1.4.2.
- [Release notes](https://github.com/webpack/loader-utils/releases)
- [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md)
- [Commits](webpack/loader-utils@v1.4.0...v1.4.2)

---
updated-dependencies:
- dependency-name: loader-utils
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump minimatch from 3.0.4 to 3.1.2 (#339)

Bumps [minimatch](https://github.com/isaacs/minimatch) from 3.0.4 to 3.1.2.
- [Release notes](https://github.com/isaacs/minimatch/releases)
- [Commits](isaacs/minimatch@v3.0.4...v3.1.2)

---
updated-dependencies:
- dependency-name: minimatch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump django from 3.2.15 to 3.2.16 (#338)

Bumps [django](https://github.com/django/django) from 3.2.15 to 3.2.16.
- [Release notes](https://github.com/django/django/releases)
- [Commits](django/django@3.2.15...3.2.16)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump oauthlib from 3.1.1 to 3.2.1 (#319)

Bumps [oauthlib](https://github.com/oauthlib/oauthlib) from 3.1.1 to 3.2.1.
- [Release notes](https://github.com/oauthlib/oauthlib/releases)
- [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst)
- [Commits](oauthlib/oauthlib@v3.1.1...v3.2.1)

---
updated-dependencies:
- dependency-name: oauthlib
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
smartspot2 and dependabot[bot] authored Nov 26, 2022
1 parent 78bdf0e commit c2687ec
Show file tree
Hide file tree
Showing 9 changed files with 3,187 additions and 2,867 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
],
"rules": {
"react/prop-types": [2],
"react-hooks/rules-of-hooks": "error"
"react-hooks/rules-of-hooks": "error",
"@typescript-eslint/no-non-null-assertion": "off"
},
"env": {
"es6": true,
Expand Down
4 changes: 3 additions & 1 deletion csm_web/frontend/src/components/TimeInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ function handleInvalid({ target }: React.ChangeEvent<HTMLInputElement>): void {
}

// A fully cross-browser compatible time input, providing a shim for browsers like Safari that don't have <input type="time">
export default function TimeInput(props: React.HTMLProps<HTMLInputElement>): React.ReactElement {
export default function TimeInput(props: React.InputHTMLAttributes<HTMLInputElement>): React.ReactElement {
// eslint complains about onChange type validation not existing
// eslint-disable-next-line react/prop-types
const { onChange, ...otherProps } = props;
function handleChange(event: React.ChangeEvent<HTMLInputElement>) {
if (event.target.type === "text") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -770,9 +770,7 @@ const EditTableRow = ({
{sortedSlots.map((slot: Slot) => (
<option key={slot.id} value={slot.id} className="matcher-assignment-section-times-option">
{(isAssigned ? `(${prefBySlot.get(slot.id!)}) ` : "") +
slot.times
.map<React.ReactNode>(time => displayTime(time))
.join(" / ")}
slot.times.map<React.ReactNode>(time => displayTime(time)).join(" / ")}
</option>
))}
</select>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,11 @@ function MentorList({ profile, prefByMentor, selectedMentor, setSelectedMentor }
/**
* List of all mentors associated with the course that have no assigned section
*/
const { data: jsonMentorList, isSuccess: jsonMentorListLoaded, refetch: refetchMentorList } = useMatcherMentors(
profile.courseId
);
const {
data: jsonMentorList,
isSuccess: jsonMentorListLoaded,
refetch: refetchMentorList
} = useMatcherMentors(profile.courseId);

const matcherConfigMutation = useMatcherConfigMutation(profile.courseId);
const matcherMentorsMutation = useMatcherAddMentorsMutation(profile.courseId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ export interface Touched {
*/
export function emptyResource(): Resource {
return {
weekNum: ("" as unknown) as number, // to trick typescript in accepting an empty string
weekNum: "" as unknown as number, // to trick typescript in accepting an empty string
date: "",
topics: "",
worksheets: [],
Expand All @@ -67,8 +67,8 @@ export function emptyResource(): Resource {
*/
export function emptyWorksheet(): Worksheet {
return {
id: (null as unknown) as number,
resource: (null as unknown) as number,
id: null as unknown as number,
resource: null as unknown as number,
name: "",
worksheetFile: "",
solutionFile: ""
Expand All @@ -77,8 +77,8 @@ export function emptyWorksheet(): Worksheet {

export function emptyLink(): Link {
return {
id: (null as unknown) as number,
resource: (null as unknown) as number,
id: null as unknown as number,
resource: null as unknown as number,
name: "",
url: "",
deleted: false
Expand Down
8 changes: 5 additions & 3 deletions csm_web/frontend/src/components/section/StudentSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,11 @@ interface StudentSectionAttendanceProps {
}

function StudentSectionAttendance({ associatedProfileId }: StudentSectionAttendanceProps) {
const { data: attendances, isSuccess: attendancesLoaded, isError: attendancesLoadError } = useStudentAttendances(
associatedProfileId
);
const {
data: attendances,
isSuccess: attendancesLoaded,
isError: attendancesLoadError
} = useStudentAttendances(associatedProfileId);

return attendancesLoaded ? (
<table id="attendance-table" className="standalone-table">
Expand Down
Loading

0 comments on commit c2687ec

Please sign in to comment.