@orchestrator-ui/orchestrator-ui-components 5.8.0 → 5.9.0

package/dist/index.js

@@ -241,7 +241,7 @@ var require_xlink = __commonJS({
         xLinkType: null
       }
     });
-    function xlinkTransform(_2, prop2) {
+    function xlinkTransform(_5, prop2) {
       return "xlink:" + prop2.slice(5).toLowerCase();
     }
   }
@@ -261,7 +261,7 @@ var require_xml = __commonJS({
         xmlSpace: null
       }
     });
-    function xmlTransform(_2, prop2) {
+    function xmlTransform(_5, prop2) {
       return "xml:" + prop2.slice(3).toLowerCase();
     }
   }
@@ -373,7 +373,7 @@ var require_aria = __commonJS({
         role: null
       }
     });
-    function ariaTransform(_2, prop2) {
+    function ariaTransform(_5, prop2) {
       return prop2 === "role" ? prop2 : "aria-" + prop2.slice(4).toLowerCase();
     }
   }
@@ -3835,7 +3835,7 @@ var require_prism_core = __commonJS({
       var lang = /(?:^|\s)lang(?:uage)?-([\w-]+)(?=\s|$)/i;
       var uniqueId = 0;
       var plainTextGrammar = {};
-      var _2 = {
+      var _5 = {
         /**
          * By default, Prism will attempt to highlight all code elements (by calling {@link Prism.highlightAll}) on the
          * current page after the page finished loading. This might be a problem if e.g. you wanted to asynchronously load
@@ -3944,9 +3944,9 @@ var require_prism_core = __commonJS({
             visited = visited || {};
             var clone;
             var id;
-            switch (_2.util.type(o)) {
+            switch (_5.util.type(o)) {
               case "Object":
-                id = _2.util.objId(o);
+                id = _5.util.objId(o);
                 if (visited[id]) {
                   return visited[id];
                 }
@@ -3963,7 +3963,7 @@ var require_prism_core = __commonJS({
                   clone
                 );
               case "Array":
-                id = _2.util.objId(o);
+                id = _5.util.objId(o);
                 if (visited[id]) {
                   return visited[id];
                 }
@@ -4121,7 +4121,7 @@ var require_prism_core = __commonJS({
            * });
            */
           extend: function(id, redef) {
-            var lang2 = _2.util.clone(_2.languages[id]);
+            var lang2 = _5.util.clone(_5.languages[id]);
             for (var key in redef) {
               lang2[key] = redef[key];
             }
@@ -4204,7 +4204,7 @@ var require_prism_core = __commonJS({
            */
           insertBefore: function(inside, before, insert2, root) {
             root = root || /** @type {any} */
-            _2.languages;
+            _5.languages;
             var grammar = root[inside];
             var ret = {};
             for (var token in grammar) {
@@ -4223,7 +4223,7 @@ var require_prism_core = __commonJS({
             }
             var old = root[inside];
             root[inside] = ret;
-            _2.languages.DFS(_2.languages, function(key, value) {
+            _5.languages.DFS(_5.languages, function(key, value) {
               if (value === old && key != inside) {
                 this[key] = ret;
               }
@@ -4233,12 +4233,12 @@ var require_prism_core = __commonJS({
           // Traverse a language definition with Depth First Search
           DFS: function DFS(o, callback, type, visited) {
             visited = visited || {};
-            var objId = _2.util.objId;
+            var objId = _5.util.objId;
             for (var i in o) {
               if (o.hasOwnProperty(i)) {
                 callback.call(o, i, o[i], type || i);
                 var property = o[i];
-                var propertyType = _2.util.type(property);
+                var propertyType = _5.util.type(property);
                 if (propertyType === "Object" && !visited[objId(property)]) {
                   visited[objId(property)] = true;
                   DFS(property, callback, null, visited);
@@ -4264,7 +4264,7 @@ var require_prism_core = __commonJS({
          * @public
          */
         highlightAll: function(async, callback) {
-          _2.highlightAllUnder(document, async, callback);
+          _5.highlightAllUnder(document, async, callback);
         },
         /**
          * Fetches all the descendants of `container` that have a `.language-xxxx` class and then calls
@@ -4287,11 +4287,11 @@ var require_prism_core = __commonJS({
             container,
             selector: 'code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'
           };
-          _2.hooks.run("before-highlightall", env);
+          _5.hooks.run("before-highlightall", env);
           env.elements = Array.prototype.slice.apply(env.container.querySelectorAll(env.selector));
-          _2.hooks.run("before-all-elements-highlight", env);
+          _5.hooks.run("before-all-elements-highlight", env);
           for (var i = 0, element; element = env.elements[i++]; ) {
-            _2.highlightElement(element, async === true, env.callback);
+            _5.highlightElement(element, async === true, env.callback);
           }
         },
         /**
@@ -4323,12 +4323,12 @@ var require_prism_core = __commonJS({
          * @public
          */
         highlightElement: function(element, async, callback) {
-          var language = _2.util.getLanguage(element);
-          var grammar = _2.languages[language];
-          _2.util.setLanguage(element, language);
+          var language = _5.util.getLanguage(element);
+          var grammar = _5.languages[language];
+          _5.util.setLanguage(element, language);
           var parent = element.parentElement;
           if (parent && parent.nodeName.toLowerCase() === "pre") {
-            _2.util.setLanguage(parent, language);
+            _5.util.setLanguage(parent, language);
           }
           var code = element.textContent;
           var env = {
@@ -4339,29 +4339,29 @@ var require_prism_core = __commonJS({
           };
           function insertHighlightedCode(highlightedCode) {
             env.highlightedCode = highlightedCode;
-            _2.hooks.run("before-insert", env);
+            _5.hooks.run("before-insert", env);
             env.element.innerHTML = env.highlightedCode;
-            _2.hooks.run("after-highlight", env);
-            _2.hooks.run("complete", env);
+            _5.hooks.run("after-highlight", env);
+            _5.hooks.run("complete", env);
             callback && callback.call(env.element);
           }
-          _2.hooks.run("before-sanity-check", env);
+          _5.hooks.run("before-sanity-check", env);
           parent = env.element.parentElement;
           if (parent && parent.nodeName.toLowerCase() === "pre" && !parent.hasAttribute("tabindex")) {
             parent.setAttribute("tabindex", "0");
           }
           if (!env.code) {
-            _2.hooks.run("complete", env);
+            _5.hooks.run("complete", env);
             callback && callback.call(env.element);
             return;
           }
-          _2.hooks.run("before-highlight", env);
+          _5.hooks.run("before-highlight", env);
           if (!env.grammar) {
-            insertHighlightedCode(_2.util.encode(env.code));
+            insertHighlightedCode(_5.util.encode(env.code));
             return;
           }
           if (async && _self2.Worker) {
-            var worker = new Worker(_2.filename);
+            var worker = new Worker(_5.filename);
             worker.onmessage = function(evt) {
               insertHighlightedCode(evt.data);
             };
@@ -4371,7 +4371,7 @@ var require_prism_core = __commonJS({
               immediateClose: true
             }));
           } else {
-            insertHighlightedCode(_2.highlight(env.code, env.grammar, env.language));
+            insertHighlightedCode(_5.highlight(env.code, env.grammar, env.language));
           }
         },
         /**
@@ -4400,13 +4400,13 @@ var require_prism_core = __commonJS({
             grammar,
             language
           };
-          _2.hooks.run("before-tokenize", env);
+          _5.hooks.run("before-tokenize", env);
           if (!env.grammar) {
             throw new Error('The language "' + env.language + '" has no grammar.');
           }
-          env.tokens = _2.tokenize(env.code, env.grammar);
-          _2.hooks.run("after-tokenize", env);
-          return Token.stringify(_2.util.encode(env.tokens), env.language);
+          env.tokens = _5.tokenize(env.code, env.grammar);
+          _5.hooks.run("after-tokenize", env);
+          return Token.stringify(_5.util.encode(env.tokens), env.language);
         },
         /**
          * This is the heart of Prism, and the most low-level function you can use. It accepts a string of text as input
@@ -4465,7 +4465,7 @@ var require_prism_core = __commonJS({
            * @public
            */
           add: function(name, callback) {
-            var hooks = _2.hooks.all;
+            var hooks = _5.hooks.all;
             hooks[name] = hooks[name] || [];
             hooks[name].push(callback);
           },
@@ -4479,7 +4479,7 @@ var require_prism_core = __commonJS({
            * @public
            */
           run: function(name, env) {
-            var callbacks = _2.hooks.all[name];
+            var callbacks = _5.hooks.all[name];
             if (!callbacks || !callbacks.length) {
               return;
             }
@@ -4490,7 +4490,7 @@ var require_prism_core = __commonJS({
         },
         Token
       };
-      _self2.Prism = _2;
+      _self2.Prism = _5;
       function Token(type, content, alias, matchedStr) {
         this.type = type;
         this.content = content;
@@ -4524,7 +4524,7 @@ var require_prism_core = __commonJS({
             env.classes.push(aliases);
           }
         }
-        _2.hooks.run("wrap", env);
+        _5.hooks.run("wrap", env);
         var attributes = "";
         for (var name in env.attributes) {
           attributes += " " + name + '="' + (env.attributes[name] || "").replace(/"/g, """) + '"';
@@ -4620,7 +4620,7 @@ var require_prism_core = __commonJS({
                 pos += before.length;
               }
               removeRange(tokenList, removeFrom, removeCount);
-              var wrapped = new Token(token, inside ? _2.tokenize(matchStr, inside) : matchStr, alias, matchStr);
+              var wrapped = new Token(token, inside ? _5.tokenize(matchStr, inside) : matchStr, alias, matchStr);
               currentNode = addAfter(tokenList, removeFrom, wrapped);
               if (after) {
                 addAfter(tokenList, currentNode, after);
@@ -4675,35 +4675,35 @@ var require_prism_core = __commonJS({
       }
       if (!_self2.document) {
         if (!_self2.addEventListener) {
-          return _2;
+          return _5;
         }
-        if (!_2.disableWorkerMessageHandler) {
+        if (!_5.disableWorkerMessageHandler) {
           _self2.addEventListener("message", function(evt) {
             var message = JSON.parse(evt.data);
             var lang2 = message.language;
             var code = message.code;
             var immediateClose = message.immediateClose;
-            _self2.postMessage(_2.highlight(code, _2.languages[lang2], lang2));
+            _self2.postMessage(_5.highlight(code, _5.languages[lang2], lang2));
             if (immediateClose) {
               _self2.close();
             }
           }, false);
         }
-        return _2;
+        return _5;
       }
-      var script = _2.util.currentScript();
+      var script = _5.util.currentScript();
       if (script) {
-        _2.filename = script.src;
+        _5.filename = script.src;
         if (script.hasAttribute("data-manual")) {
-          _2.manual = true;
+          _5.manual = true;
         }
       }
       function highlightAutomaticallyCallback() {
-        if (!_2.manual) {
-          _2.highlightAll();
+        if (!_5.manual) {
+          _5.highlightAll();
         }
       }
-      if (!_2.manual) {
+      if (!_5.manual) {
         var readyState = document.readyState;
         if (readyState === "loading" || readyState === "interactive" && script && script.defer) {
           document.addEventListener("DOMContentLoaded", highlightAutomaticallyCallback);
@@ -4715,7 +4715,7 @@ var require_prism_core = __commonJS({
           }
         }
       }
-      return _2;
+      return _5;
     }(_self);
     if (typeof module !== "undefined" && module.exports) {
       module.exports = Prism;
@@ -26801,7 +26801,7 @@ var PolicyResource = /* @__PURE__ */ ((PolicyResource2) => {
 })(PolicyResource || {});
 
 // src/configuration/version.ts
-var ORCHESTRATOR_UI_LIBRARY_VERSION = "5.8.0";
+var ORCHESTRATOR_UI_LIBRARY_VERSION = "5.9.0";
 
 // src/types/types.ts
 var EngineStatus = /* @__PURE__ */ ((EngineStatus3) => {
@@ -28698,7 +28698,7 @@ function createImmutableStateInvariantMiddleware(options = {}) {
       return JSON.stringify(obj, getSerialize2(serializer, decycler), indent);
     }, getSerialize2 = function(serializer, decycler) {
       let stack = [], keys = [];
-      if (!decycler) decycler = function(_2, value) {
+      if (!decycler) decycler = function(_5, value) {
         if (stack[0] === value) return "[Circular ~]";
         return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]";
       };
@@ -29066,6 +29066,21 @@ function executeReducerBuilderCallback(builderCallback) {
       actionsMap[type] = reducer;
       return builder;
     },
+    addAsyncThunk(asyncThunk, reducers) {
+      if (process.env.NODE_ENV !== "production") {
+        if (defaultCaseReducer) {
+          throw new Error(process.env.NODE_ENV === "production" ? formatProdErrorMessage2(43) : "`builder.addAsyncThunk` should only be called before calling `builder.addDefaultCase`");
+        }
+      }
+      if (reducers.pending) actionsMap[asyncThunk.pending.type] = reducers.pending;
+      if (reducers.rejected) actionsMap[asyncThunk.rejected.type] = reducers.rejected;
+      if (reducers.fulfilled) actionsMap[asyncThunk.fulfilled.type] = reducers.fulfilled;
+      if (reducers.settled) actionMatchers.push({
+        matcher: asyncThunk.settled,
+        reducer: reducers.settled
+      });
+      return builder;
+    },
     addMatcher(matcher, reducer) {
       if (process.env.NODE_ENV !== "production") {
         if (defaultCaseReducer) {
@@ -29338,7 +29353,7 @@ var createAsyncThunk = /* @__PURE__ */ (() => {
                 message: "Aborted due to condition callback returning false."
               };
             }
-            const abortedPromise = new Promise((_2, reject) => {
+            const abortedPromise = new Promise((_5, reject) => {
               abortHandler = () => {
                 reject({
                   name: "AbortError",
@@ -29817,6 +29832,11 @@ function getOrInsert(map, key, value) {
   if (map.has(key)) return map.get(key);
   return map.set(key, value).get(key);
 }
+function getOrInsertComputed2(map, key, compute) {
+  if (map.has(key)) return map.get(key);
+  return map.set(key, compute(key)).get(key);
+}
+var createNewMap = () => /* @__PURE__ */ new Map();
 var defaultFetchFn = (...args) => fetch(...args);
 var defaultValidateStatus = (response) => response.status >= 200 && response.status <= 299;
 var defaultIsJsonContentType = (headers) => (
@@ -30028,10 +30048,13 @@ function buildInitiate({
   infiniteQueryThunk,
   mutationThunk,
   api,
-  context
+  context,
+  internalState
 }) {
-  const runningQueries = /* @__PURE__ */ new Map();
-  const runningMutations = /* @__PURE__ */ new Map();
+  const {
+    runningQueries,
+    runningMutations
+  } = internalState;
   const {
     unsubscribeQueryResult,
     removeMutationResult,
@@ -30266,6 +30289,7 @@ var NamedSchemaError = class extends SchemaError {
     this._bqMeta = _bqMeta;
   }
 };
+var shouldSkip = (skipSchemaValidation, schemaName) => Array.isArray(skipSchemaValidation) ? skipSchemaValidation.includes(schemaName) : !!skipSchemaValidation;
 async function parseWithSchema(schema, data, schemaName, bqMeta) {
   const result = await schema["~standard"].validate(data);
   if (result.issues) {
@@ -30397,7 +30421,7 @@ function buildThunks({
       skipSchemaValidation = globalSkipSchemaValidation
     } = endpointDefinition;
     try {
-      let transformResponse = getTransformCallbackForEndpoint(endpointDefinition, "transformResponse");
+      let transformResponse = defaultTransformResponse;
       const baseQueryApi = {
         signal,
         abort,
@@ -30439,7 +30463,7 @@ function buildThunks({
           rawResponseSchema,
           responseSchema
         } = endpointDefinition;
-        if (argSchema && !skipSchemaValidation) {
+        if (argSchema && !shouldSkip(skipSchemaValidation, "arg")) {
           finalQueryArg = await parseWithSchema(
             argSchema,
             finalQueryArg,
@@ -30451,6 +30475,7 @@ function buildThunks({
         if (forceQueryFn) {
           result = forceQueryFn();
         } else if (endpointDefinition.query) {
+          transformResponse = getTransformCallbackForEndpoint(endpointDefinition, "transformResponse");
           result = await baseQuery(endpointDefinition.query(finalQueryArg), baseQueryApi, extraOptions);
         } else {
           result = await endpointDefinition.queryFn(finalQueryArg, baseQueryApi, extraOptions, (arg2) => baseQuery(arg2, baseQueryApi, extraOptions));
@@ -30485,11 +30510,11 @@ function buildThunks({
         let {
           data
         } = result;
-        if (rawResponseSchema && !skipSchemaValidation) {
+        if (rawResponseSchema && !shouldSkip(skipSchemaValidation, "rawResponse")) {
           data = await parseWithSchema(rawResponseSchema, result.data, "rawResponseSchema", result.meta);
         }
         let transformedResponse = await transformResponse(data, result.meta, finalQueryArg);
-        if (responseSchema && !skipSchemaValidation) {
+        if (responseSchema && !shouldSkip(skipSchemaValidation, "response")) {
           transformedResponse = await parseWithSchema(responseSchema, transformedResponse, "responseSchema", result.meta);
         }
         return {
@@ -30518,7 +30543,7 @@ function buildThunks({
         if ("direction" in arg && arg.direction && existingData.pages.length) {
           const previous = arg.direction === "backward";
           const pageParamFn = previous ? getPreviousPageParam : getNextPageParam;
-          const param = pageParamFn(infiniteQueryOptions, existingData);
+          const param = pageParamFn(infiniteQueryOptions, existingData, arg.originalArgs);
           result = await fetchPage(existingData, param, maxPages, previous);
         } else {
           const {
@@ -30534,7 +30559,7 @@ function buildThunks({
             };
           }
           for (let i = 1; i < totalPages; i++) {
-            const param = getNextPageParam(infiniteQueryOptions, result.data);
+            const param = getNextPageParam(infiniteQueryOptions, result.data, arg.originalArgs);
             result = await fetchPage(result.data, param, maxPages);
           }
         }
@@ -30542,7 +30567,7 @@ function buildThunks({
       } else {
         finalQueryReturnValue = await executeRequest(arg.originalArgs);
       }
-      if (metaSchema && !skipSchemaValidation && finalQueryReturnValue.meta) {
+      if (metaSchema && !shouldSkip(skipSchemaValidation, "meta") && finalQueryReturnValue.meta) {
         finalQueryReturnValue.meta = await parseWithSchema(metaSchema, finalQueryReturnValue.meta, "metaSchema", finalQueryReturnValue.meta);
       }
       return fulfillWithValue(finalQueryReturnValue.data, addShouldAutoBatch({
@@ -30562,14 +30587,14 @@ function buildThunks({
           meta
         } = caughtError;
         try {
-          if (rawErrorResponseSchema && !skipSchemaValidation) {
+          if (rawErrorResponseSchema && !shouldSkip(skipSchemaValidation, "rawErrorResponse")) {
             value = await parseWithSchema(rawErrorResponseSchema, value, "rawErrorResponseSchema", meta);
           }
-          if (metaSchema && !skipSchemaValidation) {
+          if (metaSchema && !shouldSkip(skipSchemaValidation, "meta")) {
             meta = await parseWithSchema(metaSchema, meta, "metaSchema", meta);
           }
           let transformedErrorResponse = await transformErrorResponse(value, meta, arg.originalArgs);
-          if (errorResponseSchema && !skipSchemaValidation) {
+          if (errorResponseSchema && !shouldSkip(skipSchemaValidation, "errorResponse")) {
             transformedErrorResponse = await parseWithSchema(errorResponseSchema, transformedErrorResponse, "errorResponseSchema", meta);
           }
           return rejectWithValue(transformedErrorResponse, addShouldAutoBatch({
@@ -30731,15 +30756,15 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
 function getNextPageParam(options, {
   pages,
   pageParams
-}) {
+}, queryArg) {
   const lastIndex = pages.length - 1;
-  return options.getNextPageParam(pages[lastIndex], pages, pageParams[lastIndex], pageParams);
+  return options.getNextPageParam(pages[lastIndex], pages, pageParams[lastIndex], pageParams, queryArg);
 }
 function getPreviousPageParam(options, {
   pages,
   pageParams
-}) {
-  return options.getPreviousPageParam?.(pages[0], pages, pageParams[0], pageParams);
+}, queryArg) {
+  return options.getPreviousPageParam?.(pages[0], pages, pageParams[0], pageParams, queryArg);
 }
 function calculateProvidedByThunk(action, type, endpointDefinitions, assertTagType) {
   return calculateProvidedBy(endpointDefinitions[action.meta.arg.endpointName][type], isFulfilled(action) ? action.payload : void 0, isRejectedWithValue(action) ? action.payload : void 0, action.meta.arg.originalArgs, "baseQueryMeta" in action.meta ? action.meta.baseQueryMeta : void 0, assertTagType);
@@ -31084,7 +31109,7 @@ function buildSlice({
         const {
           provided
         } = extractRehydrationInfo(action);
-        for (const [type, incomingTags] of Object.entries(provided)) {
+        for (const [type, incomingTags] of Object.entries(provided.tags ?? {})) {
           for (const [id, cacheKeys] of Object.entries(incomingTags)) {
             const subscribedQueries = (_b = (_a = draft.tags)[type] ?? (_a[type] = {}))[_c = id || "__internal_without_id"] ?? (_b[_c] = []);
             for (const queryCacheKey of cacheKeys) {
@@ -31092,6 +31117,7 @@ function buildSlice({
               if (!alreadySubscribed) {
                 subscribedQueries.push(queryCacheKey);
               }
+              draft.keys[queryCacheKey] = provided.keys[queryCacheKey];
             }
           }
         }
@@ -31308,8 +31334,8 @@ function buildSelectors({
       const isBackward = direction === "backward";
       return {
         ...stateWithRequestFlags,
-        hasNextPage: getHasNextPage(infiniteQueryOptions, stateWithRequestFlags.data),
-        hasPreviousPage: getHasPreviousPage(infiniteQueryOptions, stateWithRequestFlags.data),
+        hasNextPage: getHasNextPage(infiniteQueryOptions, stateWithRequestFlags.data, stateWithRequestFlags.originalArgs),
+        hasPreviousPage: getHasPreviousPage(infiniteQueryOptions, stateWithRequestFlags.data, stateWithRequestFlags.originalArgs),
         isFetchingNextPage: isLoading && isForward,
         isFetchingPreviousPage: isLoading && isBackward,
         isFetchNextPageError: isError2 && isForward,
@@ -31365,13 +31391,13 @@ function buildSelectors({
       /* uninitialized */
     ).map((entry) => entry.originalArgs);
   }
-  function getHasNextPage(options, data) {
+  function getHasNextPage(options, data, queryArg) {
     if (!data) return false;
-    return getNextPageParam(options, data) != null;
+    return getNextPageParam(options, data, queryArg) != null;
   }
-  function getHasPreviousPage(options, data) {
+  function getHasPreviousPage(options, data, queryArg) {
     if (!data || !options.getPreviousPageParam) return false;
-    return getPreviousPageParam(options, data) != null;
+    return getPreviousPageParam(options, data, queryArg) != null;
   }
 }
 var cache = WeakMap ? /* @__PURE__ */ new WeakMap() : void 0;
@@ -31539,7 +31565,8 @@ function safeAssign(target, ...args) {
 var buildBatchedActionsHandler = ({
   api,
   queryThunk,
-  internalState
+  internalState,
+  mwApi
 }) => {
   const subscriptionsPrefix = `${api.reducerPath}/subscriptions`;
   let previousSubscriptions = null;
@@ -31548,16 +31575,16 @@ var buildBatchedActionsHandler = ({
     updateSubscriptionOptions,
     unsubscribeQueryResult
   } = api.internalActions;
-  const actuallyMutateSubscriptions = (mutableState, action) => {
-    var _a, _b;
+  const actuallyMutateSubscriptions = (currentSubscriptions, action) => {
     if (updateSubscriptionOptions.match(action)) {
       const {
         queryCacheKey,
         requestId,
         options
       } = action.payload;
-      if (mutableState?.[queryCacheKey]?.[requestId]) {
-        mutableState[queryCacheKey][requestId] = options;
+      const sub = currentSubscriptions.get(queryCacheKey);
+      if (sub?.has(requestId)) {
+        sub.set(requestId, options);
       }
       return true;
     }
@@ -31566,13 +31593,14 @@ var buildBatchedActionsHandler = ({
         queryCacheKey,
         requestId
       } = action.payload;
-      if (mutableState[queryCacheKey]) {
-        delete mutableState[queryCacheKey][requestId];
+      const sub = currentSubscriptions.get(queryCacheKey);
+      if (sub) {
+        sub.delete(requestId);
       }
       return true;
     }
     if (api.internalActions.removeQueryResult.match(action)) {
-      delete mutableState[action.payload.queryCacheKey];
+      currentSubscriptions.delete(action.payload.queryCacheKey);
       return true;
     }
     if (queryThunk.pending.match(action)) {
@@ -31582,20 +31610,13 @@ var buildBatchedActionsHandler = ({
           requestId
         }
       } = action;
-      const substate = mutableState[_a = arg.queryCacheKey] ?? (mutableState[_a] = {});
-      substate[`${requestId}_running`] = {};
+      const substate = getOrInsertComputed2(currentSubscriptions, arg.queryCacheKey, createNewMap);
       if (arg.subscribe) {
-        substate[requestId] = arg.subscriptionOptions ?? substate[requestId] ?? {};
+        substate.set(requestId, arg.subscriptionOptions ?? substate.get(requestId) ?? {});
       }
       return true;
     }
     let mutated = false;
-    if (queryThunk.fulfilled.match(action) || queryThunk.rejected.match(action)) {
-      const state = mutableState[action.meta.arg.queryCacheKey] || {};
-      const key = `${action.meta.requestId}_running`;
-      mutated || (mutated = !!state[key]);
-      delete state[key];
-    }
     if (queryThunk.rejected.match(action)) {
       const {
         meta: {
@@ -31605,8 +31626,8 @@ var buildBatchedActionsHandler = ({
         }
       } = action;
       if (condition && arg.subscribe) {
-        const substate = mutableState[_b = arg.queryCacheKey] ?? (mutableState[_b] = {});
-        substate[requestId] = arg.subscriptionOptions ?? substate[requestId] ?? {};
+        const substate = getOrInsertComputed2(currentSubscriptions, arg.queryCacheKey, createNewMap);
+        substate.set(requestId, arg.subscriptionOptions ?? substate.get(requestId) ?? {});
         mutated = true;
       }
     }
@@ -31615,24 +31636,28 @@ var buildBatchedActionsHandler = ({
   const getSubscriptions = () => internalState.currentSubscriptions;
   const getSubscriptionCount = (queryCacheKey) => {
     const subscriptions = getSubscriptions();
-    const subscriptionsForQueryArg = subscriptions[queryCacheKey] ?? {};
-    return countObjectKeys(subscriptionsForQueryArg);
+    const subscriptionsForQueryArg = subscriptions.get(queryCacheKey);
+    return subscriptionsForQueryArg?.size ?? 0;
   };
   const isRequestSubscribed = (queryCacheKey, requestId) => {
     const subscriptions = getSubscriptions();
-    return !!subscriptions?.[queryCacheKey]?.[requestId];
+    return !!subscriptions?.get(queryCacheKey)?.get(requestId);
   };
   const subscriptionSelectors = {
     getSubscriptions,
     getSubscriptionCount,
     isRequestSubscribed
   };
-  return (action, mwApi) => {
+  function serializeSubscriptions(currentSubscriptions) {
+    return JSON.parse(JSON.stringify(Object.fromEntries([...currentSubscriptions].map(([k, v]) => [k, Object.fromEntries(v)]))));
+  }
+  return (action, mwApi2) => {
     if (!previousSubscriptions) {
-      previousSubscriptions = JSON.parse(JSON.stringify(internalState.currentSubscriptions));
+      previousSubscriptions = serializeSubscriptions(internalState.currentSubscriptions);
     }
     if (api.util.resetApiState.match(action)) {
-      previousSubscriptions = internalState.currentSubscriptions = {};
+      previousSubscriptions = {};
+      internalState.currentSubscriptions.clear();
       updateSyncTimer = null;
       return [true, false];
     }
@@ -31641,12 +31666,15 @@ var buildBatchedActionsHandler = ({
     }
     const didMutate = actuallyMutateSubscriptions(internalState.currentSubscriptions, action);
     let actionShouldContinue = true;
+    if (process.env.NODE_ENV === "test" && typeof action.type === "string" && action.type === `${api.reducerPath}/getPolling`) {
+      return [false, internalState.currentPolls];
+    }
     if (didMutate) {
       if (!updateSyncTimer) {
         updateSyncTimer = setTimeout(() => {
-          const newSubscriptions = JSON.parse(JSON.stringify(internalState.currentSubscriptions));
+          const newSubscriptions = serializeSubscriptions(internalState.currentSubscriptions);
           const [, patches] = produceWithPatches(previousSubscriptions, () => newSubscriptions);
-          mwApi.next(api.internalActions.subscriptionsUpdated(patches));
+          mwApi2.next(api.internalActions.subscriptionsUpdated(patches));
           previousSubscriptions = newSubscriptions;
           updateSyncTimer = null;
         }, 500);
@@ -31658,12 +31686,6 @@ var buildBatchedActionsHandler = ({
     return [actionShouldContinue, false];
   };
 };
-function isObjectEmpty(obj) {
-  for (const k in obj) {
-    return false;
-  }
-  return true;
-}
 var THIRTY_TWO_BIT_MAX_TIMER_SECONDS = 2147483647 / 1e3 - 1;
 var buildCacheCollectionHandler = ({
   reducerPath,
@@ -31674,21 +31696,29 @@ var buildCacheCollectionHandler = ({
   selectors: {
     selectQueryEntry,
     selectConfig
-  }
+  },
+  getRunningQueryThunk,
+  mwApi
 }) => {
   const {
     removeQueryResult,
     unsubscribeQueryResult,
     cacheEntriesUpserted
   } = api.internalActions;
+  const runningQueries = internalState.runningQueries.get(mwApi.dispatch);
   const canTriggerUnsubscribe = isAnyOf(unsubscribeQueryResult.match, queryThunk.fulfilled, queryThunk.rejected, cacheEntriesUpserted.match);
   function anySubscriptionsRemainingForKey(queryCacheKey) {
-    const subscriptions = internalState.currentSubscriptions[queryCacheKey];
-    return !!subscriptions && !isObjectEmpty(subscriptions);
+    const subscriptions = internalState.currentSubscriptions.get(queryCacheKey);
+    if (!subscriptions) {
+      return false;
+    }
+    const hasSubscriptions = subscriptions.size > 0;
+    const isRunning = runningQueries?.[queryCacheKey] !== void 0;
+    return hasSubscriptions || isRunning;
   }
   const currentRemovalTimeouts = {};
-  const handler = (action, mwApi, internalState2) => {
-    const state = mwApi.getState();
+  const handler = (action, mwApi2, internalState2) => {
+    const state = mwApi2.getState();
     const config = selectConfig(state);
     if (canTriggerUnsubscribe(action)) {
       let queryCacheKeys;
@@ -31700,7 +31730,7 @@ var buildCacheCollectionHandler = ({
         } = unsubscribeQueryResult.match(action) ? action.payload : action.meta.arg;
         queryCacheKeys = [queryCacheKey];
       }
-      handleUnsubscribeMany(queryCacheKeys, mwApi, config);
+      handleUnsubscribeMany(queryCacheKeys, mwApi2, config);
     }
     if (api.util.resetApiState.match(action)) {
       for (const [key, timeout] of Object.entries(currentRemovalTimeouts)) {
@@ -31712,14 +31742,16 @@ var buildCacheCollectionHandler = ({
       const {
         queries
       } = context.extractRehydrationInfo(action);
-      handleUnsubscribeMany(Object.keys(queries), mwApi, config);
+      handleUnsubscribeMany(Object.keys(queries), mwApi2, config);
     }
   };
   function handleUnsubscribeMany(cacheKeys, api2, config) {
     const state = api2.getState();
     for (const queryCacheKey of cacheKeys) {
       const entry = selectQueryEntry(state, queryCacheKey);
-      handleUnsubscribe(queryCacheKey, entry?.endpointName, api2, config);
+      if (entry?.endpointName) {
+        handleUnsubscribe(queryCacheKey, entry.endpointName, api2, config);
+      }
     }
   }
   function handleUnsubscribe(queryCacheKey, endpointName, api2, config) {
@@ -31736,6 +31768,11 @@ var buildCacheCollectionHandler = ({
       }
       currentRemovalTimeouts[queryCacheKey] = setTimeout(() => {
         if (!anySubscriptionsRemainingForKey(queryCacheKey)) {
+          const entry = selectQueryEntry(api2.getState(), queryCacheKey);
+          if (entry?.endpointName) {
+            const runningQuery = api2.dispatch(getRunningQueryThunk(entry.endpointName, entry.originalArgs));
+            runningQuery?.abort();
+          }
           api2.dispatch(removeQueryResult({
             queryCacheKey
           }));
@@ -31845,7 +31882,7 @@ var buildCacheLifecycleHandler = ({
     });
     lifecycleMap[queryCacheKey] = lifecycle;
     const selector = api.endpoints[endpointName].select(isAnyQueryDefinition(endpointDefinition) ? originalArgs : queryCacheKey);
-    const extra = mwApi.dispatch((_2, __, extra2) => extra2);
+    const extra = mwApi.dispatch((_5, __, extra2) => extra2);
     const lifecycleApi = {
       ...mwApi,
       getCacheEntry: () => selector(mwApi.getState()),
@@ -31940,9 +31977,9 @@ var buildInvalidationByTagsHandler = ({
         queryCacheKey
       } of valuesArray) {
         const querySubState = state.queries[queryCacheKey];
-        const subscriptionSubState = internalState.currentSubscriptions[queryCacheKey] ?? {};
+        const subscriptionSubState = getOrInsertComputed2(internalState.currentSubscriptions, queryCacheKey, createNewMap);
         if (querySubState) {
-          if (countObjectKeys(subscriptionSubState) === 0) {
+          if (subscriptionSubState.size === 0) {
             mwApi.dispatch(removeQueryResult({
               queryCacheKey
             }));
@@ -31962,25 +31999,49 @@ var buildPollingHandler = ({
   refetchQuery,
   internalState
 }) => {
-  const currentPolls = {};
+  const {
+    currentPolls,
+    currentSubscriptions
+  } = internalState;
+  const pendingPollingUpdates = /* @__PURE__ */ new Set();
+  let pollingUpdateTimer = null;
   const handler = (action, mwApi) => {
     if (api.internalActions.updateSubscriptionOptions.match(action) || api.internalActions.unsubscribeQueryResult.match(action)) {
-      updatePollingInterval(action.payload, mwApi);
+      schedulePollingUpdate(action.payload.queryCacheKey, mwApi);
     }
     if (queryThunk.pending.match(action) || queryThunk.rejected.match(action) && action.meta.condition) {
-      updatePollingInterval(action.meta.arg, mwApi);
+      schedulePollingUpdate(action.meta.arg.queryCacheKey, mwApi);
     }
     if (queryThunk.fulfilled.match(action) || queryThunk.rejected.match(action) && !action.meta.condition) {
       startNextPoll(action.meta.arg, mwApi);
     }
     if (api.util.resetApiState.match(action)) {
       clearPolls();
+      if (pollingUpdateTimer) {
+        clearTimeout(pollingUpdateTimer);
+        pollingUpdateTimer = null;
+      }
+      pendingPollingUpdates.clear();
     }
   };
+  function schedulePollingUpdate(queryCacheKey, api2) {
+    pendingPollingUpdates.add(queryCacheKey);
+    if (!pollingUpdateTimer) {
+      pollingUpdateTimer = setTimeout(() => {
+        for (const key of pendingPollingUpdates) {
+          updatePollingInterval({
+            queryCacheKey: key
+          }, api2);
+        }
+        pendingPollingUpdates.clear();
+        pollingUpdateTimer = null;
+      }, 0);
+    }
+  }
   function getCacheEntrySubscriptions(queryCacheKey, api2) {
     const state = api2.getState()[reducerPath];
     const querySubState = state.queries[queryCacheKey];
-    const subscriptions = internalState.currentSubscriptions[queryCacheKey];
+    const subscriptions = currentSubscriptions.get(queryCacheKey);
     if (!querySubState || querySubState.status === "uninitialized") return;
     return subscriptions;
   }
@@ -31989,20 +32050,20 @@ var buildPollingHandler = ({
   }, api2) {
     const state = api2.getState()[reducerPath];
     const querySubState = state.queries[queryCacheKey];
-    const subscriptions = internalState.currentSubscriptions[queryCacheKey];
+    const subscriptions = currentSubscriptions.get(queryCacheKey);
     if (!querySubState || querySubState.status === "uninitialized") return;
     const {
       lowestPollingInterval,
       skipPollingIfUnfocused
     } = findLowestPollingInterval(subscriptions);
     if (!Number.isFinite(lowestPollingInterval)) return;
-    const currentPoll = currentPolls[queryCacheKey];
+    const currentPoll = currentPolls.get(queryCacheKey);
     if (currentPoll?.timeout) {
       clearTimeout(currentPoll.timeout);
       currentPoll.timeout = void 0;
     }
     const nextPollTimestamp = Date.now() + lowestPollingInterval;
-    currentPolls[queryCacheKey] = {
+    currentPolls.set(queryCacheKey, {
       nextPollTimestamp,
       pollingInterval: lowestPollingInterval,
       timeout: setTimeout(() => {
@@ -32013,25 +32074,30 @@ var buildPollingHandler = ({
           queryCacheKey
         }, api2);
       }, lowestPollingInterval)
-    };
+    });
   }
   function updatePollingInterval({
     queryCacheKey
   }, api2) {
     const state = api2.getState()[reducerPath];
     const querySubState = state.queries[queryCacheKey];
-    const subscriptions = internalState.currentSubscriptions[queryCacheKey];
+    const subscriptions = currentSubscriptions.get(queryCacheKey);
     if (!querySubState || querySubState.status === "uninitialized") {
       return;
     }
     const {
       lowestPollingInterval
     } = findLowestPollingInterval(subscriptions);
+    if (process.env.NODE_ENV === "test") {
+      const updateCounters = currentPolls.pollUpdateCounters ?? (currentPolls.pollUpdateCounters = {});
+      updateCounters[queryCacheKey] ?? (updateCounters[queryCacheKey] = 0);
+      updateCounters[queryCacheKey]++;
+    }
     if (!Number.isFinite(lowestPollingInterval)) {
       cleanupPollForKey(queryCacheKey);
       return;
     }
-    const currentPoll = currentPolls[queryCacheKey];
+    const currentPoll = currentPolls.get(queryCacheKey);
     const nextPollTimestamp = Date.now() + lowestPollingInterval;
     if (!currentPoll || nextPollTimestamp < currentPoll.nextPollTimestamp) {
       startNextPoll({
@@ -32040,24 +32106,24 @@ var buildPollingHandler = ({
     }
   }
   function cleanupPollForKey(key) {
-    const existingPoll = currentPolls[key];
+    const existingPoll = currentPolls.get(key);
     if (existingPoll?.timeout) {
       clearTimeout(existingPoll.timeout);
     }
-    delete currentPolls[key];
+    currentPolls.delete(key);
   }
   function clearPolls() {
-    for (const key of Object.keys(currentPolls)) {
+    for (const key of currentPolls.keys()) {
       cleanupPollForKey(key);
     }
   }
-  function findLowestPollingInterval(subscribers = {}) {
+  function findLowestPollingInterval(subscribers = /* @__PURE__ */ new Map()) {
     let skipPollingIfUnfocused = false;
     let lowestPollingInterval = Number.POSITIVE_INFINITY;
-    for (let key in subscribers) {
-      if (!!subscribers[key].pollingInterval) {
-        lowestPollingInterval = Math.min(subscribers[key].pollingInterval, lowestPollingInterval);
-        skipPollingIfUnfocused = subscribers[key].skipPollingIfUnfocused || skipPollingIfUnfocused;
+    for (const entry of subscribers.values()) {
+      if (!!entry.pollingInterval) {
+        lowestPollingInterval = Math.min(entry.pollingInterval, lowestPollingInterval);
+        skipPollingIfUnfocused = entry.skipPollingIfUnfocused || skipPollingIfUnfocused;
       }
     }
     return {
@@ -32098,7 +32164,7 @@ var buildQueryLifecycleHandler = ({
         });
         lifecycleMap[requestId] = lifecycle;
         const selector = api.endpoints[endpointName].select(isAnyQueryDefinition(endpointDefinition) ? originalArgs : requestId);
-        const extra = mwApi.dispatch((_2, __, extra2) => extra2);
+        const extra = mwApi.dispatch((_5, __, extra2) => extra2);
         const lifecycleApi = {
           ...mwApi,
           getCacheEntry: () => selector(mwApi.getState()),
@@ -32158,13 +32224,14 @@ var buildWindowEventHandler = ({
     const queries = state.queries;
     const subscriptions = internalState.currentSubscriptions;
     context.batch(() => {
-      for (const queryCacheKey of Object.keys(subscriptions)) {
+      for (const queryCacheKey of subscriptions.keys()) {
         const querySubState = queries[queryCacheKey];
-        const subscriptionSubState = subscriptions[queryCacheKey];
+        const subscriptionSubState = subscriptions.get(queryCacheKey);
         if (!subscriptionSubState || !querySubState) continue;
-        const shouldRefetch = Object.values(subscriptionSubState).some((sub) => sub[type] === true) || Object.values(subscriptionSubState).every((sub) => sub[type] === void 0) && state.config[type];
+        const values = [...subscriptionSubState.values()];
+        const shouldRefetch = values.some((sub) => sub[type] === true) || values.every((sub) => sub[type] === void 0) && state.config[type];
         if (shouldRefetch) {
-          if (countObjectKeys(subscriptionSubState) === 0) {
+          if (subscriptionSubState.size === 0) {
             api2.dispatch(removeQueryResult({
               queryCacheKey
             }));
@@ -32182,7 +32249,8 @@ function buildMiddleware(input) {
     reducerPath,
     queryThunk,
     api,
-    context
+    context,
+    internalState
   } = input;
   const {
     apiUid
@@ -32194,14 +32262,12 @@ function buildMiddleware(input) {
   const handlerBuilders = [buildDevCheckHandler, buildCacheCollectionHandler, buildInvalidationByTagsHandler, buildPollingHandler, buildCacheLifecycleHandler, buildQueryLifecycleHandler];
   const middleware = (mwApi) => {
     let initialized2 = false;
-    const internalState = {
-      currentSubscriptions: {}
-    };
     const builderArgs = {
       ...input,
       internalState,
       refetchQuery,
-      isThisApiSliceAction
+      isThisApiSliceAction,
+      mwApi
     };
     const handlers = handlerBuilders.map((build) => build(builderArgs));
     const batchedActionsHandler = buildBatchedActionsHandler(builderArgs);
@@ -32356,24 +32422,12 @@ var coreModule = ({
       upsertQueryEntries: sliceActions.cacheEntriesUpserted
     });
     safeAssign(api.internalActions, sliceActions);
-    const {
-      middleware,
-      actions: middlewareActions
-    } = buildMiddleware({
-      reducerPath,
-      context,
-      queryThunk,
-      mutationThunk,
-      infiniteQueryThunk,
-      api,
-      assertTagType,
-      selectors
-    });
-    safeAssign(api.util, middlewareActions);
-    safeAssign(api, {
-      reducer,
-      middleware
-    });
+    const internalState = {
+      currentSubscriptions: /* @__PURE__ */ new Map(),
+      currentPolls: /* @__PURE__ */ new Map(),
+      runningQueries: /* @__PURE__ */ new Map(),
+      runningMutations: /* @__PURE__ */ new Map()
+    };
     const {
       buildInitiateQuery,
       buildInitiateInfiniteQuery,
@@ -32388,7 +32442,8 @@ var coreModule = ({
       infiniteQueryThunk,
       api,
       serializeQueryArgs,
-      context
+      context,
+      internalState
     });
     safeAssign(api.util, {
       getRunningMutationThunk,
@@ -32396,6 +32451,26 @@ var coreModule = ({
       getRunningQueryThunk,
       getRunningQueriesThunk
     });
+    const {
+      middleware,
+      actions: middlewareActions
+    } = buildMiddleware({
+      reducerPath,
+      context,
+      queryThunk,
+      mutationThunk,
+      infiniteQueryThunk,
+      api,
+      assertTagType,
+      selectors,
+      getRunningQueryThunk,
+      internalState
+    });
+    safeAssign(api.util, middlewareActions);
+    safeAssign(api, {
+      reducer,
+      middleware
+    });
     return {
       name: coreModuleName,
       injectEndpoint(endpointName, definition) {
@@ -32463,22 +32538,15 @@ function safeAssign2(target, ...args) {
   return Object.assign(target, ...args);
 }
 var UNINITIALIZED_VALUE = Symbol();
-function useStableQueryArgs(queryArgs, serialize, endpointDefinition, endpointName) {
-  const incoming = useMemo(() => ({
-    queryArgs,
-    serialized: typeof queryArgs == "object" ? serialize({
-      queryArgs,
-      endpointDefinition,
-      endpointName
-    }) : queryArgs
-  }), [queryArgs, serialize, endpointDefinition, endpointName]);
-  const cache2 = useRef(incoming);
+function useStableQueryArgs(queryArgs) {
+  const cache2 = useRef(queryArgs);
+  const copy = useMemo(() => copyWithStructuralSharing(cache2.current, queryArgs), [queryArgs]);
   useEffect(() => {
-    if (cache2.current.serialized !== incoming.serialized) {
-      cache2.current = incoming;
+    if (cache2.current !== copy) {
+      cache2.current = copy;
     }
-  }, [incoming]);
-  return cache2.current.serialized === incoming.serialized ? cache2.current.queryArgs : queryArgs;
+  }, [copy]);
+  return copy;
 }
 function useShallowStableValue(value) {
   const cache2 = useRef2(value);
@@ -32631,17 +32699,7 @@ function buildHooks({
       }
       subscriptionSelectorsRef.current = returnedValue;
     }
-    const stableArg = useStableQueryArgs(
-      skip ? skipToken : arg,
-      // Even if the user provided a per-endpoint `serializeQueryArgs` with
-      // a consistent return value, _here_ we want to use the default behavior
-      // so we can tell if _anything_ actually changed. Otherwise, we can end up
-      // with a case where the query args did change but the serialization doesn't,
-      // and then we never try to initiate a refetch.
-      defaultSerializeQueryArgs,
-      context.endpointDefinitions[endpointName],
-      endpointName
-    );
+    const stableArg = useStableQueryArgs(skip ? skipToken : arg);
     const stableSubscriptionOptions = useShallowStableValue({
       refetchOnReconnect,
       refetchOnFocus,
@@ -32700,7 +32758,7 @@ function buildHooks({
       const {
         select
       } = api.endpoints[endpointName];
-      const stableArg = useStableQueryArgs(skip ? skipToken : arg, serializeQueryArgs, context.endpointDefinitions[endpointName], endpointName);
+      const stableArg = useStableQueryArgs(skip ? skipToken : arg);
       const lastValue = useRef3(void 0);
       const selectDefaultResult = useMemo2(() => (
         // Normally ts-ignores are bad and should be avoided, but we're
@@ -32710,8 +32768,8 @@ function buildHooks({
         createSelector2([
           // @ts-ignore
           select(stableArg),
-          (_2, lastResult) => lastResult,
-          (_2) => stableArg
+          (_5, lastResult) => lastResult,
+          (_5) => stableArg
         ], preSelector, {
           memoizeOptions: {
             resultEqualityCheck: shallowEqual2
@@ -32872,17 +32930,7 @@ function buildHooks({
         return promise;
       }, [promiseRef, dispatch, initiate]);
       usePromiseRefUnsubscribeOnUnmount(promiseRef);
-      const stableArg = useStableQueryArgs(
-        options.skip ? skipToken : arg,
-        // Even if the user provided a per-endpoint `serializeQueryArgs` with
-        // a consistent return value, _here_ we want to use the default behavior
-        // so we can tell if _anything_ actually changed. Otherwise, we can end up
-        // with a case where the query args did change but the serialization doesn't,
-        // and then we never try to initiate a refetch.
-        defaultSerializeQueryArgs,
-        context.endpointDefinitions[endpointName],
-        endpointName
-      );
+      const stableArg = useStableQueryArgs(options.skip ? skipToken : arg);
       const refetch = useCallback(() => refetchOrErrorIfUnmounted(promiseRef), [promiseRef]);
       return useMemo2(() => {
         const fetchNextPage = () => {
@@ -34082,7 +34130,7 @@ var workflowsApi = orchestratorApi.injectEndpoints({
         document: workflowsDescription,
         variables
       }),
-      transformResponse: (response, _2, variables) => {
+      transformResponse: (response, _5, variables) => {
         const workflows = response.workflows.page || [];
         const workflow = workflows.find(
           ({ name: name2 }) => name2 === variables.workflowName
@@ -34866,7 +34914,7 @@ var streamMessagesApi = orchestratorApi.injectEndpoints({
       queryFn: () => {
         return { data: true };
       },
-      async onCacheEntryAdded(_2, {
+      async onCacheEntryAdded(_5, {
         cacheDataLoaded,
         cacheEntryRemoved,
         dispatch,
@@ -38239,7 +38287,7 @@ var WfoStartButtonComboBox = ({
           css: selectableStyle,
           searchable: true,
           options,
-          onChange: (_2, __, changedOption) => onOptionChange(changedOption),
+          onChange: (_5, __, changedOption) => onOptionChange(changedOption),
           height: 200,
           children: (list, search) => /* @__PURE__ */ jsxs41(Fragment3, { children: [
             search,
@@ -41228,11 +41276,11 @@ var WfoDragHandler = ({
   const onStart = () => {
     setIsDragging(false);
   };
-  const onDrag = (_2, data) => {
+  const onDrag = (_5, data) => {
     setIsDragging(true);
     setPosition({ x: data.x, y: data.y });
   };
-  const onStop = (_2, data) => {
+  const onStop = (_5, data) => {
     if (headerRowRef.current && isDragging) {
       const newWidth = startWidth + data.x;
       onUpdateColumWidth(
@@ -43136,7 +43184,7 @@ var WfoButtonComboBox = ({
             css: selectableStyle,
             options: optionsState,
             searchable: true,
-            onChange: (options2, _2, changedOption) => {
+            onChange: (options2, _5, changedOption) => {
               onOptionChange(changedOption);
               setOptionsState(options2);
             },
@@ -47794,7 +47842,7 @@ function Summary({
     return null;
   }
   const { headers, labels, columns } = data;
-  const extraColumnsData = columns.filter((_2, index) => index !== 0);
+  const extraColumnsData = columns.filter((_5, index) => index !== 0);
   const rows = columns[0].map((row, index) => /* @__PURE__ */ jsxs98("tr", { children: [
     labels && /* @__PURE__ */ jsx181("td", { className: `label`, children: labels[index] }),
     /* @__PURE__ */ jsx181("td", { className: `value`, children: typeof row === "string" && row.includes("<!doctype html>") ? /* @__PURE__ */ jsx181(
@@ -47804,7 +47852,7 @@ function Summary({
         dangerouslySetInnerHTML: { __html: row }
       }
     ) : row }),
-    extraColumnsData && extraColumnsData.map((_2, idx) => /* @__PURE__ */ jsx181("td", { className: `value`, children: extraColumnsData[idx][index] }, idx))
+    extraColumnsData && extraColumnsData.map((_5, idx) => /* @__PURE__ */ jsx181("td", { className: `value`, children: extraColumnsData[idx][index] }, idx))
   ] }, index));
   const tableHeader = !headers || headers.length === 0 ? null : /* @__PURE__ */ jsxs98("tr", { children: [
     labels && /* @__PURE__ */ jsx181("th", {}),
@@ -50358,7 +50406,7 @@ var WfoProcessDetailPage = ({
 };
 
 // src/pages/processes/WfoStartProcessPage.tsx
-import { useCallback as useCallback9, useEffect as useEffect34, useMemo as useMemo7, useState as useState50 } from "react";
+import { useCallback as useCallback9, useEffect as useEffect34, useMemo as useMemo7, useState as useState51 } from "react";
 import { useTranslations as useTranslations69 } from "next-intl";
 import { useRouter as useRouter10 } from "next/router";
 import {
@@ -50371,6 +50419,7 @@ import {
 
 // src/components/WfoPydanticForm/WfoPydanticForm.tsx
 import { useCallback as useCallback6, useMemo as useMemo4 } from "react";
+import _4 from "lodash";
 import { useMessages, useTranslations as useTranslations62 } from "next-intl";
 import { useRouter as useRouter9 } from "next/router";
 import {
@@ -50556,6 +50605,8 @@ var WfoTextArea = ({
 };
 
 // src/components/WfoPydanticForm/fields/WfoText.tsx
+import _2 from "lodash";
+import { getFormFieldIdWithPath } from "pydantic-forms";
 import { EuiFieldText as EuiFieldText4 } from "@elastic/eui";
 import { jsx as jsx208 } from "@emotion/react/jsx-runtime";
 var WfoText = ({
@@ -50567,6 +50618,8 @@ var WfoText = ({
   const { formFieldBaseStyle } = useWithOrchestratorTheme(
     getFormFieldsBaseStyle
   );
+  const fieldName = getFormFieldIdWithPath(pydanticFormField.id);
+  const fieldValue = _2.isObject(value) && _2.has(value, fieldName) ? _2.get(value, fieldName) : value;
   return /* @__PURE__ */ jsx208(
     EuiFieldText4,
     {
@@ -50574,7 +50627,7 @@ var WfoText = ({
       css: formFieldBaseStyle,
       disabled,
       onChange: (event) => onChange(event.target.value),
-      value: value ?? "",
+      value: fieldValue,
       fullWidth: true
     }
   );
@@ -50647,7 +50700,7 @@ var WfoSummary = ({ pydanticFormField }) => {
   const headers = summaryData?.headers;
   const labels = summaryData?.labels;
   const columns = summaryData?.columns || [];
-  const extraColumnsData = columns.filter((_2, index) => index !== 0);
+  const extraColumnsData = columns.filter((_5, index) => index !== 0);
   const rows = columns[0].map((row, index) => /* @__PURE__ */ jsxs111("tr", { children: [
     labels && /* @__PURE__ */ jsx212("td", { className: `label`, children: getNestedSummaryLabel(labels, index) }),
     /* @__PURE__ */ jsx212("td", { className: `value`, children: typeof row === "string" && row.includes("<!doctype html>") ? /* @__PURE__ */ jsx212(
@@ -50657,7 +50710,7 @@ var WfoSummary = ({ pydanticFormField }) => {
         dangerouslySetInnerHTML: { __html: row }
       }
     ) : row }),
-    extraColumnsData && extraColumnsData.map((_2, idx) => /* @__PURE__ */ jsx212("td", { className: `value`, children: extraColumnsData[idx][index].toString() }, idx))
+    extraColumnsData && extraColumnsData.map((_5, idx) => /* @__PURE__ */ jsx212("td", { className: `value`, children: extraColumnsData[idx][index].toString() }, idx))
   ] }, index));
   const tableHeader = !headers || headers.length === 0 ? null : /* @__PURE__ */ jsxs111("tr", { children: [
     labels && /* @__PURE__ */ jsx212("th", {}),
@@ -51492,7 +51545,7 @@ var WfoRadio = ({
   value,
   disabled
 }) => {
-  const radioOptions = pydanticFormField.options.map((option) => ({
+  const radioOptions = pydanticFormField.options?.map((option) => ({
     id: option.value,
     label: option.label
   }));
@@ -51500,7 +51553,7 @@ var WfoRadio = ({
     EuiRadioGroup,
     {
       "data-testid": pydanticFormField.id,
-      options: radioOptions,
+      options: radioOptions || [],
       idSelected: value,
       onChange: (id) => onChange(id),
       name: pydanticFormField.id,
@@ -51510,6 +51563,8 @@ var WfoRadio = ({
 };
 
 // src/components/WfoPydanticForm/fields/WfoInteger.tsx
+import _3 from "lodash";
+import { getFormFieldIdWithPath as getFormFieldIdWithPath2 } from "pydantic-forms";
 import { EuiFieldNumber as EuiFieldNumber2 } from "@elastic/eui";
 import { css as css38 } from "@emotion/react";
 import { jsx as jsx216 } from "@emotion/react/jsx-runtime";
@@ -51534,6 +51589,8 @@ var WfoInteger = ({
   const { formFieldBaseStyle } = useWithOrchestratorTheme(
     getFormFieldsBaseStyle2
   );
+  const fieldName = getFormFieldIdWithPath2(pydanticFormField.id);
+  const fieldValue = _3.isObject(value) && _3.has(value, fieldName) ? _3.get(value, fieldName) : value;
   return /* @__PURE__ */ jsx216(
     EuiFieldNumber2,
     {
@@ -51541,14 +51598,14 @@ var WfoInteger = ({
       css: formFieldBaseStyle,
       name: pydanticFormField.id,
       onChange: (event) => onChange(parseInt(event.target.value)),
-      value,
+      value: fieldValue,
       disabled
     }
   );
 };
 
 // src/components/WfoPydanticForm/fields/WfoReactSelect/WfoReactSelect.tsx
-import React67, { useEffect as useEffect30 } from "react";
+import { useEffect as useEffect30, useState as useState44 } from "react";
 import ReactSelect5, { components } from "react-select";
 import { EuiButtonIcon as EuiButtonIcon12 } from "@elastic/eui";
 
@@ -51624,16 +51681,18 @@ var WfoReactSelect = ({
   hasError = false,
   refetch
 }) => {
-  useEffect30(() => {
-    const selectedValue2 = options.find(
-      (option) => option.value === value
-    );
-    setSelectedValue(selectedValue2 || null);
-  }, [options, value]);
   const initialValue = options.find(
     (option) => option.value === value
   );
-  const [selectedValue, setSelectedValue] = React67.useState(initialValue || null);
+  const [selectedValue, setSelectedValue] = useState44(initialValue || null);
+  useEffect30(() => {
+    const preSelectedValue = options.find(
+      (option) => option.value === value
+    );
+    if (preSelectedValue !== selectedValue) {
+      setSelectedValue(preSelectedValue || null);
+    }
+  }, [options, selectedValue, value]);
   const {
     reactSelectInnerComponentStyles,
     containerStyle,
@@ -51673,7 +51732,7 @@ var WfoReactSelect = ({
         onChange: (option) => {
           if (option === null) {
             setSelectedValue(null);
-            onChange(void 0);
+            onChange(null);
           } else {
             const selectedValue2 = option?.value;
             setSelectedValue(option);
@@ -51704,14 +51763,14 @@ var WfoDropdown = ({
   pydanticFormField,
   value
 }) => {
-  const dropDownOptions = pydanticFormField.options.map((option) => ({
+  const dropDownOptions = pydanticFormField.options?.map((option) => ({
     value: option.value,
     label: option.label
   }));
   return /* @__PURE__ */ jsx218(
     WfoReactSelect,
     {
-      options: dropDownOptions,
+      options: dropDownOptions || [],
       onChange,
       id: pydanticFormField.id,
       value
@@ -51720,7 +51779,7 @@ var WfoDropdown = ({
 };
 
 // src/components/WfoPydanticForm/fields/WfoMultiCheckboxField.tsx
-import { useEffect as useEffect31, useState as useState44 } from "react";
+import { useEffect as useEffect31, useState as useState45 } from "react";
 import { EuiCheckboxGroup } from "@elastic/eui";
 import { jsx as jsx219 } from "@emotion/react/jsx-runtime";
 var WfoMultiCheckboxField = ({
@@ -51741,9 +51800,9 @@ var WfoMultiCheckboxField = ({
     };
     setCheckboxIdToSelectedMap(getInitialMap());
   }, [value]);
-  const [checkboxIdToSelectedMap, setCheckboxIdToSelectedMap] = useState44({});
+  const [checkboxIdToSelectedMap, setCheckboxIdToSelectedMap] = useState45({});
   const { options, id } = pydanticFormField;
-  const checkboxes = options.map((option, index) => ({
+  const checkboxes = options?.map((option, index) => ({
     label: option.label,
     id: option.value,
     "data-test-id": `${id}-${index}`
@@ -51764,7 +51823,7 @@ var WfoMultiCheckboxField = ({
   return /* @__PURE__ */ jsx219(
     EuiCheckboxGroup,
     {
-      options: checkboxes,
+      options: checkboxes || [],
       idToSelectedMap: checkboxIdToSelectedMap,
       onChange: (id2) => handleCheckboxChange(id2),
       "data-testid": id
@@ -51877,7 +51936,7 @@ var useWfoPydanticFormConfig = () => {
             isControlledElement: true
           },
           matcher(field) {
-            return field.type === PydanticFormFieldType.STRING && Array.isArray(field.options) && field.options.length > 0;
+            return field.type === PydanticFormFieldType.STRING && _4.isArray(field.options) && field.options.length > 0;
           }
         },
         {
@@ -51898,7 +51957,7 @@ var useWfoPydanticFormConfig = () => {
             isControlledElement: true
           },
           matcher(field) {
-            return field.type === PydanticFormFieldType.ARRAY && field.options?.length > 0 && field.options?.length <= 5;
+            return field.type === PydanticFormFieldType.ARRAY && _4.isArray(field.options) && field.options?.length > 0 && field.options?.length <= 5;
           },
           validator: zodValidationPresets.multiSelect
         },
@@ -52046,7 +52105,7 @@ var WfoPydanticForm = ({
 };
 
 // src/components/WfoWorkflowSteps/WfoStep/WfoStep.tsx
-import React72, { useState as useState46 } from "react";
+import React72, { useState as useState47 } from "react";
 import { useTranslations as useTranslations64 } from "next-intl";
 import {
   EuiButton as EuiButton13,
@@ -52057,7 +52116,7 @@ import {
 } from "@elastic/eui";
 
 // src/components/WfoWorkflowSteps/WfoStep/WfoStepFormOld.tsx
-import { useState as useState45 } from "react";
+import { useState as useState46 } from "react";
 import { EuiFlexItem as EuiFlexItem25 } from "@elastic/eui";
 import { jsx as jsx221 } from "@emotion/react/jsx-runtime";
 var WfoStepFormOld = ({
@@ -52066,8 +52125,8 @@ var WfoStepFormOld = ({
   processId,
   userPermissions
 }) => {
-  const [isProcessing, setIsProcessing] = useState45(false);
-  const [hasError, setHasError] = useState45(false);
+  const [isProcessing, setIsProcessing] = useState46(false);
+  const [hasError, setHasError] = useState46(false);
   const { theme } = useOrchestratorTheme();
   const [resumeProcess] = useResumeProcessMutation();
   const submitForm = (processInput) => {
@@ -52457,7 +52516,7 @@ var WfoStep = React72.forwardRef(
     userPermissions
   }, ref) => {
     const { isExpanded, step, userInputForm } = stepListItem;
-    const [tableView, setTableView] = useState46(false);
+    const [tableView, setTableView] = useState47(false);
     const { theme } = useOrchestratorTheme();
     const {
       stepEmailContainerStyle,
@@ -52697,12 +52756,12 @@ var WfoStepList = React73.forwardRef(
 WfoStepList.displayName = "WfoStepList";
 
 // src/components/WfoWorkflowSteps/WfoWorkflowStepList/WfoWorkflowStepList.tsx
-import React75, { useEffect as useEffect33, useState as useState48 } from "react";
+import React75, { useEffect as useEffect33, useState as useState49 } from "react";
 import { useTranslations as useTranslations67 } from "next-intl";
 
 // src/components/WfoDiff/WfoDiff.tsx
 var refractor = __toESM(require_refractor(), 1);
-import { useCallback as useCallback8, useEffect as useEffect32, useMemo as useMemo6, useState as useState47 } from "react";
+import { useCallback as useCallback8, useEffect as useEffect32, useMemo as useMemo6, useState as useState48 } from "react";
 import { Diff, Hunk, parseDiff, tokenize } from "react-diff-view";
 import "react-diff-view/style/index.css";
 import { useTranslations as useTranslations65 } from "next-intl";
@@ -52759,10 +52818,10 @@ var SMALL_CONTEXT = 3;
 var FULL_CONTEXT = 1e6;
 var WfoDiff = ({ oldText, newText, syntax }) => {
   const t = useTranslations65("processes.delta");
-  const [showSplit, setShowSplit] = useState47(true);
-  const [showFull, setShowFull] = useState47(false);
+  const [showSplit, setShowSplit] = useState48(true);
+  const [showFull, setShowFull] = useState48(false);
   const { diffStyle } = useWithOrchestratorTheme(getWfoDiffStyles);
-  const [{ type, hunks }, setDiff] = useState47({
+  const [{ type, hunks }, setDiff] = useState48({
     type: "modify",
     hunks: []
   });
@@ -52895,16 +52954,16 @@ var WfoWorkflowStepList = React75.forwardRef(
     userInputForm,
     userPermissions
   }, reference) => {
-    const [showHiddenKeys, setShowHiddenKeys] = useState48(false);
-    const [showRaw, setShowRaw] = useState48(false);
-    const [showDelta, setShowDelta] = useState48(false);
-    const [showTraceback, setShowTraceback] = useState48(false);
+    const [showHiddenKeys, setShowHiddenKeys] = useState49(false);
+    const [showRaw, setShowRaw] = useState49(false);
+    const [showDelta, setShowDelta] = useState49(false);
+    const [showTraceback, setShowTraceback] = useState49(false);
     const t = useTranslations67("processes.steps");
     const initialStepListItems = steps.map((step) => ({
       step,
       isExpanded: false
     }));
-    const [stepListItems, setStepListItems] = useState48(initialStepListItems);
+    const [stepListItems, setStepListItems] = useState49(initialStepListItems);
     const persistStepListItemState = (previousStepListItems, updatedSteps, userInputForm2) => {
       const reversedSteps = [...updatedSteps].reverse();
       const lastStepWithSuspendStatusStepId = reversedSteps.find(
@@ -53000,7 +53059,7 @@ var WfoWorkflowStepList = React75.forwardRef(
 WfoWorkflowStepList.displayName = "WfoWorkflowStepList";
 
 // src/components/WfoWorkflowSteps/WfoWorkflowStepList/WfoStepListHeader.tsx
-import { useState as useState49 } from "react";
+import { useState as useState50 } from "react";
 import { useTranslations as useTranslations68 } from "next-intl";
 import {
   EuiButton as EuiButton14,
@@ -53063,7 +53122,7 @@ var WfoStepListHeader = ({
     stepListContentBoldTextStyle,
     stepListOptionsContainerStyle
   } = useWithOrchestratorTheme(getWorkflowStepsStyles);
-  const [isViewOptionOpen, setIsViewOptionOpen] = useState49(false);
+  const [isViewOptionOpen, setIsViewOptionOpen] = useState50(false);
   const onViewOptionClick = () => setIsViewOptionOpen((isViewOptionOpen2) => !isViewOptionOpen2);
   const closeViewOption = () => setIsViewOptionOpen(false);
   const viewOptionButton = /* @__PURE__ */ jsx231(
@@ -53183,9 +53242,9 @@ var WfoStartProcessPage = ({
 }) => {
   const t = useTranslations69("processes.steps");
   const router = useRouter10();
-  const [hasError, setHasError] = useState50(false);
+  const [hasError, setHasError] = useState51(false);
   const { theme } = useOrchestratorTheme();
-  const [form, setForm] = useState50({});
+  const [form, setForm] = useState51({});
   const { productId, subscriptionId } = router.query;
   const {
     data: subscriptionDetail,
@@ -53603,14 +53662,14 @@ var WfoSubscriptionDetailPage = () => {
 };
 
 // src/pages/subscriptions/WfoSubscriptionsListPage.tsx
-import { useEffect as useEffect35, useState as useState51 } from "react";
+import { useEffect as useEffect35, useState as useState52 } from "react";
 import { useTranslations as useTranslations74 } from "next-intl";
 import { StringParam as StringParam4, useQueryParam as useQueryParam3, withDefault as withDefault4 } from "use-query-params";
 import { EuiSpacer as EuiSpacer23 } from "@elastic/eui";
 import { Fragment as Fragment58, jsx as jsx238, jsxs as jsxs127 } from "@emotion/react/jsx-runtime";
 var WfoSubscriptionsListPage = () => {
   const t = useTranslations74("subscriptions.detail");
-  const [tableDefaults, setTableDefaults] = useState51();
+  const [tableDefaults, setTableDefaults] = useState52();
   const getStoredTableConfig = useStoredTableConfig(
     SUBSCRIPTIONS_TABLE_LOCAL_STORAGE_KEY
   );
@@ -53675,7 +53734,7 @@ var WfoSubscriptionsListPage = () => {
 };
 
 // src/pages/tasks/WfoTasksListPage.tsx
-import { useContext as useContext11, useEffect as useEffect36, useState as useState52 } from "react";
+import { useContext as useContext11, useEffect as useEffect36, useState as useState53 } from "react";
 import { useTranslations as useTranslations75 } from "next-intl";
 import Link11 from "next/link";
 import { useRouter as useRouter12 } from "next/router";
@@ -53753,7 +53812,7 @@ var WfoTasksListPage = () => {
     "activeTab",
     withDefault5(StringParam5, "ACTIVE" /* ACTIVE */)
   );
-  const [tableDefaults, setTableDefaults] = useState52();
+  const [tableDefaults, setTableDefaults] = useState53();
   const selectedTasksListTab = getTasksListTabTypeFromString(activeTab);
   const localStorageKey = selectedTasksListTab === "ACTIVE" /* ACTIVE */ ? ACTIVE_TASKS_LIST_TABLE_LOCAL_STORAGE_KEY : COMPLETED_TASKS_LIST_TABLE_LOCAL_STORAGE_KEY;
   const getStoredTableConfig = useStoredTableConfig(localStorageKey);
@@ -53862,7 +53921,7 @@ var WfoTasksListPage = () => {
 };
 
 // src/pages/workflows/WfoWorkflowsListPage.tsx
-import { useEffect as useEffect37, useState as useState53 } from "react";
+import { useEffect as useEffect37, useState as useState54 } from "react";
 import { useTranslations as useTranslations76 } from "next-intl";
 import { useRouter as useRouter13 } from "next/router";
 import { StringParam as StringParam6, useQueryParam as useQueryParam5, withDefault as withDefault6 } from "use-query-params";
@@ -53939,7 +53998,7 @@ var WfoWorkflowsListPage = () => {
     "activeTab",
     withDefault6(StringParam6, "ACTIVE" /* ACTIVE */)
   );
-  const [tableDefaults, setTableDefaults] = useState53();
+  const [tableDefaults, setTableDefaults] = useState54();
   const selectedWorkflowsListTab = getWorkflowsListTabTypeFromString(activeTab);
   const localStorageKey = selectedWorkflowsListTab === "ACTIVE" /* ACTIVE */ ? ACTIVE_PROCESSES_LIST_TABLE_LOCAL_STORAGE_KEY : COMPLETED_PROCESSES_LIST_TABLE_LOCAL_STORAGE_KEY;
   const getStoredTableConfig = useStoredTableConfig(localStorageKey);
@@ -54325,7 +54384,7 @@ var WfoJsonCodeBlock = ({
 };
 
 // src/components/WfoSettings/WfoFlushSettings.tsx
-import { useState as useState54 } from "react";
+import { useState as useState55 } from "react";
 import { useTranslations as useTranslations78 } from "next-intl";
 import {
   EuiButton as EuiButton17,
@@ -54367,7 +54426,7 @@ var WfoFlushSettings = () => {
   );
   const [clearCache] = useClearCacheMutation();
   const t = useTranslations78("settings.page");
-  const [selectedOptions, setSelected] = useState54(
+  const [selectedOptions, setSelected] = useState55(
     []
   );
   const { showToastMessage } = useShowToastMessage();
@@ -55653,7 +55712,7 @@ var WfoTitleWithWebsocketBadge = ({
 };
 
 // src/components/WfoRadioDropdown/WfoRadioDropdown.tsx
-import { useState as useState55 } from "react";
+import { useState as useState56 } from "react";
 import {
   EuiButtonEmpty as EuiButtonEmpty5,
   EuiFlexGroup as EuiFlexGroup32,
@@ -55666,7 +55725,7 @@ var WfoRadioDropdown = ({
   onUpdateOption,
   selectedOption
 }) => {
-  const [isOpen, setIsOpen] = useState55(false);
+  const [isOpen, setIsOpen] = useState56(false);
   const handleClose = () => {
     if (isOpen) {
       setIsOpen(false);