Merge pull request #803 from hashtopolis/2418-bug-unchecking-rules-when-not-in-attack-command-removes-the--r-flag

mdArray.splice correction & test

Author: LuffyNoNika

src/app/core/_components/tables/files-attack-table/files-attack-table.component.spec.ts

@@ -0,0 +1,52 @@
+import { FileType, JFile } from '@models/file.model';
+
+import { FilesAttackTableComponent } from '@components/tables/files-attack-table/files-attack-table.component';
+import { CheckboxChangeEvent } from '@components/tables/ht-table/ht-table.models';
+
+describe('FilesAttackTableComponent', () => {
+  const rule = (id: number, filename: string): JFile => ({
+    id,
+    type: 'file',
+    filename,
+    size: 0,
+    isSecret: false,
+    fileType: FileType.RULES,
+    accessGroupId: 1,
+    lineCount: 0
+  });
+
+  const unchecked = (row: JFile): CheckboxChangeEvent => ({
+    row,
+    columnType: 'CMD',
+    checked: false
+  });
+
+  // onPrepareAttack is pure, so no Angular fixture is needed for these command transformations.
+  const component = Object.create(FilesAttackTableComponent.prototype) as FilesAttackTableComponent;
+
+  it('does not remove another rule flag when the unchecked rule was manually removed', () => {
+    const result = component.onPrepareAttack(
+      {
+        attackCmd: '#HL# -r dive.rule',
+        files: [9, 10]
+      },
+      unchecked(rule(9, 'best66.rule'))
+    );
+
+    expect(result.attackCmd).toBe('#HL# -r dive.rule');
+    expect(result.files).toEqual([10]);
+  });
+
+  it('removes only the flag paired with the unchecked rule', () => {
+    const result = component.onPrepareAttack(
+      {
+        attackCmd: '#HL# -r best66.rule -r dive.rule',
+        files: [9, 10]
+      },
+      unchecked(rule(9, 'best66.rule'))
+    );
+
+    expect(result.attackCmd).toBe('#HL# -r dive.rule');
+    expect(result.files).toEqual([10]);
+  });
+});

src/app/core/_components/tables/files-attack-table/files-attack-table.component.ts

@@ -137,13 +137,14 @@ export class FilesAttackTableComponent extends BaseTableComponent implements OnI
     }
 
     if (!event.checked) {
-      // Remove -r and filename from the command
+      // Remove the filename and only its own preceding -r flag.
       const indexFileName = newCmdArray.indexOf(fileName);
       if (indexFileName !== -1) {
-        newCmdArray.splice(indexFileName, 1);
-      }
-      if (row.fileType === 1) {
-        newCmdArray.splice(indexFileName - 1, 1);
+        if (row.fileType === FileType.RULES && newCmdArray[indexFileName - 1] === '-r') {
+          newCmdArray.splice(indexFileName - 1, 2);
+        } else {
+          newCmdArray.splice(indexFileName, 1);
+        }
       }
 
       // Remove fileId from the array