@privateaim/client-vue 0.8.7 → 0.8.9

package/dist/index.cjs

@@ -10,13 +10,12 @@ var useVuelidate = require('@vuelidate/core');
 var validators = require('@vuelidate/validators');
 var formControls = require('@vuecs/form-controls');
 var coreKit = require('@privateaim/core-kit');
+var coreKit$1 = require('@authup/core-kit');
 var crypto$1 = require('crypto');
 var listControls = require('@vuecs/list-controls');
 var rapiq = require('rapiq');
 require('@authup/kit');
-var coreHttpKit = require('@authup/core-http-kit');
 var storageKit = require('@privateaim/storage-kit');
-var coreKit$1 = require('@authup/core-kit');
 var coreRealtimeKit = require('@authup/core-realtime-kit');
 var timeago = require('@vuecs/timeago');
 var link = require('@vuecs/link');
@@ -808,9 +807,6 @@ class CryptoAsymmetricAlgorithm {
 function hasOwnProperty(obj, prop) {
     return Object.prototype.hasOwnProperty.call(obj, prop);
 }
-function isObject$3(item) {
-    return !!item && typeof item === 'object' && !Array.isArray(item);
-}
 /*
  * Copyright (c) 2021-2024.
  * Author Peter Placzek (tada5hi)
@@ -829,6 +825,14 @@ function hexToUTF8(value) {
         throw e;
     }
 }
+/*
+ * Copyright (c) 2025.
+ *  Author Peter Placzek (tada5hi)
+ *  For the full copyright and license information,
+ *  view the LICENSE file that was distributed with this source code.
+ */ function isObject$3(item) {
+    return !!item && typeof item === 'object' && !Array.isArray(item);
+}
 function createNanoID(alphabetOrLen, len) {
     return customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', 21)();
 }
@@ -838,6 +842,15 @@ function createNanoID(alphabetOrLen, len) {
  * For the full copyright and license information,
  * view the LICENSE file that was distributed with this source code.
  */ const alphaNumHyphenUnderscoreRegex = /^[a-z0-9-_]*$/;
+/*
+ * Copyright (c) 2025.
+ * Author Peter Placzek (tada5hi)
+ * For the full copyright and license information,
+ * view the LICENSE file that was distributed with this source code.
+ */ function buildDomainEventFullName(type, event) {
+    const eventCapitalized = event.substring(0, 1).toUpperCase() + event.substring(1);
+    return type + eventCapitalized;
+}
 
 /**
  * Returns true if either scoped or unscoped named slot exists
@@ -1149,7 +1162,7 @@ function decodeQueryValue(text) {
     return decode(text.replace(PLUS_RE, " "));
 }
 function parseQuery(parametersString = "") {
-    const object = {};
+    const object = /* @__PURE__ */ Object.create(null);
     if (parametersString[0] === "?") {
         parametersString = parametersString.slice(1);
     }
@@ -3534,43 +3547,8 @@ class Client extends Client$1 {
 }
 
 function setupBaseHTTPClient(app, client) {
-    const storeCreator = clientWebKit.injectStoreFactory(app);
-    const store = storeCreator();
-    const { refreshToken } = clientWebKit.storeToRefs(store);
-    const authupClient = clientWebKit.injectHTTPClient(app);
-    const tokenHook = new coreHttpKit.ClientResponseErrorTokenHook(client, {
-        baseURL: authupClient.getBaseURL(),
-        tokenCreator: ()=>{
-            if (!refreshToken.value) {
-                throw new Error('No refresh token available.');
-            }
-            return authupClient.token.createWithRefreshToken({
-                refresh_token: refreshToken.value
-            });
-        },
-        tokenCreated: (response)=>{
-            store.applyTokenGrantResponse(response);
-        },
-        tokenFailed: ()=>{
-            store.logout();
-        },
-        timer: false
-    });
-    const handleAccessTokenEvent = (token)=>{
-        if (token) {
-            client.setAuthorizationHeader({
-                type: 'Bearer',
-                token
-            });
-            tokenHook.mount();
-        } else {
-            client.unsetAuthorizationHeader();
-            tokenHook.unmount();
-        }
-    };
-    const dispatcher = clientWebKit.injectStoreDispatcher(app);
-    dispatcher.on(clientWebKit.StoreDispatcherEventName.ACCESS_TOKEN_UPDATED, (token)=>handleAccessTokenEvent(token));
-    handleAccessTokenEvent(store.accessToken);
+    const hook = clientWebKit.injectHTTPClientAuthenticationHook(app);
+    hook.attach(client);
 }
 
 const symbol$1 = Symbol.for('FCoreHTTPClient');
@@ -3661,8 +3639,8 @@ function installSocketManager(app, options) {
 function createEntitySocket(ctx) {
     if (!isSocketManagerUsable()) {
         return {
-            mount () {},
-            unmount () {}
+            subscribe () {},
+            unsubscribe () {}
         };
     }
     const socketManager = injectSocketManager();
@@ -3719,65 +3697,88 @@ function createEntitySocket(ctx) {
             ctx.onDeleted(event.data);
         }
     };
-    let mounted = false;
-    const mount = async ()=>{
-        if (ctx.target && !targetId.value || mounted) {
+    let emitEventRetryCount = 0;
+    const emitEvent = async (socket, event)=>{
+        try {
+            await socket.emitWithAck(event, targetId.value, (err)=>{
+                console.log(err);
+            // todo: handle error!
+            });
+        } catch (e) {
+            if (emitEventRetryCount > 3) {
+                throw e;
+            }
+            emitEventRetryCount += 1;
+            await new Promise((resolve)=>{
+                setTimeout(resolve, 0);
+            });
+            await emitEvent(socket, event);
+        }
+    };
+    let isActive = false;
+    const subscribe = async ()=>{
+        if (ctx.target && !targetId.value || isActive) {
             return;
         }
-        mounted = true;
+        isActive = true;
         const socket = await socketManager.connect(coreKit.buildDomainNamespaceName(realmId.value));
         let event;
         if (ctx.buildSubscribeEventName) {
             event = ctx.buildSubscribeEventName();
         } else {
-            event = coreKit.buildDomainEventSubscriptionFullName(ctx.type, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+            event = buildDomainEventFullName(ctx.type, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
         }
-        socket.emit(event, targetId.value, ()=>{
-        // todo: handle error!
-        });
         if (ctx.onCreated) {
-            socket.on(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.CREATED), handleCreated);
+            socket.on(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.CREATED), handleCreated);
         }
         if (ctx.onUpdated) {
-            socket.on(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.UPDATED), handleUpdated);
+            socket.on(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.UPDATED), handleUpdated);
         }
         if (ctx.onDeleted) {
-            socket.on(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.DELETED), handleDeleted);
+            socket.on(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.DELETED), handleDeleted);
         }
+        await emitEvent(socket, event);
     };
-    const unmount = async ()=>{
-        if (ctx.target && !targetId.value || !mounted) {
+    const unsubscribe = async ()=>{
+        if (ctx.target && !targetId.value || !isActive) {
             return;
         }
-        mounted = false;
+        isActive = false;
         const socket = await socketManager.connect(coreKit.buildDomainNamespaceName(realmId.value));
         let event;
         if (ctx.buildUnsubscribeEventName) {
             event = ctx.buildUnsubscribeEventName();
         } else {
-            event = coreKit.buildDomainEventSubscriptionFullName(ctx.type, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+            event = buildDomainEventFullName(ctx.type, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
         }
-        socket.emit(event, targetId.value);
         if (ctx.onCreated) {
-            socket.off(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.UPDATED), handleCreated);
+            socket.off(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.UPDATED), handleCreated);
         }
         if (ctx.onUpdated) {
-            socket.off(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.UPDATED), handleUpdated);
+            socket.off(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.UPDATED), handleUpdated);
         }
         if (ctx.onDeleted) {
-            socket.off(coreKit.buildDomainEventFullName(ctx.type, coreKit$1.DomainEventName.DELETED), handleDeleted);
+            socket.off(buildDomainEventFullName(ctx.type, coreKit$1.EntityDefaultEventName.DELETED), handleDeleted);
         }
+        await emitEvent(socket, event);
     };
-    vue.onMounted(()=>mount());
-    vue.onUnmounted(()=>unmount());
+    let isMounted = false;
+    vue.onMounted(()=>{
+        isMounted = true;
+        return subscribe();
+    });
+    vue.onUnmounted(()=>{
+        isMounted = false;
+        return unsubscribe();
+    });
     vue.watch(targetId, (val, oldValue)=>{
-        if (val !== oldValue) {
-            Promise.resolve().then(()=>unmount()).then(()=>mount());
+        if (val !== oldValue && isMounted) {
+            Promise.resolve().then(()=>unsubscribe()).then(()=>subscribe());
         }
     });
     return {
-        mount,
-        unmount
+        subscribe,
+        unsubscribe
     };
 }
 
@@ -4243,7 +4244,7 @@ function createEntityManager(ctx) {
         if (ctx.props.entity) {
             entity.value = ctx.props.entity;
             if (socket) {
-                socket.mount();
+                socket.subscribe();
             }
             resolved(entity.value);
             return true;
@@ -4257,10 +4258,10 @@ function createEntityManager(ctx) {
             entity.value = propEntityRef.value;
             if (val) {
                 if (socket) {
-                    socket.mount();
+                    socket.subscribe();
                 }
             } else if (socket) {
-                socket.unmount();
+                socket.unsubscribe();
             }
         });
     }
@@ -4281,7 +4282,7 @@ function createEntityManager(ctx) {
             if (ctx.props.entity) {
                 entity.value = ctx.props.entity;
                 if (socket) {
-                    socket.mount();
+                    socket.subscribe();
                 }
                 resolved(entity.value);
                 return;
@@ -4309,7 +4310,7 @@ function createEntityManager(ctx) {
             try {
                 entity.value = await domainAPI.getOne(id, query);
                 if (socket) {
-                    socket.mount();
+                    socket.subscribe();
                 }
                 resolved(entity.value);
                 return;
@@ -4330,7 +4331,7 @@ function createEntityManager(ctx) {
                 if (response.data.length === 1) {
                     [entity.value] = response.data;
                     if (socket) {
-                        socket.mount();
+                        socket.subscribe();
                     }
                 }
                 resolved(entity.value);
@@ -5489,7 +5490,7 @@ const _hoisted_3$g = {
 const _hoisted_4$g = {
     class: "ms-auto"
 };
-const _hoisted_5$b = [
+const _hoisted_5$c = [
     "disabled"
 ];
 const _hoisted_6$b = {
@@ -5525,7 +5526,7 @@ function _sfc_render$n(_ctx, _cache, $props, $setup, $data, $options) {
                             vue.createVNode(_component_FTranslationDefault, {
                                 name: "add"
                             })
-                        ], 8, _hoisted_5$b)
+                        ], 8, _hoisted_5$c)
                     ])
             ])
         ]),
