@wavemaker-ai/app-ng-runtime 12.0.0-rc.335 → 12.0.1-rc.338

package/variables/bundles/index.umd.js

@@ -653,7 +653,7 @@
                 if (completed)
                     return;
                 const text = iFrameElement.contents().find('body').text();
-                if (text && text.trim()) {
+                if (text?.trim()) {
                     completed = true;
                     let message;
                     try {
@@ -773,13 +773,28 @@
          */
         let targetNodeKey;
         if (DOT_EXPR_REX.test(target)) {
-            targetNodeKey = target.replace(/^(\[["'])|(["']\])$/g, '');
+            targetNodeKey = target.replace(/(^\[["'])|(["']\]$)/g, '');
         }
         else {
             targetNodeKey = target.split('.').pop();
         }
         return targetNodeKey;
     };
+    const applyMultiSlotValue = (targetObj, targetNodeKey, obj, value) => {
+        let values = targetObj[targetNodeKey];
+        if (!lodashEs.isArray(values)) {
+            values = targetObj[targetNodeKey] = lodashEs.isUndefined(values) ? [] : [values];
+        }
+        const slot = obj.multiIndex !== undefined ? obj.multiIndex : obj.__multiSlotIndex;
+        if (slot === undefined) {
+            obj.__multiSlotIndex = values.length;
+            values.push(value);
+        }
+        else {
+            obj.__multiSlotIndex = slot;
+            values[slot] = value;
+        }
+    };
     const setValueToNode = (target, obj, root, variable, value, noUpdate) => {
         const targetNodeKey = getTargetNodeKey(target), targetObj = getTargetObj(obj, root, variable);
         value = !lodashEs.isUndefined(value) ? value : obj.value;
@@ -790,19 +805,7 @@
             // (e.g. `bind:['fire', 'water']`), assign it directly instead of treating it
             // as a single slot's value — same as the non-multi assignment below.
             if (obj.collectionFormat === 'multi' && !lodashEs.isArray(value)) {
-                let values = targetObj[targetNodeKey];
-                if (!lodashEs.isArray(values)) {
-                    values = targetObj[targetNodeKey] = lodashEs.isUndefined(values) ? [] : [values];
-                }
-                let slot = obj.multiIndex !== undefined ? obj.multiIndex : obj.__multiSlotIndex;
-                if (slot === undefined) {
-                    slot = obj.__multiSlotIndex = values.length;
-                    values.push(value);
-                }
-                else {
-                    obj.__multiSlotIndex = slot;
-                    values[slot] = value;
-                }
+                applyMultiSlotValue(targetObj, targetNodeKey, obj, value);
             }
             else {
                 targetObj[targetNodeKey] = value;
@@ -924,13 +927,13 @@
     const applyMultiIndexForDuplicateBindings = (bindMap) => {
         const targetOccurrences = {};
         bindMap.forEach(function (node) {
-            if (node && node.target) {
+            if (node?.target) {
                 targetOccurrences[node.target] = (targetOccurrences[node.target] || 0) + 1;
             }
         });
         const nextMultiIndex = {};
         bindMap.forEach(function (node) {
-            if (node && node.target && targetOccurrences[node.target] > 1) {
+            if (node?.target && targetOccurrences[node.target] > 1) {
                 if (!node.collectionFormat) {
                     node.collectionFormat = 'multi';
                 }
@@ -1133,7 +1136,7 @@
      * @param options
      */
     const navigate = (variable, options) => {
-        variable.dataSet = (options && options.data) || variable.dataSet;
+        variable.dataSet = (options?.data) || variable.dataSet;
         let viewName;
         const pageName = variable.dataBinding.pageName || variable.pageName, operation = variable.operation, urlParams = lodashEs.clone(variable.dataSet), cacheable = lodashEs.isNil(options?.cacheable) ? variable.cacheable : options.cacheable;
         options = options || {};
@@ -1154,16 +1157,16 @@
                 });
                 break;
             case 'gotoView':
-                viewName = (variable.dataBinding && variable.dataBinding.viewName) || variable.viewName;
+                viewName = (variable.dataBinding?.viewName) || variable.viewName;
                 break;
             case 'gotoTab':
-                viewName = (variable.dataBinding && variable.dataBinding.tabName) || variable.tabName;
+                viewName = (variable.dataBinding?.tabName) || variable.tabName;
                 break;
             case 'gotoAccordion':
-                viewName = (variable.dataBinding && variable.dataBinding.accordionName) || variable.accordionName;
+                viewName = (variable.dataBinding?.accordionName) || variable.accordionName;
                 break;
             case 'gotoSegment':
-                viewName = (variable.dataBinding && variable.dataBinding.segmentName) || variable.segmentName;
+                viewName = (variable.dataBinding?.segmentName) || variable.segmentName;
                 break;
         }
         /* if view name found, call routine to navigate to it */
@@ -1225,7 +1228,7 @@
                 if (toaster && !toaster._subscriptions) {
                     toaster._subscriptions = [];
                 }
-                if (toaster && toaster._subscriptions) {
+                if (toaster?._subscriptions) {
                     toaster._subscriptions.push(onClickSubscription);
                 }
             }
@@ -1235,7 +1238,7 @@
                 if (toaster && !toaster._subscriptions) {
                     toaster._subscriptions = [];
                 }
-                if (toaster && toaster._subscriptions) {
+                if (toaster?._subscriptions) {
                     toaster._subscriptions.push(onHideSubscription);
                 }
             }
@@ -1376,7 +1379,7 @@
         httpCall(requestParams, variable, params) {
             return new Promise((resolve, reject) => {
                 variable._observable = exports.httpService.sendCallAsObservable(requestParams, params).subscribe((response) => {
-                    if (response && response.type) {
+                    if (response?.type) {
                         this.setRequestTrackId(response, variable);
                         resolve(response);
                     }
@@ -1554,25 +1557,24 @@
                                     exports.routerService.navigate([`/`]);
                                 }
                             }
-                            else {
-                                // login after a session timeout
-                                // if redirect page found and same user logs in again, just navigate to redirect page
-                                if (!lodashEs.isEmpty(redirectPage)) {
-                                    // same user logs in again, just redirect to the redirectPage
-                                    if (lastLoggedInUsername === params['j_username']) {
-                                        exports.routerService.navigate([`/${redirectPage}`], { queryParams: queryParamsObj });
-                                    }
-                                    else {
-                                        // different user logs in, reload the app and discard the redirectPage
-                                        this.redirectToAppBasePath();
-                                    }
+                            else 
+                            // login after a session timeout
+                            // if redirect page found and same user logs in again, just navigate to redirect page
+                            if (!lodashEs.isEmpty(redirectPage)) {
+                                // same user logs in again, just redirect to the redirectPage
+                                if (lastLoggedInUsername === params['j_username']) {
+                                    exports.routerService.navigate([`/${redirectPage}`], { queryParams: queryParamsObj });
                                 }
                                 else {
-                                    const securityConfig = exports.securityService.get(), sessionTimeoutLoginMode = lodashEs.get(securityConfig, 'loginConfig.sessionTimeout.type') || 'PAGE';
-                                    // if in dialog mode and a new user logs in OR login happening through page, reload the app
-                                    if (!isSameUserReloggedIn || sessionTimeoutLoginMode !== 'DIALOG') {
-                                        this.redirectToAppBasePath();
-                                    }
+                                    // different user logs in, reload the app and discard the redirectPage
+                                    this.redirectToAppBasePath();
+                                }
+                            }
+                            else {
+                                const securityConfig = exports.securityService.get(), sessionTimeoutLoginMode = lodashEs.get(securityConfig, 'loginConfig.sessionTimeout.type') || 'PAGE';
+                                // if in dialog mode and a new user logs in OR login happening through page, reload the app
+                                if (!isSameUserReloggedIn || sessionTimeoutLoginMode !== 'DIALOG') {
+                                    this.redirectToAppBasePath();
                                 }
                             }
                         }
@@ -1640,7 +1642,7 @@
                             });
                         });
                         // In case of CAS response will be the redirectUrl
-                        if (redirectUrl && redirectUrl.result) {
+                        if (redirectUrl?.result) {
                             window.location.href = redirectUrl.result;
                         }
                         else if (variable.useDefaultSuccessHandler) {
@@ -1828,7 +1830,7 @@
         static checkPaginationAtQuery(operationInfo, variable, options) {
             const paginationInfo = this.getPaginationInfo(operationInfo, variable);
             // If page is not first, pagination is present on the variable and paginationInfo's input meta has size set pagination in query params
-            const hasPagination = options && options['page'] && paginationInfo?.input.size && variable.pagination;
+            const hasPagination = options?.['page'] && paginationInfo?.input.size && variable.pagination;
             if (!hasPagination) {
                 return;
             }
@@ -1907,7 +1909,7 @@
                 // assign bodyVal to updated pagination info object
                 const bodyVal = JSON.parse(paramObj.sampleValue);
                 const bodyParam = paginationInfo.input[inputParam].split('.')[1];
-                if (bodyVal && bodyVal[bodyParam]) {
+                if (bodyVal?.[bodyParam]) {
                     const inputBodyParam = paginationInfo.input[inputParam].split('.').splice(1).join('.');
                     if (inputParam !== 'offset') {
                         lodashEs.set(reqObj, inputBodyParam, variable.pagination['page']);
@@ -2045,13 +2047,11 @@
                 else if (resOutput?.totalElements) {
                     this.setPaginationItems(resOutput.totalElements, response, res, 'totalElements', resHeaders);
                 }
+                else if (paginationInfo.type === 'offset' || paginationInfo.input.offset) {
+                    res['totalElements'] = (res['size'] * (options['page'] ? options['page'] : 1)) + 1;
+                }
                 else {
-                    if (paginationInfo.type === 'offset' || paginationInfo.input.offset) {
-                        res['totalElements'] = (res['size'] * (options['page'] ? options['page'] : 1)) + 1;
-                    }
-                    else {
-                        res['totalElements'] = (res['size'] * res['page']) + 1;
-                    }
+                    res['totalElements'] = (res['size'] * res['page']) + 1;
                 }
                 /**
                  * If hasMoreItems is present in the pagination's output metadata deduce hasMoreItems from api's response
@@ -2124,15 +2124,13 @@
                 }
                 formData.append(param.name, paramValue);
             }
+            else if (lodashEs.isArray(paramValue) && paramType === 'file') {
+                lodashEs.forEach(paramValue, function (fileObject) {
+                    formData.append(param.name, (fileObject?.content) || i1.getBlob(fileObject), fileObject.name);
+                });
+            }
             else {
-                if (lodashEs.isArray(paramValue) && paramType === 'file') {
-                    lodashEs.forEach(paramValue, function (fileObject) {
-                        formData.append(param.name, (fileObject && fileObject.content) || i1.getBlob(fileObject), fileObject.name);
-                    });
-                }
-                else {
-                    formData.append(param.name, i1.getBlob(paramValue, paramContentType), paramValue && paramValue.name);
-                }
+                formData.append(param.name, i1.getBlob(paramValue, paramContentType), paramValue?.name);
             }
             return formData;
         }
@@ -2214,7 +2212,7 @@
                     }
                 };
             }
-            else if (operationInfo && operationInfo.invalid) {
+            else if (operationInfo?.invalid) {
                 return {
                     'error': {
                         'type': VARIABLE_CONSTANTS.REST_SERVICE.ERR_TYPE.CRUD_OPERATION_MISSING,
@@ -2377,7 +2375,7 @@
             if (!lodashEs.includes(WS_CONSTANTS.NON_BODY_HTTP_METHODS, lodashEs.toUpper(method))) {
                 /*Based on the formData browser will automatically set the content type to 'multipart/form-data' and webkit boundary*/
                 if (!(operationInfo.consumes && (operationInfo.consumes[0] === WS_CONSTANTS.CONTENT_TYPES.MULTIPART_FORMDATA))) {
-                    headers['Content-Type'] = (operationInfo.consumes && operationInfo.consumes[0]) || 'application/json';
+                    headers['Content-Type'] = (operationInfo.consumes?.[0]) || 'application/json';
                 }
             }
             // if the consumes has application/x-www-form-urlencoded and
@@ -2522,7 +2520,7 @@
             // call common method to prepare config for the service operation info.
             const config = ServiceVariableUtils.constructRequestParams(variable, opInfo, inputFields);
             /* if error found, return */
-            if (config.error && config.error.message) {
+            if (config.error?.message) {
                 this._onSocketError(variable, { data: config.error.message });
                 return;
             }
@@ -3010,13 +3008,13 @@
         getByOperationId(operationId, context) {
             context = context || this.CONTEXT_APP;
             const map = this.metadataMap.get(context);
-            return map && map[operationId];
+            return map?.[operationId];
         }
         // function to get Provider details from providerMap for the passed providerId
         getByProviderId(providerId, context) {
             context = context || this.CONTEXT_APP;
             const map = this.providerMap.get(context);
-            return map && map[providerId];
+            return map?.[providerId];
         }
         getByCrudId(crudId, context) {
             context = context || this.CONTEXT_APP;
@@ -3029,10 +3027,10 @@
             }
             return ops;
         }
-        static { this.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: MetadataService, deps: [{ token: i1__namespace.AbstractHttpService }], target: i0__namespace.ɵɵFactoryTarget.Injectable }); }
-        static { this.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: MetadataService }); }
+        static { this.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: MetadataService, deps: [{ token: i1__namespace.AbstractHttpService }], target: i0__namespace.ɵɵFactoryTarget.Injectable }); }
+        static { this.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: MetadataService }); }
     }
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: MetadataService, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: MetadataService, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: () => [{ type: i1__namespace.AbstractHttpService }] });
 
@@ -3092,7 +3090,7 @@
             const root = variables.getTarget(variable), targetNodeKey = variables.getTargetNodeKey(d.target);
             let v = lodashEs.isArray(d.value) ? d.value[0] : d.value;
             if (v) {
-                if (v.startsWith && v.startsWith('bind:')) {
+                if (v.startsWith?.('bind:')) {
                     const watchExpression = i1.$watch(v.replace('bind:', ''), scope, {}, variable.invokeOnParamChange.bind(variable, d), undefined, undefined, d, () => variable.isMuted);
                     v = scope.registerDestroyListener ? scope.registerDestroyListener(watchExpression) : watchExpression;
                 }
@@ -3222,10 +3220,10 @@
             setDependency(name, ref);
             variables.wmSetDependency(name, ref);
         }
-        static { this.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: VariablesService, deps: [{ token: i1__namespace.AbstractHttpService }, { token: MetadataService }, { token: i1__namespace.AbstractNavigationService }, { token: i3__namespace.Router }, { token: i1__namespace.AbstractToasterService }, { token: i4__namespace.OAuthService }, { token: i5__namespace.SecurityService }, { token: i1__namespace.AbstractDialogService }], target: i0__namespace.ɵɵFactoryTarget.Injectable }); }
-        static { this.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: VariablesService }); }
+        static { this.ɵfac = i0__namespace.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: VariablesService, deps: [{ token: i1__namespace.AbstractHttpService }, { token: MetadataService }, { token: i1__namespace.AbstractNavigationService }, { token: i3__namespace.Router }, { token: i1__namespace.AbstractToasterService }, { token: i4__namespace.OAuthService }, { token: i5__namespace.SecurityService }, { token: i1__namespace.AbstractDialogService }], target: i0__namespace.ɵɵFactoryTarget.Injectable }); }
+        static { this.ɵprov = i0__namespace.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: VariablesService }); }
     }
-    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0__namespace, type: VariablesService, decorators: [{
+    i0__namespace.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0__namespace, type: VariablesService, decorators: [{
                 type: i0.Injectable
             }], ctorParameters: () => [{ type: i1__namespace.AbstractHttpService }, { type: MetadataService }, { type: i1__namespace.AbstractNavigationService }, { type: i3__namespace.Router }, { type: i1__namespace.AbstractToasterService }, { type: i4__namespace.OAuthService }, { type: i5__namespace.SecurityService }, { type: i1__namespace.AbstractDialogService }] });
 

package/variables/fesm2022/index.mjs

@@ -656,7 +656,7 @@ const downloadThroughIframe = (requestParams, success, dataBinding, error) => {
             if (completed)
                 return;
             const text = iFrameElement.contents().find('body').text();
-            if (text && text.trim()) {
+            if (text?.trim()) {
                 completed = true;
                 let message;
                 try {
@@ -799,13 +799,28 @@ const getTargetNodeKey = (target) => {
      */
     let targetNodeKey;
     if (DOT_EXPR_REX.test(target)) {
-        targetNodeKey = target.replace(/^(\[["'])|(["']\])$/g, '');
+        targetNodeKey = target.replace(/(^\[["'])|(["']\]$)/g, '');
     }
     else {
         targetNodeKey = target.split('.').pop();
     }
     return targetNodeKey;
 };
+const applyMultiSlotValue = (targetObj, targetNodeKey, obj, value) => {
+    let values = targetObj[targetNodeKey];
+    if (!isArray(values)) {
+        values = targetObj[targetNodeKey] = isUndefined(values) ? [] : [values];
+    }
+    const slot = obj.multiIndex !== undefined ? obj.multiIndex : obj.__multiSlotIndex;
+    if (slot === undefined) {
+        obj.__multiSlotIndex = values.length;
+        values.push(value);
+    }
+    else {
+        obj.__multiSlotIndex = slot;
+        values[slot] = value;
+    }
+};
 const setValueToNode = (target, obj, root, variable, value, noUpdate) => {
     const targetNodeKey = getTargetNodeKey(target), targetObj = getTargetObj(obj, root, variable);
     value = !isUndefined(value) ? value : obj.value;
@@ -816,19 +831,7 @@ const setValueToNode = (target, obj, root, variable, value, noUpdate) => {
         // (e.g. `bind:['fire', 'water']`), assign it directly instead of treating it
         // as a single slot's value — same as the non-multi assignment below.
         if (obj.collectionFormat === 'multi' && !isArray(value)) {
-            let values = targetObj[targetNodeKey];
-            if (!isArray(values)) {
-                values = targetObj[targetNodeKey] = isUndefined(values) ? [] : [values];
-            }
-            let slot = obj.multiIndex !== undefined ? obj.multiIndex : obj.__multiSlotIndex;
-            if (slot === undefined) {
-                slot = obj.__multiSlotIndex = values.length;
-                values.push(value);
-            }
-            else {
-                obj.__multiSlotIndex = slot;
-                values[slot] = value;
-            }
+            applyMultiSlotValue(targetObj, targetNodeKey, obj, value);
         }
         else {
             targetObj[targetNodeKey] = value;
@@ -950,13 +953,13 @@ const processBindObject = (obj, scope, root, variable) => {
 const applyMultiIndexForDuplicateBindings = (bindMap) => {
     const targetOccurrences = {};
     bindMap.forEach(function (node) {
-        if (node && node.target) {
+        if (node?.target) {
             targetOccurrences[node.target] = (targetOccurrences[node.target] || 0) + 1;
         }
     });
     const nextMultiIndex = {};
     bindMap.forEach(function (node) {
-        if (node && node.target && targetOccurrences[node.target] > 1) {
+        if (node?.target && targetOccurrences[node.target] > 1) {
             if (!node.collectionFormat) {
                 node.collectionFormat = 'multi';
             }
@@ -1204,7 +1207,7 @@ function htmlDecode(input) {
  * @param options
  */
 const navigate = (variable, options) => {
-    variable.dataSet = (options && options.data) || variable.dataSet;
+    variable.dataSet = (options?.data) || variable.dataSet;
     let viewName;
     const pageName = variable.dataBinding.pageName || variable.pageName, operation = variable.operation, urlParams = clone(variable.dataSet), cacheable = isNil(options?.cacheable) ? variable.cacheable : options.cacheable;
     options = options || {};
@@ -1225,16 +1228,16 @@ const navigate = (variable, options) => {
             });
             break;
         case 'gotoView':
-            viewName = (variable.dataBinding && variable.dataBinding.viewName) || variable.viewName;
+            viewName = (variable.dataBinding?.viewName) || variable.viewName;
             break;
         case 'gotoTab':
-            viewName = (variable.dataBinding && variable.dataBinding.tabName) || variable.tabName;
+            viewName = (variable.dataBinding?.tabName) || variable.tabName;
             break;
         case 'gotoAccordion':
-            viewName = (variable.dataBinding && variable.dataBinding.accordionName) || variable.accordionName;
+            viewName = (variable.dataBinding?.accordionName) || variable.accordionName;
             break;
         case 'gotoSegment':
-            viewName = (variable.dataBinding && variable.dataBinding.segmentName) || variable.segmentName;
+            viewName = (variable.dataBinding?.segmentName) || variable.segmentName;
             break;
     }
     /* if view name found, call routine to navigate to it */
@@ -1296,7 +1299,7 @@ class NotificationActionManager extends BaseActionManager {
             if (toaster && !toaster._subscriptions) {
                 toaster._subscriptions = [];
             }
-            if (toaster && toaster._subscriptions) {
+            if (toaster?._subscriptions) {
                 toaster._subscriptions.push(onClickSubscription);
             }
         }
@@ -1306,7 +1309,7 @@ class NotificationActionManager extends BaseActionManager {
             if (toaster && !toaster._subscriptions) {
                 toaster._subscriptions = [];
             }
-            if (toaster && toaster._subscriptions) {
+            if (toaster?._subscriptions) {
                 toaster._subscriptions.push(onHideSubscription);
             }
         }
@@ -1447,7 +1450,7 @@ class BaseVariableManager {
     httpCall(requestParams, variable, params) {
         return new Promise((resolve, reject) => {
             variable._observable = httpService.sendCallAsObservable(requestParams, params).subscribe((response) => {
-                if (response && response.type) {
+                if (response?.type) {
                     this.setRequestTrackId(response, variable);
                     resolve(response);
                 }
@@ -1625,25 +1628,24 @@ class LoginActionManager extends BaseActionManager {
                                 routerService.navigate([`/`]);
                             }
                         }
-                        else {
-                            // login after a session timeout
-                            // if redirect page found and same user logs in again, just navigate to redirect page
-                            if (!isEmpty(redirectPage)) {
-                                // same user logs in again, just redirect to the redirectPage
-                                if (lastLoggedInUsername === params['j_username']) {
-                                    routerService.navigate([`/${redirectPage}`], { queryParams: queryParamsObj });
-                                }
-                                else {
-                                    // different user logs in, reload the app and discard the redirectPage
-                                    this.redirectToAppBasePath();
-                                }
+                        else 
+                        // login after a session timeout
+                        // if redirect page found and same user logs in again, just navigate to redirect page
+                        if (!isEmpty(redirectPage)) {
+                            // same user logs in again, just redirect to the redirectPage
+                            if (lastLoggedInUsername === params['j_username']) {
+                                routerService.navigate([`/${redirectPage}`], { queryParams: queryParamsObj });
                             }
                             else {
-                                const securityConfig = securityService.get(), sessionTimeoutLoginMode = get(securityConfig, 'loginConfig.sessionTimeout.type') || 'PAGE';
-                                // if in dialog mode and a new user logs in OR login happening through page, reload the app
-                                if (!isSameUserReloggedIn || sessionTimeoutLoginMode !== 'DIALOG') {
-                                    this.redirectToAppBasePath();
-                                }
+                                // different user logs in, reload the app and discard the redirectPage
+                                this.redirectToAppBasePath();
+                            }
+                        }
+                        else {
+                            const securityConfig = securityService.get(), sessionTimeoutLoginMode = get(securityConfig, 'loginConfig.sessionTimeout.type') || 'PAGE';
+                            // if in dialog mode and a new user logs in OR login happening through page, reload the app
+                            if (!isSameUserReloggedIn || sessionTimeoutLoginMode !== 'DIALOG') {
+                                this.redirectToAppBasePath();
                             }
                         }
                     }
@@ -1711,7 +1713,7 @@ class LogoutActionManager extends BaseActionManager {
                         });
                     });
                     // In case of CAS response will be the redirectUrl
-                    if (redirectUrl && redirectUrl.result) {
+                    if (redirectUrl?.result) {
                         window.location.href = redirectUrl.result;
                     }
                     else if (variable.useDefaultSuccessHandler) {
@@ -1906,7 +1908,7 @@ class PaginationUtils {
     static checkPaginationAtQuery(operationInfo, variable, options) {
         const paginationInfo = this.getPaginationInfo(operationInfo, variable);
         // If page is not first, pagination is present on the variable and paginationInfo's input meta has size set pagination in query params
-        const hasPagination = options && options['page'] && paginationInfo?.input.size && variable.pagination;
+        const hasPagination = options?.['page'] && paginationInfo?.input.size && variable.pagination;
         if (!hasPagination) {
             return;
         }
@@ -1985,7 +1987,7 @@ class PaginationUtils {
             // assign bodyVal to updated pagination info object
             const bodyVal = JSON.parse(paramObj.sampleValue);
             const bodyParam = paginationInfo.input[inputParam].split('.')[1];
-            if (bodyVal && bodyVal[bodyParam]) {
+            if (bodyVal?.[bodyParam]) {
                 const inputBodyParam = paginationInfo.input[inputParam].split('.').splice(1).join('.');
                 if (inputParam !== 'offset') {
                     set(reqObj, inputBodyParam, variable.pagination['page']);
@@ -2123,13 +2125,11 @@ class PaginationUtils {
             else if (resOutput?.totalElements) {
                 this.setPaginationItems(resOutput.totalElements, response, res, 'totalElements', resHeaders);
             }
+            else if (paginationInfo.type === 'offset' || paginationInfo.input.offset) {
+                res['totalElements'] = (res['size'] * (options['page'] ? options['page'] : 1)) + 1;
+            }
             else {
-                if (paginationInfo.type === 'offset' || paginationInfo.input.offset) {
-                    res['totalElements'] = (res['size'] * (options['page'] ? options['page'] : 1)) + 1;
-                }
-                else {
-                    res['totalElements'] = (res['size'] * res['page']) + 1;
-                }
+                res['totalElements'] = (res['size'] * res['page']) + 1;
             }
             /**
              * If hasMoreItems is present in the pagination's output metadata deduce hasMoreItems from api's response
@@ -2202,15 +2202,13 @@ const getFormData = (formData, param, paramValue) => {
             }
             formData.append(param.name, paramValue);
         }
+        else if (isArray(paramValue) && paramType === 'file') {
+            forEach(paramValue, function (fileObject) {
+                formData.append(param.name, (fileObject?.content) || getBlob(fileObject), fileObject.name);
+            });
+        }
         else {
-            if (isArray(paramValue) && paramType === 'file') {
-                forEach(paramValue, function (fileObject) {
-                    formData.append(param.name, (fileObject && fileObject.content) || getBlob(fileObject), fileObject.name);
-                });
-            }
-            else {
-                formData.append(param.name, getBlob(paramValue, paramContentType), paramValue && paramValue.name);
-            }
+            formData.append(param.name, getBlob(paramValue, paramContentType), paramValue?.name);
         }
         return formData;
     }
@@ -2292,7 +2290,7 @@ class ServiceVariableUtils {
                 }
             };
         }
-        else if (operationInfo && operationInfo.invalid) {
+        else if (operationInfo?.invalid) {
             return {
                 'error': {
                     'type': VARIABLE_CONSTANTS.REST_SERVICE.ERR_TYPE.CRUD_OPERATION_MISSING,
@@ -2455,7 +2453,7 @@ class ServiceVariableUtils {
         if (!includes(WS_CONSTANTS.NON_BODY_HTTP_METHODS, toUpper(method))) {
             /*Based on the formData browser will automatically set the content type to 'multipart/form-data' and webkit boundary*/
             if (!(operationInfo.consumes && (operationInfo.consumes[0] === WS_CONSTANTS.CONTENT_TYPES.MULTIPART_FORMDATA))) {
-                headers['Content-Type'] = (operationInfo.consumes && operationInfo.consumes[0]) || 'application/json';
+                headers['Content-Type'] = (operationInfo.consumes?.[0]) || 'application/json';
             }
         }
         // if the consumes has application/x-www-form-urlencoded and
@@ -2600,7 +2598,7 @@ class WebSocketVariableManager extends BaseVariableManager {
         // call common method to prepare config for the service operation info.
         const config = ServiceVariableUtils.constructRequestParams(variable, opInfo, inputFields);
         /* if error found, return */
-        if (config.error && config.error.message) {
+        if (config.error?.message) {
             this._onSocketError(variable, { data: config.error.message });
             return;
         }
@@ -3088,13 +3086,13 @@ class MetadataService {
     getByOperationId(operationId, context) {
         context = context || this.CONTEXT_APP;
         const map = this.metadataMap.get(context);
-        return map && map[operationId];
+        return map?.[operationId];
     }
     // function to get Provider details from providerMap for the passed providerId
     getByProviderId(providerId, context) {
         context = context || this.CONTEXT_APP;
         const map = this.providerMap.get(context);
-        return map && map[providerId];
+        return map?.[providerId];
     }
     getByCrudId(crudId, context) {
         context = context || this.CONTEXT_APP;
@@ -3107,10 +3105,10 @@ class MetadataService {
         }
         return ops;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: MetadataService, deps: [{ token: i1.AbstractHttpService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: MetadataService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: MetadataService, deps: [{ token: i1.AbstractHttpService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: MetadataService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: MetadataService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: MetadataService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.AbstractHttpService }] });
 
@@ -3170,7 +3168,7 @@ class VariablesService {
         const root = getTarget(variable), targetNodeKey = getTargetNodeKey$1(d.target), runMode = true;
         let v = isArray(d.value) ? d.value[0] : d.value;
         if (v) {
-            if (v.startsWith && v.startsWith('bind:')) {
+            if (v.startsWith?.('bind:')) {
                 const watchExpression = $watch(v.replace('bind:', ''), scope, {}, variable.invokeOnParamChange.bind(variable, d), undefined, undefined, d, () => variable.isMuted);
                 v = scope.registerDestroyListener ? scope.registerDestroyListener(watchExpression) : watchExpression;
             }
@@ -3200,7 +3198,6 @@ class VariablesService {
     }
     processBinding(variable, context, bindSource, bindTarget) {
         bindSource = bindSource || 'dataBinding';
-        bindTarget = bindTarget || 'dataBinding';
         const bindMap = variable[bindSource];
         variable[bindSource] = {};
         variable['_bind' + bindSource] = bindMap;
@@ -3302,10 +3299,10 @@ class VariablesService {
         setDependency(name, ref);
         wmSetDependency(name, ref);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: VariablesService, deps: [{ token: i1.AbstractHttpService }, { token: MetadataService }, { token: i1.AbstractNavigationService }, { token: i3.Router }, { token: i1.AbstractToasterService }, { token: i4.OAuthService }, { token: i5.SecurityService }, { token: i1.AbstractDialogService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: VariablesService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: VariablesService, deps: [{ token: i1.AbstractHttpService }, { token: MetadataService }, { token: i1.AbstractNavigationService }, { token: i3.Router }, { token: i1.AbstractToasterService }, { token: i4.OAuthService }, { token: i5.SecurityService }, { token: i1.AbstractDialogService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: VariablesService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.20", ngImport: i0, type: VariablesService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "21.2.21", ngImport: i0, type: VariablesService, decorators: [{
             type: Injectable
         }], ctorParameters: () => [{ type: i1.AbstractHttpService }, { type: MetadataService }, { type: i1.AbstractNavigationService }, { type: i3.Router }, { type: i1.AbstractToasterService }, { type: i4.OAuthService }, { type: i5.SecurityService }, { type: i1.AbstractDialogService }] });