fix(documents): Sort by publication v1 and v2 by default (#17157)

* Sort by publication v1 and v2 by default * Remove logg --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Dec 6, 2024 · c4685ef · c4685ef
1 parent 202d2b1
commit c4685ef
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/libs/api/domains/documents/src/lib/dto/getDocumentListInput.ts b/libs/api/domains/documents/src/lib/dto/getDocumentListInput.ts
@@ -21,7 +21,7 @@ export class GetDocumentListInput {
   typeId?: string
 
   @Field({ nullable: true })
-  sortBy?: 'Date' | 'Category' | 'Type' | 'Subject' | 'Sender'
+  sortBy?: 'Date' | 'Category' | 'Type' | 'Subject' | 'Sender' | 'Publication'
 
   @Field({ nullable: true })
   order?: 'Ascending' | 'Descending'

diff --git a/libs/api/domains/documents/src/lib/models/v2/documents.input.ts b/libs/api/domains/documents/src/lib/models/v2/documents.input.ts
@@ -17,7 +17,8 @@ import {
 } from 'class-validator'
 
 export enum DocumentPageSort {
-  Date = 'Date',
+  Date = 'Date', // Date is document date
+  Publication = 'Publication', // Publication is document publication date (default)
   Category = 'Category',
   Type = 'Type',
   Sender = 'Sender',
@@ -79,7 +80,10 @@ export class DocumentsInput {
   @IsBoolean()
   readonly opened?: boolean
 
-  @Field(() => DocumentPageSort, { nullable: true, defaultValue: 'Date' })
+  @Field(() => DocumentPageSort, {
+    nullable: true,
+    defaultValue: 'Publication',
+  })
   @IsOptional()
   @IsEnum(DocumentPageSort)
   readonly sortBy?: DocumentPageSort

diff --git a/libs/clients/documents-v2/src/lib/dto/listDocuments.input.ts b/libs/clients/documents-v2/src/lib/dto/listDocuments.input.ts
@@ -8,7 +8,7 @@ export type ListDocumentsInputDto = {
   typeId?: string
   subjectContains?: string
   archived?: boolean
-  sortBy?: 'Date' | 'Category' | 'Type' | 'Sender' | 'Subject'
+  sortBy?: 'Date' | 'Category' | 'Type' | 'Sender' | 'Subject' | 'Publication'
   order?: 'Ascending' | 'Descending'
   opened?: boolean
   page?: number

diff --git a/libs/clients/documents/src/lib/documentClient.ts b/libs/clients/documents/src/lib/documentClient.ts
@@ -133,7 +133,7 @@ export class DocumentClient {
     type ExcludesFalse = <T>(x: T | null | undefined | false | '') => x is T
 
     const inputs = [
-      sortBy ? `sortBy=${sortBy}` : 'sortBy=Date', // first in array to skip &
+      sortBy ? `sortBy=${sortBy}` : 'sortBy=Publication', // first in array to skip &
       order ? `orderBy=${order}` : 'order=Descending',
       page ? `page=${page}` : 'page=1',
       pageSize ? `pageSize=${pageSize}` : 'pageSize=15',

diff --git a/libs/clients/documents/src/lib/models/DocumentInput.ts b/libs/clients/documents/src/lib/models/DocumentInput.ts
@@ -5,7 +5,7 @@ export type GetDocumentListInput = {
   categoryId?: string
   subjectContains?: string
   typeId?: string
-  sortBy?: 'Date' | 'Category' | 'Type' | 'Subject' | 'Sender'
+  sortBy?: 'Date' | 'Category' | 'Type' | 'Subject' | 'Sender' | 'Publication'
   order?: 'Ascending' | 'Descending'
   opened?: boolean
   archived?: boolean