@@ -5951,20 +5952,20 @@ var FProjectNodes = vue.defineComponent({
                 buildSubscribeEventName () {
                     if (props.realmId) {
                         if (props.direction === "in") {
-                            return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.PROJECT_NODE_IN, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                            return buildDomainEventFullName(coreKit.DomainSubType.PROJECT_NODE_IN, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                         }
-                        return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.PROJECT_NODE_OUT, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                        return buildDomainEventFullName(coreKit.DomainSubType.PROJECT_NODE_OUT, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                     }
-                    return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainType.PROJECT_NODE, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                    return buildDomainEventFullName(coreKit.DomainType.PROJECT_NODE, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                 },
                 buildUnsubscribeEventName () {
                     if (props.realmId) {
                         if (props.direction === "in") {
-                            return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.PROJECT_NODE_IN, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                            return buildDomainEventFullName(coreKit.DomainSubType.PROJECT_NODE_IN, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                         }
-                        return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.PROJECT_NODE_OUT, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                        return buildDomainEventFullName(coreKit.DomainSubType.PROJECT_NODE_OUT, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                     }
-                    return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainType.PROJECT_NODE, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                    return buildDomainEventFullName(coreKit.DomainType.PROJECT_NODE, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                 }
             },
             queryFilters: (filters)=>{
@@ -6210,7 +6211,7 @@ const _hoisted_3$f = {
 const _hoisted_4$f = {
     class: "ms-auto d-flex flex-row gap-1"
 };
-const _hoisted_5$a = {
+const _hoisted_5$b = {
     class: "row"
 };
 const _hoisted_6$a = {
@@ -6324,7 +6325,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
         vue.renderSlot(_ctx.$slots, "body", {
             data: _ctx.entity
         }, ()=>[
-                vue.createElementVNode("div", _hoisted_5$a, [
+                vue.createElementVNode("div", _hoisted_5$b, [
                     vue.createElementVNode("div", _hoisted_6$a, [
                         _cache[5] || (_cache[5] = vue.createElementVNode("div", null, [
                             vue.createElementVNode("strong", null, [
@@ -6765,7 +6766,7 @@ const _hoisted_3$e = {
 const _hoisted_4$e = {
     class: "ms-auto"
 };
-const _hoisted_5$9 = {
+const _hoisted_5$a = {
     class: "d-flex justify-content-between flex-row"
 };
 const _hoisted_6$9 = {
@@ -6853,7 +6854,7 @@ function _sfc_render$j(_ctx, _cache, $props, $setup, $data, $options) {
         vue.renderSlot(_ctx.$slots, "body", {
             data: _ctx.entity
         }, ()=>[
-                vue.createElementVNode("div", _hoisted_5$9, [
+                vue.createElementVNode("div", _hoisted_5$a, [
                     vue.createElementVNode("div", _hoisted_6$9, [
                         _cache[2] || (_cache[2] = vue.createElementVNode("div", null, [
                             vue.createElementVNode("strong", null, [
@@ -8016,7 +8017,7 @@ function createSingletonPromise(fn) {
     }
     wrapper.reset = async ()=>{
         const _prev = _promise;
-        _promise = undefined;
+        _promise = void 0;
         if (_prev) await _prev;
     };
     return wrapper;
@@ -8027,8 +8028,8 @@ function toArray(value) {
     ];
 }
 function useTimeoutFn(cb, interval, options = {}) {
-    const { immediate = true } = options;
-    const isPending = vue.ref(false);
+    const { immediate = true, immediateCallback = false } = options;
+    const isPending = vue.shallowRef(false);
     let timer = null;
     function clear() {
         if (timer) {
@@ -8041,6 +8042,7 @@ function useTimeoutFn(cb, interval, options = {}) {
         clear();
     }
     function start(...args) {
+        if (immediateCallback) cb();
         clear();
         isPending.value = true;
         timer = setTimeout(()=>{
@@ -8055,7 +8057,7 @@ function useTimeoutFn(cb, interval, options = {}) {
     }
     tryOnScopeDispose(stop);
     return {
-        isPending: vue.readonly(isPending),
+        isPending: vue.shallowReadonly(isPending),
         start,
         stop
     };
@@ -8067,12 +8069,12 @@ function watchImmediate(source, cb, options) {
     });
 }
 
-const defaultWindow = isClient ? window : undefined;
-const defaultNavigator = isClient ? window.navigator : undefined;
+const defaultWindow = isClient ? window : void 0;
+const defaultNavigator = isClient ? window.navigator : void 0;
 function unrefElement(elRef) {
     var _a;
     const plain = vue.toValue(elRef);
-    return (_a = plain == null ? undefined : plain.$el) != null ? _a : plain;
+    return (_a = plain == null ? void 0 : plain.$el) != null ? _a : plain;
 }
 function useEventListener(...args) {
     const cleanups = [];
@@ -8086,12 +8088,12 @@ function useEventListener(...args) {
     };
     const firstParamTargets = vue.computed(()=>{
         const test = toArray(vue.toValue(args[0])).filter((e)=>e != null);
-        return test.every((e)=>typeof e !== "string") ? test : undefined;
+        return test.every((e)=>typeof e !== "string") ? test : void 0;
     });
     const stopWatch = watchImmediate(()=>{
         var _a, _b;
         return [
-            (_b = (_a = firstParamTargets.value) == null ? undefined : _a.map((e)=>unrefElement(e))) != null ? _b : [
+            (_b = (_a = firstParamTargets.value) == null ? void 0 : _a.map((e)=>unrefElement(e))) != null ? _b : [
                 defaultWindow
             ].filter((e)=>e != null),
             toArray(vue.toValue(firstParamTargets.value ? args[1] : args[0])),
@@ -8101,7 +8103,7 @@ function useEventListener(...args) {
         ];
     }, ([raw_targets, raw_events, raw_listeners, raw_options])=>{
         cleanup();
-        if (!(raw_targets == null ? undefined : raw_targets.length) || !(raw_events == null ? undefined : raw_events.length) || !(raw_listeners == null ? undefined : raw_listeners.length)) return;
+        if (!(raw_targets == null ? void 0 : raw_targets.length) || !(raw_events == null ? void 0 : raw_events.length) || !(raw_listeners == null ? void 0 : raw_listeners.length)) return;
         const optionsClone = isObject(raw_options) ? {
             ...raw_options
         } : raw_options;
@@ -8117,7 +8119,7 @@ function useEventListener(...args) {
     return stop;
 }
 function useMounted() {
-    const isMounted = vue.ref(false);
+    const isMounted = vue.shallowRef(false);
     const instance = vue.getCurrentInstance();
     if (instance) {
         vue.onMounted(()=>{
@@ -8143,7 +8145,7 @@ function usePermission(permissionDesc, options = {}) {
     const state = vue.shallowRef();
     const update = ()=>{
         var _a, _b;
-        state.value = (_b = (_a = permissionStatus.value) == null ? undefined : _a.state) != null ? _b : "prompt";
+        state.value = (_b = (_a = permissionStatus.value) == null ? void 0 : _a.state) != null ? _b : "prompt";
     };
     useEventListener(permissionStatus, "change", update, {
         passive: true
@@ -8154,7 +8156,7 @@ function usePermission(permissionDesc, options = {}) {
             try {
                 permissionStatus.value = await navigator1.permissions.query(desc);
             } catch (e) {
-                permissionStatus.value = undefined;
+                permissionStatus.value = void 0;
             } finally{
                 update();
             }
@@ -8178,18 +8180,16 @@ function useClipboard(options = {}) {
     const permissionRead = usePermission("clipboard-read");
     const permissionWrite = usePermission("clipboard-write");
     const isSupported = vue.computed(()=>isClipboardApiSupported.value || legacy);
-    const text = vue.ref("");
-    const copied = vue.ref(false);
+    const text = vue.shallowRef("");
+    const copied = vue.shallowRef(false);
     const timeout = useTimeoutFn(()=>copied.value = false, copiedDuring, {
         immediate: false
     });
-    function updateText() {
+    async function updateText() {
         let useLegacy = !(isClipboardApiSupported.value && isAllowed(permissionRead.value));
         if (!useLegacy) {
             try {
-                navigator1.clipboard.readText().then((value)=>{
-                    text.value = value;
-                });
+                text.value = await navigator1.clipboard.readText();
             } catch (e) {
                 useLegacy = true;
             }
@@ -8232,7 +8232,7 @@ function useClipboard(options = {}) {
     }
     function legacyRead() {
         var _a, _b, _c;
-        return (_c = (_b = (_a = document == null ? undefined : document.getSelection) == null ? undefined : _a.call(document)) == null ? undefined : _b.toString()) != null ? _c : "";
+        return (_c = (_b = (_a = document == null ? void 0 : document.getSelection) == null ? void 0 : _a.call(document)) == null ? void 0 : _b.toString()) != null ? _c : "";
     }
     function isAllowed(status) {
         return status === "granted" || status === "prompt";
@@ -8366,7 +8366,7 @@ const _hoisted_3$d = {
 const _hoisted_4$d = {
     class: "d-flex flex-row"
 };
-const _hoisted_5$8 = {
+const _hoisted_5$9 = {
     class: "ms-auto"
 };
 const _hoisted_6$8 = {
@@ -8407,7 +8407,7 @@ function _sfc_render$i(_ctx, _cache, $props, $setup, $data, $options) {
                         label: vue.withCtx(()=>[
                                 vue.createElementVNode("div", _hoisted_4$d, [
                                     _cache[8] || (_cache[8] = vue.createElementVNode("div", null, " PublicKey ", -1)),
-                                    vue.createElementVNode("div", _hoisted_5$8, [
+                                    vue.createElementVNode("div", _hoisted_5$9, [
                                         vue.withDirectives(vue.createElementVNode("button", {
                                             type: "button",
                                             class: "btn btn-xs btn-dark",
@@ -8759,8 +8759,8 @@ var FAnalysisNodes = vue.defineComponent({
             default: `${"out"}`
         }
     },
-    slots: Object,
     emits: defineListEvents(),
+    slots: Object,
     async setup (props, ctx) {
         const source = vue.computed(()=>props.target === coreKit.DomainType.NODE ? coreKit.DomainType.ANALYSIS : coreKit.DomainType.NODE);
         const isSameSocketRoom = (room)=>{
@@ -8802,20 +8802,20 @@ var FAnalysisNodes = vue.defineComponent({
                 buildSubscribeEventName () {
                     if (props.realmId) {
                         if (props.direction === "in") {
-                            return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.ANALYSIS_NODE_IN, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                            return buildDomainEventFullName(coreKit.DomainSubType.ANALYSIS_NODE_IN, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                         }
-                        return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.ANALYSIS_NODE_OUT, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                        return buildDomainEventFullName(coreKit.DomainSubType.ANALYSIS_NODE_OUT, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                     }
-                    return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainType.ANALYSIS_NODE, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
+                    return buildDomainEventFullName(coreKit.DomainType.ANALYSIS_NODE, coreKit.DomainEventSubscriptionName.SUBSCRIBE);
                 },
                 buildUnsubscribeEventName () {
                     if (props.realmId) {
                         if (props.direction === "in") {
-                            return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.ANALYSIS_NODE_IN, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                            return buildDomainEventFullName(coreKit.DomainSubType.ANALYSIS_NODE_IN, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                         }
-                        return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainSubType.ANALYSIS_NODE_OUT, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                        return buildDomainEventFullName(coreKit.DomainSubType.ANALYSIS_NODE_OUT, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                     }
-                    return coreKit.buildDomainEventSubscriptionFullName(coreKit.DomainType.ANALYSIS_NODE, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
+                    return buildDomainEventFullName(coreKit.DomainType.ANALYSIS_NODE, coreKit.DomainEventSubscriptionName.UNSUBSCRIBE);
                 }
             },
             queryFilters: (filters)=>{
@@ -9069,7 +9069,7 @@ const _hoisted_3$c = {
 const _hoisted_4$c = {
     class: "ms-auto"
 };
-const _hoisted_5$7 = [
+const _hoisted_5$8 = [
     "disabled",
     "onClick"
 ];
@@ -9156,7 +9156,7 @@ function _sfc_render$h(_ctx, _cache, $props, $setup, $data, $options) {
                                     vue.createElementVNode("i", {
                                         class: "fa fa-trash"
                                     }, null, -1)
-                                ]), 8, _hoisted_5$7)
+                                ]), 8, _hoisted_5$8)
                             ])
                         ])
                     ]),
@@ -9697,7 +9697,7 @@ const _hoisted_4$a = [
     "disabled",
     "onClick"
 ];
-const _hoisted_5$6 = {
+const _hoisted_5$7 = {
     class: "col"
 };
 const _hoisted_6$6 = [
@@ -9756,7 +9756,7 @@ function _sfc_render$f(_ctx, _cache, $props, $setup, $data, $options) {
                 "onChanged"
             ])
         ]),
-        vue.createElementVNode("div", _hoisted_5$6, [
+        vue.createElementVNode("div", _hoisted_5$7, [
             vue.createVNode(_component_FFormInputList, {
                 ref: "itemsAfterVNode",
                 names: _ctx.itemsAfter,
@@ -10265,7 +10265,7 @@ const _hoisted_4$7 = [
     "webkitdirectory",
     "disbaled"
 ];
-const _hoisted_5$5 = {
+const _hoisted_5$6 = {
     class: "form-group mb-0"
 };
 const _hoisted_6$5 = {
@@ -10301,7 +10301,7 @@ function _sfc_render$b(_ctx, _cache, $props, $setup, $data, $options) {
                     onChange: _cache[0] || (_cache[0] = (...args)=>_ctx.checkTempFiles && _ctx.checkTempFiles(...args))
                 }, null, 40, _hoisted_4$7)
             ]),
-            vue.createElementVNode("div", _hoisted_5$5, [
+            vue.createElementVNode("div", _hoisted_5$6, [
                 vue.createElementVNode("div", _hoisted_6$5, [
                     vue.withDirectives(vue.createElementVNode("input", {
                         id: "train-file-manager-switch",
@@ -10535,7 +10535,7 @@ const _hoisted_3$6 = {
 const _hoisted_4$6 = {
     class: "form-group"
 };
-const _hoisted_5$4 = [
+const _hoisted_5$5 = [
     "disabled"
 ];
 const _hoisted_6$4 = {
@@ -10661,7 +10661,7 @@ function _sfc_render$a(_ctx, _cache, $props, $setup, $data, $options) {
                         class: "fa fa-trash"
                     }, null, -1),
                     vue.createTextVNode(" Delete ")
-                ]), 8, _hoisted_5$4)
+                ]), 8, _hoisted_5$5)
             ])
         ]),
         vue.createElementVNode("div", null, [
@@ -10946,7 +10946,7 @@ const _hoisted_3$4 = {
 const _hoisted_4$4 = [
     "for"
 ];
-const _hoisted_5$3 = {
+const _hoisted_5$4 = {
     class: "d-flex flex-row",
     style: {
         "width": "100%"
@@ -11044,7 +11044,7 @@ function _sfc_render$8(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
             ]),
         footer: vue.withCtx((props)=>[
-                vue.createElementVNode("div", _hoisted_5$3, [
+                vue.createElementVNode("div", _hoisted_5$4, [
                     vue.createElementVNode("div", null, [
                         vue.createElementVNode("button", {
                             disabled: _ctx.isBusy,
@@ -11106,6 +11106,33 @@ var _sfc_main$7 = vue.defineComponent({
         const { confirm } = bootstrapVueNext.useModalController();
         const apiClient = injectCoreHTTPClient();
         const entity = vue.toRef(props, 'entity');
+        const form = vue.reactive({
+            query: null,
+            master_image_id: null,
+            files: [],
+            hash_signed: '',
+            hash: null
+        });
+        const updateForm = (entity)=>{
+            initFormAttributesFromSource(form, entity);
+        };
+        updateForm(entity.value);
+        const isBusy = vue.ref(false);
+        const initialized = vue.ref(false);
+        const valid = vue.ref(false);
+        const startIndex = vue.ref(0);
+        const index = vue.ref(0);
+        const steps = [
+            coreKit.AnalysisConfigurationStatus.NODES,
+            coreKit.AnalysisConfigurationStatus.FILES,
+            coreKit.AnalysisConfigurationStatus.MASTER_IMAGE
+        ];
+        const updatedAt = vue.computed(()=>entity.value ? entity.value.updated_at : undefined);
+        vue.watch(updatedAt, (val, oldValue)=>{
+            if (val && val !== oldValue) {
+                updateForm(entity.value);
+            }
+        });
         const entrypointFile = vue.ref(null);
         const masterImage = vue.ref(null);
         const resolveRelations = async ()=>{
@@ -11136,33 +11163,6 @@ var _sfc_main$7 = vue.defineComponent({
             }
         };
         await resolveRelations();
-        const form = vue.reactive({
-            query: null,
-            master_image_id: null,
-            files: [],
-            hash_signed: '',
-            hash: null
-        });
-        const updateForm = (entity)=>{
-            initFormAttributesFromSource(form, entity);
-        };
-        updateForm(entity.value);
-        const isBusy = vue.ref(false);
-        const initialized = vue.ref(false);
-        const valid = vue.ref(false);
-        const startIndex = vue.ref(0);
-        const index = vue.ref(0);
-        const steps = [
-            coreKit.AnalysisConfigurationStatus.NODES,
-            coreKit.AnalysisConfigurationStatus.FILES,
-            coreKit.AnalysisConfigurationStatus.MASTER_IMAGE
-        ];
-        const updatedAt = vue.computed(()=>entity.value ? entity.value.updated_at : undefined);
-        vue.watch(updatedAt, (val, oldValue)=>{
-            if (val && val !== oldValue) {
-                updateForm(entity.value);
-            }
-        });
         const handleUpdated = (entity)=>{
             updateForm(entity);
             emit('updated', entity);
@@ -11562,7 +11562,7 @@ const _hoisted_4$3 = {
     key: 0,
     class: "col"
 };
-const _hoisted_5$2 = [
+const _hoisted_5$3 = [
     "disabled",
     "onClick"
 ];
@@ -11695,7 +11695,7 @@ function _sfc_render$6(_ctx, _cache, $props, $setup, $data, $options) {
                                         "fa fa-minus": _ctx.form.project_id === props.data.id
                                     })
                                 }, null, 2)
-                            ], 10, _hoisted_5$2)
+                            ], 10, _hoisted_5$3)
                         ]),
                     _: 1
                 }, 8, [
@@ -12166,65 +12166,9 @@ var TrainPipeline = /* @__PURE__ */ _export_sfc(_sfc_main$3, [
     ]
 ]);
 
-var FAnalysisNodeRunStatus = vue.defineComponent({
-    props: {
-        status: {
-            type: String,
-            default: null
-        }
-    },
-    setup (props, { slots }) {
-        const statusText = vue.computed(()=>{
-            if (props.status) {
-                return props.status;
-            }
-            return 'none';
-        });
-        const classSuffix = vue.computed(()=>{
-            switch(props.status){
-                case coreKit.AnalysisNodeRunStatus.STARTED:
-                case coreKit.AnalysisNodeRunStatus.STARTING:
-                    {
-                        return 'primary';
-                    }
-                case coreKit.AnalysisNodeRunStatus.FINISHED:
-                    {
-                        return 'success';
-                    }
-                case coreKit.AnalysisNodeRunStatus.RUNNING:
-                    {
-                        return 'dark';
-                    }
-                case coreKit.AnalysisNodeRunStatus.STOPPED:
-                case coreKit.AnalysisNodeRunStatus.STOPPING:
-                    {
-                        return 'warning';
-                    }
-                case coreKit.AnalysisNodeRunStatus.FAILED:
-                    {
-                        return 'danger';
-                    }
-            }
-            return 'info';
-        });
-        if (hasNormalizedSlot('default', slots)) {
-            return ()=>normalizeSlot('default', {
-                    classSuffix: classSuffix.value,
-                    statusText: statusText.value
-                }, slots);
-        }
-        return ()=>vue.h('span', {
-                class: `text-${classSuffix.value}`
-            }, [
-                statusText.value
-            ]);
-    }
-});
-
 var _sfc_main$2 = vue.defineComponent({
     components: {
-        FAnalysisNodes,
-        FAnalysisNodeRunStatus
+        FAnalysisNodes
     },
     props: {
         entity: {
@@ -12267,20 +12211,22 @@ var _sfc_main$2 = vue.defineComponent({
 
 const _hoisted_1$2 = {
     key: 0,
-    class: "train-stations-progress"
+    class: "analysis-nodes"
 };
 const _hoisted_2$2 = {
-    class: "icon"
+    class: "text-left"
 };
 const _hoisted_3$2 = {
+    class: "icon"
+};
+const _hoisted_4$2 = {
     key: 1,
     class: "progress bg-white"
 };
-const _hoisted_4$2 = [
+const _hoisted_5$2 = [
     "aria-valuenow"
 ];
 function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
-    const _component_FAnalysisNodeRunStatus = vue.resolveComponent("FAnalysisNodeRunStatus");
     const _component_FAnalysisNodes = vue.resolveComponent("FAnalysisNodes");
     return vue.openBlock(), vue.createElementBlock("div", null, [
         _ctx.elementType === "steps" ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_1$2, [
@@ -12295,8 +12241,11 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
                         (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(props.data, (item)=>{
                             return vue.openBlock(), vue.createElementBlock("div", {
                                 key: item.id,
-                                class: "d-flex flex-column progress-step"
+                                class: "d-flex flex-column progress-step flex-grow-1"
                             }, [
+                                vue.createElementVNode("div", _hoisted_2$2, [
+                                    vue.createElementVNode("h6", null, vue.toDisplayString(item.node.name), 1)
+                                ]),
                                 vue.createElementVNode("div", {
                                     class: vue.normalizeClass([
                                         "d-flex justify-content-center icon-circle text-light p-1",
@@ -12310,20 +12259,8 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
                                         }
                                     ])
                                 }, [
-                                    vue.createElementVNode("span", _hoisted_2$2, vue.toDisplayString(item.node.name), 1)
-                                ], 2),
-                                _cache[0] || (_cache[0] = vue.createElementVNode("div", {
-                                    class: "mt-1"
-                                }, [
-                                    vue.createElementVNode("strong", null, "Status")
-                                ], -1)),
-                                vue.createElementVNode("div", null, [
-                                    vue.createVNode(_component_FAnalysisNodeRunStatus, {
-                                        status: item.run_status
-                                    }, null, 8, [
-                                        "status"
-                                    ])
-                                ])
+                                    vue.createElementVNode("span", _hoisted_3$2, vue.toDisplayString(item.run_status || "none"), 1)
+                                ], 2)
                             ]);
                         }), 128))
                     ]),
@@ -12333,7 +12270,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
                 "realm-id",
                 "source-id"
             ])
-        ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_3$2, [
+        ])) : (vue.openBlock(), vue.createElementBlock("div", _hoisted_4$2, [
             vue.createElementVNode("div", {
                 class: vue.normalizeClass([
                     "progress-bar",
@@ -12348,7 +12285,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
                 "aria-valuenow": _ctx.progressPercentage,
                 "aria-valuemin": "0",
                 "aria-valuemax": "100"
-            }, null, 14, _hoisted_4$2)
+            }, null, 14, _hoisted_5$2)
         ]))
     ]);
 }
@@ -13219,6 +13156,61 @@ const FAnalysisNodeApprovalStatus = vue.defineComponent({
     }
 });
 
+var FAnalysisNodeRunStatus = vue.defineComponent({
+    props: {
+        status: {
+            type: String,
+            default: null
+        }
+    },
+    setup (props, { slots }) {
+        const statusText = vue.computed(()=>{
+            if (props.status) {
+                return props.status;
+            }
+            return 'none';
+        });
+        const classSuffix = vue.computed(()=>{
+            switch(props.status){
+                case coreKit.AnalysisNodeRunStatus.STARTED:
+                case coreKit.AnalysisNodeRunStatus.STARTING:
+                    {
+                        return 'primary';
+                    }
+                case coreKit.AnalysisNodeRunStatus.FINISHED:
+                    {
+                        return 'success';
+                    }
+                case coreKit.AnalysisNodeRunStatus.RUNNING:
+                    {
+                        return 'dark';
+                    }
+                case coreKit.AnalysisNodeRunStatus.STOPPED:
+                case coreKit.AnalysisNodeRunStatus.STOPPING:
+                    {
+                        return 'warning';
+                    }
+                case coreKit.AnalysisNodeRunStatus.FAILED:
+                    {
+                        return 'danger';
+                    }
+            }
+            return 'info';
+        });
+        if (hasNormalizedSlot('default', slots)) {
+            return ()=>normalizeSlot('default', {
+                    classSuffix: classSuffix.value,
+                    statusText: statusText.value
+                }, slots);
+        }
+        return ()=>vue.h('span', {
+                class: `text-${classSuffix.value}`
+            }, [
+                statusText.value
+            ]);
+    }
+});
+
 var _sfc_main = vue.defineComponent({
     components: {
         FAnalysisBucket,