@alfresco/adf-process-services-cloud 9.2.0-35569866168 → 9.2.0-35636294809

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

@@ -3,7 +3,7 @@ import { inject, Injectable, InjectionToken, EventEmitter, DestroyRef, Output, I
 import * as i3 from '@alfresco/adf-core';
 import { AppConfigService, JwtHelperService, OAuth2Service, TranslationService, DataTableSchema, UserPreferencesService, UserPreferenceValues, CustomEmptyContentTemplateDirective, ObjectDataTableAdapter, ColumnsSelectorComponent, MainMenuDataTableTemplateDirective, EmptyContentComponent, NoContentTemplateDirective, LoadingContentTemplateDirective, DataTableComponent, AdfDateFnsAdapter, MOMENT_DATE_FORMATS, AuthenticationService, StorageService, IconModule, DateFnsUtils, ADF_DATE_FORMATS, FullNamePipe, InitialUsernamePipe, FormService, FormModel, FormFieldTypes, ROW_ID_PREFIX, FormBaseComponent, ADF_DISPLAY_TEXT_SETTINGS, WidgetVisibilityService, FormExpressionService, UploadWidgetContentLinkModel, FormEvent, FormOutcomeModel, ConfirmDialogComponent, FormRulesEvent, FormOutcomeEvent, FormRendererComponent, ToolbarDividerComponent, ToolbarComponent, FormatSpacePipe, NotificationService, DownloadService, WidgetComponent, ThumbnailService, ErrorWidgetComponent, LocalizedDatePipe, UploadDirective, ContentLinkModel, ErrorMessageModel, DEFAULT_DATE_FORMAT, FormFieldValueFormatterService, ADF_TYPED_VALUE_FORMATTING_ENABLED, FormFieldEvent, SelectFilterInputComponent, FormRenderingService, DynamicComponentMapper, CardViewUpdateService, ClipboardService, CardViewTextItemModel, CardViewSelectItemModel, CardViewDatetimeItemModel, CardViewDateItemModel, CardViewArrayItemModel, CardViewComponent, CustomLoadingContentTemplateDirective, isOutcomeButtonVisible, InplaceFormInputComponent, BaseViewerWidgetComponent, BaseDisplayTextWidgetComponent, ObjectDataColumn, ObjectDataRow, FormBaseModule, provideTranslations } from '@alfresco/adf-core';
 import { from, EMPTY, isObservable, of, Subject, throwError, BehaviorSubject, combineLatest, defer, merge, asapScheduler, firstValueFrom, forkJoin, catchError as catchError$1 } from 'rxjs';
-import { map, take, switchMap, catchError, tap, filter, finalize, debounceTime, shareReplay, mergeMap, distinctUntilChanged, expand, reduce, mapTo, concatMap } from 'rxjs/operators';
+import { map, take, switchMap, catchError, distinctUntilChanged, filter, tap, finalize, debounceTime, shareReplay, mergeMap, expand, reduce, mapTo, concatMap } from 'rxjs/operators';
 import { AlfrescoApiService, NodeAction, ContentNodeSelectorComponent, NodesApiService, ContentService, ContentNodeSelectorPanelService, NewVersionUploaderService, NewVersionUploaderDataAction, ContentMetadataComponent, AlfrescoViewerComponent } from '@alfresco/adf-content-services';
 import { AdfHttpClient } from '@alfresco/adf-core/api';
 import { takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
@@ -1479,15 +1479,20 @@ class TaskListCloudComponent extends BaseTaskListCloudComponent {
         this.rows = [];
         this.isReloadingSubject$ = new BehaviorSubject(false);
         this.isLoading$ = combineLatest([this.isLoadingPreferences$, this.isReloadingSubject$]).pipe(map(([isLoadingPreferences, isReloading]) => isLoadingPreferences || isReloading));
+        // incremented on every explicit reload() so it always refetches, even when the computed request is unchanged
+        this.reloadNonce = 0;
         this.fetchProcessesTrigger$ = new Subject();
-        combineLatest([this.isLoadingPreferences$, this.isColumnSchemaCreated$, this.fetchProcessesTrigger$])
-            .pipe(tap(() => this.isReloadingSubject$.next(true)), filter(([isLoadingPreferences, isColumnSchemaCreated]) => !isLoadingPreferences && !!isColumnSchemaCreated), switchMap(() => {
+        combineLatest([this.isLoadingPreferences$.pipe(distinctUntilChanged()), this.isColumnSchemaCreated$, this.fetchProcessesTrigger$])
+            .pipe(filter(([isLoadingPreferences, isColumnSchemaCreated]) => !isLoadingPreferences && !!isColumnSchemaCreated), map(([, , reloadNonce]) => {
+            const requestNode = this.searchApiMethod === 'POST' ? this.createTaskListRequestNode() : this.createRequestNode();
+            return { reloadNonce, requestNode, requestKey: JSON.stringify(requestNode) };
+        }), 
+        // skip identical requests triggered by schema/preference re-emissions, but always refetch on an explicit reload()
+        distinctUntilChanged((previous, current) => previous.reloadNonce === current.reloadNonce && previous.requestKey === current.requestKey), tap(() => this.isReloadingSubject$.next(true)), switchMap(({ requestNode }) => {
             if (this.searchApiMethod === 'POST') {
-                const requestNode = this.createTaskListRequestNode();
                 return this.taskListCloudService.fetchTaskList(requestNode).pipe(take(1));
             }
             else {
-                const requestNode = this.createRequestNode();
                 this.requestNode = requestNode;
                 return this.taskListCloudService.getTaskByRequest(requestNode);
             }
@@ -1513,7 +1518,7 @@ class TaskListCloudComponent extends BaseTaskListCloudComponent {
     }
     reload() {
         this.isReloadingSubject$.next(true);
-        this.fetchProcessesTrigger$.next();
+        this.fetchProcessesTrigger$.next(++this.reloadNonce);
     }
     createTaskListRequestNode() {
         const requestNode = {
@@ -8688,6 +8693,7 @@ class FormCloudComponent extends FormBaseComponent {
     }
     refreshFormData(previousData = []) {
         const snapshot = this.snapshotRuntimeState();
+        const variableSnapshot = this.snapshotVariablesRuntimeState();
         this.mergeProcessVariables(this.data ?? []);
         this.form = this.parseForm(this.formCloudRepresentationJSON);
         if (!this.form) {
@@ -8695,6 +8701,7 @@ class FormCloudComponent extends FormBaseComponent {
         }
         const changedFieldIds = this.getChangedFieldIds(previousData, this.data ?? []);
         this.restoreRuntimeState(this.form, snapshot, changedFieldIds);
+        this.restoreVariablesRuntimeState(this.form, variableSnapshot, changedFieldIds, this.data ?? []);
         this.setCheckParentVisibilityForValidationOnFields();
         this.visibilityService.refreshVisibility(this.form, this.data);
         this.form.validateForm();
@@ -8716,7 +8723,8 @@ class FormCloudComponent extends FormBaseComponent {
         const byName = new Map();
         for (const variable of [...existing, ...updates]) {
             if (variable?.name) {
-                byName.set(variable.name, variable);
+                const name = variable.name.startsWith('variables.') ? variable.name.slice('variables.'.length) : variable.name;
+                byName.set(name, variable);
             }
         }
         this.formCloudRepresentationJSON.processVariables = Array.from(byName.values());
@@ -8766,6 +8774,45 @@ class FormCloudComponent extends FormBaseComponent {
             field.visibilityCondition = prior.visibilityCondition;
         }
     }
+    snapshotVariablesRuntimeState() {
+        const snapshot = new Map();
+        if (!this.form?.variables?.length) {
+            return snapshot;
+        }
+        for (const variable of this.form.variables) {
+            snapshot.set(variable.id, {
+                value: variable.value,
+                runtimeSet: variable.runtimeSet
+            });
+        }
+        return snapshot;
+    }
+    restoreVariablesRuntimeState(form, snapshot, changedVariableNames, updates) {
+        if (!form?.variables?.length || !snapshot.size) {
+            return;
+        }
+        for (const variable of form.variables) {
+            const prior = snapshot.get(variable.id);
+            if (!prior?.runtimeSet) {
+                continue;
+            }
+            const identifiers = [variable.id, variable.name, `variables.${variable.name}`];
+            const changedIdentifier = identifiers.find((identifier) => changedVariableNames.has(identifier));
+            /*
+                Form variables are shared with the stored representation, so a value set at runtime survives
+                the re-parse on its own. It has to be cleared explicitly once the refresh brings a newer value,
+                otherwise the runtime value would mask every later update from the server.
+            */
+            if (changedIdentifier) {
+                const refreshed = updates.find((update) => update?.name === changedIdentifier);
+                variable.value = refreshed ? refreshed.value : variable.value;
+                variable.runtimeSet = false;
+                continue;
+            }
+            variable.value = prior.value;
+            variable.runtimeSet = true;
+        }
+    }
     recomputeVisibleOutcomes() {
         const outcomes = this.form?.outcomes;
         if (!outcomes) {
@@ -9936,12 +9983,25 @@ class DropdownCloudWidgetComponent extends WidgetComponent {
             this.dropdownControl.setValue(value, { emitEvent: false });
         });
         this.setupDropdown();
-        this.formService.onFormVariableChanged.subscribe(({ field }) => {
-            if (field.id === this.field.id) {
+        /*
+            Wired once: both read `this.field` when they emit, so they survive every later setup run.
+            Re-wiring them on each setup would stack subscriptions and duplicate the events they raise.
+        */
+        this.subscribeToInputChanges();
+        this.initFilter();
+        this.formService.onFormVariableChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ field }) => {
+            if (this.isDependentOnChangedVariable(field)) {
                 this.setupDropdown();
             }
         });
     }
+    isDependentOnChangedVariable(field) {
+        const variableName = this.field?.variableConfig?.variableName;
+        if (field.id === this.field.id) {
+            return true;
+        }
+        return this.isVariableOptionType && !!variableName && field?.variableConfig?.variableName === variableName;
+    }
     computeReadOnlyDisplayValue() {
         const value = this.field.value;
         const isFormattableValue = value != null && (typeof value !== 'string' || this.formatter.hasFormatter(this.field.type));
@@ -9983,8 +10043,6 @@ class DropdownCloudWidgetComponent extends WidgetComponent {
         this.updateOptions();
         this.setFormControlValue();
         this.updateFormControlState();
-        this.subscribeToInputChanges();
-        this.initFilter();
         this.handleErrors();
     }
     subscribeToInputChanges() {
@@ -10060,10 +10118,8 @@ class DropdownCloudWidgetComponent extends WidgetComponent {
     persistFieldOptionsFromVariable() {
         const optionsPath = this.field?.variableConfig?.optionsPath ?? this.defaultVariableOptionPath;
         const variableName = this.field?.variableConfig?.variableName;
-        const processVariables = this.field?.form?.processVariables;
-        const formVariables = this.field?.form?.variables;
-        const dropdownOptions = this.getOptionsFromVariable(processVariables, formVariables, variableName);
-        if (dropdownOptions) {
+        const dropdownOptions = this.field?.form?.resolveVariableValue(variableName);
+        if (dropdownOptions != null) {
             const formVariableOptions = this.getOptionsFromPath(dropdownOptions, optionsPath);
             this.updateOptions(formVariableOptions);
             this.resetInvalidValue();
@@ -10112,15 +10168,6 @@ class DropdownCloudWidgetComponent extends WidgetComponent {
         }
         return option;
     }
-    getOptionsFromVariable(processVariables, formVariables, variableName) {
-        const processVariableDropdownOptions = this.getVariableValueByName(processVariables, variableName);
-        const formVariableDropdownOptions = this.getVariableValueByName(formVariables, variableName);
-        return processVariableDropdownOptions ?? formVariableDropdownOptions;
-    }
-    getVariableValueByName(variables, variableName) {
-        return variables?.find((variable) => variable?.name === `variables.${variableName}` || variable?.name === variableName)
-            ?.value;
-    }
     persistFieldOptionsFromRestApi() {
         if (this.isValidRestConfig) {
             this.resetRestApiErrorMessage();
@@ -15770,15 +15817,20 @@ class DataTableWidgetComponent extends WidgetComponent {
         this.defaultResponseProperty = 'data';
         this.pathParserHelper = new DataTablePathParserHelper();
         this.formCloudService = inject(FormCloudService);
+        this.destroyRef = inject(DestroyRef);
     }
     ngOnInit() {
         this.init();
-        this.formService.onFormVariableChanged.subscribe(({ field }) => {
-            if (field.id === this.field.id) {
+        this.formService.onFormVariableChanged.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(({ field }) => {
+            if (this.isDependentOnChangedVariable(field)) {
                 this.init();
             }
         });
     }
+    isDependentOnChangedVariable(field) {
+        const variableName = this.field?.variableConfig?.variableName;
+        return field.id === this.field.id || (!!variableName && field?.variableConfig?.variableName === variableName);
+    }
     init() {
         this.dataTableLoadFailed = false;
         this.setPreviewState();
@@ -15818,15 +15870,7 @@ class DataTableWidgetComponent extends WidgetComponent {
         return this.pathParserHelper.retrieveDataFromPath(rowsData, optionsPath);
     }
     getDataFromVariable() {
-        const processVariables = this.field?.form?.processVariables;
-        const formVariables = this.field?.form?.variables;
-        const processVariableData = this.getVariableValueByName(processVariables, this.variableName);
-        const formVariableData = this.getVariableValueByName(formVariables, this.variableName);
-        return processVariableData ?? formVariableData;
-    }
-    getVariableValueByName(variables, variableName) {
-        return variables?.find((variable) => variable?.name === `variables.${variableName}` || variable?.name === variableName)
-            ?.value;
+        return this.field?.form?.resolveVariableValue(this.variableName);
     }
     setPreviewState() {
         this.previewState = this.formCloudService.getPreviewState();