Merge branch 'development' into 4001-datatable-use-datagrid

openforis · Dec 30, 2024 · 67e09bb · 67e09bb
2 parents 325b649 + cb9dcf5
commit 67e09bb
Show file tree

Hide file tree

Showing 106 changed files with 19 additions and 28,593 deletions.
diff --git a/src/server/repository/assessment/section/getMany.ts b/src/server/repository/assessment/section/getMany.ts
@@ -3,10 +3,13 @@ import { Assessment, Cycle, Section } from 'meta/assessment'
 import { BaseProtocol, DB, Schemas } from 'server/db'
 import { SectionAdapter } from 'server/repository/adapter'
 
-export const getMany = async (
-  props: { assessment: Assessment; cycle: Cycle; showHidden?: boolean },
-  client: BaseProtocol = DB
-): Promise<Array<Section>> => {
+type Props = {
+  assessment: Assessment
+  cycle: Cycle
+  showHidden?: boolean
+}
+
+export const getMany = async (props: Props, client: BaseProtocol = DB): Promise<Array<Section>> => {
   const { assessment, cycle, showHidden = false } = props
   const schemaName = Schemas.getName(assessment)
 

diff --git a/src/server/repository/assessment/section/getManyMetadata.ts b/src/server/repository/assessment/section/getManyMetadata.ts
@@ -1,22 +1,23 @@
-import { Assessment, Cycle, TableSection } from 'meta/assessment'
+import { Assessment, Cycle, SectionName, TableSection } from 'meta/assessment'
 
 import { BaseProtocol, DB, Schemas } from 'server/db'
 import { TableSectionAdapter } from 'server/repository/adapter'
 
-export const getManyMetadata = async (
-  props: {
-    assessment: Assessment
-    sectionNames?: Array<string>
-    cycle: Cycle
-    showHidden?: boolean
-  },
-  client: BaseProtocol = DB
-): Promise<Record<string, Array<TableSection>>> => {
+type Props = {
+  assessment: Assessment
+  cycle: Cycle
+  sectionNames?: Array<SectionName>
+  showHidden?: boolean
+}
+
+type RecordTableSections = Record<SectionName, Array<TableSection>>
+
+export const getManyMetadata = async (props: Props, client: BaseProtocol = DB): Promise<RecordTableSections> => {
   const { cycle, sectionNames, assessment, showHidden = false } = props
   const schemaName = Schemas.getName(assessment)
 
   // @ts-ignore
-  return client.result<Record<string, Array<TableSection>>>(
+  return client.result<RecordTableSections>(
     `
         with "row" as (select s.props ->> 'name' as section_name,
                               to_jsonb(ts.*)     as table_section,

diff --git a/src/test/dataMigration/jest.config.js b/src/test/dataMigration/jest.config.js
diff --git a/src/test/dataMigration/panEuPostDataMigration.ts b/src/test/dataMigration/panEuPostDataMigration.ts
diff --git a/src/test/dataMigration/postDataMigration.ts b/src/test/dataMigration/postDataMigration.ts