@eclipse-scout/core 22.0.0-beta.1 → 22.0.0

package/src/session/Session.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -319,7 +319,6 @@ export default class Session {
     }
 
     function onAjaxFail(jqXHR, textStatus, errorThrown, ...args) {
-      this._setApplicationLoading(false);
       this._processErrorResponse(jqXHR, textStatus, errorThrown, request);
       return $.rejectedPromise(jqXHR, textStatus, errorThrown, ...args);
     }
@@ -423,6 +422,8 @@ export default class Session {
     // Extract client session data without creating a model adapter for it. It is (currently) only used to transport the desktop's adapterId.
     let clientSessionData = this._getAdapterData(data.startupData.clientSession);
     this.desktop = this.getOrCreateWidget(clientSessionData.desktop, this.rootAdapter.widget);
+    App.get()._triggerDesktopReady(this.desktop);
+
     let renderDesktopImpl = function() {
       this._renderDesktop();
 
@@ -444,6 +445,7 @@ export default class Session {
       this._resumeBackgroundJobPolling();
 
       this.ready = true;
+      App.get()._triggerSessionReady(this);
 
       $.log.isInfoEnabled() && $.log.info('Session initialized. Detected ' + Device.get());
       if ($.log.isDebugEnabled()) {
@@ -1070,7 +1072,6 @@ export default class Session {
       }
       this._fatalMessagesOnScreen[errorCode] = true;
     }
-    this._setApplicationLoading(false);
 
     options = options || {};
     let model = {
@@ -1394,62 +1395,6 @@ export default class Session {
     return request;
   }
 
-  _setApplicationLoading(applicationLoading) {
-    if (applicationLoading) {
-      this._applicationLoadingTimeoutId = setTimeout(() => {
-        if (!this.desktop || !this.desktop.rendered) {
-          this._renderApplicationLoading();
-        }
-      }, 200);
-    } else {
-      clearTimeout(this._applicationLoadingTimeoutId);
-      this._applicationLoadingTimeoutId = null;
-      this._removeApplicationLoading();
-    }
-  }
-
-  _renderApplicationLoading() {
-    let $body = $('body'),
-      $loadingRoot = $body.children('.application-loading-root');
-    if (!$loadingRoot.length) {
-      $loadingRoot = $body.appendDiv('application-loading-root')
-        .addClass('application-loading-root')
-        .fadeIn();
-    }
-    this._renderApplicationLoadingElement($loadingRoot, 'application-loading01');
-    this._renderApplicationLoadingElement($loadingRoot, 'application-loading02');
-    this._renderApplicationLoadingElement($loadingRoot, 'application-loading03');
-  }
-
-  _renderApplicationLoadingElement($loadingRoot, cssClass) {
-    if ($loadingRoot.children('.' + cssClass).length) {
-      return;
-    }
-    // noinspection JSValidateTypes
-    $loadingRoot.appendDiv(cssClass).hide()
-      .fadeIn();
-  }
-
-  _removeApplicationLoading() {
-    let $loadingRoot = $('body').children('.application-loading-root');
-    // the fadeout animation only contains a to-value and no from-value
-    // therefore set the current value to the elements style
-    $loadingRoot.css('opacity', $loadingRoot.css('opacity'));
-    if ($loadingRoot.css('opacity') == 1) {
-      $loadingRoot.addClass('fadeout and-more');
-    } else {
-      $loadingRoot.addClass('fadeout');
-    }
-    if (Device.get().supportsCssAnimation()) {
-      $loadingRoot.oneAnimationEnd(() => {
-        $loadingRoot.remove();
-      });
-    } else {
-      // fallback for old browsers that do not support the animation-end event
-      $loadingRoot.remove();
-    }
-  }
-
   _processEvents(events) {
     let i = 0;
     while (i < events.length) {
@@ -1493,9 +1438,6 @@ export default class Session {
   start() {
     $.log.isInfoEnabled() && $.log.info('Session starting...');
 
-    // After a short time, display a loading animation (will be removed again in _renderDesktop)
-    this._setApplicationLoading(true);
-
     // Send startup request
     return this._sendStartupRequest();
   }
@@ -1545,7 +1487,6 @@ export default class Session {
   _renderDesktop() {
     this.desktop.render(this.$entryPoint);
     this.desktop.invalidateLayoutTree(false);
-    this._setApplicationLoading(false);
   }
 
   _onLogout(event) {

package/src/status/Status.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2020 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -16,6 +16,7 @@ export default class Status {
   constructor(model) {
     this.message = null;
     this.severity = Status.Severity.ERROR;
+    this.iconId = null;
     this.code = 0;
     this.children = null;
     this.deletable = true;

package/src/style/colors-dark.less

@@ -164,13 +164,15 @@
 @desktop-navigation-body-in-background-background-color: @palette-gray-9;
 @desktop-navigation-color: @text-color;
 @desktop-navigation-handle-background-color: @desktop-navigation-body-background-color;
+@default-combo-menu-separator-color: @text-inverted-color;
 @dimmed-background-color: @palette-gray-9;
 @group-header-color: @text-color-2;
 @notification-ok-background-color: fade(@palette-green-5, 60%);
 @notification-info-background-color: fade(@accent-color-5, 60%);
 @notification-warning-background-color: fade(@palette-orange-5, 60%);
 @notification-error-background-color: fade(@palette-red-5, 50%);
-@outline-group-background-color: @palette-gray-7;
+@outline-group-background-color: @palette-gray-6-1;
+@outline-in-background-group-background-color: @palette-gray-7;
 @outline-node-selected-icon-color: @palette-gray-6-1;
 @outline-breadcrumb-border-color: @palette-gray-6; // Needs to be a solid color for compact mode to make selection background not shine through
 @planner-activity-color: @text-inverted-color;

package/src/style/colors.less

@@ -239,6 +239,7 @@
 @default-button-background-color: @selected-background-color;
 @default-button-color: @selected-color;
 @default-button-hover-background-color: @selected-hover-background-color;
+@default-combo-menu-separator-color: @border-color;
 @desktop-bench-background-color: @background-color;
 @desktop-bench-drop-shadow-color: fade(@palette-black, 10%);
 @desktop-bench-tab-area-background-color: @dimmed-background-color;
@@ -309,6 +310,7 @@
 @outline-breadcrumb-child-background-color: @desktop-navigation-body-background-color;
 @outline-breadcrumb-node-active-background-color: @hover-background-color;
 @outline-group-background-color: @accent-color-0;
+@outline-in-background-group-background-color: darken(@desktop-navigation-body-in-background-background-color, 5%);
 @outline-in-background-selection-background-color: @selected-disabled-background-color;
 @outline-in-background-selection-color: @outline-selection-color;
 @outline-selection-background-color: @selected-background-color;

package/src/style/sizes.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -26,9 +26,10 @@
 @drop-shadow-blur: 13px;
 @drop-shadow-large-y: 8px;
 @drop-shadow-large-blur: 32px;
-@filter-field-bottom: 6px;
-@filter-field-right: 6px;
+@filter-field-bottom: 8px;
+@filter-field-right: 8px;
 @filter-field-height: @logical-grid-row-height;
+@filter-field-height-dense: @logical-grid-row-height-dense;
 @filter-field-width: 190px;
 @filter-field-min-width: 75px;
 @filter-field-max-width: 60%;
@@ -136,6 +137,7 @@
 @context-menu-item-padding-y: 8px;
 @context-menu-item-padding-left: 16px;
 @context-menu-item-padding-right: 16px;
+@context-menu-item-icon-margin-right: 14px;
 @dashboard-tile-label-padding-bottom: 5px;
 @dashboard-tile-label-large-padding-bottom: 10px;
 @dashboard-tile-drop-shadow-light-alpha: 0.05;

package/src/table/Table.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -2199,7 +2199,7 @@ export default class Table extends Widget {
     let cell, column, predicate;
 
     predicate = function(column) {
-      if (column.guiOnly) {
+      if (!column.isVisible() || column.guiOnly) {
         // does not support tabbing
         return false;
       }
@@ -3056,6 +3056,7 @@ export default class Table extends Widget {
     this.ensureRowRendered(row);
     let popup = column.startCellEdit(row, field);
     this.cellEditorPopup = popup;
+    this.$container.toggleClass('has-cell-editor-popup', !!popup);
     return popup;
   }
 
@@ -3754,7 +3755,7 @@ export default class Table extends Widget {
   addFilter(filter, applyFilter = true) {
     if (filter instanceof TableUserFilter) {
       let previousFilter = this.getFilter(filter.createKey());
-      this.filterSupport.removeFilter(previousFilter);
+      this.filterSupport.removeFilter(previousFilter, false);
     }
 
     let added = this.filterSupport.addFilter(filter, applyFilter);
@@ -5384,6 +5385,9 @@ export default class Table extends Widget {
     let destroyEditor = () => {
       this.cellEditorPopup.destroy();
       this.cellEditorPopup = null;
+      if (this.$container) {
+        this.$container.removeClass('has-cell-editor-popup');
+      }
       if (callback) {
         callback();
       }

package/src/table/Table.less

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2021 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -121,20 +121,30 @@
   }
 
   & > .filter-field {
-    --filter-field-max-bottom: calc(~'50% - ' (@filter-field-height + var(--controls-height)) / 2);
+    --filter-field-max-bottom: calc(~'50% - ' (var(--filter-field-height) + var(--controls-height)) / 2);
 
     &:not(.focused).empty {
       --filter-field-max-bottom: calc(~'50% - ' (@filter-field-icon-size + var(--controls-height)) / 2);
     }
 
     .has-menubar.menubar-bottom& {
-      --filter-field-max-bottom: calc(~'50% - ' (@filter-field-height + var(--controls-height)) / 2);
+      --filter-field-max-bottom: calc(~'50% - ' (var(--filter-field-height) + var(--controls-height)) / 2);
       bottom: calc(min(var(--filter-field-bottom), var(--filter-field-max-bottom)) + var(--menubar-height));
 
       &:not(.focused).empty {
         --filter-field-max-bottom: calc(~'50% - ' (@filter-field-icon-size + var(--controls-height)) / 2);
       }
     }
+
+    .has-cell-editor-popup& {
+      opacity: 0;
+      visibility: hidden;
+
+      // start the "fade out" transition right away
+      --filter-field-opacity-transition-delay: 0s;
+      // set visibility to hidden right after the "fade out" transition ends
+      --filter-field-visibility-transition-delay: calc(@filter-field-transition-duration + var(--filter-field-opacity-transition-delay));
+    }
   }
 }
 

package/src/table/columns/Column.js

@@ -447,6 +447,10 @@ export default class Column {
     return this.table.cellValue(this, row);
   }
 
+  cellValue(row) {
+    return this.table.cellValue(this, row);
+  }
+
   cellText(row) {
     return this.table.cellText(this, row);
   }

package/src/tile/fields/htmlfield/TileHtmlField.js

@@ -0,0 +1,28 @@
+/*
+ * Copyright (c) 2010-2022 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 {HtmlField} from '../../../index';
+
+export default class TileHtmlField extends HtmlField {
+
+  constructor() {
+    super();
+  }
+
+  _render() {
+    super._render();
+
+    this.$container.addClass('scrollbar-y-outside');
+  }
+
+  _installScrollbars(options) {
+    return super._installScrollbars($.extend(true, {}, options, {scrollShadow: 'gradient'}));
+  }
+}

package/src/tooltip/Tooltip.less

@@ -17,11 +17,6 @@
   #scout.drop-shadow(@y: 4px, @blur: 6px, @alpha: 5%);
   max-width: 300px;
   white-space: normal;
-
-  &.has-menus {
-    padding-top: 6px;
-    padding-bottom: 6px;
-  }
 }
 
 .tooltip-content {
@@ -37,6 +32,7 @@
     font-weight: @font-weight-bold;
     padding-left: @context-menu-item-padding-left;
     padding-right: @context-menu-item-padding-right;
+    padding-top: @tooltip-padding-y + 6px;
   }
 
   & .small {
@@ -53,6 +49,12 @@
 
 .tooltip-menus {
   position: relative;
+  background-color: inherit; // Necessary if arrow has a border
+  padding-bottom: 6px;
+
+  .no-text > & {
+    padding-top: 6px;
+  }
 
   & > .menu-item {
     display: flex;

package/src/tree/LazyNodeFilter.js

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017 BSI Business Systems Integration AG.
+ * Copyright (c) 2010-2022 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
@@ -8,27 +8,36 @@
  * Contributors:
  *     BSI Business Systems Integration AG - initial API and implementation
  */
+
 export default class LazyNodeFilter {
 
-  constructor(tree) { //
+  constructor(tree) {
     this.tree = tree;
   }
 
   accept(node) {
-    if (!node.expanded && node.parentNode && node.parentNode.expandedLazy && node.parentNode.lazyExpandingEnabled && this.tree.lazyExpandingEnabled) {
-      // if this node is not expanded and parent is lazyExpanding.
-      for (let i = 0; i < this.tree.selectedNodes.length; i++) {
-        let selectedNode = this.tree.selectedNodes[i];
-        // not initialized selected nodes
-        if (typeof selectedNode === 'string') {
-          break;
-        }
-        if (selectedNode === node || selectedNode.isDescendantOf(node)) {
-          return true;
-        }
+    if (node.expanded) {
+      return true;
+    }
+    // not expanded: remove lazy expand marker (forget lazy expanded children)
+    node.childNodes.forEach(child => child._lazyNodeFilterAccepted = false);
+
+    if (!node.parentNode || !node.parentNode.expandedLazy || !node.parentNode.lazyExpandingEnabled || !this.tree.lazyExpandingEnabled) {
+      // no lazy expanding supported
+      return true;
+    }
+
+    // if this node is not expanded and parent is lazyExpanding.
+    for (let i = 0; i < this.tree.selectedNodes.length; i++) {
+      let selectedNode = this.tree.selectedNodes[i];
+      if (typeof selectedNode === 'string') {
+        break;
+      }
+      if (selectedNode == node) {
+        node._lazyNodeFilterAccepted = true;
+        return true;
       }
-      return false;
     }
-    return true;
+    return !!node._lazyNodeFilterAccepted;
   }
 }