@eclipse-scout/core 11.0.36 → 11.0.42

package/dist/file-list

@@ -1,5 +1,5 @@
-eclipse-scout-core-9d2c34f578874327626d.min.js
-eclipse-scout-core-9d2c34f578874327626d.min.js.map
+eclipse-scout-core-f05c37a693e6abaa57dc.min.js
+eclipse-scout-core-f05c37a693e6abaa57dc.min.js.map
 eclipse-scout-core-theme-d1dee22d4f9b9233a432.min.css
 eclipse-scout-core-theme-dark-7ead007f849a9c1a6ec1.min.css
 eclipse-scout-core-theme-dark.css

package/dist/texts.json

@@ -127,6 +127,8 @@
     "ui.PleaseWait_": "Please wait",
     "ui.PopupBlockerDetected": "Opening a new window automatically was blocked by the browser.",
     "ui.Reconnecting_": "Reconnecting...",
+    "ui.RejectedUpload": "Rejected File Upload",
+    "ui.RejectedUploadMsg": "The uploaded file was rejected by the security policy.",
     "ui.Reload": "Reload",
     "ui.ReloadData": "Reload data",
     "ui.RemoveFilter": "Remove filter",
@@ -298,6 +300,8 @@
     "ui.PleaseWait_": "Veuillez attendre",
     "ui.PopupBlockerDetected": "L'ouverture d'une nouvelle fenêtre a été empêchée par la navigateur.",
     "ui.Reconnecting_": "Connexion …",
+    "ui.RejectedUpload": "Téléchargement de fichier rejeté",
+    "ui.RejectedUploadMsg": "Le fichier téléchargé a été rejeté par la politique de sécurité.",
     "ui.Reload": "Charger à nouveau",
     "ui.ReloadData": "Nouveau chargement des données",
     "ui.RemoveFilter": "Supprimer le filtre",
@@ -469,6 +473,8 @@
     "ui.PleaseWait_": "Attendere prego",
     "ui.PopupBlockerDetected": "Apertura automatica di una nuova finestra impedita dal browser.",
     "ui.Reconnecting_": "Collegamento...",
+    "ui.RejectedUpload": "Caricamento file rifiutato",
+    "ui.RejectedUploadMsg": "Il file caricato è stato rifiutato dalla politica di sicurezza.",
     "ui.Reload": "Ricarica",
     "ui.ReloadData": "Ricarica dati",
     "ui.RemoveFilter": "Rimuovere filtro",
@@ -645,6 +651,8 @@
     "ui.PleaseWait_": "Bitte warten",
     "ui.PopupBlockerDetected": "Das automatische Öffnen eines neuen Fensters wurde durch den Browser verhindert.",
     "ui.Reconnecting_": "Verbinde...",
+    "ui.RejectedUpload": "Abgelehnte Datei",
+    "ui.RejectedUploadMsg": "Die hochgeladene Datei wurde durch die Sicherheitsrichtlinie abgelehnt.",
     "ui.Reload": "Neu laden",
     "ui.ReloadData": "Daten neu laden",
     "ui.RemoveFilter": "Filter entfernen",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eclipse-scout/core",
-  "version": "11.0.36",
+  "version": "11.0.42",
   "description": "Eclipse Scout runtime",
   "author": "BSI Business Systems Integration AG",
   "homepage": "https://www.eclipse.org/scout",
