@nsshunt/stsuxvue 1.0.73 → 1.0.74

package/dist/stsuxvue.cjs

@@ -10620,10 +10620,13 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     const LogDebug = (message) => {
       stsutils.defaultLogger.debug(baseColour(`stsuxvue:UXModelNavigator:${message}`));
     };
+    const LogWarning = (message) => {
+      stsutils.defaultLogger.warn(baseColour(`stsuxvue:UXModelNavigator:${message}`));
+    };
     const TransformSubscriptionPayloadCallback = (subscriptionPayload) => {
       observabilitySubscriberManager?.TransformSubscriptionPayloadCallback(subscriptionPayload);
     };
-    let rootLevelSubscriptions = [{
+    const GetRootLevelSubscriptions = () => [{
       subscriptionKey: {
         id: v4(),
         topic: stsobservability.SubscriptionTopic.AllServicesCombined
@@ -10636,7 +10639,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       },
       cb: TransformSubscriptionPayloadCallback
     }];
-    const ServicesSubscriptions = [{
+    const GetServicesSubscriptions = () => [{
       subscriptionKey: {
         id: v4(),
         topic: stsobservability.SubscriptionTopic.Services
@@ -10664,7 +10667,6 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
         cb: TransformSubscriptionPayloadCallback
       }];
     };
-    let navSubscriptions = rootLevelSubscriptions;
     let navigationSubscriptions = {
       subscriptions: [],
       currentSubscriptions: null
@@ -10708,7 +10710,7 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
         if (store._models[props.modelId].serviceModelSubscriptionKey) {
           switch (store._models[props.modelId].serviceModelSubscriptionKey?.topic) {
             case stsobservability.SubscriptionTopic.AllServicesCombined:
-              navigate(ServicesSubscriptions);
+              navigate(GetServicesSubscriptions());
               break;
             case stsobservability.SubscriptionTopic.Services:
               navigate(GetServiceInstancesSubscriptions(id));
@@ -10721,8 +10723,11 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       }
     };
     const navigate = function(subscriptions) {
-      obj.subscriptions.push(navSubscriptions);
-      navSubscriptions = subscriptions;
+      if (obj.currentSubscriptions) {
+        obj.subscriptions.push(obj.currentSubscriptions);
+      } else {
+        LogWarning(`navigate: obj.currentSubscriptions not defined`);
+      }
       obj.currentSubscriptions = subscriptions;
       LogDebug(`navigate: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(subscriptions)})`);
       observabilitySubscriberManager?.UpdateModelCursor(subscriptions);
@@ -10731,10 +10736,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       if (obj.subscriptions.length > 0) {
         let key = obj.subscriptions.pop();
         if (key) {
-          navSubscriptions = key;
           obj.currentSubscriptions = key;
-          LogDebug(`GoBack: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(navSubscriptions)})`);
-          observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
+          LogDebug(`GoBack: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(obj.currentSubscriptions)})`);
+          observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
         } else {
           LogDebug(`GoBack: subscriptions key not defined`);
         }
@@ -10744,10 +10748,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
     };
     const TopLevel = function() {
       obj.subscriptions = [];
-      navSubscriptions = rootLevelSubscriptions;
-      obj.currentSubscriptions = rootLevelSubscriptions;
-      LogDebug(`TopLevel: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(navSubscriptions)})`);
-      observabilitySubscriberManager?.UpdateModelCursor(navSubscriptions);
+      obj.currentSubscriptions = GetRootLevelSubscriptions();
+      LogDebug(`TopLevel: observabilitySubscriberManager().UpdateModelCursor(${JSON.stringify(obj.currentSubscriptions)})`);
+      observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
     };
     vue.onMounted(() => {
       LogDebug(`onMounted()`);
@@ -10776,9 +10779,9 @@ const _sfc_main$1 = /* @__PURE__ */ vue.defineComponent({
       store.UpdateObservabilitySubscriberManager(observabilitySubscriberManager.id, observabilitySubscriberManager);
       LogDebug(`Start(): observabilitySubscriberManager().Start(): Mode: [${options.consumeInstrumentationMode}]`);
       await observabilitySubscriberManager.Start();
-      obj.currentSubscriptions = rootLevelSubscriptions;
-      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(): Mode: [${options.consumeInstrumentationMode}] rootLevelSubscriptions: [(${JSON.stringify(rootLevelSubscriptions)}]`);
-      observabilitySubscriberManager?.UpdateModelCursor(rootLevelSubscriptions);
+      obj.currentSubscriptions = GetRootLevelSubscriptions();
+      LogDebug(`Start(): observabilitySubscriberManager().UpdateModelCursor(): Mode: [${options.consumeInstrumentationMode}] rootLevelSubscriptions: [(${JSON.stringify(obj.currentSubscriptions)}]`);
+      observabilitySubscriberManager?.UpdateModelCursor(obj.currentSubscriptions);
       store.UpdateSate(props.modelId, _estate.STARTED);
     };
     __expose({