Fix for group errors

Fix several bugs related to datasets only having one group. fixes #181

Author: nana-boateng

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

@@ -211,14 +211,14 @@ export class XmlEffects {
     );
   });
 
-  saveVariableStatusPending$ = createEffect(() => {
+  saveBulkVariableStatusPending$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(XmlManipulationActions.bulkSaveWeightAndGroupChange),
       map(() => DatasetActions.saveVariableStatusPending()),
     );
   });
 
-  clearVariableStatusSuccess$ = createEffect(() => {
+  clearBulkVariableStatusSuccess$ = createEffect(() => {
     return this.actions$.pipe(
       ofType(XmlManipulationActions.bulkSaveWeightAndGroupChangeSuccess),
       delay(10000),

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

@@ -139,7 +139,7 @@ interface FileDescription {
 }
 
 interface DataDescription {
-  varGrp: VariableGroup[];
+  varGrp: VariableGroup[] | VariableGroup;
   var: Variable[];
   processedVar?: { [variableID: string]: Variable };
 }

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

@@ -120,7 +120,9 @@ export const xmlReducer = createReducer(
         );
         if (variableTemplate.groups) {
           duplicateState.dataset.codeBook.dataDscr.varGrp = updateGroups(
-            importDdiData.codeBook.dataDscr.varGrp,
+            Array.isArray(importDdiData.codeBook.dataDscr.varGrp)
+              ? importDdiData.codeBook.dataDscr.varGrp
+              : [importDdiData.codeBook.dataDscr.varGrp],
             variablesMatched,
           );
         }
@@ -189,13 +191,22 @@ export const xmlReducer = createReducer(
     };
   }),
   on(XmlManipulationActions.createGroup, (state, { groupID, label }) => {
-    const duplicateVariableGroups = structuredClone(
+    let duplicateVariableGroups = structuredClone(
       state.dataset?.codeBook.dataDscr.varGrp || [],
     );
-    duplicateVariableGroups.push({
+    const newGroup = {
       '@_ID': groupID,
       labl: label,
-    });
+    };
+
+    if (Array.isArray(duplicateVariableGroups)) {
+      duplicateVariableGroups.push(newGroup);
+    } else if (duplicateVariableGroups) {
+      duplicateVariableGroups = [duplicateVariableGroups, newGroup];
+    } else {
+      duplicateVariableGroups = [newGroup];
+    }
+
     return {
       ...state,
       dataset: !state.dataset

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

@@ -239,7 +239,7 @@ export function changeSingleVariable(
 }
 
 export function changeGroupsForSingleVariable(
-  variableGroups: VariableGroup[],
+  variableGroups: VariableGroup[] | VariableGroup,
   variableID: string,
   groups: string[],
 ) {
@@ -300,13 +300,19 @@ export function changeGroupsForMultipleVariables(
 }
 
 export function renameVariableGroup(
-  duplicateVariableGroups: VariableGroup[],
+  duplicateVariableGroups: VariableGroup[] | VariableGroup,
   groupID: string,
   newLabel: string,
 ) {
-  const variableGroupArrayLength: number = duplicateVariableGroups.length;
-  for (let i = 0; i < variableGroupArrayLength - 1; i++) {
-    const currentVariableGroup = duplicateVariableGroups[i];
+  const variableGroupArrayLength: number = Array.isArray(
+    duplicateVariableGroups,
+  )
+    ? duplicateVariableGroups.length
+    : 1;
+  for (let i = 0; i < variableGroupArrayLength; i++) {
+    const currentVariableGroup = Array.isArray(duplicateVariableGroups)
+      ? duplicateVariableGroups[i]
+      : duplicateVariableGroups;
     if (currentVariableGroup['@_ID'] === groupID) {
       currentVariableGroup.labl = newLabel;
       break;
@@ -316,32 +322,49 @@ export function renameVariableGroup(
 }
 
 export function deleteVariableGroup(
-  duplicateVariableGroups: VariableGroup[],
+  duplicateVariableGroups: VariableGroup[] | VariableGroup,
   groupID: string,
 ) {
-  const variableGroupArrayLength: number = duplicateVariableGroups.length;
+  const variableGroupArrayLength: number = Array.isArray(
+    duplicateVariableGroups,
+  )
+    ? duplicateVariableGroups.length
+    : 1;
   let index = -1;
   for (let i = 0; i < variableGroupArrayLength; i++) {
-    const currentVariableGroup = duplicateVariableGroups[i];
+    const currentVariableGroup = Array.isArray(duplicateVariableGroups)
+      ? duplicateVariableGroups[i]
+      : duplicateVariableGroups;
     if (currentVariableGroup['@_ID'] === groupID) {
       index = i;
       break;
     }
   }
   if (index > -1) {
-    duplicateVariableGroups.splice(index, 1);
+    if (Array.isArray(duplicateVariableGroups)) {
+      duplicateVariableGroups.splice(index, 1);
+    } else {
+      return [];
+    }
   }
   return duplicateVariableGroups;
 }
 
 export function removeVariablesFromGroups(
   groupID: string,
   variableIDs: string[],
-  duplicateVariableGroups: VariableGroup[],
+  duplicateVariableGroups: VariableGroup[] | VariableGroup,
 ) {
-  const variableGroupArrayLength: number = duplicateVariableGroups.length;
+  // If the variable groups are not an array (when there is only one variable group), we need to make it an array
+  const variableGroupArrayLength: number = Array.isArray(
+    duplicateVariableGroups,
+  )
+    ? duplicateVariableGroups.length
+    : 1;
   for (let i = 0; i < variableGroupArrayLength; i++) {
-    const currentVariableGroup = duplicateVariableGroups[i];
+    const currentVariableGroup = Array.isArray(duplicateVariableGroups)
+      ? duplicateVariableGroups[i]
+      : duplicateVariableGroups;
     if (currentVariableGroup['@_ID'] === groupID) {
       const variableListAsArray: string[] =
         currentVariableGroup['@_var']?.split(' ') || [];