fix: better ordering of proposals in home page

allinbits · Sep 16, 2024 · 5461933 · 5461933
1 parent a60045d
commit 5461933
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 224 deletions.
diff --git a/src/gql/gql.ts b/src/gql/gql.ts
diff --git a/src/gql/graphql.ts b/src/gql/graphql.ts
diff --git a/src/gql/index.ts b/src/gql/index.ts
@@ -1,2 +1,2 @@
 export * from "./fragment-masking";
-export * from "./gql";
+export * from "./gql";
diff --git a/src/graphql/proposalsActive.graphql b/src/graphql/proposalsActive.graphql
@@ -1,5 +1,10 @@
 query ProposalsActive($limit: Int!, $offset: Int!, $where: proposal_bool_exp = {}) {
-  all_proposals: proposal(order_by: { active_first_order: asc }, limit: $limit, offset: $offset, where: $where) {
+  all_proposals: proposal(
+    order_by: [{ active_first_order: asc }, { id: desc }]
+    limit: $limit
+    offset: $offset
+    where: $where
+  ) {
     content
     deposit_end_time
     description

diff --git a/src/graphql/proposalsFailed.graphql b/src/graphql/proposalsFailed.graphql
@@ -1,5 +1,10 @@
 query ProposalsFailed($limit: Int!, $offset: Int!, $where: proposal_bool_exp = {}) {
-  all_proposals: proposal(order_by: { failed_first_order: asc }, limit: $limit, offset: $offset, where: $where) {
+  all_proposals: proposal(
+    order_by: [{ failed_first_order: asc }, { id: desc }]
+    limit: $limit
+    offset: $offset
+    where: $where
+  ) {
     content
     deposit_end_time
     description

diff --git a/src/graphql/proposalsPassed.graphql b/src/graphql/proposalsPassed.graphql
@@ -1,5 +1,10 @@
 query ProposalsPassed($limit: Int!, $offset: Int!, $where: proposal_bool_exp = {}) {
-  all_proposals: proposal(order_by: { passed_first_order: asc }, limit: $limit, offset: $offset, where: $where) {
+  all_proposals: proposal(
+    order_by: [{ passed_first_order: asc }, { id: desc }]
+    limit: $limit
+    offset: $offset
+    where: $where
+  ) {
     content
     deposit_end_time
     description

diff --git a/src/graphql/proposalsRejected.graphql b/src/graphql/proposalsRejected.graphql
@@ -1,5 +1,10 @@
 query ProposalsRejected($limit: Int!, $offset: Int!, $where: proposal_bool_exp = {}) {
-  all_proposals: proposal(order_by: { rejected_first_order: asc }, limit: $limit, offset: $offset, where: $where) {
+  all_proposals: proposal(
+    order_by: [{ rejected_first_order: asc }, { id: desc }]
+    limit: $limit
+    offset: $offset
+    where: $where
+  ) {
     content
     deposit_end_time
     description

diff --git a/src/graphql/proposalsSearch.graphql b/src/graphql/proposalsSearch.graphql
@@ -1,5 +1,10 @@
 query ProposalsSearch($limit: Int!, $offset: Int!, $searchString: String!) {
-  all_proposals: proposal(order_by: { active_first_order: asc }, limit: $limit, offset: $offset, where: {_or: [{title: {_ilike: $searchString}},{description: {_ilike: $searchString}}]}) {
+  all_proposals: proposal(
+    order_by: [{ active_first_order: asc }, { id: desc }]
+    limit: $limit
+    offset: $offset
+    where: { _or: [{ title: { _ilike: $searchString } }, { description: { _ilike: $searchString } }] }
+  ) {
     content
     deposit_end_time
     description
@@ -21,7 +26,9 @@ query ProposalsSearch($limit: Int!, $offset: Int!, $searchString: String!) {
     voting_end_time
     voting_start_time
   }
-  proposal_aggregate(where: {_or: [{title: {_ilike: $searchString}},{description: {_ilike: $searchString}}]}) {
+  proposal_aggregate(
+    where: { _or: [{ title: { _ilike: $searchString } }, { description: { _ilike: $searchString } }] }
+  ) {
     aggregate {
       count
     }