barsa-sap-ui 1.0.340 → 1.0.342

package/fesm2020/barsa-sap-ui.mjs

@@ -4,7 +4,7 @@ import * as i2 from 'barsa-novin-ray-core';
 import { BaseComponent, ReportViewBaseComponent, getUniqueId, BarsaApi, LayoutItemBaseComponent, getDeviceIsMobile, LayoutService, BaseUlvSettingComponent, FormComponent, createFormPanelMetaConditions, ReportBaseComponent, GetAllColumnsSorted, measureText, getParentHeight, getControlSizeMode, getGridSettings, FieldBaseComponent, DateService, getDateService as getDateService$1, DateMiladiService, DateHijriService, DateShamsiService, BaseDirective, EllipsifyDirective, createGridEditorFormPanel, FormPanelService, BaseViewItemPropsComponent, isImage, getIcon, LayoutPanelBaseComponent, BaseViewContentPropsComponent, enumValueToStringSize, PreventDefaulEvent, BaseColumnPropsComponent, ColumnService, DateRanges, LogService, UlvMainService, isFunction, FilesValidationHelper, getValidExtension, getImagePath, UploadService, LinearListHelper, FormToolbarBaseComponent, isFirefox, FormBaseComponent, PageWithFormHandlerBaseComponent, getHeaderValue, getFieldValue, ContainerComponent, FORM_DIALOG_COMPONENT, ContainerService, FormPropsBaseComponent, NumberBaseComponent, ImageMimeType, BaseFormToolbaritemPropsComponent, executeUlvCommandHandler, getDeviceIsPhone, getDeviceIsTablet, PortalService, NOTIFICATAION_POPUP_SERVER, TOAST_SERVICE, BaseModule, BarsaNovinRayCoreModule, DIALOG_SERVICE } from 'barsa-novin-ray-core';
 import moment from 'moment';
 import jmoment from 'moment-jalaali';
-import { merge, of, BehaviorSubject, Subject, combineLatest, takeUntil as takeUntil$1, fromEvent, filter as filter$1, tap as tap$1 } from 'rxjs';
+import { merge, of, BehaviorSubject, Subject, combineLatest, takeUntil as takeUntil$1, fromEvent, filter as filter$1, withLatestFrom as withLatestFrom$1 } from 'rxjs';
 import { tap, filter, map, debounceTime, distinctUntilChanged, withLatestFrom, takeUntil, exhaustMap, finalize, switchMap, delay, concatMap, catchError } from 'rxjs/operators';
 import * as i1$1 from '@fundamental-ngx/core';
 import { TableComponent, ToolbarComponent, RadioButtonComponent, DynamicPageComponent, FileUploaderComponent, MultiInputComponent, TabPanelComponent, WizardComponent, WizardStepComponent, ComboboxComponent, InlineHelpDirective, ContentDensityMode, GlobalContentDensityService, ThemesService, NotificationRef, RtlService, MessageToastService, FundamentalNgxCoreModule, FacetModule, WizardModule, PipeModule, DialogService, ContentDensityModule } from '@fundamental-ngx/core';
@@ -2261,9 +2261,10 @@ class SapUiReportBaseComponent extends ReportBaseComponent {
         }
         const gridSize = getControlSizeMode(elNativeElement, deviceSize);
         let deviceName = 'desktop';
-        const allColumnsWidth = this.allColumns
+        this.allColumns
             ?.filter((c) => !c.Hidden)
-            .map((column) => (column.Width == 0 ? this._getWidth(column.Alias) : column.Width));
+            .forEach((c) => (c.$TextWidth = c.$TextWidth ? c.$TextWidth : this._getWidth(c.Alias) + 10));
+        const allColumnsWidth = this.allColumns.map((column) => column.$TextWidth && column.Width > column.$TextWidth ? column.Width : column.$TextWidth || column.Width);
         const visibleColumns = this._visibleColumnsSource.getValue();
         let columnsCount = visibleColumns.length;
         switch (gridSize) {
@@ -2294,15 +2295,9 @@ class SapUiReportBaseComponent extends ReportBaseComponent {
             sumColWidth += 210;
         }
         const containerWidth = elNativeElement.clientWidth;
-        if (columnsWidth.length > 0 && containerWidth > 0) {
+        if (columnsWidth.length > 0 && containerWidth > 0 && deviceSize !== 's') {
             columnsCount = visibleColumns.length;
             columnsWidth.forEach((width, index) => {
-                if (visibleColumns[index]) {
-                    const labelWidth = this._getWidth(visibleColumns[index].Alias) + 10;
-                    if (labelWidth > width) {
-                        width = labelWidth;
-                    }
-                }
                 if (sumColWidth + width > containerWidth && columnsCount === visibleColumns.length) {
                     columnsCount = index;
                 }
@@ -11563,15 +11558,16 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImpor
             }] } });
 
 class ExecutePushNotificationCommandComponent extends BaseComponent {
-    constructor(_activatedRoute, _portalService, _localStorage) {
+    constructor(_portalService, _localStorage) {
         super();
-        this._activatedRoute = _activatedRoute;
         this._portalService = _portalService;
         this._localStorage = _localStorage;
     }
     ngOnInit() {
         super.ngOnInit();
-        this._portalService.userLoggedIn$.pipe(filter$1((userLoggedin) => userLoggedin)).subscribe((_) => {
+        this._portalService.pushAction$
+            .pipe(withLatestFrom$1(this._portalService.userLoggedIn$), filter$1(([action, userLoggedin]) => userLoggedin))
+            .subscribe((_) => {
             const pushActionStr = this._localStorage.getItem('pushAction');
             if (pushActionStr) {
                 this._localStorage.remove('pushAction');
@@ -11579,24 +11575,14 @@ class ExecutePushNotificationCommandComponent extends BaseComponent {
                 this._portalService.ExecuteNotificationAction(pushAction.notificationTag, pushAction.action);
             }
         });
-        this._activatedRoute.queryParams.pipe(tap$1((params) => this._handle(params))).subscribe();
-    }
-    _handle(params) {
-        const { notificationTag, action } = params;
-        if (notificationTag && action) {
-            this._localStorage.setItem('pushAction', JSON.stringify({
-                notificationTag,
-                action
-            }));
-        }
     }
 }
-ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i2$4.ActivatedRoute }, { token: i2.PortalService }, { token: i2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
+ExecutePushNotificationCommandComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, deps: [{ token: i2.PortalService }, { token: i2.LocalStorageService }], target: i0.ɵɵFactoryTarget.Component });
 ExecutePushNotificationCommandComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.7", type: ExecutePushNotificationCommandComponent, selector: "bsu-execute-push-notification-command", usesInheritance: true, ngImport: i0, template: '', isInline: true, changeDetection: i0.ChangeDetectionStrategy.OnPush });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.7", ngImport: i0, type: ExecutePushNotificationCommandComponent, decorators: [{
             type: Component,
             args: [{ selector: 'bsu-execute-push-notification-command', template: '', changeDetection: ChangeDetectionStrategy.OnPush }]
-        }], ctorParameters: function () { return [{ type: i2$4.ActivatedRoute }, { type: i2.PortalService }, { type: i2.LocalStorageService }]; } });
+        }], ctorParameters: function () { return [{ type: i2.PortalService }, { type: i2.LocalStorageService }]; } });
 
 class BarsaCartableTemplateComponent extends RichTextStaticComponent {
     ngOnInit() {