@alfresco/adf-process-services-cloud 8.4.0-18007101927 → 8.4.0-18008472431

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

@@ -13339,7 +13339,7 @@ class StartProcessCloudComponent {
         }
     }
     get disableStartButton() {
-        return !this.appName || !this.processDefinition.valid || this.isProcessStarting || !this.processDefinitionLoaded || this.isFormCloudLoading;
+        return !this.appName || !this.processDefinition.valid || this.isProcessStarting || this.isFormCloudLoading;
     }
     get isProcessDefinitionsEmpty() {
         return !this.processDefinitionList.length;
@@ -13390,8 +13390,8 @@ class StartProcessCloudComponent {
         this.filteredProcesses = [];
         this.staticMappings = [];
         this.isProcessStarting = false;
-        this.isFormCloudLoading = false;
         this.isFormCloudLoaded = false;
+        this.isFormCloudLoading = true;
         this.processDefinitionLoaded = false;
         this.processForm = new FormGroup({
             processInstanceName: new FormControl('', [
@@ -13416,6 +13416,9 @@ class StartProcessCloudComponent {
         if (this.processDefinitionName) {
             this.processDefinition.setValue(this.processDefinitionName);
         }
+        else {
+            this.isFormCloudLoading = false;
+        }
         this.processDefinition.valueChanges
             .pipe(debounceTime(PROCESS_DEFINITION_DEBOUNCE))
             .pipe(takeUntilDestroyed(this.destroyRef))
@@ -13458,53 +13461,43 @@ class StartProcessCloudComponent {
             this.setProcessDefinitionOnForm(this.filteredProcesses[0].name);
         }
     }
-    fetchStaticVariablesAndConstants(selectedProcessDefinitionName) {
-        const processDefinitionCurrent = this.selectProcessDefinition(selectedProcessDefinitionName);
-        return forkJoin([
+    setProcessDefinitionOnForm(selectedProcessDefinitionName) {
+        this.isFormCloudLoading = true;
+        const processDefinitionCurrent = this.filteredProcesses.find((process) => process.name === selectedProcessDefinitionName || process.key === selectedProcessDefinitionName);
+        forkJoin([
             this.startProcessCloudService
                 .getStartEventFormStaticValuesMapping(this.appName, processDefinitionCurrent.id)
                 .pipe(catchError(() => of([]))),
             this.startProcessCloudService
                 .getStartEventConstants(this.appName, processDefinitionCurrent.id)
                 .pipe(catchError(() => of([])))
-        ]);
-    }
-    onFetchStaticVariablesAndConstants([staticMappings, constants]) {
-        this.staticMappings = staticMappings;
-        this.resolvedValues = this.staticMappings.concat(this.values || []);
-        const displayStart = constants?.find((constant) => constant.name === 'startEnabled');
-        const startLabel = constants?.find((constant) => constant.name === 'startLabel');
-        const displayCancel = constants?.find((constant) => constant.name === 'cancelEnabled');
-        const cancelLabel = constants?.find((constant) => constant.name === 'cancelLabel');
-        if (displayStart) {
-            this.displayStartSubject.next(displayStart?.value);
-        }
-        if (startLabel) {
-            this.startProcessButtonLabel = startLabel?.value?.trim()?.length > 0 ? startLabel.value.trim() : this.defaultStartProcessButtonLabel;
-        }
-        if (displayCancel) {
-            this.showCancelButton = displayCancel?.value === 'true' && this.showCancelButton;
-        }
-        if (cancelLabel) {
-            this.cancelButtonLabel = cancelLabel?.value?.trim()?.length > 0 ? cancelLabel.value.trim() : this.defaultCancelProcessButtonLabel;
-        }
-    }
-    setProcessDefinitionOnForm(selectedProcessDefinitionName) {
-        this.isFormCloudLoading = true;
-        this.fetchStaticVariablesAndConstants(selectedProcessDefinitionName).subscribe({
-            next: ([staticMappings, constants]) => this.onFetchStaticVariablesAndConstants([staticMappings, constants]),
-            error: () => {
-                this.isFormCloudLoading = false;
-            },
-            complete: () => {
+        ]).subscribe({
+            next: ([staticMappings, constants]) => {
+                this.staticMappings = staticMappings;
+                this.resolvedValues = this.staticMappings.concat(this.values || []);
+                this.processDefinitionCurrent = processDefinitionCurrent;
+                const displayStart = constants?.find((constant) => constant.name === 'startEnabled');
+                const startLabel = constants?.find((constant) => constant.name === 'startLabel');
+                const displayCancel = constants?.find((constant) => constant.name === 'cancelEnabled');
+                const cancelLabel = constants?.find((constant) => constant.name === 'cancelLabel');
+                if (displayStart) {
+                    this.displayStartSubject.next(displayStart?.value);
+                }
+                if (startLabel) {
+                    this.startProcessButtonLabel =
+                        startLabel?.value?.trim()?.length > 0 ? startLabel.value.trim() : this.defaultStartProcessButtonLabel;
+                }
+                if (displayCancel) {
+                    this.showCancelButton = displayCancel?.value === 'true' && this.showCancelButton;
+                }
+                if (cancelLabel) {
+                    this.cancelButtonLabel = cancelLabel?.value?.trim()?.length > 0 ? cancelLabel.value.trim() : this.defaultCancelProcessButtonLabel;
+                }
                 this.isFormCloudLoading = false;
             }
         });
-        this.processPayloadCloud.processDefinitionKey = this.processDefinitionCurrent.key;
-    }
-    selectProcessDefinition(keyOrName) {
-        this.processDefinitionCurrent = this.filteredProcesses.find((process) => process.name === keyOrName || process.key === keyOrName);
-        return this.processDefinitionCurrent;
+        this.isFormCloudLoaded = false;
+        this.processPayloadCloud.processDefinitionKey = processDefinitionCurrent.key;
     }
     getProcessDefinitionListByNameOrKey(processDefinitionName) {
         return this.processDefinitionList.filter((processDefinitionCloud) => !processDefinitionName || this.getProcessDefinition(processDefinitionCloud, processDefinitionName));
@@ -13531,37 +13524,30 @@ class StartProcessCloudComponent {
         this.resetErrorMessage();
         this.startProcessCloudService
             .getProcessDefinitions(this.appName)
-            .pipe(takeUntilDestroyed(this.destroyRef), tap((processDefinitionRepresentations) => {
-            this.processDefinitionList = processDefinitionRepresentations;
-        }), switchMap((processDefinitionRepresentations) => {
-            if (!this.processDefinitionName) {
-                return EMPTY;
-            }
-            if (processDefinitionRepresentations.length === 1) {
-                this.selectDefaultProcessDefinition();
-                return EMPTY;
-            }
-            this.processDefinition.setValue(this.processDefinitionName);
-            const selectedProcessDefinition = this.processDefinitionList.find((process) => process.name === this.processDefinitionName);
-            if (!selectedProcessDefinition) {
-                return EMPTY;
-            }
-            this.filteredProcesses = this.getProcessDefinitionListByNameOrKey(selectedProcessDefinition.name);
-            this.processDefinitionSelectionChanged(selectedProcessDefinition);
-            return this.fetchStaticVariablesAndConstants(selectedProcessDefinition.name);
-        }))
+            .pipe(takeUntilDestroyed(this.destroyRef))
             .subscribe({
-            next: ([staticMappings, constants]) => {
-                if (staticMappings && constants) {
-                    this.onFetchStaticVariablesAndConstants([staticMappings, constants]);
+            next: (processDefinitionRepresentations) => {
+                this.processDefinitionList = processDefinitionRepresentations;
+                if (processDefinitionRepresentations.length === 1) {
+                    this.selectDefaultProcessDefinition();
+                }
+                else if (this.processDefinitionName) {
+                    this.processDefinition.setValue(this.processDefinitionName, { emitEvent: false });
+                    const processDefinition = this.processDefinitionList.find((process) => process.name === this.processDefinitionName);
+                    if (processDefinition) {
+                        this.filteredProcesses = this.getProcessDefinitionListByNameOrKey(processDefinition.name);
+                        this.setProcessDefinitionOnForm(processDefinition.name);
+                        this.processDefinitionSelectionChanged(processDefinition);
+                    }
+                }
+                else {
+                    this.isFormCloudLoading = false;
                 }
                 this.processDefinitionLoaded = true;
             },
             error: () => {
                 this.errorMessageId = 'ADF_CLOUD_PROCESS_LIST.ADF_CLOUD_START_PROCESS.ERROR.LOAD_PROCESS_DEFS';
-            },
-            complete: () => {
-                this.processDefinitionLoaded = true;
+                this.isFormCloudLoading = false;
             }
         });
     }