@eclipse-scout/core 22.0.34 → 22.0.39

package/dist/file-list

@@ -1,5 +1,5 @@
-eclipse-scout-core-0c86d1e671be93def26c.min.js
-eclipse-scout-core-0c86d1e671be93def26c.min.js.map
+eclipse-scout-core-990e036967fa14669bd8.min.js
+eclipse-scout-core-990e036967fa14669bd8.min.js.map
 eclipse-scout-core-theme-dark-17a1d77d53510e113a3c.min.css
 eclipse-scout-core-theme-dark.css
 eclipse-scout-core-theme-dark.css.map

package/dist/texts.json

@@ -6,6 +6,7 @@
     "Column": "Column",
     "ColumnSorting": "Sorting",
     "ConfirmApplyChanges": "Would you like to apply the changes?",
+    "DateIsNotAllowed": "Date is not allowed",
     "ErrorWhileLoadingData": "Failed to load the data.",
     "FormEmptyMandatoryFieldsMessage": "The following fields must be filled in:",
     "FormInvalidFieldsMessage": "The following fields are invalid:",
@@ -186,6 +187,7 @@
     "Column": "Colonne",
     "ColumnSorting": "Tri",
     "ConfirmApplyChanges": "Voulez-vous appliquer les modifications?",
+    "DateIsNotAllowed": "Date interdite",
     "ErrorWhileLoadingData": "Erreur lors du chargement des données",
     "FormEmptyMandatoryFieldsMessage": "Les champs suivants doivent être remplis:",
     "FormInvalidFieldsMessage": "Les champs suivants ont une valeur invalide:",
@@ -366,6 +368,7 @@
     "Column": "Colonna",
     "ColumnSorting": "Ordinamento",
     "ConfirmApplyChanges": "Applicare le modifiche?",
+    "DateIsNotAllowed": "Data non valida",
     "ErrorWhileLoadingData": "Caricamento dati fallito",
     "FormEmptyMandatoryFieldsMessage": "I seguenti campi devono essere compilati:",
     "FormInvalidFieldsMessage": "I campi seguenti hanno un valore invalido:",
@@ -546,6 +549,7 @@
     "Column": "Spalte",
     "ColumnSorting": "Sortierung",
     "ConfirmApplyChanges": "Möchten Sie die Änderungen übernehmen?",
+    "DateIsNotAllowed": "Unzulässiges Datum",
     "ErrorWhileLoadingData": "Fehler beim Laden der Daten",
     "FormEmptyMandatoryFieldsMessage": "Folgende Felder müssen ausgefüllt werden:",
     "FormInvalidFieldsMessage": "Folgende Felder haben einen ungültigen Wert:",
@@ -814,6 +818,7 @@
     "CloseButton": "Cerrar",
     "Column": "Columna",
     "ColumnSorting": "Clasificación",
+    "DateIsNotAllowed": "No se permite la fecha",
     "ErrorWhileLoadingData": "Error al cargar los datos.",
     "FormEmptyMandatoryFieldsMessage": "Se requieren los siguientes campos:",
     "FormInvalidFieldsMessage": "Los siguientes campos no son válidos:",
@@ -1005,6 +1010,7 @@
     "CloseButton": "閉じる",
     "Column": "間隙",
     "ColumnSorting": "並び替え",
+    "DateIsNotAllowed": "日付は許可されていません",
     "ErrorWhileLoadingData": "データの読み込みに失敗しました。",
     "FormEmptyMandatoryFieldsMessage": "以下のフィールドが必要です:",
     "FormInvalidFieldsMessage": "以下のフィールドは無効です:",
@@ -1043,6 +1049,7 @@
     "CancelButton": "Annuleer",
     "CloseButton": "Sluit",
     "Column": "Kolom",
+    "DateIsNotAllowed": "Datum is niet toegestaan",
     "ErrorWhileLoadingData": "Laden van gegevens mislukt.",
     "FormEmptyMandatoryFieldsMessage": "Volgende velden zijn verplicht:",
     "FormInvalidFieldsMessage": "Volgende velden zijn ongeldig:",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/core",
