fix: xml import fixes

Author: nana-boateng

src/app/new.state/xml/xml.effects.ts

@@ -338,13 +338,24 @@ export class XmlEffects {
       return this.actions$.pipe(
         ofType(XmlManipulationActions.startImportMetadata),
         switchMap(({ importedXmlString, variableTemplate }) => {
-          const xml = ddiService.XMLtoJSON(importedXmlString);
-          return of(
-            XmlManipulationActions.importConversionSuccess({
-              importDdiData: xml,
-              variableTemplate,
-            }),
-          );
+          try {
+            const xml = ddiService.XMLtoJSON(importedXmlString);
+            return of(
+              XmlManipulationActions.importConversionSuccess({
+                importDdiData: xml,
+                variableTemplate,
+              }),
+            );
+          } catch (error) {
+            return of(
+              XmlManipulationActions.importConversionError({
+                error:
+                  error instanceof Error
+                    ? error.message
+                    : 'Failed to parse imported XML file',
+              }),
+            );
+          }
         }),
       );
     },

src/app/new.state/xml/xml.reducer.ts

@@ -115,36 +115,48 @@ export const xmlReducer = createReducer(
       const variables = duplicateState.dataset?.codeBook.dataDscr.var || [];
       let variableGroups =
         duplicateState.dataset?.codeBook.dataDscr.varGrp || [];
-      if (duplicateState.dataset && variables.length) {
-        const variablesMatched: MatchVariables = matchVariableIDs(
-          importDdiData.codeBook.dataDscr.var,
-          variables,
-        );
-        duplicateState.dataset.codeBook.dataDscr.var = createNewVariables(
+
+      // Validate imported DDI structure before accessing
+      const importedVariables = importDdiData?.codeBook?.dataDscr?.var;
+      if (!duplicateState.dataset || !variables.length || !importedVariables) {
+        return { ...duplicateState };
+      }
+
+      // Normalize single-element to array for fast-xml-parser
+      const importedVariablesArray = Array.isArray(importedVariables)
+        ? importedVariables
+        : [importedVariables];
+
+      const variablesMatched: MatchVariables = matchVariableIDs(
+        importedVariablesArray,
+        variables,
+      );
+      duplicateState.dataset.codeBook.dataDscr.var = createNewVariables(
+        variablesMatched,
+        variables,
+        variableTemplate,
+      );
+      if (variableTemplate.groups) {
+        const importedVariableGroups =
+          importDdiData.codeBook.dataDscr.varGrp || [];
+        variableGroups = updateGroups(
+          Array.isArray(importedVariableGroups)
+            ? importedVariableGroups
+            : [importedVariableGroups],
           variablesMatched,
-          variables,
-          variableTemplate,
         );
-        if (variableTemplate.groups) {
-          const importedVariableGroups = importDdiData.codeBook.dataDscr.varGrp
-            ? importDdiData.codeBook.dataDscr.varGrp
-            : [];
-          variableGroups = updateGroups(
-            Array.isArray(importedVariableGroups)
-              ? importedVariableGroups
-              : [importedVariableGroups],
-            variablesMatched,
-          );
-        }
-        duplicateState.info
-          ? (duplicateState.info.importedSuccess = true)
-          : {
-              siteURL: '',
-              fileID: '',
-              apiKey: '',
-              importedSuccess: true,
-            };
+        duplicateState.dataset.codeBook.dataDscr.varGrp = variableGroups;
+      }
+
+      if (duplicateState.info) {
+        duplicateState.info.importedSuccess = true;
+      } else {
+        duplicateState.info = {
+          secureUploadUrl: null,
+          importedSuccess: true,
+        };
       }
+
       return {
         ...duplicateState,
       };

src/app/new.state/xml/xml.util.ts

@@ -423,7 +423,10 @@ export function updateGroups(
     const newVars: string[] = [];
     if (groupVariables.length) {
       groupVariables.forEach((variable) => {
-        newVars.push(flipMatched[variable]);
+        const mapped = flipMatched[variable];
+        if (mapped !== undefined) {
+          newVars.push(mapped);
+        }
       });
     }
     duplicateVariableGroups.push({