NAS-114840: Renaming single letter variables (#6409)

src/app/app.component.ts

@@ -68,16 +68,16 @@ export class AppComponent {
       document.body.className += ' safari-platform';
     }
 
-    router.events.pipe(untilDestroyed(this)).subscribe((s) => {
+    router.events.pipe(untilDestroyed(this)).subscribe((event) => {
       // save currenturl
-      if (s instanceof NavigationEnd) {
-        if (this.ws.loggedIn && s.url !== '/sessions/signin') {
-          sessionStorage.currentUrl = s.url;
+      if (event instanceof NavigationEnd) {
+        if (this.ws.loggedIn && event.url !== '/sessions/signin') {
+          sessionStorage.currentUrl = event.url;
         }
       }
 
-      if (s instanceof NavigationCancel) {
-        const params = new URLSearchParams(s.url.split('#')[1]);
+      if (event instanceof NavigationCancel) {
+        const params = new URLSearchParams(event.url.split('#')[1]);
         const isEmbedded = params.get('embedded');
 
         if (isEmbedded) {

src/app/components/common/dialog/download-key/download-key-dialog.component.ts

@@ -55,9 +55,9 @@ export class DownloadKeyDialogComponent {
               this.isDownloaded = true;
             }
           });
-      }, (e) => {
+      }, (error) => {
         this.loader.close();
-        new EntityUtils().handleWsError(this, e, this.dialog);
+        new EntityUtils().handleWsError(this, error, this.dialog);
       });
     } else {
       mimetype = 'application/octet-stream';

src/app/components/common/dual-list/dual-list.component.ts

@@ -8,7 +8,7 @@ const transfer = <T>(from: ListSelection<T>, to: ListSelection<T>): {
   from: ListSelection<T>; to: ListSelection<T>;
 } => ({
     from: new ListSelectionImpl(
-      from.totalItems.filter((x) => !from.isSelected(x)),
+      from.totalItems.filter((item) => !from.isSelected(item)),
     ),
     to: new ListSelectionImpl([...from.selectedItems, ...to.totalItems]),
   });

src/app/components/common/dual-list/models.ts

@@ -52,16 +52,16 @@ export class ListSelectionImpl<T> implements ListSelection<T> {
     this._selectedItems = this.totalItems;
   }
 
-  unselect(item: T): void {
-    if (!this.isSelected(item)) {
+  unselect(itemToUnselect: T): void {
+    if (!this.isSelected(itemToUnselect)) {
       throw new Error('Cannot unselect an item that is not selected');
     }
 
-    this._selectedItems = this._selectedItems.filter((e) => e !== item);
+    this._selectedItems = this._selectedItems.filter((item) => item !== itemToUnselect);
   }
 
-  isSelected(item: T): boolean {
-    return !!this._selectedItems.find((e) => e === item);
+  isSelected(itemToCheck: T): boolean {
+    return !!this._selectedItems.find((item) => item === itemToCheck);
   }
 
   get selectedItems(): T[] {

src/app/components/common/layouts/admin-layout/admin-layout.component.ts

@@ -126,10 +126,10 @@ export class AdminLayoutComponent implements OnInit, AfterViewChecked {
 
     // Allows for one-page-at-a-time scrolling in sidenav on Windows
     if (window.navigator.platform.toLowerCase() === 'win32') {
-      navigationHold.addEventListener('wheel', (e) => {
+      navigationHold.addEventListener('wheel', (event) => {
         // deltaY is 1 for page scrolling and 33.3 per line for regular scrolling; default is 100, or 3 lines at a time
-        if (e.deltaY === 1 || e.deltaY === -1) {
-          navigationHold.scrollBy(0, e.deltaY * window.innerHeight);
+        if (event.deltaY === 1 || event.deltaY === -1) {
+          navigationHold.scrollBy(0, event.deltaY * window.innerHeight);
         }
       });
     }

src/app/components/common/modal/modal.component.ts

@@ -43,8 +43,8 @@ export class ModalComponent implements OnInit, OnDestroy {
     document.body.appendChild(this.element);
 
     // close modal on background click
-    this.element.addEventListener('click', (e) => {
-      if ((e.target as HTMLElement).className === 'jw-modal') {
+    this.element.addEventListener('click', (event) => {
+      if ((event.target as HTMLElement).className === 'jw-modal') {
         this.close();
       }
     });

src/app/modules/charts/components/view-chart-gauge/view-chart-gauge.component.ts

@@ -76,13 +76,13 @@ export class ViewChartGaugeComponent /* extends DisplayObject */ implements Afte
       .attr('height', height);
 
     // Arc Group
-    const g = svg.append('g').attr('transform', 'translate(' + width / 2 + ',' + height / 2 + ')');
+    const arcGroup = svg.append('g').attr('transform', 'translate(' + width / 2 + ',' + height / 2 + ')');
 
     // Text Group
-    const gt = svg.append('g').attr('class', 'text-group');
+    const textGroup = svg.append('g').attr('class', 'text-group');
 
     // Setup value text element
-    const text = gt.append('text').attr('id', 'text-value');
+    const text = textGroup.append('text').attr('id', 'text-value');
     if (!text.node()) {
       // Avoid console errors if text.node isn't available yet.
       return;
@@ -96,7 +96,7 @@ export class ViewChartGaugeComponent /* extends DisplayObject */ implements Afte
       .attr('alignment-baseline', 'central');
 
     // Setup subtitle text element
-    const subtext = gt.append('text').attr('id', 'text-subtitle');
+    const subtext = textGroup.append('text').attr('id', 'text-subtitle');
     if (!subtext.node()) {
       // Avoid console errors if text.node isn't available yet.
       return;
@@ -115,7 +115,7 @@ export class ViewChartGaugeComponent /* extends DisplayObject */ implements Afte
     // Adjust group to compensate
     const isFirefox: boolean = navigator.userAgent.toLowerCase().includes('firefox');
     const offsetY = isFirefox ? 10 : 0;
-    const bbox = gt.node().getBBox();
+    const bbox = textGroup.node().getBBox();
     const top = (height / 2) - (bbox.height / 2);
     text.attr('x', width / 2)
       .attr('y', top + offsetY);
@@ -124,13 +124,13 @@ export class ViewChartGaugeComponent /* extends DisplayObject */ implements Afte
       .attr('y', top + 24 + offsetY);
 
     // Arc background
-    g.append('path')
+    arcGroup.append('path')
       .datum({ endAngle: this.doublePi })
       .style('fill', 'var(--bg1)')
       .attr('d', this.arc);
 
     // Arc foreground
-    g.append('path')
+    arcGroup.append('path')
       .datum({ endAngle: 0.127 * this.doublePi })
       .style('fill', 'var(--primary)')
       .attr('class', 'value')

src/app/modules/entity/entity-dialog/entity-dialog.component.ts

@@ -91,10 +91,10 @@ export class EntityDialogComponent implements OnInit {
       this.loader.open();
       this.ws.call(this.conf.method_ws, [this.formValue]).pipe(untilDestroyed(this)).subscribe(
         () => {},
-        (e) => {
+        (error) => {
           this.loader.close();
           this.dialogRef.close(false);
-          new EntityUtils().handleWsError(this, e);
+          new EntityUtils().handleWsError(this, error);
         },
         () => {
           this.loader.close();

src/app/modules/entity/entity-form/classes/field-sets.ts

@@ -37,7 +37,7 @@ export class FieldSets {
   configs(): FieldConfig[] {
     return this.list()
       .reduce((configList, set) => configList.concat(set.config), [])
-      .filter((c) => !!c);
+      .filter((config) => !!config);
   }
 
   list(): FieldSet[] {
@@ -51,7 +51,7 @@ export class FieldSets {
 
   toggleSets(setClasses: string[] = this.advancedSets): this {
     this._fieldSets
-      .filter((set) => setClasses.some((c) => c === set.class))
+      .filter((set) => setClasses.some((className) => className === set.class))
       .forEach((set) => (set.label = !set.label));
     return this;
   }

src/app/modules/entity/entity-form/components/form-chip/form-chip.component.ts

@@ -71,7 +71,7 @@ export class FormChipComponent implements Field, OnInit {
   selected(event: MatAutocompleteSelectedEvent): void {
     if (this.config.selectOnly) {
       if (this.chipLists.includes(event.option.viewValue)) {
-        this.chipLists = this.chipLists.filter((e) => e !== event.option.viewValue);
+        this.chipLists = this.chipLists.filter((chip) => chip !== event.option.viewValue);
       } else {
         this.chipLists = [...new Set([...this.chipLists, event.option.viewValue])];
       }

src/app/modules/entity/entity-form/components/form-scheduler/form-scheduler.component.ts

@@ -250,15 +250,15 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
     return this._preset;
   }
 
-  set preset(p: CronPreset) {
-    if (!p.value) {
+  set preset(preset: CronPreset) {
+    if (!preset.value) {
       this.crontab = '0 0 * * *';
       this.convertPreset('0 0 * * *');
       this._preset = this.customOption;
     } else {
-      this.crontab = p.value;
-      this.convertPreset(p.value);
-      this._preset = p;
+      this.crontab = preset.value;
+      this.convertPreset(preset.value);
+      this._preset = preset;
     }
 
     if (this.minDate && this.maxDate) {
@@ -405,8 +405,8 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
     this.generateSchedule();
   }
 
-  private getMinDate(d: Date): Date {
-    const dt = dateFns.addSeconds(d, 1);
+  private getMinDate(date: Date): Date {
+    const dt = dateFns.addSeconds(date, 1);
     const now = this.zonedTime;
     const thisMonth = dateFns.getMonth(now);
     const thisYear = dateFns.getYear(now);
@@ -517,8 +517,8 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
             parseCounter++;
           }
         }
-      } catch (e: unknown) {
-        console.warn(e);
+      } catch (error: unknown) {
+        console.warn(error);
         break;
       }
     }
@@ -541,8 +541,8 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
         try {
           const obj = intervalDays.next();
           daySchedule.push(obj.value);
-        } catch (e: unknown) {
-          console.error(e);
+        } catch (error: unknown) {
+          console.error(error);
           break;
         }
       }
@@ -588,23 +588,23 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
     return cells;
   }
 
-  getAttribute(attr: string, node: HTMLElement): string {
-    const a = node.attributes.getNamedItem(attr);
-    if (a) {
-      return a.value;
+  getAttribute(name: string, node: HTMLElement): string {
+    const attribute = node.attributes.getNamedItem(name);
+    if (attribute) {
+      return attribute.value;
     }
   }
 
-  setAttribute(attr: string, node: HTMLElement, value: string): void {
-    const a = document.createAttribute(attr);
-    a.value = value;
-    node.attributes.removeNamedItem(attr);
-    node.attributes.setNamedItem(a);
+  setAttribute(name: string, node: HTMLElement, value: string): void {
+    const attribute = document.createAttribute(name);
+    attribute.value = value;
+    node.attributes.removeNamedItem(name);
+    node.attributes.setNamedItem(attribute);
   }
 
-  private checkSchedule(aria?: string, sched?: CronDate[]): boolean {
+  private checkSchedule(aria?: string, schedule?: CronDate[]): boolean {
     if (!aria) { return; }
-    if (!sched) { sched = this.generatedSchedule; }
+    if (!schedule) { schedule = this.generatedSchedule; }
 
     const cal = aria.split(' '); // eg. May 06, 2018
     const cd = cal[1].split(',');
@@ -616,8 +616,8 @@ export class FormSchedulerComponent implements Field, OnInit, AfterViewInit, Aft
     } else {
       calDay = cd[0];
     }
-    for (const s of sched) {
-      const schedule = s.toString().split(' ');
+    for (const date of schedule) {
+      const schedule = date.toString().split(' ');
       if (schedule[1] === calMonth && schedule[2] === calDay && schedule[3] === calYear) {
         return true;
       }

src/app/modules/entity/entity-form/services/entity-form.service.ts

@@ -129,11 +129,11 @@ export class EntityFormService {
     }
 
     return this.ws.call('filesystem.listdir', [node.data.name, typeFilter,
-      { order_by: ['name'], limit: 1000 }]).toPromise().then((res) => {
-      res = _.sortBy(res, (o) => o.name.toLowerCase());
+      { order_by: ['name'], limit: 1000 }]).toPromise().then((files) => {
+      files = _.sortBy(files, (file) => file.name.toLowerCase());
 
       const children: ListdirChild[] = [];
-      res.forEach((file) => {
+      files.forEach((file) => {
         if (file.type === FileType.Symlink || !file.hasOwnProperty('name')) {
           return;
         }

src/app/modules/entity/entity-table/entity-table-actions/entity-table-actions.component.html

@@ -27,7 +27,7 @@
       [matMenuTriggerFor]="appMenu"
       [style.cursor]="'pointer'"
       [style.font-size]="'24px'"
-      (click)="noPropogate($event)">
+      (click)="noPropagate($event)">
     </mat-icon>
 
     <!-- Standard Material Icon Set -->
@@ -39,7 +39,7 @@
       id="{{row[entity?.conf?.rowIdentifier || 'name']}}_{{action}}_button"
       [matMenuTriggerFor]="appMenu"
       [style.cursor]="'pointer'"
-      (click)="noPropogate($event)">
+      (click)="noPropagate($event)">
       {{icon_name}}
     </mat-icon>
 

src/app/modules/entity/entity-table/entity-table-actions/entity-table-actions.component.ts

@@ -54,8 +54,8 @@ export class EntityTableActionsComponent implements OnInit, OnChanges {
     this.actions = this.entity.getActions(this.row);
   }
 
-  noPropogate(e: MouseEvent): void {
-    e.stopPropagation();
+  noPropagate(event: MouseEvent): void {
+    event.stopPropagation();
   }
 
   get singleAction(): EntityTableAction {

src/app/modules/entity/entity-table/entity-table.component.ts

@@ -802,7 +802,7 @@ export class EntityTableComponent<Row = any> implements OnInit, AfterViewInit, A
     if (this.conf.rowValue) {
       try {
         return this.conf.rowValue(row, attr);
-      } catch (e: unknown) {
+      } catch (error: unknown) {
         return row[attr];
       }
     }
@@ -1046,14 +1046,14 @@ export class EntityTableComponent<Row = any> implements OnInit, AfterViewInit, A
   }
 
   // Next section operates the checkboxes to show/hide columns
-  toggle(col: EntityTableColumn): void {
-    const isChecked = this.isChecked(col);
+  toggle(columnToToggle: EntityTableColumn): void {
+    const isChecked = this.isChecked(columnToToggle);
     this.anythingClicked = true;
 
     if (isChecked) {
-      this.conf.columns = this.conf.columns.filter((c) => c.name !== col.name);
+      this.conf.columns = this.conf.columns.filter((column) => column.name !== columnToToggle.name);
     } else {
-      this.conf.columns = [...this.conf.columns, col];
+      this.conf.columns = [...this.conf.columns, columnToToggle];
     }
     this.selectColumnsToShowOrHide();
     this.changeDetectorRef.detectChanges();
@@ -1095,8 +1095,8 @@ export class EntityTableComponent<Row = any> implements OnInit, AfterViewInit, A
     }
   }
 
-  isChecked(col: EntityTableColumn): boolean {
-    return this.conf.columns.find((c) => c.name === col.name) !== undefined;
+  isChecked(columnToTest: EntityTableColumn): boolean {
+    return this.conf.columns.find((column) => column.name === columnToTest.name) !== undefined;
   }
 
   // Toggle between all/none cols selected

src/app/modules/entity/utils.ts

@@ -170,8 +170,8 @@ export class EntityUtils {
     }
   }
 
-  isObject = (a: unknown): a is Record<string, unknown> => {
-    return (!!a) && (a.constructor === Object);
+  isObject = (something: unknown): something is Record<string, unknown> => {
+    return (!!something) && (something.constructor === Object);
   };
 
   flattenData(data: DataBeforeFlattening, level = 0, parent?: { id: string | number }): FlattenedData[] {

src/app/modules/ix-forms/components/ix-input/ix-input.component.ts

@@ -99,8 +99,8 @@ export class IxInputComponent implements ControlValueAccessor {
     return this.invalid || (this.value && this.value.toString().length > 0);
   }
 
-  resetInput(e: HTMLInputElement): void {
-    e.value = '';
+  resetInput(input: HTMLInputElement): void {
+    input.value = '';
     this.invalid = false;
     this.value = '';
     this.formatted = '';

src/app/modules/ix-forms/components/ix-slide-in/ix-slide-in.component.ts

@@ -53,8 +53,8 @@ export class IxSlideInComponent implements OnInit, OnDestroy {
     document.body.appendChild(this.element);
 
     // close modal on background click
-    this.element.addEventListener('click', (e) => {
-      if ((e.target as HTMLElement).className === 'ix-slide-in') {
+    this.element.addEventListener('click', (event) => {
+      if ((event.target as HTMLElement).className === 'ix-slide-in') {
         this.close();
       }
     });

src/app/modules/terminal/components/terminal/terminal.component.ts

@@ -182,8 +182,8 @@ export class TerminalComponent implements OnInit, OnDestroy {
     font.load().then(() => {
       this.xterm.open(this.container.nativeElement);
       this.fitAddon.fit();
-    }, (e) => {
-      console.error('Font is not available', e);
+    }, (error) => {
+      console.error('Font is not available', error);
     });
   }
 

src/app/modules/terminal/xterm-attach-addon.ts

@@ -32,8 +32,8 @@ export class XtermAttachAddon implements ITerminalAddon {
   }
 
   dispose(): void {
-    for (const d of this.disposables) {
-      d.dispose();
+    for (const disposable of this.disposables) {
+      disposable.dispose();
     }
   }