@wavemaker/app-ng-runtime 11.15.5-rc.267 → 11.15.5-rc.647813

package/variables/fesm2022/index.mjs

@@ -1,7 +1,7 @@
 import { $rootScope as $rootScope$1, BaseAction, ApiAwareVariable, VARIABLE_CONSTANTS as VARIABLE_CONSTANTS$1, TimerAction, CrudVariable, LiveVariable, ServiceVariable, ModelVariable, wmSetDependency, getTarget, getTargetNodeKey as getTargetNodeKey$1, setValueToNode as setValueToNode$1, internalBoundNodeMap as internalBoundNodeMap$1 } from '@wavemaker/variables';
 import * as i1 from '@wm/core';
 import { $parseEvent, triggerFn, findValueOf, stringStartsWith, getClonedObject, $watch, getBlob, DEFAULT_FORMATS, DataType, extractType, getWmProjectProperties, getValidJSON, isDateTimeType, isDefined, replace as replace$1, xmlToJson, isInsecureContentRequest, isObject as isObject$1, DataSource, _WM_APP_PROJECT, $invokeWatchers, processFilterExpBindNode } from '@wm/core';
-import { noop, debounce, isUndefined, isFunction, forEach, isString, split, join, slice, get, pickBy, isEmpty, includes, toUpper, last, replace, isArray, keys, filter, set, isObject, isNumber, map, trim, remove, isDate, toLower, clone, isNil, capitalize, extend, isBoolean, each, startsWith, find, result, concat, isNull, reject } from 'lodash-es';
+import { noop, debounce, isUndefined, isFunction, forEach, isString, split, join, slice, get, pickBy, isEmpty, includes, toUpper, last, replace, keys, filter, set, isObject, isArray, isNumber, map, trim, remove, isDate, toLower, clone, isNil, capitalize, extend, isBoolean, each, startsWith, find, result, concat, isNull, reject } from 'lodash-es';
 import * as momentLib from 'moment';
 import { $WebSocket } from 'angular2-websocket/angular2-websocket';
 import { jmespath } from '@metrichor/jmespath';
@@ -25,11 +25,11 @@ const VARIABLE_CONSTANTS = {
         CRUD: 'wm.CrudVariable',
         SERVICE: 'wm.ServiceVariable',
         WEBSOCKET: 'wm.WebSocketVariable',
-        NAVIGATION: 'wm.NavigationAction',
-        NOTIFICATION: 'wm.NotificationAction',
-        TIMER: 'wm.TimerAction',
-        LOGIN: 'wm.LoginAction',
-        LOGOUT: 'wm.LogoutAction',
+        NAVIGATION: 'wm.NavigationVariable',
+        NOTIFICATION: 'wm.NotificationVariable',
+        TIMER: 'wm.TimerVariable',
+        LOGIN: 'wm.LoginVariable',
+        LOGOUT: 'wm.LogoutVariable',
     },
     EVENTS: ['onBefore',
         'onBeforeUpdate',
@@ -811,28 +811,7 @@ const setValueToNode = (target, obj, root, variable, value, noUpdate) => {
     value = !isUndefined(value) ? value : obj.value;
     /* sanity check, user can bind parent nodes to non-object values, so child node bindings may fail */
     if (targetObj) {
-        // Multi query params: one slot per binding; rebinds replace that slot (not append).
-        // Exception: if the bind expression itself resolved to the complete array
-        // (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;
-            }
-        }
-        else {
-            targetObj[targetNodeKey] = value;
-        }
+        targetObj[targetNodeKey] = value;
     }
     processVariablePostBindUpdate(targetNodeKey, value, obj.type, variable, noUpdate);
 };
