@yoobic/yobi 8.5.0-50 → 8.5.0-52

package/dist/collection/components/grid/grid/grid.js

@@ -1,5 +1,5 @@
-import { EMPTYSTATE_TEXT_MAP, EMPTYSTATE_TITLE_MAP, FormFieldType, FormFilterAutocompleteOperator } from '@shared/interfaces';
-import { dispatchCustomEvent, filterListByText, getAsyncExtraData, getAuthentication, getSession, HorizontalSlidesAnimation, isAnimationsDisabled, isDateTimeField, isEmail, isFirefox, isForceScrollbar, isMapField, isNullOrUndefined, isOffline, isPresent, isWeb, MONGODB_ID_REGEX, pipes, safeScrollIntoView, showActionSheet, showModal, toButton, translate, translateMulti } from '@shared/utils';
+import { CALENDAR_VIEW_IDS, EMPTYSTATE_TEXT_MAP, EMPTYSTATE_TITLE_MAP, FormFieldType, FormFilterAutocompleteOperator } from '@shared/interfaces';
+import { dispatchCustomEvent, filterListByText, getAsyncExtraData, getAuthentication, getSession, HorizontalSlidesAnimation, isAnimationsDisabled, isAutocompleteLocalField, isDateTimeField, isEmail, isFirefox, isForceScrollbar, isMapField, isNullOrUndefined, isNumberField, isOffline, isPresent, isWeb, MONGODB_ID_REGEX, pipes, safeScrollIntoView, showActionSheet, showModal, toButton, translate, translateMulti } from '@shared/utils';
 import { forceUpdate, h, Host } from '@stencil/core';
 import { compact, debounce, findIndex, get, isArray, isBoolean, isEmpty, isEqual, isFunction, isNumber, isString, map, range, sortBy, sum } from 'lodash-es';
 import { isObject } from 'lodash-es';
@@ -336,6 +336,8 @@ export class YooGridComponent {
         extraParams: this.extraFetchParams || {},
         startDate: this.isCalendar() ? this.calendarStartDate : null,
         endDate: this.isCalendar() ? this.calendarEndDate : null,
+        startDateField: this.calendarDateField,
+        endDateField: this.calendarDateEndField,
         sortsAndFilters: this.sortsAndFilters,
         getCustomDataLoader: this.getCustomDataLoader
       });
@@ -754,14 +756,20 @@ export class YooGridComponent {
       onColumnMoved: () => this.onGridStateUpdate(),
       onColumnVisible: () => this.onGridStateUpdate(),
       onColumnPinned: () => this.onGridStateUpdate(),
+      onColumnRowGroupChanged: () => this.onGridStateUpdate(),
+      onColumnPivotChanged: () => this.onGridStateUpdate(),
+      onColumnValueChanged: () => this.onGridStateUpdate(),
       getRowId: (params) => {
         return params.data[this.idAttributeName || '_id'];
       },
       onGridReady: (params) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.gridApi = params.api;
         this.columnApi = params.columnApi;
-        if (((_b = (_a = this.gridState) === null || _a === void 0 ? void 0 : _a.columnState) === null || _b === void 0 ? void 0 : _b.length) > 0 && !this.disconnected) {
+        if (((_a = this.gridState) === null || _a === void 0 ? void 0 : _a.isPivotMode) && !this.disconnected) {
+          this.columnApi.setPivotMode(this.gridState.isPivotMode);
+        }
+        if (((_c = (_b = this.gridState) === null || _b === void 0 ? void 0 : _b.columnState) === null || _c === void 0 ? void 0 : _c.length) > 0 && !this.disconnected) {
           this.columnApi.applyColumnState({ state: this.gridState.columnState, applyOrder: true });
         }
         if (this.gridApi.destroyCalled) {
@@ -803,6 +811,8 @@ export class YooGridComponent {
                   infiniteScrollType: 'datasource',
                   startDate: this.isCalendar() ? this.calendarStartDate : null,
                   endDate: this.isCalendar() ? this.calendarEndDate : null,
+                  startDateField: this.calendarDateField,
+                  endDateField: this.calendarDateEndField,
                   sortsAndFilters: this.sortsAndFilters,
                   getCustomDataLoader: this.getCustomDataLoader,
                   datasourceSuccess: (data, _lastRow, purge, fromDelete) => {
@@ -845,7 +855,7 @@ export class YooGridComponent {
           });
         }
         else if (!this.disconnected) {
-          this.isEmptyAgGrid = !(((_c = this.items) === null || _c === void 0 ? void 0 : _c.length) > 0);
+          this.isEmptyAgGrid = !(((_d = this.items) === null || _d === void 0 ? void 0 : _d.length) > 0);
           this.gridApi.setRowData(this.items);
         }
       },
@@ -934,7 +944,8 @@ export class YooGridComponent {
   onGridStateUpdate() {
     if (this.columnApi && !this.disconnected) {
       const columnState = this.columnApi.getColumnState();
-      this.gridStateChanged.emit({ columnState });
+      const isPivotMode = this.columnApi.isPivotMode();
+      this.gridStateChanged.emit({ columnState, isPivotMode });
     }
   }
   preventSlidePerView() {
@@ -1144,6 +1155,8 @@ export class YooGridComponent {
           customPosition: position,
           startDate: this.isCalendar() ? this.calendarStartDate : null,
           endDate: this.isCalendar() ? this.calendarEndDate : null,
+          startDateField: this.calendarDateField,
+          endDateField: this.calendarDateEndField,
           sortsAndFilters: this.sortsAndFilters,
           getCustomDataLoader: this.getCustomDataLoader
         });
@@ -1177,6 +1190,8 @@ export class YooGridComponent {
         infiniteScrollType: 'infiniteScroll',
         startDate: this.isCalendar() ? this.calendarStartDate : null,
         endDate: this.isCalendar() ? this.calendarEndDate : null,
+        startDateField: this.calendarDateField,
+        endDateField: this.calendarDateEndField,
         sortsAndFilters: this.sortsAndFilters,
         getCustomDataLoader: this.getCustomDataLoader
       });
@@ -1900,8 +1915,8 @@ export class YooGridComponent {
         }, "icon-prefix": "search", size: isWeb(this.host) ? 'medium' : 'large', value: this.searchText, placeholder: this.searchBarPlaceholder ? translateMulti(this.searchBarPlaceholder) : translate('SEARCH'), hideOptional: true, onInputChanged: (ev) => this.onSearchInputChange(ev), onInputFocused: () => this.onSearchInputFocused(), onInputBlurred: () => this.onSearchInputBlurred(), onEnterPressed: (ev) => this.onSearchInputEnterPressed(ev) })
     ]);
   }