-  "version": "22.0.34",
+  "version": "22.0.39",
   "description": "Eclipse Scout runtime",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -26,7 +26,7 @@
     "src"
   ],
   "devDependencies": {
-    "@eclipse-scout/cli": "22.0.34",
+    "@eclipse-scout/cli": "22.0.39",
     "@eclipse-scout/releng": "^22.0.0",
     "jasmine-core": "3.10.1",
     "jasmine-ajax": "4.0.0",

package/src/datepicker/DatePicker.js

@@ -23,7 +23,7 @@ export default class DatePicker extends 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.
@@ -342,7 +342,7 @@ export default class DatePicker extends Widget {
     let date = this.preselectedDate;
 
     if (this.selectedDate) {
-      if (this.allowedDates) {
+      if (this.allowedDates.length > 0) {
         date = this._findNextAllowedDate(years, months, days);
       } else {
         date = dates.shift(this.selectedDate, years, months, days);
@@ -391,16 +391,12 @@ export default class DatePicker extends 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 = dates.trunc(date).getTime();
+    return this.allowedDates.some(allowedDate => allowedDate.getTime() === dateAsTimestamp);
   }
 
   _build$DateBox(viewDate) {

package/src/form/fields/datefield/DateField.js

@@ -16,6 +16,7 @@ export default class DateField extends ValueField {
   constructor() {
     super();
 
+    this.allowedDates = [];
     this.popup = null;
     this.autoDate = null;
     this.dateDisplayText = null;
@@ -438,6 +439,11 @@ export default class DateField extends 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 = dates.combineDateTime(null, value);
@@ -445,6 +451,14 @@ export default class DateField extends ValueField {
     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 = dates.trunc(date).getTime();
+    return this.allowedDates.some(allowedDate => allowedDate.getTime() === dateAsTimestamp);
+  }
+
   _valueEquals(valueA, valueB) {
     return dates.equals(valueA, valueB);
   }
@@ -458,15 +472,19 @@ export default class DateField extends ValueField {
     this._setProperty('autoDate', autoDate);
   }
 
+  setAllowedDates(allowedDates) {
+    this.setProperty('allowedDates', allowedDates);
+  }
+
   _setAllowedDates(allowedDates) {
-    if (Array.isArray(allowedDates)) {
-      allowedDates = allowedDates.map(date => {
-        return dates.ensure(date);
-      });
-      this._setProperty('allowedDates', allowedDates);
-    } else {
-      this._setProperty('allowedDates', null);
-    }
+    let truncDates = [];
+    arrays.ensure(allowedDates).forEach(date => {
+      if (date) {
+        truncDates.push(dates.trunc(dates.ensure(date)));
+      }
+    });
+    truncDates = truncDates.sort(dates.compare);
+    this._setProperty('allowedDates', truncDates);
   }
 
   /**

package/src/form/fields/datefield/DateFieldAdapter.js

@@ -8,7 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {arrays, dates, ParsingFailedStatus, ValueFieldAdapter} from '../../../index';
+import {App, arrays, DateField, dates, objects, ParsingFailedStatus, ValueFieldAdapter} from '../../../index';
 
 export default class DateFieldAdapter extends ValueFieldAdapter {
 
@@ -18,13 +18,6 @@ export default class DateFieldAdapter extends ValueFieldAdapter {
 
   static PROPERTIES_ORDER = ['hasTime', 'hasDate'];
 
-  /**
-   * @override
-   */
-  _initProperties(model) {
-    super._initProperties(model);
-  }
-
   /**
    * @override
    */
@@ -64,4 +57,21 @@ export default class DateFieldAdapter extends ValueFieldAdapter {
     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 (!App.get().remote) {
+      return;
+    }
+
+    objects.replacePrototypeFunction(DateField, 'isDateAllowed', DateFieldAdapter.isDateAllowedRemote, true);
+  }
 }
+
+App.addListener('bootstrap', DateFieldAdapter.modifyPrototype);

package/src/form/js/JsFormAdapter.js

@@ -15,6 +15,7 @@ import {FormAdapter} from '../../index';
  * @property {object} parent
  * @property {object} owner
  * @property {object} displayParent
+ * @property {string} displayHint
  * @property {object} inputData
  * @property {string} jsFormObjectType
  * @property {object} jsFormModel
@@ -41,6 +42,7 @@ export default class JsFormAdapter extends FormAdapter {
       owner: model.owner,
       objectType: model.jsFormObjectType,
       displayParent: model.displayParent,
+      displayHint: model.displayHint,
       data: model.inputData
     };
 

package/src/lookup/StaticLookupCall.js

@@ -120,14 +120,39 @@ export default class StaticLookupCall extends LookupCall {
   }
 
   _lookupRowsByText(text) {
-    let datas = this.data.filter(data => {
-      return 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 = strings.nvl(text);
+    text = text.toLowerCase();
+    text = text.replace(new RegExp(strings.quote(WILDCARD), 'g'), WILDCARD_PLACEHOLDER);
+    text = strings.quote(text);
+
+    // replace repeating wildcards to prevent regex DoS
+    let duplicateWildcards = WILDCARD_PLACEHOLDER + WILDCARD_PLACEHOLDER;
+    while (strings.contains(text, duplicateWildcards)) {
+      text = text.replace(duplicateWildcards, WILDCARD_PLACEHOLDER);
+    }
+
+    if (!strings.endsWith(WILDCARD_PLACEHOLDER)) {
+      text += WILDCARD_PLACEHOLDER;
+    }
+
+    text = text.replace(new RegExp(strings.quote(WILDCARD_PLACEHOLDER), 'g'), '.*');
+
+    return new RegExp('^' + text + '$', 's'); // s = DOT_ALL
+  }
+
   _getByKey(key) {
     let deferred = $.Deferred();
     setTimeout(this._queryByKey.bind(this, deferred, key), this.delay);

package/src/tile/TileGrid.js

@@ -51,6 +51,7 @@ export default class TileGrid extends Widget {
     this.virtual = false;
     this.virtualScrolling = null;
     this.withPlaceholders = false;
+    this.placeholderProducer = null;
 
     this.$filterFieldContainer = null;
     this.textFilterEnabled = false;
@@ -610,6 +611,10 @@ export default class TileGrid extends Widget {
     this.invalidateLayoutTree();
   }
 
+  setPlaceholderProducer(placeholderProducer) {
+    this.setProperty('placeholderProducer', placeholderProducer);
+  }
+
   fillUpWithPlaceholders() {
     if (!this.withPlaceholders) {
       this._deleteAllPlaceholders();
@@ -623,9 +628,7 @@ export default class TileGrid extends Widget {
     if (!this.withPlaceholders) {
       return this.tiles;
     }
-    return this.tiles.filter(tile => {
-      return !(tile instanceof PlaceholderTile);
-    });
+    return this.tiles.filter(tile => !(tile instanceof PlaceholderTile));
   }
 
   _createPlaceholders() {
@@ -656,9 +659,17 @@ export default class TileGrid extends Widget {
   }
 
   _createPlaceholder() {
-    return scout.create('PlaceholderTile', {
-      parent: this
-    });
+    let placeholder = (this.placeholderProducer && this.placeholderProducer()) || {};
+    if (placeholder instanceof PlaceholderTile) {
+      return placeholder;
+    }
+    if (objects.isPlainObject(placeholder)) {
+      return scout.create($.extend(true, {}, {
+        objectType: 'PlaceholderTile',
+        parent: this
+      }, placeholder));
+    }
+    throw new Error('Placeholder producer returned unexpected result.');
   }
 
   _deleteObsoletePlaceholders() {
@@ -1001,7 +1012,7 @@ export default class TileGrid extends Widget {
   }
 
   _applyFilters(tiles, fullReset) {
-    return this.filterSupport.applyFilters(tiles, fullReset);
+    return this.filterSupport.applyFilters(tiles.filter(tile => !(tile instanceof PlaceholderTile)), fullReset);
   }
 
   /**
@@ -1011,7 +1022,7 @@ export default class TileGrid extends Widget {
     return new FilterSupport({
       widget: this,
       $container: () => this.$filterFieldContainer,
-      getElementsForFiltering: () => this.tiles,
+      getElementsForFiltering: this.tilesWithoutPlaceholders.bind(this),
       createTextFilter: this._createTextFilter.bind(this),
       updateTextFilterText: this._updateTextFilterText.bind(this)
     });

package/src/timepicker/TimePicker.js

@@ -204,39 +204,6 @@ export default class TimePicker extends Widget {
 
   }
 
-  _findNextAllowedDate(years, months, days) {
-    let i, date,
-      sum = years + months + days,
-      dir = sum > 0 ? 1 : -1,
-      now = this.selectedDate || 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 = dates.shift(now, years, 0, 0);
-    } else if (months !== 0) {
-      now = 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 (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 (dates.compare(now, date) > 0) {
-          return date;
-        }
-      }
-    }
-
-    return null;
-  }
-
   _onNavigationMouseDown(event) {
     let $target = $(event.currentTarget);
     let diff = $target.data('shift');