Update enableChart URLs and types

alexlipovka · alexlipovka · commit 48a4889cdbc8 · 2026-02-11T13:21:31.000+04:00
diff --git a/src/converter/__tests__/resources/questionnaire_fce/enable_chart.json b/src/converter/__tests__/resources/questionnaire_fce/enable_chart.json
@@ -16,12 +16,10 @@
                             }
                         ]
                     },
-                    "enableChart": [
-                        {
-                            "linkIdX": "date",
-                            "linkIdY": "weight"
-                        }
-                    ],
+                    "enableChart": {
+                        "linkIdX": "date",
+                        "linkIdY": "weight"
+                    },
                     "item": [
                         {
                             "text": "Date",
diff --git a/src/converter/__tests__/resources/questionnaire_fhir/enable_chart.json b/src/converter/__tests__/resources/questionnaire_fhir/enable_chart.json
@@ -11,14 +11,14 @@
                     "repeats": true,
                     "extension": [
                         {
-                            "url": "https://emr-core.beda.software/StructureDefinition/enable-chart",
+                            "url": "https://emr-core.beda.software/StructureDefinition/enableChart",
                             "extension": [
                                 {
-                                    "url": "link-id-x",
+                                    "url": "linkIdX",
                                     "valueString": "date"
                                 },
                                 {
-                                    "url": "link-id-y",
+                                    "url": "linkIdY",
                                     "valueString": "weight"
                                 }
                             ]
diff --git a/src/converter/extensions.ts b/src/converter/extensions.ts
@@ -52,7 +52,7 @@ export enum ExtensionIdentifier {
     MinOccurs = 'http://hl7.org/fhir/StructureDefinition/questionnaire-minOccurs',
     MaxOccurs = 'http://hl7.org/fhir/StructureDefinition/questionnaire-maxOccurs',
 
-    EnableChart = 'https://emr-core.beda.software/StructureDefinition/enable-chart',
+    EnableChart = 'https://emr-core.beda.software/StructureDefinition/enableChart',
 }
 
 export type ExtensionTransformer = {
@@ -373,31 +373,29 @@ export const extensionTransformers: ExtensionTransformer = {
         transform: {
             fromExtensions: (extensions) => {
                 return {
-                    enableChart: extensions.map((extension) => {
-                        const enableChartExtension = extension.extension!;
-
-                        return {
-                            linkIdX: enableChartExtension.find((obj) => obj.url === 'link-id-x')?.valueString,
-                            linkIdY: enableChartExtension.find((obj) => obj.url === 'link-id-y')?.valueString,
-                        };
-                    }),
+                    enableChart: {
+                        linkIdX: extensions[0]?.extension?.find((obj) => obj.url === 'linkIdX')?.valueString,
+                        linkIdY: extensions[0]?.extension?.find((obj) => obj.url === 'linkIdY')?.valueString,
+                    },
                 };
             },
             toExtensions: (item) => {
                 if (item.enableChart) {
-                    return item.enableChart.map((enableChart) => ({
-                        url: ExtensionIdentifier.EnableChart,
-                        extension: [
-                            {
-                                url: 'link-id-x',
-                                valueString: enableChart.linkIdX,
-                            },
-                            {
-                                url: 'link-id-y',
-                                valueString: enableChart.linkIdY,
-                            },
-                        ],
-                    }));
+                    return [
+                        {
+                            url: ExtensionIdentifier.EnableChart,
+                            extension: [
+                                {
+                                    url: 'linkIdX',
+                                    valueString: item.enableChart.linkIdX,
+                                },
+                                {
+                                    url: 'linkIdY',
+                                    valueString: item.enableChart.linkIdY,
+                                },
+                            ],
+                        },
+                    ];
                 }
 
                 return [];
diff --git a/src/fce.types.ts b/src/fce.types.ts
@@ -114,7 +114,7 @@ export interface FCEQuestionnaireItem extends QuestionnaireItem {
     choiceColumns?: number;
     ordinalValue?: number;
     mimeType?: string[];
-    enableChart?: FCEQuestionnaireItemEnableChart[];
+    enableChart?: FCEQuestionnaireItemEnableChart;
 }
 
 export interface FCEQuestionnaireItemText {

Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,10 @@`
`16`	`16`	`}`
`17`	`17`	`]`
`18`	`18`	`},`
`19`		`- "enableChart": [`
`20`		`- {`
`21`		`- "linkIdX": "date",`
`22`		`- "linkIdY": "weight"`
`23`		`- }`
`24`		`- ],`
	`19`	`+ "enableChart": {`
	`20`	`+ "linkIdX": "date",`
	`21`	`+ "linkIdY": "weight"`
	`22`	`+ },`
`25`	`23`	`"item": [`
`26`	`24`	`{`
`27`	`25`	`"text": "Date",`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@`
`11`	`11`	`"repeats": true,`
`12`	`12`	`"extension": [`
`13`	`13`	`{`
`14`		`- "url": "https://emr-core.beda.software/StructureDefinition/enable-chart",`
	`14`	`+ "url": "https://emr-core.beda.software/StructureDefinition/enableChart",`
`15`	`15`	`"extension": [`
`16`	`16`	`{`
`17`		`- "url": "link-id-x",`
	`17`	`+ "url": "linkIdX",`
`18`	`18`	`"valueString": "date"`
`19`	`19`	`},`
`20`	`20`	`{`
`21`		`- "url": "link-id-y",`
	`21`	`+ "url": "linkIdY",`
`22`	`22`	`"valueString": "weight"`
`23`	`23`	`}`
`24`	`24`	`]`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ export interface FCEQuestionnaireItem extends QuestionnaireItem {`
`114`	`114`	`choiceColumns?: number;`
`115`	`115`	`ordinalValue?: number;`
`116`	`116`	`mimeType?: string[];`
`117`		`- enableChart?: FCEQuestionnaireItemEnableChart[];`
	`117`	`+ enableChart?: FCEQuestionnaireItemEnableChart;`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`export interface FCEQuestionnaireItemText {`