refactor: reorder GraphQL fields

Author: pan93412

app/(admin)/(activity-management)/events/[id]/_components/query.ts

@@ -4,13 +4,13 @@ export const EVENT_BY_ID_QUERY = graphql(`
     query EventById($id: ID!) {
       event(id: $id) {
         id
+        payload
+        triggeredAt
+        type
         user {
           id
           name
         }
-        type
-        payload
-        triggeredAt
       }
     }
 `);

app/(admin)/(activity-management)/events/_components/query.ts

@@ -2,29 +2,29 @@ import { graphql } from "@/gql";
 
 export const EVENTS_TABLE_QUERY = graphql(`
   query EventsTable(
-    $first: Int
     $after: Cursor
-    $last: Int
     $before: Cursor
+    $first: Int
+    $last: Int
     $where: EventWhereInput
   ) {
-    events(first: $first, after: $after, last: $last, before: $before, where: $where, orderBy: { field: TRIGGERED_AT, direction: DESC }) {
+    events(after: $after, before: $before, first: $first, last: $last, orderBy: { field: TRIGGERED_AT, direction: DESC }, where: $where) {
+      totalCount
       edges {
         node {
           id
+          triggeredAt
+          type
           user {
             id
             name
           }
-          type
-          triggeredAt
         }
       }
-      totalCount
       pageInfo {
+        endCursor
         hasNextPage
         hasPreviousPage
-        endCursor
         startCursor
       }
     }

app/(admin)/(activity-management)/points/[id]/_components/header.tsx

@@ -8,8 +8,8 @@ const POINT_HEADER_QUERY = graphql(`
   query PointHeader($id: ID!) {
     pointGrant(id: $id) {
       id
-      points
       grantedAt
+      points
     }
   }
 `);

app/(admin)/(activity-management)/points/[id]/_components/point-cards.tsx

@@ -8,9 +8,9 @@ import { UserCard } from "./user-card";
 const POINT_CARDS_QUERY = graphql(`
   query PointCards($id: ID!) {
     pointGrant(id: $id) {
-      id
       ...PointDetailsCard
       ...PointUserCard
+      id
     }
   }
 `);

app/(admin)/(activity-management)/points/[id]/_components/point-details-card.tsx

@@ -6,9 +6,9 @@ import { type FragmentType, graphql, useFragment } from "@/gql";
 const POINT_DETAILS_CARD_FRAGMENT = graphql(`
   fragment PointDetailsCard on Point {
     id
-    points
     description
     grantedAt
+    points
   }
 `);
 

app/(admin)/(activity-management)/points/_components/data-table.tsx

@@ -10,30 +10,30 @@ import { columns, type Point } from "./data-table-columns";
 
 export const POINTS_TABLE_QUERY = graphql(`
   query PointsTable(
-    $first: Int
     $after: Cursor
-    $last: Int
     $before: Cursor
+    $first: Int
+    $last: Int
     $where: PointWhereInput
   ) {
     points(
-      first: $first
       after: $after
-      last: $last
       before: $before
-      where: $where
+      first: $first
+      last: $last
       orderBy: { field: GRANTED_AT, direction: DESC }
+      where: $where
     ) {
+      totalCount
       edges {
         node {
-          id
           ...PointsTableRow
+          id
         }
       }
-      totalCount
       pageInfo {
-        hasNextPage
         endCursor
+        hasNextPage
       }
     }
   }
@@ -42,13 +42,13 @@ export const POINTS_TABLE_QUERY = graphql(`
 const POINTS_TABLE_ROW_FRAGMENT = graphql(`
   fragment PointsTableRow on Point {
     id
+    description
+    grantedAt
+    points
     user {
       id
       name
     }
-    points
-    description
-    grantedAt
   }
 `);
 

app/(admin)/(activity-management)/points/_components/update-form.tsx

@@ -31,8 +31,8 @@ const UPDATE_POINTS_FORM_USER_INFO_QUERY = graphql(`
   query UpdatePointsFormUserInfo($id: ID!) {
     user(id: $id) {
       id
-      name
       email
+      name
     }
   }
 `);

app/(admin)/(activity-management)/submissions/[id]/_components/result-card.tsx

@@ -12,8 +12,8 @@ const SUBMISSION_RESULT_CARD_FRAGMENT = graphql(`
     id
     queryResult {
       columns
-      rows
       matchAnswer
+      rows
     }
     question {
       id

app/(admin)/(activity-management)/submissions/[id]/_components/submission-cards.tsx

@@ -9,10 +9,10 @@ import { UserCard } from "./user-card";
 const SUBMISSION_CARDS_QUERY = graphql(`
   query SubmissionCards($id: ID!) {
     submission(id: $id) {
-      id
       ...SubmissionDetailsCard
-      ...SubmissionUserCard
       ...SubmissionResultCard
+      ...SubmissionUserCard
+      id
     }
   }
 `);

app/(admin)/(activity-management)/submissions/[id]/_components/submission-details-card.tsx

@@ -6,8 +6,8 @@ import { type FragmentType, graphql, useFragment } from "@/gql";
 const SUBMISSION_DETAILS_CARD_FRAGMENT = graphql(`
   fragment SubmissionDetailsCard on Submission {
     id
-    submittedCode
     error
+    submittedCode
   }
 `);