Fix after review: remove comments, add access modifiers, delete dead code, rename underscore-prefixed members

Author: aleksei-semikozov

packages/devextreme/js/__internal/scheduler/workspaces/m_agenda.ts

@@ -136,8 +136,6 @@ class SchedulerAgenda extends WorkSpace {
 
   protected override updateAllDayVisibility() { return noop(); }
 
-  private updateAllDayHeight() { return noop(); }
-
   protected override initWorkSpaceUnits() {
     this.initGroupTable();
     this._$timePanel = $('<table>').attr('aria-hidden', true).addClass(TIME_PANEL_CLASS);
@@ -348,8 +346,6 @@ class SchedulerAgenda extends WorkSpace {
 
   protected override attachEvents() { return noop(); }
 
-  private cleanCellDataCache() { return noop(); }
-
   isIndicationAvailable() {
     return false;
   }
@@ -536,8 +532,6 @@ class SchedulerAgenda extends WorkSpace {
 
   renovatedRenderSupported() { return false; }
 
-  private setSelectedCellsByCellData() {}
-
   protected override getTotalViewDuration() {
     return dateUtils.dateToMilliseconds('day') * (this.option('intervalCount') as any);
   }

packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts

@@ -35,7 +35,7 @@ const HORIZONTAL = 'horizontal';
 const toMs = dateUtils.dateToMilliseconds;
 
 class SchedulerTimeline extends SchedulerWorkSpace {
-  _$sidebarTable: any;
+  protected override $sidebarTable: any;
 
   get verticalGroupTableClass() { return GROUP_TABLE_CLASS; }
 
@@ -44,7 +44,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
   get renovatedHeaderPanelComponent() { return HeaderPanelTimelineComponent; }
 
   getGroupTableWidth() {
-    return this._$sidebarTable ? getOuterWidth(this._$sidebarTable) : 0;
+    return this.$sidebarTable ? getOuterWidth(this.$sidebarTable) : 0;
   }
 
   protected override getTotalRowCount(groupCount) {
@@ -96,19 +96,17 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     if (this._isHorizontalGroupedWorkSpace()) {
       return this._$thead;
     }
-    return this._$sidebarTable;
+    return this.$sidebarTable;
   }
 
   protected override insertAllDayRowsIntoDateTable() {
     return false;
   }
 
-  // Overridden in SchedulerTimelineDay, SchedulerTimelineWeek
   protected needRenderWeekHeader() {
     return false;
   }
 
-  // Overridden in SchedulerTimelineWeek, SchedulerTimelineWorkWeek
   protected incrementDate(date) {
     date.setDate(date.getDate() + 1);
   }
@@ -132,20 +130,19 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     return today.getTime() - date.getTime();
   }
 
-  // Overridden in SchedulerTimelineMonth
   protected calculateDurationInCells(timeDiff) {
     const today = this.getToday();
     const differenceInDays = Math.floor(timeDiff / toMs('day'));
     let duration = (timeDiff - differenceInDays * toMs('day') - (this.option('startDayHour') as any) * toMs('hour')) / this.getCellDuration();
 
     if (today.getHours() > (this.option('endDayHour') as any)) {
-      duration = this.getCellCountInDay();
+      duration = this._getCellCountInDay();
     }
 
     if (duration < 0) {
       duration = 0;
     }
-    return differenceInDays * this.getCellCountInDay() + duration;
+    return differenceInDays * this._getCellCountInDay() + duration;
   }
 
   getIndicationWidth() {
@@ -159,19 +156,19 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     return this.getIndicationCellCount() * this.getCellWidth();
   }
 
-  isVerticalShader() {
+  protected override isVerticalShader() {
     return false;
   }
 
-  isCurrentTimeHeaderCell() {
+  protected override isCurrentTimeHeaderCell() {
     return false;
   }
 
   protected override setTableSizes() {
     super.setTableSizes();
 
     const minHeight = this.getWorkSpaceMinHeight();
-    setHeight(this._$sidebarTable, minHeight);
+    setHeight(this.$sidebarTable, minHeight);
     setHeight(this._$dateTable, minHeight);
 
     this.virtualScrollingDispatcher.updateDimensions();
@@ -226,7 +223,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     const fullDays = Math.floor(fullInterval / toMs('day'));
     const tailDuration = fullInterval - (fullDays * toMs('day'));
     let tailDelta = 0;
-    const cellCount = this.getCellCountInDay() * (fullDays - this.getWeekendsCount(fullDays));
+    const cellCount = this._getCellCountInDay() * (fullDays - this.getWeekendsCount(fullDays));
     const gapBeforeAppt = apptStart - dateUtils.trimTime(new Date(currentDate)).getTime();
     let result = cellCount * (this.option('hoursInterval') as any) * toMs('hour');
 
@@ -307,7 +304,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     super._init();
 
     (this.$element() as any).addClass(TIMELINE_CLASS);
-    this._$sidebarTable = $('<div>')
+    this.$sidebarTable = $('<div>')
       .addClass(GROUP_TABLE_CLASS);
   }
 
@@ -349,7 +346,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
 
     this._shader = new HorizontalShader(this);
 
-    this._$sidebarTable.appendTo(this._sidebarScrollable.$content());
+    this.$sidebarTable.appendTo(this._sidebarScrollable.$content());
 
     if (this.isRenovatedRender() && this.isVerticalGroupedWorkSpace()) {
       this.renderRGroupPanel();
@@ -403,7 +400,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
 
       const $cells: any[] = [];
       const groupCount = this._getGroupCount();
-      const cellCountInDay = this.getCellCountInDay();
+      const cellCountInDay = this._getCellCountInDay();
       const colSpan = this.isGroupedByDate()
         ? cellCountInDay * groupCount
         : cellCountInDay;
@@ -455,7 +452,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
     }
   }
 
-  renderIndicator(height, rtlOffset, $container, groupCount) {
+  protected override renderIndicator(height, rtlOffset, $container, groupCount) {
     let $indicator;
     const width = this.getIndicationWidth();
 
@@ -496,7 +493,7 @@ class SchedulerTimeline extends SchedulerWorkSpace {
   // Old render methods.
   // TODO Old render: delete these methods with the old render.
 
-  setCurrentTimeCells(): void {
+  protected override setCurrentTimeCells(): void {
     const timePanelCells = this.getTimePanelCells();
     const currentTimeCellIndices = this.getCurrentTimePanelCellIndices();
     currentTimeCellIndices.forEach((timePanelCellIndex) => {

packages/devextreme/js/__internal/scheduler/workspaces/m_timeline_week.ts

@@ -1,5 +1,4 @@
 import registerComponent from '@js/core/component_registrator';
-import { getBoundingRect } from '@js/core/utils/position';
 
 import { VIEWS } from '../utils/options/constants_view';
 import SchedulerTimeline from './m_timeline';
@@ -13,10 +12,6 @@ export default class SchedulerTimelineWeek extends SchedulerTimeline {
     return TIMELINE_CLASS;
   }
 
-  _getHeaderPanelCellWidth($headerRow) {
-    return getBoundingRect($headerRow.children().first().get(0)).width;
-  }
-
   protected override needRenderWeekHeader() {
     return true;
   }

packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts

@@ -298,7 +298,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
 
   _shader: any;
 
-  _$sidebarTable: any;
+  protected $sidebarTable: any;
 
   _interval: any;
 
@@ -822,8 +822,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
     });
   }
 
-  // TODO: rename to getCellCount — used externally via workSpace reference:
-  // m_work_space_grouped_strategy_horizontal.ts (7 usages), m_work_space_grouped_strategy_vertical.ts, shaders/current_time_shader_horizontal.ts
+  // TODO: rename to getCellCount (used externally by strategy classes and shaders)
   _getCellCount() {
     return this.viewDataProvider.getCellCount({
       intervalCount: this.option('intervalCount'),
@@ -1103,10 +1102,10 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
   }
 
   protected getTimePanelRowCount() {
-    return this.getCellCountInDay();
+    return this._getCellCountInDay();
   }
 
-  protected getCellCountInDay() {
+  protected _getCellCountInDay() {
     const hoursInterval = this.option('hoursInterval');
     const startDayHour = this.option('startDayHour');
     const endDayHour = this.option('endDayHour');
@@ -2833,7 +2832,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
       this._$groupTable.empty();
 
       this._$allDayTable?.empty();
-      this._$sidebarTable?.empty();
+      this.$sidebarTable?.empty();
     }
 
     this._shader?.clean();

packages/devextreme/js/__internal/scheduler/workspaces/m_work_space_indicator.ts

@@ -58,8 +58,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     return dateUtils.dateInRange(today, firstViewDate, endViewDate);
   }
 
-  // Overridden in SchedulerTimeline
-  renderIndicator(height, rtlOffset, $container, groupCount) {
+  protected renderIndicator(height, rtlOffset, $container, groupCount) {
     const groupedByDate = this.isGroupedByDate();
     const repeatCount = groupedByDate ? 1 : groupCount;
     for (let i = 0; i < repeatCount; i++) {
@@ -103,8 +102,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     }
   }
 
-  // Overridden in SchedulerTimeline
-  isVerticalShader() {
+  protected isVerticalShader() {
     return true;
   }
 
@@ -177,8 +175,7 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     this.renderDateTimeIndication();
   }
 
-  // Overridden in SchedulerTimeline
-  isCurrentTimeHeaderCell(headerIndex: number): boolean {
+  protected isCurrentTimeHeaderCell(headerIndex: number): boolean {
     if (this.isIndicationOnView()) {
       const { completeDateHeaderMap } = this.viewDataProvider;
       const date = completeDateHeaderMap[completeDateHeaderMap.length - 1][headerIndex].startDate;
@@ -254,7 +251,6 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     });
   }
 
-  // Overridden in SchedulerTimeline
   protected getCurrentTimePanelCellIndices() {
     const rowCountPerGroup = this.getTimePanelRowCount();
     const today = this.getToday();
@@ -311,10 +307,8 @@ class SchedulerWorkSpaceIndicator extends SchedulerWorkSpace {
     }
   }
 
-  // Temporary new render methods.
   // TODO Old render: replace base call methods by these after the deleting of the old render.
-  // Overridden in SchedulerTimeline
-  setCurrentTimeCells(): void {
+  protected setCurrentTimeCells(): void {
     const timePanelCells = this.getTimePanelCells();
     const currentTimeCellIndices = this.getCurrentTimePanelCellIndices();
     currentTimeCellIndices.forEach((timePanelCellIndex) => {