@gravitee/ui-particles-angular 16.4.0 → 16.4.1-fix-apim-12804-16-x-4170031

package/fesm2022/gravitee-ui-particles-angular.mjs

@@ -3275,6 +3275,9 @@ class GioFormJsonSchemaComponent {
         this.touched = false;
         this.isValid$ = new ReplaySubject(1); // Wait JsonSchema to be loaded to check if it's valid
         this.stateChanges$ = new Subject();
+        this.isWritingValue = false;
+        this.isStable = false;
+        this.isUpdatingParent = false;
         if (ngControl) {
             // Setting the value accessor directly (instead of using
             // the providers `NG_VALUE_ACCESSOR`) to avoid running into a circular import.
@@ -3321,9 +3324,9 @@ class GioFormJsonSchemaComponent {
         // Sync control value with default value (without emit event) as long as the component is not ready
         // When formly is initialised, it emits several values as it builds up step by step.
         this.formGroup.valueChanges
-            .pipe(distinctUntilChanged(isEqual), tap(value => {
-            this.ngControl?.control?.reset(value, { emitEvent: false });
-        }), takeUntil(this.ready), takeUntil(this.unsubscribe$))
+            .pipe(distinctUntilChanged(isEqual), filter(() => !this.isWritingValue && this.isStable), tap(value => {
+            this.syncValueToParent(value);
+        }), takeUntil(this.unsubscribe$))
             .subscribe();
         // Avoid ExpressionChangedAfterItHasBeenCheckedError on project
         this.changeDetectorRef.markForCheck();
@@ -3381,7 +3384,22 @@ class GioFormJsonSchemaComponent {
     }
     // From ControlValueAccessor
     writeValue(value) {
+        if (this.isUpdatingParent)
+            return;
+        this.isWritingValue = true;
+        this.isStable = false;
         this.model = cloneDeep(value) ?? {};
+        setTimeout(() => {
+            this.isWritingValue = false;
+            this.isStable = true;
+            this.syncValueToParent(this.formGroup.value);
+            this.changeDetectorRef.markForCheck();
+        }, 0);
+    }
+    syncValueToParent(value) {
+        this.isUpdatingParent = true;
+        this.ngControl?.control?.setValue(value, { emitEvent: false });
+        this.isUpdatingParent = false;
     }
     // From ControlValueAccessor
     registerOnChange(fn) {
@@ -4753,10 +4771,41 @@ const toCronExpression = (cronDisplay) => {
 const toCronDescription = (cronExpression) => {
     throwIfInvalid(cronExpression);
     if (!isEmpty(cronExpression)) {
-        return Cronstrue.toString(cronExpression);
+        return Cronstrue.toString(expandMisleadingSteps(cronExpression));
     }
     return '';
 };
+/**
+ * Expand step values (like *\/50) that don't evenly divide the field range
+ * into explicit value lists (like 0,50) so that cronstrue generates an accurate description.
+ *
+ * For example, *\/50 in the minutes field means "at every minute divisible by 50" (i.e. 0 and 50),
+ * NOT "every 50 minutes". Without this fix, cronstrue would display "Every 50 minutes" which is misleading.
+ *
+ * See: https://github.com/bradymholt/cRonstrue/issues/360
+ */
+const expandMisleadingSteps = (cronExpression) => {
+    const parts = cronExpression.trim().split(/\s+/);
+    // Field ranges: [seconds, minutes, hours, day-of-month, month, day-of-week]
+    const fieldRanges = [60, 60, 24, undefined, undefined, undefined];
+    const expandedParts = parts.map((part, index) => {
+        const range = fieldRanges[index];
+        if (range === undefined)
+            return part;
+        const match = part.match(/^\*\/(\d+)$/);
+        if (!match)
+            return part;
+        const step = parseInt(match[1], 10);
+        if (step <= 0 || range % step === 0)
+            return part;
+        const values = [];
+        for (let v = 0; v < range; v += step) {
+            values.push(v);
+        }
+        return values.join(',');
+    });
+    return expandedParts.join(' ');
+};
 /**
  * Simple validation to ensure that the cron expression has 6 parts.
  * Note : The full cron expression validation is done by the backend.