diff --git a/apps/console/src/pages/organizations/employee/EmployeeApprovalsPage.tsx b/apps/console/src/pages/organizations/employee/EmployeeApprovalsPage.tsx index b10b5ce7c..22c5c8d3d 100644 --- a/apps/console/src/pages/organizations/employee/EmployeeApprovalsPage.tsx +++ b/apps/console/src/pages/organizations/employee/EmployeeApprovalsPage.tsx @@ -28,7 +28,7 @@ export const employeeApprovalsPageQuery = graphql` approvableDocuments( organizationId: $organizationId first: 1000 - orderBy: { field: CREATED_AT, direction: DESC } + orderBy: { field: UPDATED_AT, direction: DESC } ) @required(action: THROW) { edges @required(action: THROW) { node @required(action: THROW) { diff --git a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx index d7c26cf4e..3e221cf1d 100644 --- a/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx +++ b/apps/console/src/pages/organizations/employee/EmployeeDocumentsPage.tsx @@ -28,7 +28,7 @@ export const employeeDocumentsPageQuery = graphql` signableDocuments( organizationId: $organizationId first: 1000 - orderBy: { field: CREATED_AT, direction: DESC } + orderBy: { field: UPDATED_AT, direction: DESC } ) @required(action: THROW) { edges @required(action: THROW) { node @required(action: THROW) { diff --git a/pkg/coredata/document.go b/pkg/coredata/document.go index c0988681e..142909521 100644 --- a/pkg/coredata/document.go +++ b/pkg/coredata/document.go @@ -52,6 +52,8 @@ func (p Document) CursorKey(orderBy DocumentOrderField) page.CursorKey { switch orderBy { case DocumentOrderFieldCreatedAt: return page.NewCursorKey(p.ID, p.CreatedAt) + case DocumentOrderFieldUpdatedAt: + return page.NewCursorKey(p.ID, p.UpdatedAt) case DocumentOrderFieldTitle: return page.NewCursorKey(p.ID, p.Title) case DocumentOrderFieldDocumentType: diff --git a/pkg/coredata/document_order_field.go b/pkg/coredata/document_order_field.go index 019b59399..c5323b94b 100644 --- a/pkg/coredata/document_order_field.go +++ b/pkg/coredata/document_order_field.go @@ -22,6 +22,7 @@ type ( const ( DocumentOrderFieldCreatedAt DocumentOrderField = "CREATED_AT" + DocumentOrderFieldUpdatedAt DocumentOrderField = "UPDATED_AT" DocumentOrderFieldTitle DocumentOrderField = "TITLE" DocumentOrderFieldDocumentType DocumentOrderField = "DOCUMENT_TYPE" ) @@ -30,6 +31,8 @@ func (p DocumentOrderField) Column() string { switch p { case DocumentOrderFieldCreatedAt: return "created_at" + case DocumentOrderFieldUpdatedAt: + return "updated_at" case DocumentOrderFieldTitle: return "title" case DocumentOrderFieldDocumentType: @@ -41,6 +44,7 @@ func (p DocumentOrderField) Column() string { func (p DocumentOrderField) IsValid() bool { switch p { case DocumentOrderFieldCreatedAt, + DocumentOrderFieldUpdatedAt, DocumentOrderFieldTitle, DocumentOrderFieldDocumentType: return true diff --git a/pkg/server/api/console/v1/schema.graphql b/pkg/server/api/console/v1/schema.graphql index a93db132c..9c5fcdf0a 100644 --- a/pkg/server/api/console/v1/schema.graphql +++ b/pkg/server/api/console/v1/schema.graphql @@ -542,6 +542,10 @@ enum DocumentOrderField @goEnum( value: "go.probo.inc/probo/pkg/coredata.DocumentOrderFieldCreatedAt" ) + UPDATED_AT + @goEnum( + value: "go.probo.inc/probo/pkg/coredata.DocumentOrderFieldUpdatedAt" + ) DOCUMENT_TYPE @goEnum( value: "go.probo.inc/probo/pkg/coredata.DocumentOrderFieldDocumentType" diff --git a/pkg/server/api/console/v1/types/employee_document.go b/pkg/server/api/console/v1/types/employee_document.go index 1eca205e6..b579ab722 100644 --- a/pkg/server/api/console/v1/types/employee_document.go +++ b/pkg/server/api/console/v1/types/employee_document.go @@ -103,6 +103,8 @@ func (d EmployeeDocument) CursorKey(orderBy coredata.DocumentOrderField) page.Cu switch orderBy { case coredata.DocumentOrderFieldCreatedAt: return page.NewCursorKey(d.ID, d.CreatedAt) + case coredata.DocumentOrderFieldUpdatedAt: + return page.NewCursorKey(d.ID, d.UpdatedAt) case coredata.DocumentOrderFieldTitle: return page.NewCursorKey(d.ID, d.Title) case coredata.DocumentOrderFieldDocumentType: