Merge branch 'main' into release

griffithlab · Jan 10, 2024 · c6d47c4 · c6d47c4
2 parents 4756178 + 3443f8d
commit c6d47c4
Show file tree

Hide file tree

Showing 22 changed files with 252 additions and 156 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Adding Known Hosts
         run: ssh-keyscan -H ${{ secrets.SSH_HOST }}
 
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

diff --git a/...t/src/app/components/organizations/organizations-table/organizations-table.component.html b/...t/src/app/components/organizations/organizations-table/organizations-table.component.html
@@ -108,7 +108,7 @@
           <td
             nzRight
             nzAlign="right">
-            {{ organization.mostRecentEvent?.createdAt | timeAgo }}
+            {{ organization.mostRecentActivityTimestamp | timeAgo }}
           </td>
         </tr>
       </ng-template>

diff --git a/client/src/app/components/organizations/organizations-table/organizations-table.query.gql b/client/src/app/components/organizations/organizations-table/organizations-table.query.gql
@@ -44,9 +44,7 @@ fragment OrganizationBrowseTableRowFields on Organization {
     name
     id
   }
-  mostRecentEvent {
-    createdAt
-  }
+  mostRecentActivityTimestamp
   # orgStatsHash @include(if: $cardView) {
   #   comments
   #   revisions

diff --git a/client/src/app/components/users/users-table/users-table.component.html b/client/src/app/components/users/users-table/users-table.component.html
@@ -176,8 +176,8 @@
           </td>
           <td nzAlign="right">
             <ng-container
-              *ngIf="user.mostRecentActionTimestamp; else eventElse">
-              {{ user.mostRecentActionTimestamp | timeAgo }}
+              *ngIf="user.mostRecentActivityTimestamp; else eventElse">
+              {{ user.mostRecentActivityTimestamp | timeAgo }}
             </ng-container>
             <ng-template #eventElse> -- </ng-template>
           </td>

diff --git a/client/src/app/components/users/users-table/users-table.query.gql b/client/src/app/components/users/users-table/users-table.query.gql
@@ -48,5 +48,5 @@ fragment UserBrowseTableRowFields on User {
     revisions
   }
   profileImagePath(size: 64)
-  mostRecentActionTimestamp
+  mostRecentActivityTimestamp
 }
diff --git a/client/src/app/core/pipes/timeago-formatter.ts b/client/src/app/core/pipes/timeago-formatter.ts
@@ -1,4 +1,4 @@
-import { Injectable, Pipe } from '@angular/core'
+import { Pipe } from '@angular/core'
 
 const SECONDS_IN_MINUTE = 60
 const SECONDS_IN_HOUR = SECONDS_IN_MINUTE * 60
