Fix request schema (#4400)

beyondessential · Mar 27, 2023 · a49fc95 · a49fc95
1 parent 0018752
commit a49fc95
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 24 deletions.
diff --git a/packages/types/src/schemas/schemas.ts b/packages/types/src/schemas/schemas.ts
@@ -24436,6 +24436,7 @@ export const DataTableSchema = {
 				"data_element_metadata",
 				"data_group_metadata",
 				"entities",
+				"entity_attributes",
 				"entity_relations",
 				"events",
 				"sql"
@@ -24666,7 +24667,6 @@ export const EntitySchema = {
 				"case_contact",
 				"catchment",
 				"city",
-				"complaint",
 				"country",
 				"disaster",
 				"district",
@@ -24692,7 +24692,6 @@ export const EntitySchema = {
 				"sub_facility",
 				"trap",
 				"village",
-				"water_sample",
 				"wish_sub_district",
 				"world"
 			],
@@ -24997,6 +24996,15 @@ export const MapOverlaySchema = {
 		"name": {
 			"type": "string"
 		},
+		"permission_group": {
+			"type": "string"
+		},
+		"project_codes": {
+			"type": "array",
+			"items": {
+				"type": "string"
+			}
+		},
 		"report_code": {
 			"type": "string"
 		}
@@ -25005,7 +25013,8 @@ export const MapOverlaySchema = {
 	"additionalProperties": false,
 	"required": [
 		"code",
-		"name"
+		"name",
+		"permission_group"
 	]
 } 
 
@@ -25044,12 +25053,6 @@ export const MapOverlayGroupRelationSchema = {
 		"map_overlay_group_id": {
 			"type": "string"
 		},
-		"permission_groups": {
-			"type": "array",
-			"items": {
-				"type": "string"
-			}
-		},
 		"sort_order": {
 			"type": "number"
 		}
@@ -25308,7 +25311,6 @@ export const PermissionsBasedMeditrakSyncQueueSchema = {
 				"case_contact",
 				"catchment",
 				"city",
-				"complaint",
 				"country",
 				"disaster",
 				"district",
@@ -25334,7 +25336,6 @@ export const PermissionsBasedMeditrakSyncQueueSchema = {
 				"sub_facility",
 				"trap",
 				"village",
-				"water_sample",
 				"wish_sub_district",
 				"world"
 			],
@@ -26068,7 +26069,6 @@ export const EntityTypeSchema = {
 		"case_contact",
 		"catchment",
 		"city",
-		"complaint",
 		"country",
 		"disaster",
 		"district",
@@ -26094,7 +26094,6 @@ export const EntityTypeSchema = {
 		"sub_facility",
 		"trap",
 		"village",
-		"water_sample",
 		"wish_sub_district",
 		"world"
 	],
@@ -26127,6 +26126,7 @@ export const DataTableTypeSchema = {
 		"data_element_metadata",
 		"data_group_metadata",
 		"entities",
+		"entity_attributes",
 		"entity_relations",
 		"events",
 		"sql"
@@ -26207,7 +26207,6 @@ export const EntityCreatedSchema = {
 				"case_contact",
 				"catchment",
 				"city",
-				"complaint",
 				"country",
 				"disaster",
 				"district",
@@ -26233,7 +26232,6 @@ export const EntityCreatedSchema = {
 				"sub_facility",
 				"trap",
 				"village",
-				"water_sample",
 				"wish_sub_district",
 				"world"
 			],
@@ -26376,7 +26374,6 @@ export const MeditrakSurveyResponseRequestSchema = {
 							"case_contact",
 							"catchment",
 							"city",
-							"complaint",
 							"country",
 							"disaster",
 							"district",
@@ -26402,7 +26399,6 @@ export const MeditrakSurveyResponseRequestSchema = {
 							"sub_facility",
 							"trap",
 							"village",
-							"water_sample",
 							"wish_sub_district",
 							"world"
 						],
@@ -26477,8 +26473,8 @@ export const MeditrakSurveyResponseRequestSchema = {
 export const DataTablePreviewRequestSchema = {
 	"properties": {
 		"runtimeParams": {
-			"type": "object",
-			"additionalProperties": false
+			"additionalProperties": true,
+			"type": "object"
 		},
 		"code": {
 			"type": "string"
@@ -26502,6 +26498,7 @@ export const DataTablePreviewRequestSchema = {
 				"data_element_metadata",
 				"data_group_metadata",
 				"entities",
+				"entity_attributes",
 				"entity_relations",
 				"events",
 				"sql"
@@ -26515,7 +26512,6 @@ export const DataTablePreviewRequestSchema = {
 		"code",
 		"id",
 		"permission_groups",
-		"runtimeParams",
 		"type"
 	]
 } 

diff --git a/packages/types/src/types/models.ts b/packages/types/src/types/models.ts
@@ -313,6 +313,8 @@ export interface MapOverlay {
   'legacy'?: boolean;
   'linked_measures'?: string[] | null;
   'name': string;
+  'permission_group': string;
+  'project_codes'?: string[] | null;
   'report_code'?: string | null;
 }
 export interface MapOverlayGroup {
@@ -325,7 +327,6 @@ export interface MapOverlayGroupRelation {
   'child_type': string;
   'id': string;
   'map_overlay_group_id': string;
-  'permission_groups'?: string[] | null;
   'sort_order'?: number | null;
 }
 export interface MeditrakDevice {
@@ -618,8 +619,6 @@ export enum EntityType {
   'asset' = 'asset',
   'institute' = 'institute',
   'msupply_store' = 'msupply_store',
-  'complaint' = 'complaint',
-  'water_sample' = 'water_sample',
 }
 export enum DisasterType {
   'cyclone' = 'cyclone',
@@ -641,6 +640,7 @@ export enum DataTableType {
   'sql' = 'sql',
   'data_group_metadata' = 'data_group_metadata',
   'data_element_metadata' = 'data_element_metadata',
+  'entity_attributes' = 'entity_attributes',
 }
 export enum DataSourceType {
   'dataElement' = 'dataElement',

diff --git a/packages/types/src/types/requests/data-table-server/DataTablePreviewRequest.ts b/packages/types/src/types/requests/data-table-server/DataTablePreviewRequest.ts
@@ -10,5 +10,8 @@
 import { DataTable } from '../../models';
 
 export interface DataTablePreviewRequest extends DataTable {
-  runtimeParams: Record<string, unknown>;
+  /**
+   * @additionalProperties true
+   */
+  runtimeParams?: Record<string, unknown>;
 }