@@ -941,32 +920,6 @@ const processBindObject = (obj, scope, root, variable) => {
  *                              for some it can be 'dataSet' and hence will be passed as param
  * @param {string} bindTarget, the object field in variable where the computed bindings will be set
  */
-/**
- * In older saved REST/Swagger service variables, duplicate query parameters may not have a
- * collectionFormat, so they are treated as multi-value parameters for backward compatibility:
- * each duplicate target is tagged collectionFormat 'multi' and given a stable multiIndex.
- * Shared by both processBinding implementations (this file and VariablesService).
- */
-const applyMultiIndexForDuplicateBindings = (bindMap) => {
-    const targetOccurrences = {};
-    bindMap.forEach(function (node) {
-        if (node && 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.collectionFormat) {
-                node.collectionFormat = 'multi';
-            }
-            if (node.multiIndex === undefined) {
-                nextMultiIndex[node.target] = nextMultiIndex[node.target] || 0;
-                node.multiIndex = nextMultiIndex[node.target]++;
-            }
-        }
-    });
-};
 const processBinding = (variable, context, bindSource, bindTarget) => {
     bindSource = bindSource || 'dataBinding';
     bindTarget = bindTarget || 'dataBinding';
@@ -976,9 +929,6 @@ const processBinding = (variable, context, bindSource, bindTarget) => {
     if (!bindMap || !isArray(bindMap)) {
         return;
     }
-    if (variable.category === VARIABLE_CONSTANTS.CATEGORY.SERVICE) {
-        applyMultiIndexForDuplicateBindings(bindMap);
-    }
     bindMap.forEach(function (node) {
         /* for static variable change the binding with target 'dataBinding' to 'dataSet', as the results have to reflect directly in the dataSet */
         if (variable.category === 'wm.Variable' && node.target === 'dataBinding') {
@@ -2160,24 +2110,6 @@ class PaginationUtils {
 const isBodyTypeQueryOrProcedure = (variable) => {
     return (includes(['QueryExecution', 'ProcedureExecution'], variable.controller)) && (includes(['put', 'post'], variable.operationType));
 };
-const appendQueryParam = (queryParams, paramName, paramValue, preEncoded = false) => {
-    const encodedValue = preEncoded ? paramValue : encodeURIComponent(paramValue);
-    const pair = `${paramName}=${encodedValue}`;
-    return queryParams ? `${queryParams}&${pair}` : `?${pair}`;
-};
-const getQueryParamValues = (param, paramValue) => {
-    if (isArray(paramValue)) {
-        // 'multi' (duplicate query-param bindings) repeats the param, e.g. tag=a&tag=b.
-        if (param.collectionFormat === 'multi') {
-            return map(paramValue, (value) => ({ value, preEncoded: false }));
-        }
-        // Otherwise, join into a single comma-separated value, e.g. tag=a,b. Encode each
-        // element individually so the joining commas stay literal (unambiguously the
-        // separator) while a comma inside an element's own value stays escaped as %2C.
-        return [{ value: map(paramValue, (value) => encodeURIComponent(value)).join(','), preEncoded: true }];
-    }
-    return [{ value: paramValue, preEncoded: false }];
-};
 /**
  * returns true if the variable is a Query service variable
  * @param {string} controller
@@ -2395,12 +2327,12 @@ class ServiceVariableUtils {
                         if (isNull(paramValue) && isQueryServiceVar(variable.controller, variable.serviceType)) {
                             break;
                         }
-                        getQueryParamValues(param, paramValue).forEach(({ value: queryValue, preEncoded }) => {
-                            if (isNull(queryValue) && isQueryServiceVar(variable.controller, variable.serviceType)) {
-                                return;
-                            }
-                            queryParams = appendQueryParam(queryParams, param.name, queryValue, preEncoded);
-                        });
+                        if (!queryParams) {
+                            queryParams = '?' + param.name + '=' + encodeURIComponent(paramValue);
+                        }
+                        else {
+                            queryParams += '&' + param.name + '=' + encodeURIComponent(paramValue);
+                        }
                         break;
                     case 'PATH':
                         /* replacing the path param based on the regular expression in the relative path */
@@ -2822,10 +2754,10 @@ class WebSocketVariableManager extends BaseVariableManager {
 const managerMap = new Map(), typeToManagerMap = {
     'Variable': BaseVariableManager,
     'Action': BaseActionManager,
-    'wm.NavigationAction': NavigationActionManager,
-    'wm.NotificationAction': NotificationActionManager,
-    'wm.LoginAction': LoginActionManager,
-    'wm.LogoutAction': LogoutActionManager,
+    'wm.NavigationVariable': NavigationActionManager,
+    'wm.NotificationVariable': NotificationActionManager,
+    'wm.LoginVariable': LoginActionManager,
+    'wm.LogoutVariable': LogoutActionManager,
     'wm.WebSocketVariable': WebSocketVariableManager
 };
 class VariableManagerFactory {
@@ -3189,15 +3121,6 @@ class VariablesService {
             value: v
         };
     }
-    processSpinnerMessageBinding(variable, scope) {
-        if (!variable.spinnerMessage?.startsWith?.('bind:')) {
-            return;
-        }
-        const expr = variable.spinnerMessage.replace('bind:', '');
-        variable.spinnerMessage = '';
-        const watchExpression = $watch(expr, scope, {}, nv => variable.spinnerMessage = nv ?? '');
-        scope.registerDestroyListener?.(watchExpression);
-    }
     processBinding(variable, context, bindSource, bindTarget) {
         bindSource = bindSource || 'dataBinding';
         bindTarget = bindTarget || 'dataBinding';
@@ -3207,9 +3130,6 @@ class VariablesService {
         if (!bindMap || !isArray(bindMap)) {
             return;
         }
-        if (variable.category === VARIABLE_CONSTANTS.CATEGORY.SERVICE) {
-            applyMultiIndexForDuplicateBindings(bindMap);
-        }
         bindMap.forEach((node) => {
             /* for static variable change the binding with target 'dataBinding' to 'dataSet', as the results have to reflect directly in the dataSet */
             if (variable.category === 'wm.Variable' && node.target === 'dataBinding') {
@@ -3253,7 +3173,6 @@ class VariablesService {
             const params = {};
             varInstance = VariableFactory.create(variablesJson[variableName], scope);
             varInstance.init();
-            this.processSpinnerMessageBinding(varInstance, scope);
             if (this.isVariableSeperated(variablesJson, variableName)) {
                 this.processBinding(varInstance, scope, 'dataBinding', this.getBindSourceTarget(varInstance));
                 varInstance.httpService = this.httpService;
@@ -3272,7 +3191,7 @@ class VariablesService {
                     varInstance.simulateFileDownload = simulateFileDownload;
                 }
             }
-            if (this.isVariableSeperated(variablesJson, variableName) || variablesJson[variableName].category === 'wm.TimerAction') {
+            if (this.isVariableSeperated(variablesJson, variableName) || variablesJson[variableName].category === 'wm.TimerVariable') {
                 for (const e in VARIABLE_CONSTANTS.EVENT) {
                     if (varInstance[VARIABLE_CONSTANTS.EVENT[e]]) {
                         varInstance[VARIABLE_CONSTANTS.EVENT[e]] = $parseEvent(varInstance[VARIABLE_CONSTANTS.EVENT[e]]);