-  renderRefresh() {
-    return (!this.hideRefreshButton && !this.isReadonly && !this.isLocal && (h("yoo-tooltip", { content: translate('REFRESH'), hoverable: true, placement: "bottom" }, h("yoo-button", { shape: "circular", fill: "transparent", rippleType: "unbounded", onClick: () => this.pullToRefresh() }, h("yoo-icon", { name: "refresh", color: "stable" })))));
+  renderRefresh(force) {
+    return ((!this.hideRefreshButton && !this.isReadonly && (force || !this.isLocal)) && (h("yoo-tooltip", { content: translate('REFRESH'), hoverable: true, placement: "bottom" }, h("yoo-button", { shape: "circular", fill: "transparent", rippleType: "unbounded", onClick: () => this.pullToRefresh() }, h("yoo-icon", { name: "refresh", color: "stable" })))));
   }
   shouldRenderEntityQueryBuilder() {
     return isWeb(this.host) && !this.isAutoComplete && (this.gridIsExpanded || !this.gridIsExpanded) && (this.showFilters || this.showAdvancedQueryBuilder);
@@ -1977,7 +1992,7 @@ export class YooGridComponent {
     var _a;
     const buttons = (_a = this.displayTypes) === null || _a === void 0 ? void 0 : _a.map((displayType) => ({
       icon: this.getIconFromDisplayType(displayType),
-      text: translate(displayType.toUpperCase()),
+      text: translate('YOOBIC' + displayType.toUpperCase()),
       iconColor: this.displayType === displayType ? 'app-color' : 'stable',
       handler: () => this.onChangeDisplay(displayType)
     }));
@@ -2195,7 +2210,7 @@ export class YooGridComponent {
       }, onFieldFetchCustomData: (ev) => {
         ev.stopPropagation();
         this.fieldFetchCustomData.emit(ev.detail);
-      }, class: { 'no-padding': this.showSearch === false }, floating: this.floatingFilters, disabled: this.isSelectAll && this.total > 0 }, isWeb(this.host) && !this.isReadonly && (h("div", { class: "search-container-inner", slot: "before" }, this.renderToggleSelectAll(), this.showSearch !== false && this.renderSearchInput(), h("slot", { name: "search-buttons-before" }))), isWeb(this.host) && this.isCalendar() && this.hasDateTimeFields() && this.renderDateFieldSelect(), isWeb(this.host) && this.isMap() && this.hasMapFields() && this.renderMapFieldSelect(), isWeb(this.host) && this.isKanban() && this.hasKanbanColumnFields() && this.renderKanbanColumnFieldSelect(), isWeb(this.host) && this.isKanban() && showDisplaySize && this.renderDisplaySize(), isWeb(this.host) && this.renderDisplayMode(), this.renderCustomViews(), isWeb(this.host) && this.renderRefresh(), isWeb(this.host) && this.renderExports(), actions.length > 0 && (h("yoo-items", { class: { 'margin-left': !isWeb(this.host) && this.isToggleModeVisible() } }, actions
+      }, class: { 'no-padding': this.showSearch === false }, floating: this.floatingFilters, disabled: this.isSelectAll && this.total > 0 }, isWeb(this.host) && !this.isReadonly && (h("div", { class: "search-container-inner", slot: "before" }, this.renderToggleSelectAll(), this.showSearch !== false && this.renderSearchInput(), h("slot", { name: "search-buttons-before" }))), isWeb(this.host) && this.isMap() && this.hasMapFields() && this.renderMapFieldSelect(), isWeb(this.host) && this.isKanban() && this.hasKanbanColumnFields() && this.renderKanbanColumnFieldSelect(), isWeb(this.host) && this.isKanban() && showDisplaySize && this.renderDisplaySize(), isWeb(this.host) && this.renderDisplayMode(), this.renderCustomViews(), isWeb(this.host) && this.renderRefresh(), isWeb(this.host) && this.renderExports(), actions.length > 0 && (h("yoo-items", { class: { 'margin-left': !isWeb(this.host) && this.isToggleModeVisible() } }, actions
       .map((a) => toButton(a, this))
       .map((button) => getButton({
       ...button,
@@ -2424,7 +2439,7 @@ export class YooGridComponent {
     const fields = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isMapField(f));
     return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-autocomplete", { class: "map-field inline", size: "medium" //{isWeb(this.host) ? 'medium' : 'large'}
       ,
-      hideIcon: true, clearable: false, value: this.mapGeolocField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", placeholder: translate('CHOOSEMAPFIELD'), useTranslate: true, onInputChanged: (ev) => this.onMapFieldChange(ev) }));
+      hideIcon: true, clearable: false, value: this.mapGeolocField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", placeholder: translate('CHOOSEMAPFIELD'), useTranslate: true, onInputChanged: (ev) => this.onMapFieldChange(ev), onFetchData: (ev) => ev.stopPropagation(), dialogWidth: "200px" }));
   }
   onMapFieldChange(ev) {
     if (ev === null || ev === void 0 ? void 0 : ev.detail) {
@@ -2440,13 +2455,52 @@ export class YooGridComponent {
   renderDateFieldSelect() {
     var _a;
     const fields = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isDateTimeField(f));
-    return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-autocomplete", { class: "date-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.calendarDateField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", placeholder: translate('CHOOSEDATEFIELD'), useTranslate: true }));
+    return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-input-container", { field: { title: translate('YOOBICCHOOSESTARTDATEFIELD') }, hideOptional: true }, h("yoo-form-autocomplete", { class: "date-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.calendarDateField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", useTranslate: true, onInputChanged: (ev) => this.calendarDateField = ev.detail, onFetchData: (ev) => ev.stopPropagation(), dialogWidth: "200px" })));
+  }
+  renderDateEndFieldSelect() {
+    var _a;
+    const fields = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isDateTimeField(f));
+    return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-input-container", { field: { title: translate('YOOBICCHOOSEENDDATEFIELD') }, hideOptional: true }, h("yoo-form-autocomplete", { class: "date-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.calendarDateEndField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", useTranslate: true, onInputChanged: (ev) => this.calendarDateEndField = ev.detail, onFetchData: (ev) => ev.stopPropagation(), dialogWidth: "200px" })));
+  }
+  hasResourceFields() {
+    var _a;
+    return ((_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isAutocompleteLocalField(f)).length) > 0;
+  }
+  renderResourceFieldSelect() {
+    var _a;
+    const fields = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isAutocompleteLocalField(f));
+    return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-input-container", { field: { title: translate('YOOBICCHOOSERESOURCEFIELD') }, hideOptional: true }, h("yoo-form-autocomplete", { class: "resource-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.calendarResourceField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", useTranslate: true, onInputChanged: (ev) => {
+        this.calendarResourceField = ev.detail;
+      }, onFetchData: (ev) => ev.stopPropagation(), dialogWidth: "200px" })));
+  }
+  hasResourceDurationFields() {
+    var _a;
+    return ((_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isNumberField(f)).length) > 0;
+  }
+  renderResourceDurationFieldSelect() {
+    var _a;
+    const fields = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isNumberField(f));
+    return (fields === null || fields === void 0 ? void 0 : fields.length) > 0 && (h("yoo-form-input-container", { field: { title: translate('YOOBICCHOOSEDURATIONFIELD') }, hideOptional: true }, h("yoo-form-autocomplete", { class: "duration-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.calendarResourceDurationField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: fields, displayType: "card-list", useTranslate: true, onInputChanged: (ev) => {
+        this.calendarResourceDurationField = ev.detail;
+      }, onFetchData: (ev) => ev.stopPropagation(), dialogWidth: "200px" })));
   }
   renderCalendar() {
-    var _a, _b, _c, _d, _e;
-    this.calendarDateField =
-      this.calendarDateField || ((_b = (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.find((f) => isDateTimeField(f))) === null || _b === void 0 ? void 0 : _b.name) || ((_e = (_d = (_c = this.customModel) === null || _c === void 0 ? void 0 : _c.formFields) === null || _d === void 0 ? void 0 : _d.find((f) => isDateTimeField(f))) === null || _e === void 0 ? void 0 : _e.name);
-    return (h("yoo-grid-calendar", { events: this.items, entityType: this.entityType, editable: this.editable && !this.calendarPreventMove, suffix: this.suffix, timezone: this.calendarTimezone, titleField: this.calendarTitleField, dateField: this.calendarDateField, dateEndField: this.calendarDateEndField, showResourcesView: this.calendarShowResourcesView, calendarDefaultView: this.calendarDefaultView, durationField: this.calendarDurationField, durationFieldUnit: this.calendarDurationFieldUnit, slotDuration: this.calendarSlotDuration, openingHours: this.calendarOpeningHours, expandRows: this.calendarExpandRows, customModel: this.customModel, onDateChanged: (ev) => this.onCalendarDateChanged(ev), onDateSelected: (ev) => this.onCalendarDateSelected(ev), onItemSelected: (ev) => this.onCalendarItemSelected(ev) }, ' '));
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    const dateFields = ((_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isDateTimeField(f))) || ((_c = (_b = this.customModel) === null || _b === void 0 ? void 0 : _b.formFields) === null || _c === void 0 ? void 0 : _c.filter((f) => isDateTimeField(f)));
+    const durationFields = ((_d = this.campaignFields) === null || _d === void 0 ? void 0 : _d.filter((f) => isNumberField(f))) || ((_f = (_e = this.customModel) === null || _e === void 0 ? void 0 : _e.formFields) === null || _f === void 0 ? void 0 : _f.filter((f) => isNumberField(f)));
+    this.calendarDateField = this.calendarDateField || dateFields.length > 0 ? (_g = dateFields[0]) === null || _g === void 0 ? void 0 : _g.name : null;
+    this.calendarDateEndField = this.calendarDateEndField || dateFields.length > 1 ? (_h = dateFields[1]) === null || _h === void 0 ? void 0 : _h.name : null;
+    this.calendarResourceDurationField = this.calendarResourceDurationField || durationFields.length > 0 ? (_j = durationFields[0]) === null || _j === void 0 ? void 0 : _j.name : null;
+    const resources = (_l = (_k = this.campaignFields) === null || _k === void 0 ? void 0 : _k.find((f) => f.name === this.calendarResourceField)) === null || _l === void 0 ? void 0 : _l.values;
+    const viewIds = [...CALENDAR_VIEW_IDS];
+    const calendarView = viewIds.find((v) => v._id === this.calendarDefaultView);
+    return (h("yoo-grid-calendar", { ref: (el) => this.calendarEl = el, events: this.items, entityType: this.entityType, editable: this.editable && !this.calendarPreventMove, suffix: this.suffix, timezone: this.calendarTimezone, titleField: this.calendarTitleField, dateField: this.calendarDateField, hideHeader: true, dateEndField: this.calendarDateEndField, resourceField: this.calendarResourceField, showResourcesView: this.calendarShowResourcesView || (!!this.calendarResourceField && (resources === null || resources === void 0 ? void 0 : resources.length) > 0), resources: resources, calendarDefaultView: this.calendarDefaultView, durationField: this.calendarDurationField, resourceDurationField: this.calendarResourceDurationField, durationFieldUnit: this.calendarDurationFieldUnit, slotDuration: this.calendarSlotDuration, openingHours: this.calendarOpeningHours, expandRows: this.calendarExpandRows, customModel: this.customModel, onDateChanged: (ev) => this.onCalendarDateChanged(ev), onDateSelected: (ev) => this.onCalendarDateSelected(ev), onItemSelected: (ev) => this.onCalendarItemSelected(ev) }, h("div", { class: "views-container", slot: "header" }, h("yoo-form-autocomplete", { size: "medium", values: viewIds, value: calendarView, placeholder: translate('VIEW'), useTranslate: true, dynamicOrdering: false, onInputChanged: (ev) => {
+        var _a, _b;
+        if ((_a = ev === null || ev === void 0 ? void 0 : ev.detail) === null || _a === void 0 ? void 0 : _a._id) {
+          this.calendarDefaultView = ev.detail._id;
+          (_b = this.calendarEl) === null || _b === void 0 ? void 0 : _b.changeView(this.calendarDefaultView);
+        }
+      }, dialogWidth: "200px" }), this.renderRefresh(true)), h("div", { class: "calendar-filters", slot: "more-filters" }, isWeb(this.host) && this.isCalendar() && this.hasResourceFields() && this.renderResourceFieldSelect(), isWeb(this.host) && this.isCalendar() && this.hasDateTimeFields() && this.renderDateFieldSelect(), isWeb(this.host) && this.isCalendar() && this.hasDateTimeFields() && this.renderDateEndFieldSelect(), isWeb(this.host) && this.isCalendar() && this.hasResourceDurationFields() && this.renderResourceDurationFieldSelect())));
   }
   hasKanbanColumnFields() {
     var _a;
@@ -2454,7 +2508,7 @@ export class YooGridComponent {
   }
   renderKanbanColumnFieldSelect() {
     var _a;
-    return (h("yoo-form-autocomplete", { class: "kanban-column-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.kanbanColumnField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isKanbanColumnField(f)), displayType: "card-list", placeholder: translate('CHOOSECOLUMNFIELD'), useTranslate: true, onInputChanged: (ev) => this.onKanbanColumnFieldChange(ev) }));
+    return (h("yoo-form-autocomplete", { class: "kanban-column-field inline", size: isWeb(this.host) ? 'medium' : 'large', hideIcon: true, clearable: false, value: this.kanbanColumnField, idOnly: true, idAttributeName: "name", entityType: "formfield", values: (_a = this.campaignFields) === null || _a === void 0 ? void 0 : _a.filter((f) => isKanbanColumnField(f)), displayType: "card-list", placeholder: translate('CHOOSECOLUMNFIELD'), onFetchData: (ev) => ev.stopPropagation(), useTranslate: true, onInputChanged: (ev) => this.onKanbanColumnFieldChange(ev), dialogWidth: "200px" }));
   }
   onKanbanColumnFieldChange(ev) {
     this.kanbanColumnField = ev.detail;
@@ -4875,6 +4929,40 @@ export class YooGridComponent {
         "attribute": "calendar-date-field",
         "reflect": false
       },
+      "calendarDateEndField": {
+        "type": "string",
+        "mutable": true,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": true,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "calendar-date-end-field",
+        "reflect": false
+      },
+      "calendarResourceField": {
+        "type": "string",
+        "mutable": true,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": true,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "calendar-resource-field",
+        "reflect": false
+      },
       "calendarTitleField": {
         "type": "string",
         "mutable": false,
@@ -4894,7 +4982,7 @@ export class YooGridComponent {
       },
       "calendarDefaultView": {
         "type": "string",
-        "mutable": false,
+        "mutable": true,
         "complexType": {
           "original": "TGridCalendarView",
           "resolved": "\"day\" | \"month\" | \"week\"",
@@ -4916,7 +5004,7 @@ export class YooGridComponent {
       },
       "calendarDurationField": {
         "type": "string",
-        "mutable": false,
+        "mutable": true,
         "complexType": {
           "original": "string",
           "resolved": "string",
@@ -4931,9 +5019,9 @@ export class YooGridComponent {
         "attribute": "calendar-duration-field",
         "reflect": false
       },
-      "calendarDurationFieldUnit": {
+      "calendarResourceDurationField": {
         "type": "string",
-        "mutable": false,
+        "mutable": true,
         "complexType": {
           "original": "string",
           "resolved": "string",
@@ -4945,10 +5033,10 @@ export class YooGridComponent {
           "tags": [],
           "text": ""
         },
-        "attribute": "calendar-duration-field-unit",
+        "attribute": "calendar-resource-duration-field",
         "reflect": false
       },
-      "calendarDateEndField": {
+      "calendarDurationFieldUnit": {
         "type": "string",
         "mutable": false,
         "complexType": {
@@ -4962,7 +5050,7 @@ export class YooGridComponent {
           "tags": [],
           "text": ""
         },
-        "attribute": "calendar-date-end-field",
+        "attribute": "calendar-duration-field-unit",
         "reflect": false
       },
       "calendarShowResourcesView": {

package/dist/collection/components/grid/grid-calendar/grid-calendar.css

@@ -2523,7 +2523,6 @@ svg:not(:root) {
   font-weight: 500;
   font-size: var(--font-size-14, 0.875rem);
   border-right: none;
-  border-left: none;
 }
 
 .fc.web th {
@@ -2671,23 +2670,19 @@ svg:not(:root) {
   display: none;
 }
 
-.fc .fc-event.hidden {
-  display: none;
+.fc .fc-scrollgrid-section-body table,
+.fc .fc-scrollgrid-section-footer table {
+  border-bottom: var(--border-width-01, 0.0625rem) solid var(--stable-light, #f1f1f1);
 }
 
-.fc .fc-scroller {
-  overflow: hidden auto !important;
+.fc .fc-event.hidden {
+  display: none;
 }
 
 .fc .fc-list-event-graphic {
   display: none;
 }
 
-.fc.fc-theme-standard .fc-list,
-.fc.fc-theme-standard td:not(.fc-day):not(.fc-timegrid-slot-lane) {
-  border: none;
-}
-
 .fc .fc-list-table td.fc-list-event-title {
   padding: var(--spacing-08, 0.5rem) 0;
 }

package/dist/collection/components/grid/grid-calendar/grid-calendar.js

@@ -1,8 +1,8 @@
 import { ATTENDANCE_TRANSLATIONS, CALENDAR_TRANSLATIONS, QuickviewModaNoTopClass, WaitlistAPIDateFormat } from '@shared/interfaces';
-import { dateAdd, dateDiff, dateFormat, getAsyncExtraData, getCalendarParticipantStatusColor, getCssColor, getCurrentLanguage, getEventStatusInfo, getEventTypeColor, getRecurrences, getStartDayOfWeek, getUrlParameterByName, isWeb, translate } from '@shared/utils';
+import { dateAdd, dateDiff, dateFormat, getAsyncExtraData, getCalendarParticipantStatusColor, getCssColor, getCurrentLanguage, getEventStatusInfo, getEventTypeColor, getRecurrences, getStartDayOfWeek, getUrlParameterByName, isWeb, toMinutes, translate } from '@shared/utils';
 import { forceUpdate, h, Host } from '@stencil/core';
 import { isArray } from 'highcharts';
-import { assign, compact, flatten, get, remove } from 'lodash-es';
+import { assign, compact, flatten, get, remove, sumBy } from 'lodash-es';
 import tippy from 'tippy.js';
 import { getMissionColor } from '../../../feature-operate/campaign/helpers/operation-helpers';
 import { getAppContext } from '../../../utils/helpers/common-helpers';
@@ -18,6 +18,16 @@ export class YooGridCalendarComponent {
   onEventsChange() {
     this.renderEvents();
   }
+  onDateEndChange() {
+    this.renderEvents();
+  }
+  onDateStartChange() {
+    this.renderEvents();
+  }
+  onResourcesChange() {
+    this.changeView(this.calendarDefaultView || 'month');
+    this.renderEvents();
+  }
   async today() {
     var _a;
     (_a = this.calendar) === null || _a === void 0 ? void 0 : _a.today();
@@ -101,17 +111,17 @@ export class YooGridCalendarComponent {
   getCalendarViewType(type) {
     switch (type) {
       case 'month':
-        return 'dayGridMonth';
+        return this.showResourcesView ? 'resourceTimelineMonth' : 'dayGridMonth';
+      case 'listMonth':
+        return this.showResourcesView ? 'resourceTimelineMonth' : 'listMonth';
       case 'week':
-        return 'timeGridWeek';
+        return this.showResourcesView ? 'resourceTimelineWeek' : 'timeGridWeek';
+      case 'listWeek':
+        return this.showResourcesView ? 'resourceTimelineWeek' : 'listWeek';
       case 'day':
-        return 'timeGridDay';
-      case 'listMonth':
-        return 'listMonth';
+        return this.showResourcesView ? 'resourceDayGridDay' : 'timeGridDay';
       case 'listDay':
-        return 'listDay';
-      case 'listWeek':
-        return 'listDay';
+        return this.showResourcesView ? 'resourceTimelineDay' : 'listDay';
     }
     return type;
   }
@@ -167,7 +177,7 @@ export class YooGridCalendarComponent {
     return 0; //this.calendar?.isRendering ? 0 : 1000;
   }
   getCalendarOptions(fake, plugins, locales) {
-    var _a, _b;
+    var _a;
     let businessHours;
     if (this.openingHours) {
       const days = ['sun', 'mon', 'tue', 'wed', 'thu', 'fri', 'sat'];
@@ -198,6 +208,16 @@ export class YooGridCalendarComponent {
       events: this.urlICS ? { url: this.urlICS, format: 'ics' } : null,
       rerenderDelay: this.getRerenderDelay(),
       businessHours,
+      resourceAreaColumns: [
+        {
+          field: 'title',
+          headerContent: translate('YOOBICALENDARRESOURCE')
+        },
+        {
+          field: 'duration',
+          headerContent: translate('YOOBICALENDARRESOURCEDURATION')
+        }
+      ],
       displayEventTime: true,
       eventOverlap: false,
       slotEventOverlap: false,
@@ -207,78 +227,6 @@ export class YooGridCalendarComponent {
         hour12: getCurrentLanguage() === 'us'
       },
       scrollTime: '08:00:00',
-      customButtons: this.showResourcesView
-        ? {
-          resourceSwitcher: {
-            text: translate('RESOURCESVIEW'),
-            click: () => {
-              let currentView = this.calendar.view.type;
-              this.showResources = !this.showResources;
-              switch (currentView) {
-                case 'dayGridMonth':
-                  currentView = 'resourceTimelineMonth';
-                  break;
-                case 'timeGridWeek':
-                  currentView = 'resourceTimelineWeek';
-                  break;
-                case 'timeGridDay':
-                  currentView = 'resourceTimelineDay';
-                  break;
-              }
-              this.calendar.changeView(currentView);
-              this.calendar.setOption('headerToolbar', this.showResources
-                ? {
-                  start: 'calendarSwitcher',
-                  center: 'title',
-                  end: 'resourceTimelineMonth,resourceTimelineWeek,resourceTimelineDay,today prev,next'
-                }
-                : {
-                  left: 'resourceSwitcher',
-                  center: 'title',
-                  right: 'dayGridMonth,timeGridWeek,timeGridDay,today,prev,next'
-                });
-            }
-          },
-          calendarSwitcher: {
-            text: translate('CALENDARVIEW'),
-            click: () => {
-              let currentView = this.calendar.view.type;
-              this.showResources = !this.showResources;
-              switch (currentView) {
-                case 'resourceTimelineMonth':
-                  currentView = 'dayGridMonth';
-                  break;
-                case 'resourceTimelineWeek':
-                  currentView = 'timeGridWeek';
-                  break;
-                case 'resourceTimelineDay':
-                  currentView = 'timeGridDay';
-                  break;
-              }
-              this.calendar.changeView(currentView);
-              this.calendar.setOption('headerToolbar', this.showResources
-                ? {
-                  start: 'calendarSwitcher',
-                  center: 'title',
-                  end: 'resourceTimelineMonth,resourceTimelineWeek,resourceTimelineDay today prev,next'
-                }
-                : {
-                  start: 'resourceSwitcher',
-                  center: 'title',
-                  end: 'dayGridMonth,timeGridWeek,timeGridDay today prev,next'
-                });
-            }
-          }
-        }
-        : {
-          datePicker: {
-            text: ((_a = translate('YOOBICCALENDAR')) === null || _a === void 0 ? void 0 : _a.substring(0, 4)) + '...',
-            // icon: 'calendar',
-            click: () => {
-              this.showMobileCalendar = !this.showMobileCalendar;
-            }
-          }
-        },
       headerToolbar: this.hideHeader ? false : {
         start: 'prev',
         center: 'title',
@@ -288,7 +236,7 @@ export class YooGridCalendarComponent {
         ...(locales || {})
       },
       locale: this.getLocale(),
-      initialView: ((_b = this.currentView) === null || _b === void 0 ? void 0 : _b._id) ? this.getCalendarViewType(this.currentView._id) :
+      initialView: ((_a = this.currentView) === null || _a === void 0 ? void 0 : _a._id) ? this.getCalendarViewType(this.currentView._id) :
         this.calendarDefaultView === 'day'
           ? isWeb(this.host)
             ? 'timeGridDay'
@@ -315,6 +263,22 @@ export class YooGridCalendarComponent {
         timeGridDay: {
           displayEventTime: true,
           allDayText: translate('ALLDAY')
+        },
+        resourceTimelineMonth: {
+          slotLabelFormat: [
+            { month: 'long', year: 'numeric' },
+            { weekday: 'short' } // lower level of text
+          ]
+        },
+        resourceTimelineWeek: {
+          slotLabelFormat: [
+            { weekday: 'short' },
+            {
+              hour: '2-digit',
+              minute: '2-digit',
+              hour12: getCurrentLanguage() === 'us'
+            }
+          ]
         }
       },
       editable: this.editable,
@@ -395,7 +359,7 @@ export class YooGridCalendarComponent {
         }
       },
       noEventsContent: translate('YOOBICNOACTIVITY')
-    }, { schedulerLicenseKey: '0565952525-fcs-1637884800' });
+    }, { schedulerLicenseKey: '0144794256-fcs-1669420800' });
     return options;
   }
   getEntity(item, width) {
@@ -449,6 +413,7 @@ export class YooGridCalendarComponent {
     this.leftCalendarDateChanged.emit(ev.detail);
   }
   renderEvents() {
+    var _a, _b;
     if (this.calendar) {
       this.calendar.removeAllEvents();
       if (this.events && this.dateField) {
@@ -484,6 +449,9 @@ export class YooGridCalendarComponent {
               item: i,
               displayEventTime: true
             };
+            if (this.showResourcesView && this.resourceField) {
+              eventData.resourceId = get(i, this.resourceField);
+            }
             if ((_c = i === null || i === void 0 ? void 0 : i.rrule) === null || _c === void 0 ? void 0 : _c.dtstart) {
               let duration = 0;
               if (i.type === 'events') {
@@ -504,6 +472,17 @@ export class YooGridCalendarComponent {
             }
           }
         });
+        (_a = this.calendar.getResources()) === null || _a === void 0 ? void 0 : _a.forEach((r) => {
+          r.remove();
+        });
+        (_b = this.resources) === null || _b === void 0 ? void 0 : _b.forEach((r) => {
+          const events = calendarEvents.filter((c) => c.resourceId === r);
+          const duration = Math.round(sumBy(events, (e) => {
+            const dateDuration = toMinutes(dateDiff(e.end, e.start));
+            return this.resourceDurationField ? get(e.item, this.resourceDurationField) || dateDuration : dateDuration;
+          }));
+          this.calendar.addResource({ id: r, title: r, duration });
+        });
         if (calendarEvents.length > 0) {
           this.calendar.batchRendering(() => {
             calendarEvents.slice(0, 5000).forEach((ev) => this.calendar.addEvent(ev));
@@ -581,7 +560,7 @@ export class YooGridCalendarComponent {
       h("yoo-collapsible", { class: "bold margin-top", collapsed: false, header: translate('EVENTATTENDANCE') }, this.eventStatuses.map((t) => {
         var _a;
         return h("yoo-form-checkbox", { animated: this.animated, class: "app-color", onClick: () => this.onToggleAttendance(t), value: !(((_a = this.hiddenStatuses) === null || _a === void 0 ? void 0 : _a.indexOf(t)) > 0), header: translate(ATTENDANCE_TRANSLATIONS[t]) });
-      })), h("slot", { name: "more-filters" }))));
+      }))), h("slot", { name: "more-filters" })));
   }
   renderHeader(calendar, type) {
     if (calendar && !isWeb(this.host)) {
@@ -737,6 +716,38 @@ export class YooGridCalendarComponent {
         "attribute": "date-end-field",
         "reflect": false
       },
+      "resourceField": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "resource-field",
+        "reflect": false
+      },
+      "resources": {
+        "type": "unknown",
+        "mutable": false,
+        "complexType": {
+          "original": "string[]",
+          "resolved": "string[]",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        }
+      },
       "showResourcesView": {
         "type": "boolean",
         "mutable": false,
@@ -776,6 +787,23 @@ export class YooGridCalendarComponent {
         "attribute": "calendar-default-view",
         "reflect": false
       },
+      "resourceDurationField": {
+        "type": "string",
+        "mutable": false,
+        "complexType": {
+          "original": "string",
+          "resolved": "string",
+          "references": {}
+        },
+        "required": false,
+        "optional": false,
+        "docs": {
+          "tags": [],
+          "text": ""
+        },
+        "attribute": "resource-duration-field",
+        "reflect": false
+      },
       "durationField": {
         "type": "string",
         "mutable": false,
@@ -1402,6 +1430,15 @@ export class YooGridCalendarComponent {
     return [{
         "propName": "events",
         "methodName": "onEventsChange"
+      }, {
+        "propName": "dateEndField",
+        "methodName": "onDateEndChange"
+      }, {
+        "propName": "dateField",
+        "methodName": "onDateStartChange"
+      }, {
+        "propName": "resources",
+        "methodName": "onResourcesChange"
       }];
   }
 }