refactor resource processor with promises (DevExpress#29650)

Co-authored-by: Vladimir Bushmanov <[email protected]>

Author: Ambrozy

packages/devextreme/js/__internal/scheduler/appointments/appointment/agenda_appointment.ts

@@ -0,0 +1,51 @@
+import type { dxElementWrapper } from '@js/core/renderer';
+import $ from '@js/core/renderer';
+import type { ResourceProcessor } from '@ts/scheduler/resources/resource_processor';
+
+import {
+  APPOINTMENT_CONTENT_CLASSES,
+} from '../../m_classes';
+import { Appointment } from './m_appointment';
+
+export class AgendaAppointment extends Appointment {
+  get coloredElement(): dxElementWrapper {
+    return this.$element().find(`.${APPOINTMENT_CONTENT_CLASSES.AGENDA_MARKER}`);
+  }
+
+  get resourceProcessor(): ResourceProcessor {
+    const getResourceProcessor = this.option('getResourceProcessor') as () => ResourceProcessor;
+    return getResourceProcessor();
+  }
+
+  _renderResourceList(): void {
+    // eslint-disable-next-line no-void
+    void this.resourceProcessor
+      .getAppointmentResourcesValues(this.rawAppointment)
+      .then((list) => {
+        const parent = this.$element().find(`.${APPOINTMENT_CONTENT_CLASSES.APPOINTMENT_CONTENT_DETAILS}`);
+        const container = $('<div>')
+          .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST)
+          .appendTo(parent);
+
+        list.forEach((item) => {
+          const itemContainer = $('<div>')
+            .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST_ITEM)
+            .appendTo(container);
+
+          $('<div>')
+            .text(`${item.label}:`)
+            .appendTo(itemContainer);
+
+          $('<div>')
+            .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST_ITEM_VALUE)
+            .text(item.values.join(', '))
+            .appendTo(itemContainer);
+        });
+      });
+  }
+
+  _render(): void {
+    super._render();
+    this._renderResourceList();
+  }
+}

…/scheduler/appointments/m_appointment.ts …ppointments/appointment/m_appointment.tspackages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts renamed to packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts packages/devextreme/js/__internal/scheduler/appointments/m_appointment.ts renamed to packages/devextreme/js/__internal/scheduler/appointments/appointment/m_appointment.ts

@@ -1,4 +1,3 @@
-/* eslint-disable max-classes-per-file */
 import { move } from '@js/common/core/animation/translator';
 import eventsEngine from '@js/common/core/events/core/events_engine';
 import pointerEvents from '@js/common/core/events/pointer';
@@ -10,15 +9,13 @@ import DOMComponent from '@js/core/dom_component';
 import Guid from '@js/core/guid';
 import type { dxElementWrapper } from '@js/core/renderer';
 import $ from '@js/core/renderer';
-import { Deferred } from '@js/core/utils/deferred';
 import { extend } from '@js/core/utils/extend';
 import { isDefined } from '@js/core/utils/type';
 import Resizable from '@js/ui/resizable';
 import { hide, show } from '@ts/ui/tooltip/m_tooltip';
 
 import {
   ALL_DAY_APPOINTMENT_CLASS,
-  APPOINTMENT_CONTENT_CLASSES,
   APPOINTMENT_DRAG_SOURCE_CLASS,
   APPOINTMENT_HAS_RESOURCE_COLOR_CLASS,
   DIRECTION_APPOINTMENT_CLASSES,
@@ -27,9 +24,9 @@ import {
   REDUCED_APPOINTMENT_CLASS,
   REDUCED_APPOINTMENT_ICON,
   REDUCED_APPOINTMENT_PARTS_CLASSES,
-} from '../m_classes';
-import { getRecurrenceProcessor } from '../m_recurrence';
-import type { AppointmentDataAccessor } from '../utils';
+} from '../../m_classes';
+import { getRecurrenceProcessor } from '../../m_recurrence';
+import type { AppointmentDataAccessor } from '../../utils';
 
 const DEFAULT_HORIZONTAL_HANDLES = 'left right';
 const DEFAULT_VERTICAL_HANDLES = 'top bottom';
@@ -359,47 +356,3 @@ export class Appointment extends DOMComponent {
 }
 
 registerComponent('dxSchedulerAppointment', Appointment);
