Scheduler: Fix the default resource text being rendered in the agenda view when resourceCellTemplate is defined (T1181733)

js/ui/scheduler/workspaces/ui.scheduler.agenda.js

@@ -258,13 +258,8 @@ class SchedulerAgenda extends WorkSpace {
             groupTableClass: GROUP_TABLE_CLASS,
             groupRowClass: GROUP_ROW_CLASS,
             groupCellClass: this._getGroupHeaderClass(),
-            groupCellCustomContent(cell, cellText, index, data) {
+            groupCellCustomContent(cell, cellTextElement, index, data) {
                 const container = domAdapter.createElement('div');
-                const contentWrapper = domAdapter.createElement('div');
-
-                container.className = getGroupHeaderContentClass;
-                contentWrapper.appendChild(cellText);
-                container.appendChild(contentWrapper);
                 container.className = getGroupHeaderContentClass;
 
                 if(cellTemplate && cellTemplate.render) {
@@ -273,14 +268,15 @@ class SchedulerAgenda extends WorkSpace {
                             data: data.data,
                             id: data.value,
                             color: data.color,
-                            text: cellText.textContent
+                            text: cellTextElement.textContent
                         },
                         container: getPublicElement($(container)),
                         index: index
                     }));
 
                 } else {
-                    contentWrapper.appendChild(cellText);
+                    const contentWrapper = domAdapter.createElement('div');
+                    contentWrapper.appendChild(cellTextElement);
                     container.appendChild(contentWrapper);
                 }
 

testing/testcafe/model/scheduler/groupRow.ts

@@ -0,0 +1,16 @@
+const CLASS = {
+  groupRow: 'dx-scheduler-group-row',
+  groupCell: 'dx-scheduler-group-header-content',
+};
+
+export class GroupRow {
+  readonly element: Selector;
+
+  readonly groupCells: Selector;
+
+  constructor(scheduler: Selector) {
+    this.element = scheduler.find(`.${CLASS.groupRow}`);
+
+    this.groupCells = this.element.find(`.${CLASS.groupCell}`);
+  }
+}

testing/testcafe/model/scheduler/index.ts

@@ -8,6 +8,7 @@ import Toolbar from './toolbar';
 import Collectors from './collectors';
 import ReducedIconTooltip from './appointment/tooltip/reducedIconTooltip';
 import { WidgetName } from '../../helpers/createWidget';
+import { GroupRow } from './groupRow';
 import { HeaderPanel } from './headerPanel';
 
 export const CLASS = {
@@ -60,6 +61,8 @@ export default class Scheduler extends Widget {
 
   readonly headerPanel: HeaderPanel;
 
+  readonly groupRow: GroupRow;
+
   readonly headerSpaceScroll: { left: Promise<number>; top: Promise<number> };
 
   readonly workspaceScrollable: Selector;
@@ -98,6 +101,7 @@ export default class Scheduler extends Widget {
     this.headerPanel = new HeaderPanel(this.element);
     this.toolbar = new Toolbar(this.element);
     this.collectors = new Collectors(this.element);
+    this.groupRow = new GroupRow(this.element);
 
     this.headerSpaceScroll = {
       left: headerSpaceScroll.scrollLeft,
@@ -137,6 +141,10 @@ export default class Scheduler extends Widget {
     return this.allDayTableCells.nth(cellIndex);
   }
 
+  getGroupCell(cellIndex = 0): Selector {
+    return this.groupRow.groupCells.nth(cellIndex);
+  }
+
   getFocusedCell(isAllDay = false): Selector {
     const cells = isAllDay ? this.allDayTableCells : this.dateTableCells;
 

testing/testcafe/tests/scheduler/grouping/resourceCellTemplate.ts

@@ -0,0 +1,39 @@
+import createWidget from '../../../helpers/createWidget';
+import url from '../../../helpers/getPageUrl';
+import Scheduler from '../../../model/scheduler';
+
+fixture.disablePageReloads`ResourceCellTemplate`
+  .page(url(__dirname, '../../container.html'));
+
+test('resourceCellTemplate layout should be rendered right in the agenda view', async (t) => {
+  const scheduler = new Scheduler('#container');
+  const groupHeader = scheduler.getGroupCell();
+
+  await t.expect(groupHeader.textContent).eql('Custom resource text');
+}).before(async () => {
+  const currentDate = new Date(2017, 4, 25);
+  await createWidget('dxScheduler', {
+    dataSource: [{
+      text: 'appointment',
+      startDate: currentDate,
+      endDate: currentDate,
+      resource: 1,
+    }],
+    views: ['agenda'],
+    currentView: 'agenda',
+    currentDate,
+    resourceCellTemplate() {
+      return 'Custom resource text';
+    },
+    groups: ['resource'],
+    resources: [{
+      fieldExpr: 'resource',
+      dataSource: [{
+        text: 'Resource text',
+        id: 1,
+      }],
+      label: 'Resource',
+    }],
+    height: 600,
+  });
+});