@alfresco/adf-process-services-cloud 9.2.0-33428582503 → 9.2.0-33748326393

package/fesm2022/adf-process-services-cloud.mjs

@@ -1868,7 +1868,6 @@ class WebSocketService {
         this.httpLink = inject(HttpLink);
         this.authService = inject(AuthenticationService);
         this.appConfigService = inject(AppConfigService);
-        this.subscriptionProtocol = 'graphql-ws';
     }
     getSubscription(options) {
         const { apolloClientName, subscriptionOptions } = options;
@@ -1906,8 +1905,7 @@ class WebSocketService {
             operation.setContext(({ headers }) => ({
                 headers: {
                     ...headers,
-                    ...(this.subscriptionProtocol === 'graphql-ws' && { Authorization: `Bearer ${this.authService.getToken()}` }),
-                    ...(this.subscriptionProtocol === 'transport-ws' && { 'X-Authorization': `Bearer ${this.authService.getToken()}` })
+                    Authorization: `Bearer ${this.authService.getToken()}`
                 }
             }));
             return forward(operation);
@@ -1915,14 +1913,15 @@ class WebSocketService {
         const errorLink = onError(({ graphQLErrors, networkError, operation, forward }) => {
             if (graphQLErrors) {
                 for (const error of graphQLErrors) {
-                    if (error.extensions && error.extensions['code'] === 'UNAUTHENTICATED') {
-                        authLink(operation, forward);
+                    if (error.extensions?.['code'] === 'UNAUTHENTICATED') {
+                        return authLink(operation, forward);
                     }
                 }
             }
             if (networkError) {
                 console.error(`[Network error]: ${networkError}`);
             }
+            return undefined;
         });
         const retryLink = new RetryLink({
             delay: {
@@ -1937,28 +1936,31 @@ class WebSocketService {
         });
         this.apollo.createNamed(options.apolloClientName, {
             headers: {
-                ...(this.subscriptionProtocol === 'graphql-ws' && { Authorization: `Bearer ${this.authService.getToken()}` }),
-                ...(this.subscriptionProtocol === 'transport-ws' && { 'X-Authorization': `Bearer ${this.authService.getToken()}` })
+                Authorization: `Bearer ${this.authService.getToken()}`
             },
             link: from$1([authLink, retryLink, errorLink, link]),
             cache: new InMemoryCache({ merge: true })
         });
     }
     createGraphQLWsLink(options) {
-        this.wsLink = new GraphQLWsLink(createClient({
+        this.wsLink = new GraphQLWsLink(this.createWsClient({
             url: this.createWsUrl(options.wsUrl) + '/v2/ws/graphql',
             connectionParams: () => ({
                 Authorization: 'Bearer ' + this.authService.getToken()
             }),
             on: {
-                error: () => {
-                    this.apollo.removeClient(options.apolloClientName);
-                    this.initSubscriptions(options);
-                }
+                error: () => this.reconnect(options)
             },
             lazy: true
         }));
     }
+    createWsClient(clientOptions) {
+        return createClient(clientOptions);
+    }
+    reconnect(options) {
+        this.apollo.removeClient(options.apolloClientName);
+        this.initSubscriptions(options);
+    }
     createHttpLinkHandler(options) {
         this.httpLinkHandler = options.httpUrl
             ? this.httpLink.create({
@@ -8674,6 +8676,7 @@ class FormCloudComponent extends FormBaseComponent {
     }
     refreshFormData(previousData = []) {
         const snapshot = this.snapshotRuntimeState();
+        this.mergeProcessVariables(this.data ?? []);
         this.form = this.parseForm(this.formCloudRepresentationJSON);
         if (!this.form) {
             return;
@@ -8681,12 +8684,31 @@ class FormCloudComponent extends FormBaseComponent {
         const changedFieldIds = this.getChangedFieldIds(previousData, this.data ?? []);
         this.restoreRuntimeState(this.form, snapshot, changedFieldIds);
         this.setCheckParentVisibilityForValidationOnFields();
-        this.visibilityService.refreshVisibility(this.form);
+        this.visibilityService.refreshVisibility(this.form, this.data);
         this.form.validateForm();
         this.onFormLoaded(this.form);
         this.formService.formRulesEvent.next(new FormRulesEvent('dataRefreshed', new FormEvent(this.form)));
         this.onFormDataRefreshed(this.form);
     }
+    /**
+     * Keeps the process variables on the stored representation up to date with the latest data, so that a
+     * variable omitted by a later partial refresh still resolves to the most recent value received.
+     *
+     * @param updates Variables received on the latest data refresh
+     */
+    mergeProcessVariables(updates) {
+        if (!this.formCloudRepresentationJSON) {
+            return;
+        }
+        const existing = this.formCloudRepresentationJSON.processVariables ?? [];
+        const byName = new Map();
+        for (const variable of [...existing, ...updates]) {
+            if (variable?.name) {
+                byName.set(variable.name, variable);
+            }
+        }
+        this.formCloudRepresentationJSON.processVariables = Array.from(byName.values());
+    }
     snapshotRuntimeState() {
         const snapshot = new Map();
         if (!this.form) {