@@ -24,14 +24,16 @@ const withYearFormatter = new Intl.DateTimeFormat('en-US', withYearOptions)
 
 @Pipe({
   name: 'timeAgo',
-  pure: true
+  pure: true,
 })
 export class CivicTimeagoFormatter {
   transform(input: number | string): string {
+    if (!input) return '--'
+
     let then: number
-    if (typeof input =='number') {
+    if (typeof input == 'number') {
       then = input
-    }  else {
+    } else {
       then = Date.parse(input)
     }
 

diff --git a/client/src/app/generated/civic.apollo-helpers.ts b/client/src/app/generated/civic.apollo-helpers.ts
@@ -883,7 +883,7 @@ export type GeneEdgeFieldPolicy = {
 	cursor?: FieldPolicy<any> | FieldReadFunction<any>,
 	node?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type LeaderboardOrganizationKeySpecifier = ('actionCount' | 'description' | 'eventCount' | 'events' | 'id' | 'memberCount' | 'members' | 'mostRecentEvent' | 'name' | 'orgAndSuborgsStatsHash' | 'orgStatsHash' | 'profileImagePath' | 'rank' | 'ranks' | 'subGroups' | 'url' | LeaderboardOrganizationKeySpecifier)[];
+export type LeaderboardOrganizationKeySpecifier = ('actionCount' | 'description' | 'eventCount' | 'events' | 'id' | 'memberCount' | 'members' | 'mostRecentActivityTimestamp' | 'name' | 'orgAndSuborgsStatsHash' | 'orgStatsHash' | 'profileImagePath' | 'rank' | 'ranks' | 'subGroups' | 'url' | LeaderboardOrganizationKeySpecifier)[];
 export type LeaderboardOrganizationFieldPolicy = {
 	actionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -892,7 +892,7 @@ export type LeaderboardOrganizationFieldPolicy = {
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	memberCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	members?: FieldPolicy<any> | FieldReadFunction<any>,
-	mostRecentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	mostRecentActivityTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	orgAndSuborgsStatsHash?: FieldPolicy<any> | FieldReadFunction<any>,
 	orgStatsHash?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -920,7 +920,7 @@ export type LeaderboardRankFieldPolicy = {
 	actionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	rank?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type LeaderboardUserKeySpecifier = ('actionCount' | 'areaOfExpertise' | 'bio' | 'country' | 'displayName' | 'email' | 'events' | 'facebookProfile' | 'id' | 'linkedinProfile' | 'mostRecentActionTimestamp' | 'mostRecentConflictOfInterestStatement' | 'mostRecentEvent' | 'mostRecentOrganizationId' | 'name' | 'notifications' | 'orcid' | 'organizations' | 'profileImagePath' | 'rank' | 'ranks' | 'role' | 'statsHash' | 'twitterHandle' | 'url' | 'username' | LeaderboardUserKeySpecifier)[];
+export type LeaderboardUserKeySpecifier = ('actionCount' | 'areaOfExpertise' | 'bio' | 'country' | 'displayName' | 'email' | 'events' | 'facebookProfile' | 'id' | 'linkedinProfile' | 'mostRecentActivityTimestamp' | 'mostRecentConflictOfInterestStatement' | 'mostRecentEvent' | 'mostRecentOrganizationId' | 'name' | 'notifications' | 'orcid' | 'organizations' | 'profileImagePath' | 'rank' | 'ranks' | 'role' | 'statsHash' | 'twitterHandle' | 'url' | 'username' | LeaderboardUserKeySpecifier)[];
 export type LeaderboardUserFieldPolicy = {
 	actionCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	areaOfExpertise?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -932,7 +932,7 @@ export type LeaderboardUserFieldPolicy = {
 	facebookProfile?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	linkedinProfile?: FieldPolicy<any> | FieldReadFunction<any>,
-	mostRecentActionTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
+	mostRecentActivityTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentConflictOfInterestStatement?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentOrganizationId?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1284,15 +1284,15 @@ export type ObjectFieldDiffFieldPolicy = {
 	removedObjects?: FieldPolicy<any> | FieldReadFunction<any>,
 	suggestedObjects?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type OrganizationKeySpecifier = ('description' | 'eventCount' | 'events' | 'id' | 'memberCount' | 'members' | 'mostRecentEvent' | 'name' | 'orgAndSuborgsStatsHash' | 'orgStatsHash' | 'profileImagePath' | 'ranks' | 'subGroups' | 'url' | OrganizationKeySpecifier)[];
+export type OrganizationKeySpecifier = ('description' | 'eventCount' | 'events' | 'id' | 'memberCount' | 'members' | 'mostRecentActivityTimestamp' | 'name' | 'orgAndSuborgsStatsHash' | 'orgStatsHash' | 'profileImagePath' | 'ranks' | 'subGroups' | 'url' | OrganizationKeySpecifier)[];
 export type OrganizationFieldPolicy = {
 	description?: FieldPolicy<any> | FieldReadFunction<any>,
 	eventCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	events?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	memberCount?: FieldPolicy<any> | FieldReadFunction<any>,
 	members?: FieldPolicy<any> | FieldReadFunction<any>,
-	mostRecentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
+	mostRecentActivityTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
 	name?: FieldPolicy<any> | FieldReadFunction<any>,
 	orgAndSuborgsStatsHash?: FieldPolicy<any> | FieldReadFunction<any>,
 	orgStatsHash?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1844,7 +1844,7 @@ export type UpdateSourceSuggestionStatusPayloadFieldPolicy = {
 	clientMutationId?: FieldPolicy<any> | FieldReadFunction<any>,
 	sourceSuggestion?: FieldPolicy<any> | FieldReadFunction<any>
 };
-export type UserKeySpecifier = ('areaOfExpertise' | 'bio' | 'country' | 'displayName' | 'email' | 'events' | 'facebookProfile' | 'id' | 'linkedinProfile' | 'mostRecentActionTimestamp' | 'mostRecentConflictOfInterestStatement' | 'mostRecentEvent' | 'mostRecentOrg' | 'mostRecentOrganizationId' | 'name' | 'notifications' | 'orcid' | 'organizations' | 'profileImagePath' | 'ranks' | 'role' | 'statsHash' | 'twitterHandle' | 'url' | 'username' | UserKeySpecifier)[];
+export type UserKeySpecifier = ('areaOfExpertise' | 'bio' | 'country' | 'displayName' | 'email' | 'events' | 'facebookProfile' | 'id' | 'linkedinProfile' | 'mostRecentActivityTimestamp' | 'mostRecentConflictOfInterestStatement' | 'mostRecentEvent' | 'mostRecentOrg' | 'mostRecentOrganizationId' | 'name' | 'notifications' | 'orcid' | 'organizations' | 'profileImagePath' | 'ranks' | 'role' | 'statsHash' | 'twitterHandle' | 'url' | 'username' | UserKeySpecifier)[];
 export type UserFieldPolicy = {
 	areaOfExpertise?: FieldPolicy<any> | FieldReadFunction<any>,
 	bio?: FieldPolicy<any> | FieldReadFunction<any>,
@@ -1855,7 +1855,7 @@ export type UserFieldPolicy = {
 	facebookProfile?: FieldPolicy<any> | FieldReadFunction<any>,
 	id?: FieldPolicy<any> | FieldReadFunction<any>,
 	linkedinProfile?: FieldPolicy<any> | FieldReadFunction<any>,
-	mostRecentActionTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
+	mostRecentActivityTimestamp?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentConflictOfInterestStatement?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentEvent?: FieldPolicy<any> | FieldReadFunction<any>,
 	mostRecentOrg?: FieldPolicy<any> | FieldReadFunction<any>,

diff --git a/client/src/app/generated/civic.apollo.ts b/client/src/app/generated/civic.apollo.ts
@@ -2130,7 +2130,7 @@ export type LeaderboardOrganization = {
   id: Scalars['Int'];
   memberCount: Scalars['Int'];
   members: UserConnection;
-  mostRecentEvent?: Maybe<Event>;
+  mostRecentActivityTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
   name: Scalars['String'];
   orgAndSuborgsStatsHash: Stats;
   orgStatsHash: Stats;
@@ -2204,7 +2204,7 @@ export type LeaderboardUser = {
   facebookProfile?: Maybe<Scalars['String']>;
   id: Scalars['Int'];
   linkedinProfile?: Maybe<Scalars['String']>;
-  mostRecentActionTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
+  mostRecentActivityTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
   mostRecentConflictOfInterestStatement?: Maybe<Coi>;
   mostRecentEvent?: Maybe<Event>;
   mostRecentOrganizationId?: Maybe<Scalars['Int']>;
@@ -3167,7 +3167,7 @@ export type Organization = {
   id: Scalars['Int'];
   memberCount: Scalars['Int'];
   members: UserConnection;
-  mostRecentEvent?: Maybe<Event>;
+  mostRecentActivityTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
   name: Scalars['String'];
   orgAndSuborgsStatsHash: Stats;
   orgStatsHash: Stats;
@@ -5270,7 +5270,7 @@ export type User = {
   facebookProfile?: Maybe<Scalars['String']>;
   id: Scalars['Int'];
   linkedinProfile?: Maybe<Scalars['String']>;
-  mostRecentActionTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
+  mostRecentActivityTimestamp?: Maybe<Scalars['ISO8601DateTime']>;
   mostRecentConflictOfInterestStatement?: Maybe<Coi>;
   mostRecentEvent?: Maybe<Event>;
   mostRecentOrg?: Maybe<Organization>;
@@ -6277,9 +6277,9 @@ export type OrganizationsBrowseQueryVariables = Exact<{
 }>;
 
 
-export type OrganizationsBrowseQuery = { __typename: 'Query', organizations: { __typename: 'OrganizationConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'OrganizationEdge', cursor: string, node?: { __typename: 'Organization', id: number, name: string, description: string, url: string, memberCount: number, eventCount: number, subGroups: Array<{ __typename: 'Organization', name: string, id: number }>, mostRecentEvent?: { __typename: 'Event', createdAt: any } | undefined } | undefined }> } };
+export type OrganizationsBrowseQuery = { __typename: 'Query', organizations: { __typename: 'OrganizationConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined, endCursor?: string | undefined }, edges: Array<{ __typename: 'OrganizationEdge', cursor: string, node?: { __typename: 'Organization', id: number, name: string, description: string, url: string, memberCount: number, eventCount: number, mostRecentActivityTimestamp?: any | undefined, subGroups: Array<{ __typename: 'Organization', name: string, id: number }> } | undefined }> } };
 
-export type OrganizationBrowseTableRowFieldsFragment = { __typename: 'Organization', id: number, name: string, description: string, url: string, memberCount: number, eventCount: number, subGroups: Array<{ __typename: 'Organization', name: string, id: number }>, mostRecentEvent?: { __typename: 'Event', createdAt: any } | undefined };
+export type OrganizationBrowseTableRowFieldsFragment = { __typename: 'Organization', id: number, name: string, description: string, url: string, memberCount: number, eventCount: number, mostRecentActivityTimestamp?: any | undefined, subGroups: Array<{ __typename: 'Organization', name: string, id: number }> };
 
 export type PhenotypePopoverQueryVariables = Exact<{
   phenotypeId: Scalars['Int'];
@@ -6541,9 +6541,9 @@ export type UsersBrowseQueryVariables = Exact<{
 }>;
 
 
-export type UsersBrowseQuery = { __typename: 'Query', users: { __typename: 'UserConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'UserEdge', cursor: string, node?: { __typename: 'User', id: number, name?: string | undefined, displayName: string, role: UserRole, profileImagePath?: string | undefined, mostRecentActionTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, statsHash: { __typename: 'Stats', submittedEvidenceItems: number, revisions: number } } | undefined }> } };
+export type UsersBrowseQuery = { __typename: 'Query', users: { __typename: 'UserConnection', totalCount: number, pageInfo: { __typename: 'PageInfo', endCursor?: string | undefined, hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | undefined }, edges: Array<{ __typename: 'UserEdge', cursor: string, node?: { __typename: 'User', id: number, name?: string | undefined, displayName: string, role: UserRole, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, statsHash: { __typename: 'Stats', submittedEvidenceItems: number, revisions: number } } | undefined }> } };
 
-export type UserBrowseTableRowFieldsFragment = { __typename: 'User', id: number, name?: string | undefined, displayName: string, role: UserRole, profileImagePath?: string | undefined, mostRecentActionTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, statsHash: { __typename: 'Stats', submittedEvidenceItems: number, revisions: number } };
+export type UserBrowseTableRowFieldsFragment = { __typename: 'User', id: number, name?: string | undefined, displayName: string, role: UserRole, profileImagePath?: string | undefined, mostRecentActivityTimestamp?: any | undefined, organizations: Array<{ __typename: 'Organization', id: number, name: string }>, statsHash: { __typename: 'Stats', submittedEvidenceItems: number, revisions: number } };
 
 export type VariantGroupPopoverQueryVariables = Exact<{
   variantGroupId: Scalars['Int'];
@@ -8333,9 +8333,7 @@ export const OrganizationBrowseTableRowFieldsFragmentDoc = gql`
     name
     id
   }
-  mostRecentEvent {
-    createdAt
-  }
+  mostRecentActivityTimestamp
 }
     `;
 export const PhenotypeBrowseTableRowFieldsFragmentDoc = gql`
@@ -8621,7 +8619,7 @@ export const UserBrowseTableRowFieldsFragmentDoc = gql`
     revisions
   }
   profileImagePath(size: 64)
-  mostRecentActionTimestamp
+  mostRecentActivityTimestamp
 }
     `;
 export const VariantGroupPopoverFieldsFragmentDoc = gql`

diff --git a/client/src/app/generated/server.model.graphql b/client/src/app/generated/server.model.graphql
@@ -3506,7 +3506,7 @@ type LeaderboardOrganization {
     """
     last: Int
   ): UserConnection!
-  mostRecentEvent: Event
+  mostRecentActivityTimestamp: ISO8601DateTime
   name: String!
   orgAndSuborgsStatsHash: Stats!
   orgStatsHash: Stats!
@@ -3598,7 +3598,7 @@ type LeaderboardUser {
   facebookProfile: String
   id: Int!
   linkedinProfile: String
-  mostRecentActionTimestamp: ISO8601DateTime
+  mostRecentActivityTimestamp: ISO8601DateTime
   mostRecentConflictOfInterestStatement: Coi
   mostRecentEvent: Event
   mostRecentOrganizationId: Int
@@ -5044,7 +5044,7 @@ type Organization {
     """
     last: Int
   ): UserConnection!
-  mostRecentEvent: Event
+  mostRecentActivityTimestamp: ISO8601DateTime
   name: String!
   orgAndSuborgsStatsHash: Stats!
   orgStatsHash: Stats!
@@ -8483,7 +8483,7 @@ type User {
   facebookProfile: String
   id: Int!
   linkedinProfile: String
-  mostRecentActionTimestamp: ISO8601DateTime
+  mostRecentActivityTimestamp: ISO8601DateTime
   mostRecentConflictOfInterestStatement: Coi
   mostRecentEvent: Event
   mostRecentOrganizationId: Int

diff --git a/client/src/app/generated/server.schema.json b/client/src/app/generated/server.schema.json
@@ -16980,12 +16980,12 @@
               "deprecationReason": null
             },
             {
-              "name": "mostRecentEvent",
+              "name": "mostRecentActivityTimestamp",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Event",
+                "kind": "SCALAR",
+                "name": "ISO8601DateTime",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -17522,7 +17522,7 @@
               "deprecationReason": null
             },
             {
-              "name": "mostRecentActionTimestamp",
+              "name": "mostRecentActivityTimestamp",
               "description": null,
               "args": [],
               "type": {
@@ -24358,12 +24358,12 @@
               "deprecationReason": null
             },
             {
-              "name": "mostRecentEvent",
+              "name": "mostRecentActivityTimestamp",
               "description": null,
               "args": [],
               "type": {
-                "kind": "OBJECT",
-                "name": "Event",
+                "kind": "SCALAR",
+                "name": "ISO8601DateTime",
                 "ofType": null
               },
               "isDeprecated": false,
@@ -39093,7 +39093,7 @@
               "deprecationReason": null
             },
             {
-              "name": "mostRecentActionTimestamp",
+              "name": "mostRecentActivityTimestamp",
               "description": null,
               "args": [],
               "type": {

diff --git a/client/yarn.lock b/client/yarn.lock
@@ -5302,9 +5302,9 @@ flat@^5.0.2:
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
 follow-redirects@^1.0.0, follow-redirects@^1.15.0:
-  version "1.15.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13"
-  integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==
+  version "1.15.4"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.4.tgz#cdc7d308bf6493126b17ea2191ea0ccf3e535adf"
+  integrity sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==
 
 for-each@^0.3.3:
   version "0.3.3"

diff --git a/server/Gemfile b/server/Gemfile
@@ -8,7 +8,7 @@ gem 'rails', '~> 6.1', '>= 6.1.3.1'
 # Use postgresql as the database for Active Record
 gem 'pg', '~> 1.1'
 # Use Puma as the app server
-gem 'puma', '5.6.7'
+gem 'puma', '5.6.8'
 # Use SCSS for stylesheets
 gem 'sass-rails', '>= 6'
 # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker

diff --git a/server/Gemfile.lock b/server/Gemfile.lock
@@ -247,7 +247,7 @@ GEM
     net-smtp (0.3.3)
       net-protocol
     net-ssh (7.2.0)
-    nio4r (2.5.9)
+    nio4r (2.7.0)
     nokogiri (1.15.4-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.4-x86_64-darwin)
@@ -295,7 +295,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (5.0.3)
-    puma (5.6.7)
+    puma (5.6.8)
       nio4r (~> 2.0)
     raabro (1.4.0)
     racc (1.7.1)
@@ -515,7 +515,7 @@ DEPENDENCIES
   pg (~> 1.1)
   pry
   pry-rails
-  puma (= 5.6.7)
+  puma (= 5.6.8)
   rack-cors (~> 1.1.1)
   rack-mini-profiler (~> 2.0)
   rails (~> 6.1, >= 6.1.3.1)

diff --git a/server/app/graphql/civic2_schema.rb b/server/app/graphql/civic2_schema.rb
@@ -1,5 +1,5 @@
 class Civic2Schema < GraphQL::Schema
-  default_max_page_size 50
+  default_max_page_size 100
   mutation(Types::MutationType)
   query(Types::QueryType)
 

diff --git a/server/app/graphql/resolvers/top_level_users.rb b/server/app/graphql/resolvers/top_level_users.rb
@@ -41,7 +41,7 @@ class Resolvers::TopLevelUsers < GraphQL::Schema::Resolver
     when 'ROLE'
       scope.reorder("users.role #{value.direction}")
     when 'LAST_ACTION'
-      scope.reorder("users.most_recent_action_timestamp #{value.direction} NULLS LAST")
+      scope.reorder("users.most_recent_activity_timestamp #{value.direction} NULLS LAST")
     end
   end
 end