@eclipse-scout/core 22.0.34 → 22.0.39

package/dist/eclipse-scout-core.js

@@ -6613,7 +6613,7 @@ class DatePicker extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     this.selectedDate = null;
     this.dateFormat = null;
     this.viewDate = null;
-    this.allowedDates = null;
+    this.allowedDates = [];
     this.currentMonth = null;
     this.$scrollable = null;
     // Contains the months to be rendered.
@@ -6901,7 +6901,7 @@ class DatePicker extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
   shiftSelectedDate(years, months, days) {
     let date = this.preselectedDate;
     if (this.selectedDate) {
-      if (this.allowedDates) {
+      if (this.allowedDates.length > 0) {
         date = this._findNextAllowedDate(years, months, days);
       } else {
         date = _index__WEBPACK_IMPORTED_MODULE_0__.dates.shift(this.selectedDate, years, months, days);
@@ -6948,16 +6948,12 @@ class DatePicker extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
   }
   _isDateAllowed(date) {
     // when allowedDates is empty or not set, any date is allowed
-    if (!this.allowedDates || this.allowedDates.length === 0) {
+    if (this.allowedDates.length === 0) {
       return true;
     }
     // when allowedDates is set, only dates contained in this array are allowed
-    let allowedDateAsTimestamp,
-      dateAsTimestamp = date.getTime();
-    return this.allowedDates.some(allowedDate => {
-      allowedDateAsTimestamp = allowedDate.getTime();
-      return allowedDateAsTimestamp === dateAsTimestamp;
-    });
+    let dateAsTimestamp = _index__WEBPACK_IMPORTED_MODULE_0__.dates.trunc(date).getTime();
+    return this.allowedDates.some(allowedDate => allowedDate.getTime() === dateAsTimestamp);
   }
   _build$DateBox(viewDate) {
     let cl,
@@ -28477,6 +28473,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 class DateField extends _index__WEBPACK_IMPORTED_MODULE_0__.ValueField {
   constructor() {
     super();
+    this.allowedDates = [];
     this.popup = null;
     this.autoDate = null;
     this.dateDisplayText = null;
@@ -28833,12 +28830,23 @@ class DateField extends _index__WEBPACK_IMPORTED_MODULE_0__.ValueField {
     if (!(value instanceof Date)) {
       throw this.session.text(this.invalidValueMessageKey);
     }
+    if (!this.isDateAllowed(value)) {
+      throw this.session.text('DateIsNotAllowed');
+    }
     if (!this.hasDate && !this.value) {
       // truncate to 01.01.1970 if no date was entered before. Otherwise preserve date part (important for toggling hasDate on the fly)
       value = _index__WEBPACK_IMPORTED_MODULE_0__.dates.combineDateTime(null, value);
     }
     return value;
   }
+  isDateAllowed(date) {
+    if (!date || this.allowedDates.length === 0 || this.embedded) {
+      // in embedded mode, main date field must take care of validation, otherwise error status won't be shown
+      return true;
+    }
+    let dateAsTimestamp = _index__WEBPACK_IMPORTED_MODULE_0__.dates.trunc(date).getTime();
+    return this.allowedDates.some(allowedDate => allowedDate.getTime() === dateAsTimestamp);
+  }
   _valueEquals(valueA, valueB) {
     return _index__WEBPACK_IMPORTED_MODULE_0__.dates.equals(valueA, valueB);
   }
@@ -28849,15 +28857,18 @@ class DateField extends _index__WEBPACK_IMPORTED_MODULE_0__.ValueField {
     autoDate = _index__WEBPACK_IMPORTED_MODULE_0__.dates.ensure(autoDate);
     this._setProperty('autoDate', autoDate);
   }
+  setAllowedDates(allowedDates) {
+    this.setProperty('allowedDates', allowedDates);
+  }
   _setAllowedDates(allowedDates) {
-    if (Array.isArray(allowedDates)) {
-      allowedDates = allowedDates.map(date => {
-        return _index__WEBPACK_IMPORTED_MODULE_0__.dates.ensure(date);
-      });
-      this._setProperty('allowedDates', allowedDates);
-    } else {
-      this._setProperty('allowedDates', null);
-    }
+    let truncDates = [];
+    _index__WEBPACK_IMPORTED_MODULE_0__.arrays.ensure(allowedDates).forEach(date => {
+      if (date) {
+        truncDates.push(_index__WEBPACK_IMPORTED_MODULE_0__.dates.trunc(_index__WEBPACK_IMPORTED_MODULE_0__.dates.ensure(date)));
+      }
+    });
+    truncDates = truncDates.sort(_index__WEBPACK_IMPORTED_MODULE_0__.dates.compare);
+    this._setProperty('allowedDates', truncDates);
   }
 
   /**
@@ -30171,13 +30182,6 @@ class DateFieldAdapter extends _index__WEBPACK_IMPORTED_MODULE_0__.ValueFieldAda
   constructor() {
     super();
   }
-  /**
-   * @override
-   */
-  _initProperties(model) {
-    super._initProperties(model);
-  }
-
   /**
    * @override
    */
@@ -30215,8 +30219,22 @@ class DateFieldAdapter extends _index__WEBPACK_IMPORTED_MODULE_0__.ValueFieldAda
   _orderPropertyNamesOnSync(newProperties) {
     return Object.keys(newProperties).sort(this._createPropertySortFunc(DateFieldAdapter.PROPERTIES_ORDER));
   }
+  static isDateAllowedRemote(date) {
+    if (!this.modelAdapter) {
+      return this.isDateAllowedOrig(date);
+    }
+    // Server will take care of it
+    return true;
+  }
+  static modifyPrototype() {
+    if (!_index__WEBPACK_IMPORTED_MODULE_0__.App.get().remote) {
+      return;
+    }
+    _index__WEBPACK_IMPORTED_MODULE_0__.objects.replacePrototypeFunction(_index__WEBPACK_IMPORTED_MODULE_0__.DateField, 'isDateAllowed', DateFieldAdapter.isDateAllowedRemote, true);
+  }
 }
 _defineProperty(DateFieldAdapter, "PROPERTIES_ORDER", ['hasTime', 'hasDate']);
+_index__WEBPACK_IMPORTED_MODULE_0__.App.addListener('bootstrap', DateFieldAdapter.modifyPrototype);
 
 /***/ }),
 
@@ -44681,6 +44699,7 @@ __webpack_require__.r(__webpack_exports__);
  * @property {object} parent
  * @property {object} owner
  * @property {object} displayParent
+ * @property {string} displayHint
  * @property {object} inputData
  * @property {string} jsFormObjectType
  * @property {object} jsFormModel
@@ -44704,6 +44723,7 @@ class JsFormAdapter extends _index__WEBPACK_IMPORTED_MODULE_0__.FormAdapter {
       owner: model.owner,
       objectType: model.jsFormObjectType,
       displayParent: model.displayParent,
+      displayHint: model.displayHint,
       data: model.inputData
     };
     if (model.jsFormModel) {
@@ -59190,11 +59210,32 @@ class StaticLookupCall extends _index__WEBPACK_IMPORTED_MODULE_0__.LookupCall {
     });
   }
   _lookupRowsByText(text) {
-    let datas = this.data.filter(data => {
-      return _index__WEBPACK_IMPORTED_MODULE_0__.strings.startsWith(data[1].toLowerCase(), text.toLowerCase());
-    });
+    let regex = this._createSearchPattern(text);
+    let datas = this.data.filter(data => regex.test(data[1].toLowerCase()));
     return datas.map(this._dataToLookupRow, this).filter(this._filterActiveLookupRow, this);
   }
+  _createSearchPattern(text) {
+    // Implementation copied from LocalLookupRow.java
+
+    const WILDCARD = '*';
+    const WILDCARD_PLACEHOLDER = '@wildcard@';
+    text = _index__WEBPACK_IMPORTED_MODULE_0__.strings.nvl(text);
+    text = text.toLowerCase();
+    text = text.replace(new RegExp(_index__WEBPACK_IMPORTED_MODULE_0__.strings.quote(WILDCARD), 'g'), WILDCARD_PLACEHOLDER);
+    text = _index__WEBPACK_IMPORTED_MODULE_0__.strings.quote(text);
+
+    // replace repeating wildcards to prevent regex DoS
+    let duplicateWildcards = WILDCARD_PLACEHOLDER + WILDCARD_PLACEHOLDER;
+    while (_index__WEBPACK_IMPORTED_MODULE_0__.strings.contains(text, duplicateWildcards)) {
+      text = text.replace(duplicateWildcards, WILDCARD_PLACEHOLDER);
+    }
+    if (!_index__WEBPACK_IMPORTED_MODULE_0__.strings.endsWith(WILDCARD_PLACEHOLDER)) {
+      text += WILDCARD_PLACEHOLDER;
+    }
+    text = text.replace(new RegExp(_index__WEBPACK_IMPORTED_MODULE_0__.strings.quote(WILDCARD_PLACEHOLDER), 'g'), '.*');
+    return new RegExp('^' + text + '$', 's'); // s = DOT_ALL
+  }
+
   _getByKey(key) {
     let deferred = jquery__WEBPACK_IMPORTED_MODULE_1___default().Deferred();
     setTimeout(this._queryByKey.bind(this, deferred, key), this.delay);
@@ -96663,6 +96704,7 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     this.virtual = false;
     this.virtualScrolling = null;
     this.withPlaceholders = false;
+    this.placeholderProducer = null;
     this.$filterFieldContainer = null;
     this.textFilterEnabled = false;
     this.filterSupport = this._createFilterSupport();
@@ -97151,6 +97193,9 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
   _renderWithPlaceholders() {
     this.invalidateLayoutTree();
   }
+  setPlaceholderProducer(placeholderProducer) {
+    this.setProperty('placeholderProducer', placeholderProducer);
+  }
   fillUpWithPlaceholders() {
     if (!this.withPlaceholders) {
       this._deleteAllPlaceholders();
@@ -97163,9 +97208,7 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     if (!this.withPlaceholders) {
       return this.tiles;
     }
-    return this.tiles.filter(tile => {
-      return !(tile instanceof _index__WEBPACK_IMPORTED_MODULE_0__.PlaceholderTile);
-    });
+    return this.tiles.filter(tile => !(tile instanceof _index__WEBPACK_IMPORTED_MODULE_0__.PlaceholderTile));
   }
   _createPlaceholders() {
     let numPlaceholders,
@@ -97193,9 +97236,17 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     return placeholders;
   }
   _createPlaceholder() {
-    return _index__WEBPACK_IMPORTED_MODULE_0__.scout.create('PlaceholderTile', {
-      parent: this
-    });
+    let placeholder = this.placeholderProducer && this.placeholderProducer() || {};
+    if (placeholder instanceof _index__WEBPACK_IMPORTED_MODULE_0__.PlaceholderTile) {
+      return placeholder;
+    }
+    if (_index__WEBPACK_IMPORTED_MODULE_0__.objects.isPlainObject(placeholder)) {
+      return _index__WEBPACK_IMPORTED_MODULE_0__.scout.create(jquery__WEBPACK_IMPORTED_MODULE_1___default().extend(true, {}, {
+        objectType: 'PlaceholderTile',
+        parent: this
+      }, placeholder));
+    }
+    throw new Error('Placeholder producer returned unexpected result.');
   }
   _deleteObsoletePlaceholders() {
     let obsoletePlaceholders = [],
@@ -97503,7 +97554,7 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     this.filterSupport.filter();
   }
   _applyFilters(tiles, fullReset) {
-    return this.filterSupport.applyFilters(tiles, fullReset);
+    return this.filterSupport.applyFilters(tiles.filter(tile => !(tile instanceof _index__WEBPACK_IMPORTED_MODULE_0__.PlaceholderTile)), fullReset);
   }
 
   /**
@@ -97513,7 +97564,7 @@ class TileGrid extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     return new _index__WEBPACK_IMPORTED_MODULE_0__.FilterSupport({
       widget: this,
       $container: () => this.$filterFieldContainer,
-      getElementsForFiltering: () => this.tiles,
+      getElementsForFiltering: this.tilesWithoutPlaceholders.bind(this),
       createTextFilter: this._createTextFilter.bind(this),
       updateTextFilterText: this._updateTextFilterText.bind(this)
     });
@@ -101063,39 +101114,6 @@ class TimePicker extends _index__WEBPACK_IMPORTED_MODULE_0__.Widget {
     time.setMinutes(min);
     return time;
   }
-  _findNextAllowedDate(years, months, days) {
-    let i,
-      date,
-      sum = years + months + days,
-      dir = sum > 0 ? 1 : -1,
-      now = this.selectedDate || _index__WEBPACK_IMPORTED_MODULE_0__.dates.trunc(new Date());
-
-    // if we shift by year or month, shift the 'now' date and then use that date as starting point
-    // to find the next allowed date.
-    if (years !== 0) {
-      now = _index__WEBPACK_IMPORTED_MODULE_0__.dates.shift(now, years, 0, 0);
-    } else if (months !== 0) {
-      now = _index__WEBPACK_IMPORTED_MODULE_0__.dates.shift(now, 0, months, 0);
-    }
-    if (dir === 1) {
-      // find next allowed date, starting from currently selected date
-      for (i = 0; i < this.allowedDates.length; i++) {
-        date = this.allowedDates[i];
-        if (_index__WEBPACK_IMPORTED_MODULE_0__.dates.compare(now, date) < 0) {
-          return date;
-        }
-      }
-    } else if (dir === -1) {
-      // find previous allowed date, starting from currently selected date
-      for (i = this.allowedDates.length - 1; i >= 0; i--) {
-        date = this.allowedDates[i];
-        if (_index__WEBPACK_IMPORTED_MODULE_0__.dates.compare(now, date) > 0) {
-          return date;
-        }
-      }
-    }
-    return null;
-  }
   _onNavigationMouseDown(event) {
     let $target = jquery__WEBPACK_IMPORTED_MODULE_1___default()(event.currentTarget);
     let diff = $target.data('shift');