Skip to content

Commit

Permalink
fix: incorrect variable naming causing crash (#220)
Browse files Browse the repository at this point in the history
* ci: avoid multiple typescript-eslint instances

* fix: use API instead of fetch

* fix: camelCase name
  • Loading branch information
jennifer-richards authored Sep 24, 2024
1 parent d07342f commit 5983b48
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 11 deletions.
8 changes: 5 additions & 3 deletions client/components/DocumentCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ Based on https://tailwindui.com/components/application-ui/lists/grid-lists#compo
<div class="flex justify-between gap-x-4 py-3">
<dt class="text-gray-500">Deadline</dt>
<dd class="grow flex items-start gap-x-2">
{{ cookedDocument.external_deadline?.toLocaleString(DateTime.DATE_FULL) || '-' }}</dd>
{{ cookedDocument.externalDeadline?.toLocaleString(DateTime.DATE_FULL) || '-' }}
</dd>
</div>
<div class="flex justify-between gap-x-4 py-3">
<dt class="text-gray-500">Pages</dt>
Expand All @@ -61,7 +62,8 @@ Based on https://tailwindui.com/components/application-ui/lists/grid-lists#compo
class="flex flex-row gap-1 items-center relative w-full cursor-default rounded-lg bg-white py-2 pl-3 pr-1 text-left shadow-md focus:outline-none focus-visible:border-indigo-500 focus-visible:ring-2 focus-visible:ring-white focus-visible:ring-opacity-75 focus-visible:ring-offset-2 focus-visible:ring-offset-orange-300 sm:text-sm"
>
<div class="flex-auto ">
<div v-for="person in uniqBy(cookedDocument.assignmentsPersons, person => person?.id)" :key="person?.id">
<div v-for="person in uniqBy(cookedDocument.assignmentsPersons, person => person?.id)"
:key="person?.id">
{{ person.name }}
</div>
</div>
Expand Down Expand Up @@ -175,7 +177,7 @@ const cookedDocument = computed(() => {

return ({
...props.document,
external_deadline: props.document.externalDeadline && DateTime.fromJSDate(props.document.externalDeadline),
externalDeadline: props.document.externalDeadline && DateTime.fromJSDate(props.document.externalDeadline),
assignments: props.document.assignments,
assignmentsPersons,
assignmentsPersonIds: assignmentsPersons?.map(editor => editor?.id),
Expand Down
2 changes: 1 addition & 1 deletion client/components/DocumentCardsTypes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export interface DocumentCardType {
id: string
name: string
external_deadline: string
externalDeadline: string
needsAssignment?: {
name: string
}
Expand Down
5 changes: 1 addition & 4 deletions client/eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ import vue from 'eslint-plugin-vue'
import globals from 'globals'
import parser from 'vue-eslint-parser'
import eslint from '@eslint/js'
import tseslint from 'typescript-eslint'
import neostandard from 'neostandard'
import withNuxt from './.nuxt/eslint.config.mjs'

export default withNuxt(
...neostandard(),
eslint.configs.recommended,
...tseslint.configs.recommended,
...tseslint.configs.stylistic, {
eslint.configs.recommended, {
plugins: {
vue
},
Expand Down
11 changes: 8 additions & 3 deletions client/pages/docs/assignments.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<script setup lang="ts">
import type { ResolvedDocument, ResolvedPerson } from '~/components/AssignmentsTypes'
import type { Assignment, RfcToBe, RpcPerson } from '~/rpctracker_client'
import type { Assignment, RfcToBe, RpcPerson, RpcRole } from '~/rpctracker_client'
import { DateTime } from 'luxon'
const csrf = useCookie('csrftoken', { sameSite: 'strict' })
Expand Down Expand Up @@ -175,7 +175,11 @@ async function refresh () {
// DATA RETRIEVAL
const { data: people, pending: pendingPeople, refresh: refreshPeople } = await useFetch<RpcPerson[]>('/api/rpc/rpc_person/', { baseURL: '/', server: false })
const { data: people, pending: pendingPeople, refresh: refreshPeople } = await useAsyncData<RpcPerson[]>(
'rpcPersons',
() => api.rpcPersonList(),
{ server: false, default: () => ([]) }
)
const { data: rfcsToBe, pending: pendingDocs, refresh: refreshDocs } = await useAsyncData<RfcToBe[]>(
'rfcsToBe',
Expand All @@ -187,7 +191,7 @@ const {
pending: pendingAssignments,
refresh: refreshAssignments
} = await useFetch<Assignment[]>('/api/rpc/assignments/', { baseURL: '/', server: false })
const { data: roles } = await useAsyncData(
const { data: roles } = await useAsyncData<RpcRole[]>(
'roles',
async () => {
try {
Expand All @@ -198,6 +202,7 @@ const { data: roles } = await useAsyncData(
title: 'Unable to list roles',
text: e
})
return []
}
},
{ default: () => ([]) }
Expand Down

0 comments on commit 5983b48

Please sign in to comment.