-
-export class AgendaAppointment extends Appointment {
-  get coloredElement() {
-    return (this.$element() as any).find(`.${APPOINTMENT_CONTENT_CLASSES.AGENDA_MARKER}`);
-  }
-
-  _getDefaultOptions() {
-    return extend(super._getDefaultOptions(), {
-      // @ts-expect-error
-      createPlainResourceListAsync: new Deferred(),
-    });
-  }
-
-  _renderResourceList(container, list) {
-    list.forEach((item) => {
-      const itemContainer = $('<div>')
-        .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST_ITEM)
-        .appendTo(container);
-
-      $('<div>')
-        .text(`${item.label}:`)
-        .appendTo(itemContainer);
-
-      $('<div>')
-        .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST_ITEM_VALUE)
-        .text(item.values.join(', '))
-        .appendTo(itemContainer);
-    });
-  }
-
-  _render() {
-    super._render();
-
-    const createPlainResourceListAsync: any = this.option('createPlainResourceListAsync');
-    createPlainResourceListAsync(this.rawAppointment).done((list) => {
-      const parent = (this.$element() as any).find(`.${APPOINTMENT_CONTENT_CLASSES.APPOINTMENT_CONTENT_DETAILS}`);
-      const container = $('<div>')
-        .addClass(APPOINTMENT_CONTENT_CLASSES.AGENDA_RESOURCE_LIST)
-        .appendTo(parent);
-
-      this._renderResourceList(container, list);
-    });
-  }
-}

packages/devextreme/js/__internal/scheduler/appointments/m_appointment_collection.ts

@@ -33,8 +33,9 @@ import timeZoneUtils from '../m_utils_time_zone';
 import { getPathToLeaf } from '../resources/m_utils';
 import type { AppointmentViewModel } from '../types';
 import type { AppointmentDataAccessor } from '../utils';
+import { AgendaAppointment } from './appointment/agenda_appointment';
+import { Appointment } from './appointment/m_appointment';
 import { getAppointmentTakesSeveralDays, sortAppointmentsByStartDate } from './data_provider/m_utils';
-import { AgendaAppointment, Appointment } from './m_appointment';
 import { createAgendaAppointmentLayout, createAppointmentLayout } from './m_appointment_layout';
 import { getAppointmentDateRange } from './resizing/m_core';
 
@@ -616,13 +617,10 @@ class SchedulerAppointments extends CollectionWidget {
 
         getAppointmentColor: this.option('getAppointmentColor'),
         getResourceDataAccessors: this.option('getResourceDataAccessors'),
+        getResourceProcessor: this.option('getResourceProcessor'),
         timeZoneCalculator: this.option('timeZoneCalculator'),
       };
 
-      if (this.isAgendaView) {
-        const agendaResourceProcessor = this.option('getAgendaResourceProcessor')();
-        config.createPlainResourceListAsync = (rawAppointment) => agendaResourceProcessor.createListAsync(rawAppointment);
-      }
       (this as any)._createComponent(
         element,
         this.isAgendaView ? AgendaAppointment : Appointment,

packages/devextreme/js/__internal/scheduler/m_scheduler.ts

@@ -64,7 +64,6 @@ import subscribes from './m_subscribes';
 import { utils } from './m_utils';
 import timeZoneUtils from './m_utils_time_zone';
 import { SchedulerOptionsValidator, SchedulerOptionsValidatorErrorsHandler } from './options_validator/index';
-import { AgendaResourceProcessor } from './resources/m_agenda_resource_processor';
 import {
   createExpressions,
   createResourceEditorModel,
@@ -73,6 +72,7 @@ import {
   loadResources,
   setResourceToAppointment,
 } from './resources/m_utils';
+import { ResourceProcessor } from './resources/resource_processor';
 import { DesktopTooltipStrategy } from './tooltip_strategies/m_desktop_tooltip_strategy';
 import { MobileTooltipStrategy } from './tooltip_strategies/m_mobile_tooltip_strategy';
 import type {
@@ -185,7 +185,7 @@ class Scheduler extends Widget<any> {
 
   _dataAccessors!: AppointmentDataAccessor;
 
-  agendaResourceProcessor: any;
+  agendaResourceProcessor!: ResourceProcessor;
 
   _actions: any;
 
@@ -606,7 +606,7 @@ class Scheduler extends Widget<any> {
         break;
       case 'resources':
         this._dataAccessors.resources = createExpressions(this.option('resources'));
-        this.agendaResourceProcessor.initializeState(this.option('resources'));
+        this.agendaResourceProcessor = new ResourceProcessor(this.option('resources'));
         this.updateInstances();
         this.option('resourceLoaderMap').clear();
 
@@ -1034,7 +1034,7 @@ class Scheduler extends Widget<any> {
 
     this._subscribes = subscribes;
 
-    this.agendaResourceProcessor = new AgendaResourceProcessor(this.option('resources'));
+    this.agendaResourceProcessor = new ResourceProcessor(this.option('resources'));
 
     this._optionsValidator = new SchedulerOptionsValidator();
 
@@ -1580,7 +1580,7 @@ class Scheduler extends Widget<any> {
       getResources: () => this.option('resources'),
       getLoadedResources: () => this.option('loadedResources'),
       getResourceDataAccessors: this.getResourceDataAccessors.bind(this),
-      getAgendaResourceProcessor: () => this.agendaResourceProcessor,
+      getResourceProcessor: () => this.agendaResourceProcessor,
       getAppointmentColor: this.createGetAppointmentColor(),
 
       getAppointmentDataProvider: () => this.appointmentDataProvider,