@@ -40,7 +40,7 @@
     "release-postdependency": "releng-scripts release-publish-dependency"
   },
   "devDependencies": {
-    "@eclipse-scout/cli": "11.0.36",
+    "@eclipse-scout/cli": "11.0.42",
     "@eclipse-scout/releng": "^10.0.0",
     "jasmine-core": "3.6.0",
     "jasmine-ajax": "4.0.0",

package/src/form/fields/smartfield/ProposalField.js

@@ -80,9 +80,6 @@ export default class ProposalField extends SmartField {
     if (this.trimText) {
       validValue = validValue.trim();
     }
-    if (validValue.length > this.maxLength) {
-      validValue = validValue.substring(0, this.maxLength);
-    }
     if (validValue === '') {
       validValue = null;
     }
@@ -207,10 +204,6 @@ export default class ProposalField extends SmartField {
     this.setProperty('trimText', trimText);
   }
 
-  setMaxLength(maxLength) {
-    this.setProperty('maxLength', maxLength);
-  }
-
   /**
    * @override ValueField.js
    */

package/src/form/fields/smartfield/SmartField.js

@@ -63,6 +63,8 @@ export default class SmartField extends ValueField {
     // only when the result is up-to-date, we can use the selected lookup row
     this.initActiveFilter = null;
     this.disabledCopyOverlay = true;
+    this.maxLength = 500;
+    this.maxLengthHandler = scout.create('MaxLengthHandler', {target: this});
 
     this._addCloneProperties(['lookupRow', 'codeType', 'lookupCall', 'activeFilter', 'activeFilterEnabled', 'activeFilterLabels',
       'browseHierarchy', 'browseMaxRowCount', 'browseAutoExpandAll', 'browseLoadIncremental', 'searchRequired', 'columnDescriptors',
@@ -150,6 +152,7 @@ export default class SmartField extends ValueField {
         .on('input', this._onFieldInput.bind(this));
     }
     this.addField($field);
+    this.maxLengthHandler.install($field);
 
     if (!this.embedded) {
       this.addMandatoryIndicator();
@@ -159,6 +162,11 @@ export default class SmartField extends ValueField {
     this.addStatus();
   }
 
+  _renderProperties() {
+    super._renderProperties();
+    this._renderMaxLength();
+  }
+
   _renderGridData() {
     super._renderGridData();
     this.updateInnerAlignment({
@@ -588,6 +596,14 @@ export default class SmartField extends ValueField {
     this.$field.setTabbable(this.enabledComputed);
   }
 
+  setMaxLength(maxLength) {
+    this.setProperty('maxLength', maxLength);
+  }
+
+  _renderMaxLength() {
+    this.maxLengthHandler.render();
+  }
+
   setLookupCall(lookupCall) {
     this.setProperty('lookupCall', lookupCall);
   }

package/src/form/fields/stringfield/StringField.js

@@ -8,20 +8,7 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {
-  arrays,
-  BasicField,
-  fields,
-  InputFieldKeyStrokeContext,
-  objects,
-  scout,
-  Status,
-  StringFieldCtrlEnterKeyStroke,
-  StringFieldEnterKeyStroke,
-  StringFieldLayout,
-  strings,
-  texts
-} from '../../../index';
+import {BasicField, fields, InputFieldKeyStrokeContext, objects, scout, Status, StringFieldCtrlEnterKeyStroke, StringFieldEnterKeyStroke, StringFieldLayout, strings, texts} from '../../../index';
 
 export default class StringField extends BasicField {
   constructor() {
@@ -32,6 +19,7 @@ export default class StringField extends BasicField {
     this.inputMasked = false;
     this.inputObfuscated = false;
     this.maxLength = 4000;
+    this.maxLengthHandler = scout.create('MaxLengthHandler', {target: this});
     this.multilineText = false;
     this.selectionStart = 0;
     this.selectionEnd = 0;
@@ -90,9 +78,9 @@ export default class StringField extends BasicField {
     } else {
       $field = fields.makeTextField(this.$parent);
     }
-    $field.on('paste', this._onFieldPaste.bind(this));
 
     this.addField($field);
+    this.maxLengthHandler.install($field);
     this.addStatus();
   }
 
@@ -185,35 +173,6 @@ export default class StringField extends BasicField {
     return super.isClearable() && !this.multilineText;
   }
 
-  setMaxLength(maxLength) {
-    this.setProperty('maxLength', maxLength);
-  }
-
-  _renderMaxLength() {
-    // Check if "maxLength" attribute is supported by browser
-    if (this.$field[0].maxLength) {
-      this.$field.attr('maxlength', this.maxLength);
-    } else {
-      // Fallback for IE9
-      this.$field.on('keyup paste', e => {
-        setTimeout(truncate.bind(this), 0);
-      });
-    }
-
-    // Make sure current text does not exceed max length
-    truncate.call(this);
-    if (!this.rendering) {
-      this.parseAndSetValue(this._readDisplayText());
-    }
-
-    function truncate() {
-      let text = this.$field.val();
-      if (text.length > this.maxLength) {
-        this.$field.val(text.slice(0, this.maxLength));
-      }
-    }
-  }
-
   setSelectionStart(selectionStart) {
     this.setProperty('selectionStart', selectionStart);
   }
@@ -432,6 +391,14 @@ export default class StringField extends BasicField {
     });
   }
 
+  setMaxLength(maxLength) {
+    this.setProperty('maxLength', maxLength);
+  }
+
+  _renderMaxLength() {
+    this.maxLengthHandler.render();
+  }
+
   _onIconClick(event) {
     this.acceptInput();
     this.$field.focus();
@@ -561,51 +528,6 @@ export default class StringField extends BasicField {
     }
   }
 
-  /**
-   * Get clipboard data, different strategies for browsers.
-   * Must use a callback because this is required by Chrome's clipboard API.
-   */
-  _getClipboardData(event, doneHandler) {
-    let data = event.originalEvent.clipboardData || this.$container.window(true).clipboardData;
-    if (data) {
-      // Chrome, Firefox
-      if (data.items && data.items.length) {
-        let item = arrays.find(data.items, item => {
-          return item.type === 'text/plain';
-        });
-        if (item) {
-          item.getAsString(doneHandler);
-        }
-        return;
-      }
-
-      // IE, Safari
-      if (data.getData) {
-        doneHandler(data.getData('Text'));
-      }
-    }
-
-    // Can't access clipboard -> don't call done handler
-  }
-
-  _onFieldPaste(event) {
-    // must store text and selection because when the callback is executed, the clipboard content has already been applied to the input field
-    let text = this.$field.val();
-    let selection = this._getSelection();
-
-    this._getClipboardData(event, pastedText => {
-      if (!pastedText) {
-        return;
-      }
-
-      // Make sure the user is notified about pasted text which is cut off because of maxlength constraints
-      text = this._applyTextToSelection(text, pastedText, selection);
-      if (text.length > this.maxLength) {
-        this._showNotification('ui.PastedTextTooLong');
-      }
-    });
-  }
-
   _showNotification(textKey) {
     scout.create('DesktopNotification', {
       parent: this,

package/src/form/fields/tagfield/TagField.js

@@ -10,9 +10,9 @@
  */
 import {
   arrays,
+  fields,
   HtmlComponent,
   InputFieldKeyStrokeContext,
-  fields,
   keys,
   LookupCall,
   scout,
@@ -38,6 +38,8 @@ export default class TagField extends ValueField {
     this.lookupCall = null;
     this._currentLookupCall = null;
     this.tagBar = null;
+    this.maxLength = 500;
+    this.maxLengthHandler = scout.create('MaxLengthHandler', {target: this});
   }
 
   _init(model) {
@@ -85,12 +87,14 @@ export default class TagField extends ValueField {
       .on('input', this._onFieldInput.bind(this));
     this.addFieldContainer($fieldContainer);
     this.addField($field);
+    this.maxLengthHandler.install($field);
     this.addStatus();
   }
 
   _renderProperties() {
     super._renderProperties();
     this._renderValue();
+    this._renderMaxLength();
   }
 
   _renderValue() {
@@ -155,6 +159,14 @@ export default class TagField extends ValueField {
     }
   }
 
+  setMaxLength(maxLength) {
+    this.setProperty('maxLength', maxLength);
+  }
+
+  _renderMaxLength() {
+    this.maxLengthHandler.render();
+  }
+
   _updateInputVisible() {
     let visible, oldVisible = !this.$field.isVisible();
     if (this.enabledComputed) {

package/src/index.js

@@ -42,6 +42,7 @@ export {default as fonts} from './util/fonts';
 export {default as icons} from './util/icons';
 export {default as inspector} from './util/inspector';
 export {default as locales} from './util/locales';
+export {default as MaxLengthHandler} from './util/MaxLengthHandler';
 export {default as logging} from './logging/logging';
 export {default as NullLogger} from './logging/NullLogger';
 export {default as mimeTypes} from './util/mimeTypes';

package/src/lookup/RestLookupCall.js

@@ -8,9 +8,38 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
-import {arrays, LookupCall, scout} from '../index';
+import {arrays, LookupCall, objects, scout} from '../index';
 import $ from 'jquery';
 
+/**
+ * A lookup call that can load lookup rows from a REST service.
+ *
+ * API:
+ * ----
+ * By default, the REST service is expected to listen for POST requests at the URL defined by
+ * this.resourceUrl. It receives a restriction object and must return a list of matching lookup rows.
+ * The serialization format is JSON.
+ *
+ * Lookup rows:
+ * ------------
+ * The standard lookup row properties defined by Scout are usually sufficient (see AbstractLookupRowDo.java).
+ *
+ * Restriction:
+ * ------------
+ * The restriction object consists of a number of 'well-known' properties (e.g. 'text' in QueryBy.TEXT
+ * mode, see AbstractLookupRestrictionDo.java for details) and additional, service-dependent properties
+ * that can either be predefined in the model or added programmatically at runtime. Since all of those
+ * properties are sent in the same restriction object, some care must be taken to prevent accidental
+ * overwriting of properties.
+ *
+ * Order of precedence (lowest to highest):
+ * 1. Restrictions automatically applied to all clones after their creation in the respective cloneFor method.
+ *    These are: 'active' (ALL, TEXT, REC) and 'maxRowCount' (ALL, TEXT, REC)
+ * 2. Restrictions predefined in the model property 'restriction', shared by all clones.
+ * 3. Restrictions applied to clones programmatically, e.g. during a 'prepareLookupCall' event.
+ * 4. Hard-coded properties that are fundamental to the respective queryBy mode (cannot be overridden).
+ *    These are: 'ids' (KEY, KEYS) and 'text' (TEXT)
+ */
 export default class RestLookupCall extends LookupCall {
 
   constructor() {
@@ -42,6 +71,17 @@ export default class RestLookupCall extends LookupCall {
     this._restriction[key] = value;
   }
 
+  /**
+   * Adds the given key-value pair to 'this._restriction', but only if there is no predefined
+   * value for this key in 'this.restriction'. This prevents unintentional overriding of
+   * user-defined model restrictions.
+   */
+  _addRestrictionIfAbsent(key, value) {
+    if (!this.restriction || objects.isNullOrUndefined(this.restriction[key])) {
+      this.addRestriction(key, value);
+    }
+  }
+
   _getAll() {
     return this._call();
   }
@@ -63,22 +103,22 @@ export default class RestLookupCall extends LookupCall {
 
   cloneForAll() {
     let clone = super.cloneForAll();
-    clone.addRestriction('active', true);
-    clone.addRestriction('maxRowCount', this.maxRowCount);
+    clone._addRestrictionIfAbsent('active', true);
+    clone._addRestrictionIfAbsent('maxRowCount', this.maxRowCount);
     return clone;
   }
 
   cloneForText(text) {
     let clone = super.cloneForText(text);
-    clone.addRestriction('active', true);
-    clone.addRestriction('maxRowCount', this.maxRowCount);
+    clone._addRestrictionIfAbsent('active', true);
+    clone._addRestrictionIfAbsent('maxRowCount', this.maxRowCount);
     return clone;
   }
 
   cloneForRec(parentKey) {
     let clone = super.cloneForRec(parentKey);
-    clone.addRestriction('active', true);
-    clone.addRestriction('maxRowCount', this.maxRowCount);
+    clone._addRestrictionIfAbsent('active', true);
+    clone._addRestrictionIfAbsent('maxRowCount', this.maxRowCount);
     return clone;
   }
 
@@ -167,7 +207,7 @@ export default class RestLookupCall extends LookupCall {
       return value;
     };
 
-    let newRestrictions = {};
+    let resolvedRestriction = {};
     let restriction = $.extend({}, this.restriction, this._restriction);
     Object.keys(restriction).forEach(key => {
       let value = restriction[key];
@@ -180,11 +220,11 @@ export default class RestLookupCall extends LookupCall {
         newValue = resolveValue(value);
       }
       // Only add non-null restrictions
-      if (newValue) {
-        newRestrictions[key] = newValue;
+      if (!objects.isNullOrUndefined(newValue)) {
+        resolvedRestriction[key] = newValue;
       }
     });
-    return newRestrictions;
+    return resolvedRestriction;
   }
 
   _createAjaxCall() {

package/src/session/Session.js

@@ -122,6 +122,7 @@ export default class Session {
     SESSION_TIMEOUT: 10,
     UI_PROCESSING: 20,
     UNSAFE_UPLOAD: 30,
+    REJECTED_UPLOAD: 31,
     VERSION_MISMATCH: 40
   };
 
@@ -1048,6 +1049,12 @@ export default class Session {
       boxOptions.yesButtonText = this.optText('ui.Ok', 'Ok');
       boxOptions.yesButtonAction = () => {
       };
+    } else if (jsonError.code === Session.JsonResponseError.REJECTED_UPLOAD) {
+      boxOptions.header = this.optText('ui.RejectedUpload', boxOptions.header);
+      boxOptions.body = this.optText('ui.RejectedUploadMsg', boxOptions.body);
+      boxOptions.yesButtonText = this.optText('ui.Ok', 'Ok');
+      boxOptions.yesButtonAction = () => {
+      };
     }
     this.showFatalMessage(boxOptions, jsonError.code);
   }

package/src/util/MaxLengthHandler.js

@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     BSI Business Systems Integration AG - initial API and implementation
+ */
+import {arrays, objects, scout, Status} from '../index';
+import $ from 'jquery';
+import {assertValue} from '../scout';
+
+export default class MaxLengthHandler {
+
+  constructor(options) {
+    options = options || {};
+    assertValue(options.target, 'target is mandatory');
+
+    this.$textInputField = null;
+    this.onInputFieldPaste = this._onInputFieldPaste.bind(this);
+    $.extend(this, options);
+  }
+
+  install($textInputField) {
+    this.uninstall();
+    if (!$textInputField || (!$textInputField.is('input:text') && !$textInputField.is('textarea'))) {
+      return;
+    }
+    if ($textInputField) {
+      this.$textInputField = $textInputField;
+      this.$textInputField.on('paste', this.onInputFieldPaste);
+    }
+  }
+
+  uninstall() {
+    if (this.$textInputField) {
+      this.$textInputField.off('paste', this.onInputFieldPaste);
+    }
+  }
+
+  render() {
+    if (!this.$textInputField || objects.isNullOrUndefined(this.target.maxLength)) {
+      return;
+    }
+    this.$textInputField.attr('maxlength', this.target.maxLength);
+
+    // Make sure current text does not exceed max length
+    let text = this.$textInputField.val();
+    if (text.length > this.target.maxLength) {
+      this.$textInputField.val(text.slice(0, this.target.maxLength));
+    }
+    if (!this.target.rendering) {
+      this.target.parseAndSetValue(this.target._readDisplayText());
+    }
+  }
+
+  _onInputFieldPaste(event) {
+    if (!this.$textInputField || objects.isNullOrUndefined(this.target.maxLength)) {
+      return;
+    }
+    // must read out the text and selection size now because when the callback is executed, the clipboard content has already been applied to the input field
+    let textSize = this.$textInputField.val().length - this._getSelectionSize();
+
+    this._getClipboardData(event, pastedText => {
+      if (!pastedText) {
+        return;
+      }
+      if ((textSize + pastedText.length) > this.target.maxLength) {
+        this._showNotification('ui.PastedTextTooLong');
+      }
+    });
+  }
+
+  _getSelectionSize() {
+    let start = scout.nvl(this.$textInputField[0].selectionStart, null);
+    let end = scout.nvl(this.$textInputField[0].selectionEnd, null);
+    if (start === null || end === null) {
+      return 0;
+    }
+    return end - start;
+  }
+
+  /**
+   * Get clipboard data, different strategies for browsers.
+   * Must use a callback because this is required by Chrome's clipboard API.
+   */
+  _getClipboardData(event, doneHandler) {
+    let data = event.originalEvent.clipboardData || this.target.$container.window(true).clipboardData;
+    if (data) {
+      // Chrome, Firefox
+      if (data.items && data.items.length) {
+        let item = arrays.find(data.items, item => {
+          return item.type === 'text/plain';
+        });
+        if (item) {
+          item.getAsString(doneHandler);
+        }
+        return;
+      }
+
+      // IE, Safari
+      if (data.getData) {
+        doneHandler(data.getData('Text'));
+      }
+    }
+
+    // Can't access clipboard -> don't call done handler
+  }
+
+  _showNotification(textKey) {
+    scout.create('DesktopNotification', {
+      parent: this.target,
+      severity: Status.Severity.WARNING,
+      message: this.target.session.text(textKey)
+    }).show();
+  }
+}