NAS-133540 / 25.04 / Allow disk list to be filtered by size

src/app/helpers/file-size.utils.spec.ts

@@ -1,4 +1,4 @@
-import { buildNormalizedFileSize } from 'app/helpers/file-size.utils';
+import { buildNormalizedFileSize, convertStringDiskSizeToBytes } from 'app/helpers/file-size.utils';
 
 describe('buildNormalizedFileSize with base 2', () => {
   it('converts 1000 bytes to 1000 B with base 2', () => {
@@ -83,3 +83,21 @@ describe('buildNormalizedFileSize with base 10', () => {
     expect(buildNormalizedFileSize(1000 ** 9, 'b', 10)).toBe('1000 Yb');
   });
 });
+
+describe('convertStringDiskSizeToBytes', () => {
+  it('converts 16 gib of disk size to bytes', () => {
+    expect(convertStringDiskSizeToBytes('16 gib')).toBe(17179869184);
+  });
+
+  it('converts 16 g of disk size to bytes', () => {
+    expect(convertStringDiskSizeToBytes('16 g')).toBe(17179869184);
+  });
+
+  it('converts 16 gb of disk size to bytes', () => {
+    expect(convertStringDiskSizeToBytes('16 gb')).toBe(17179869184);
+  });
+
+  it('handles invalid value', () => {
+    expect(convertStringDiskSizeToBytes('1 dummy')).toBeNull();
+  });
+});

src/app/helpers/file-size.utils.ts

@@ -22,6 +22,47 @@ export function buildNormalizedFileSize(
   return `${formatted} ${unit}`;
 }
 
+export function convertStringDiskSizeToBytes(input: string): number | null {
+  const sizeRegex = /^(\d+(\.\d+)?)([KMGTP](?:i)?(?:B)?)?$/i;
+  const match = input.replace(/\s+/g, '').match(sizeRegex);
+
+  if (!match) {
+    return null;
+  }
+
+  const value = parseFloat(match[1]);
+  let unit = match[3]?.toUpperCase() || '';
+
+  const units = [
+    'B', 'Gb', 'kb', 'Mb', 'Tb', 'Pb', 'Eb', 'Zb', 'Yb',
+    'GiB', 'KiB', 'MiB', 'PiB', 'TiB', 'EiB', 'ZiB', 'YiB',
+  ];
+
+  unit = units.find((item) => item.toUpperCase().includes(unit.toUpperCase())) || 'B';
+
+  const unitMultipliers: Record<string, number> = {
+    B: 1,
+    KIB: KiB,
+    MIB: MiB,
+    GIB: GiB,
+    TIB: TiB,
+    PIB: PiB,
+    EIB: EiB,
+    ZIB: ZiB,
+    YIB: YiB,
+    KB: KiB,
+    MB: MiB,
+    GB: GiB,
+    TB: TiB,
+    PB: PiB,
+    EB: EiB,
+    ZB: ZiB,
+    YB: YiB,
+  };
+
+  return value * (unitMultipliers[unit.toUpperCase()] || 1);
+}
+
 function normalizeFileSizeBase2(value: number, baseUnit: 'b' | 'B'): [formatted: number, unit: string] {
   let formatted = value;
   let increment = 1;

src/app/modules/ix-table/classes/async-data-provider/async-data-provider.spec.ts

@@ -8,10 +8,13 @@ interface TestTableData {
   numberField: number;
   stringField: string;
   booleanField: boolean;
+  size?: number;
 }
 
 const testTableData: TestTableData[] = [
-  { numberField: 1, stringField: 'a', booleanField: true },
+  {
+    numberField: 1, stringField: 'a', booleanField: true, size: 17179869999,
+  },
   { numberField: 2, stringField: 'c', booleanField: false },
   { numberField: 4, stringField: 'b', booleanField: false },
   { numberField: 3, stringField: 'd', booleanField: true },
@@ -67,4 +70,18 @@ describe('AsyncDataProvider', () => {
       await firstValueFrom(dataProvider.currentPage$),
     ).toEqual([{ numberField: 2, stringField: 'c', booleanField: false }]);
   });
+
+  it('filters rows based on "size" query param with a pre-defined margin', async () => {
+    const request$ = of(testTableData);
+    const dataProvider = new AsyncDataProvider<TestTableData>(request$);
+    dataProvider.load();
+
+    dataProvider.setFilter({ query: '16.3 gib', columnKeys: ['size'] });
+    expect(dataProvider.totalRows).toBe(1);
+    expect(
+      await firstValueFrom(dataProvider.currentPage$),
+    ).toEqual([{
+      numberField: 1, stringField: 'a', booleanField: true, size: 17179869999,
+    }]);
+  });
 });

src/app/modules/ix-table/utils.ts

@@ -1,4 +1,5 @@
 import { get } from 'lodash-es';
+import { convertStringDiskSizeToBytes } from 'app/helpers/file-size.utils';
 import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class';
 import { TableFilter } from 'app/modules/ix-table/interfaces/table-filter.interface';
 
@@ -36,9 +37,18 @@ export function filterTableRows<T>(filter: TableFilter<T>): T[] {
   return list.filter((item) => {
     return columnKeys.some((columnKey) => {
       let value = get(item, columnKey) as string | undefined;
+
+      if ((columnKey as string) === 'size' && typeof value === 'number') {
+        const margin = value * 0.05;
+        const parsedQuerySize = convertStringDiskSizeToBytes(filterString) as number;
+
+        return (value >= parsedQuerySize - margin && value <= parsedQuerySize + margin);
+      }
+
       if (preprocessMap?.[columnKey]) {
         value = preprocessMap[columnKey]?.(value as T[keyof T]);
       }
+
       return value?.toString()?.toLowerCase()?.includes(filterString);
     });
   });

src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.html

@@ -1,6 +1,13 @@
 <ix-page-header [loading]="!!(dataProvider.isLoading$ | async)">
-  <ix-search-input1 [value]="filterString" (search)="onListFiltered($event)"></ix-search-input1>
-  <ix-table-columns-selector [columns]="columns" (columnsChange)="columnsChange($event)"></ix-table-columns-selector>
+  <ix-search-input1
+    [value]="filterString"
+    (search)="onListFiltered($event)"
+  ></ix-search-input1>
+
+  <ix-table-columns-selector
+    [columns]="columns"
+    (columnsChange)="columnsChange($event)"
+  ></ix-table-columns-selector>
 </ix-page-header>
 
 @if (selectedDisks.length) {

src/app/pages/storage/modules/disks/components/disk-list/disk-list.component.ts

@@ -316,7 +316,7 @@ export class DiskListComponent implements OnInit {
 
   protected onListFiltered(query: string): void {
     this.filterString = query;
-    this.dataProvider.setFilter({ list: this.disks, query, columnKeys: ['name', 'pool', 'serial'] });
+    this.dataProvider.setFilter({ list: this.disks, query, columnKeys: ['name', 'pool', 'serial', 'size'] });
   }
 
   protected columnsChange(columns: typeof this.columns): void {