fix(groups): fix adding variables to groups

Author: nana-boateng

src/app/components/body/variables/sidebar/group-button/group-button.component.ts

@@ -22,6 +22,7 @@ export class GroupButtonComponent {
     if (this.newGroupName) {
       this.emitConfirm.emit(this.newGroupName);
       this.adding.set(false);
+      this.newGroupName = '';
     }
   }
 

src/app/components/body/variables/sidebar/sidebar-button/sidebar-button.component.ts

@@ -13,6 +13,7 @@ import { RenamingSidebarButtonComponent } from './renaming-button/renaming-sideb
 import { DeletingSidebarButtonComponent } from './deleting-button/deleting-sidebar-button.component';
 import { TranslateModule } from '@ngx-translate/core';
 import { VariableTabUIAction } from 'src/app/new.state/ui/ui.actions';
+import { XmlManipulationActions } from 'src/app/new.state/xml/xml.actions';
 
 @Component({
   selector: 'dct-sidebar-button',
@@ -35,10 +36,6 @@ export class SidebarButtonComponent {
   selected = input.required<boolean>();
   disabledOptions = input<boolean>(false);
 
-  changeSelectedGroupID = output<string>();
-  emitDeleteGroup = output<string>();
-  emitRenameGroup = output<{ groupID: string; newLabel: string }>();
-
   renaming = signal(false);
   renamingActive = computed(() => {
     return this.selected() && this.renaming();
@@ -54,34 +51,41 @@ export class SidebarButtonComponent {
     this.store.dispatch(
       VariableTabUIAction.changeSelectedGroupID({ groupID: this.groupID() }),
     );
-    // const elem = document.activeElement;
-    //if (elem instanceof HTMLElement) {
-    //elem?.blur();
-    //}
-    // setTimeout(()=>{
-    //   const heading = document.querySelector('#tableHeading');
-    //   if (heading) {
-    //     (heading as HTMLElement)?.focus();
-    //   }
-    // },1000)
+    const elem = document.activeElement;
+    if (elem instanceof HTMLElement) {
+      elem?.blur();
+    }
+    setTimeout(() => {
+      const heading = document.querySelector('#tableHeading');
+      if (heading) {
+        (heading as HTMLElement)?.focus();
+      }
+    }, 1000);
   }
 
   delete() {
     this.deleting.set(true);
   }
 
   confirmDelete() {
+    this.store.dispatch(
+      XmlManipulationActions.deleteGroup({ groupID: this.groupID() }),
+    );
     this.resetUI();
-    this.emitDeleteGroup.emit(this.groupID());
   }
 
   rename() {
     this.renaming.set(true);
   }
 
   confirmRename(newLabel: string) {
+    this.store.dispatch(
+      XmlManipulationActions.renameGroup({
+        groupID: this.groupID(),
+        newLabel,
+      }),
+    );
     this.resetUI();
-    this.emitRenameGroup.emit({ groupID: this.groupID(), newLabel });
   }
 
   resetUI() {

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

@@ -265,7 +265,11 @@ export function changeGroupsForSingleVariable(
   // Then insert variable ID in selected groups
   dereferencedArray.forEach((variableGroup) => {
     if (groups.includes(variableGroup['@_ID'])) {
-      variableGroup['@_var'] = variableGroup['@_var'] + ' ' + variableID;
+      if (variableGroup['@_var']?.split(' ').length) {
+        variableGroup['@_var'] = variableGroup['@_var'] + ' ' + variableID;
+      } else {
+        variableGroup['@_var'] = '' + variableID + '';
+      }
     }
     updatedGroupArray.push(variableGroup);
   });