Skip to content

🔄 Sync: [TanStack Query Optimization] #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ldsgroups225 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

🔄 Sync: [TanStack Query Optimization] #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions apps/core/src/components/schools/link-user-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ export function LinkUserDialog({ schoolId }: LinkUserDialogProps) {
setSelectedRoleId(null)
}

const { data: usersData, isPending: isLoadingUsers } = useQuery(
const { data: usersData, isPending: isPendingUsers } = useQuery(
platformUsersQueryOptions({ search, limit: 5 }),
)

const { data: rolesData, isPending: isLoadingRoles } = useQuery(
const { data: rolesData, isPending: isPendingRoles } = useQuery(
platformRolesQueryOptions('school'),
)

Expand Down Expand Up @@ -111,8 +111,8 @@ export function LinkUserDialog({ schoolId }: LinkUserDialogProps) {
onValueChange={setSearch}
/>
<CommandList>
{isLoadingUsers && <CommandEmpty>{LL.common.loading()}</CommandEmpty>}
{!isLoadingUsers && (usersData?.data?.length ?? 0) === 0 && (
{isPendingUsers && <CommandEmpty>{LL.common.loading()}</CommandEmpty>}
{!isPendingUsers && (usersData?.data?.length ?? 0) === 0 && (
<CommandEmpty>{LL.common.noResults()}</CommandEmpty>
)}
<CommandGroup>
Expand Down Expand Up @@ -142,7 +142,7 @@ export function LinkUserDialog({ schoolId }: LinkUserDialogProps) {
<Select
value={selectedRoleId || ''}
onValueChange={setSelectedRoleId}
disabled={isLoadingRoles}
disabled={isPendingRoles}
>
<SelectTrigger>
<SelectValue placeholder={t.roleSelectPlaceholder()}>
Expand Down
6 changes: 3 additions & 3 deletions apps/school/src/components/grades/validations/student-grades-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,17 @@ export interface StudentGradeRow {
}

interface StudentGradesTableProps {
isLoadingGrades: boolean
isPendingGrades: boolean
studentGradesData: StudentGradeRow[] | undefined
}

export function StudentGradesTable({
isLoadingGrades,
isPendingGrades,
studentGradesData,
}: StudentGradesTableProps) {
return (
<div className="bg-card overflow-hidden rounded-xl border shadow-sm">
{isLoadingGrades
{isPendingGrades
? (
<div className="space-y-2 p-4">
{[1, 2, 3, 4, 5].map(item => (
Expand Down
6 changes: 3 additions & 3 deletions apps/school/src/routes/_auth/grades/grading-validations/-grading-details-sheet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface GradingDetailsSheetProps {
onOpenChange: (open: boolean) => void
detailValidation: PendingValidation | null
studentGradesData: StudentGradeRow[] | undefined
isLoadingGrades: boolean
isPendingGrades: boolean
onValidate: (validation: PendingValidation) => void
onReject: (validation: PendingValidation) => void
t: TranslationFunctions
Expand All @@ -39,7 +39,7 @@ export function GradingDetailsSheet({
onOpenChange,
detailValidation,
studentGradesData,
isLoadingGrades,
isPendingGrades,
onValidate,
onReject,
t,
Expand Down Expand Up @@ -312,7 +312,7 @@ export function GradingDetailsSheet({
Notes des élèves
</h3>
</div>
<StudentGradesTable isLoadingGrades={isLoadingGrades} studentGradesData={studentGradesData} />
<StudentGradesTable isPendingGrades={isPendingGrades} studentGradesData={studentGradesData} />
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/school/src/routes/_auth/grades/validations.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function GradeValidationsPage() {
setIsSheetOpen(true)
}

const { data: studentGradesData, isPending: isLoadingGrades } = useQuery({
const { data: studentGradesData, isPending: isPendingGrades } = useQuery({
...gradesOptions.byClass({
classId: detailValidation?.classId ?? '',
subjectId: detailValidation?.subjectId ?? '',
Expand Down Expand Up @@ -339,7 +339,7 @@ function GradeValidationsPage() {
onOpenChange={setIsSheetOpen}
detailValidation={detailValidation}
studentGradesData={studentGradesData}
isLoadingGrades={isLoadingGrades}
isPendingGrades={isPendingGrades}
onValidate={handleValidate}
onReject={handleReject}
t={t}
Expand Down
Loading