@fuentis/phoenix-ui 0.0.9-alpha.588 → 0.0.9-alpha.590

package/fesm2022/fuentis-phoenix-ui.mjs

@@ -2900,7 +2900,11 @@ const DEFAULT_MORE_ACTIONS = {
     label: '',
     items: [
         { key: 'EXPORT_PDF', label: 'ACTION.EXPORT_PDF', icon: 'pi pi-file-pdf' },
-        { key: 'EXPORT_EXCEL', label: 'ACTION.EXPORT_EXCEL', icon: 'pi pi-file-excel' },
+        {
+            key: 'EXPORT_EXCEL',
+            label: 'ACTION.EXPORT_EXCEL',
+            icon: 'pi pi-file-excel',
+        },
     ],
 };
 class TableComponent {
@@ -3154,7 +3158,9 @@ class TableComponent {
             this.columnTypeMap = {};
             for (const col of this.columns)
                 this.columnTypeMap[col.field] = col.columnType;
-            const nextSelected = this.selectedColumnsInput?.length ? this.selectedColumnsInput : this.columns;
+            const nextSelected = this.selectedColumnsInput?.length
+                ? this.selectedColumnsInput
+                : this.columns;
             // microtask to avoid change detection timing issues
             Promise.resolve().then(() => {
                 this.selectedColumns = [...nextSelected];
@@ -3255,29 +3261,31 @@ class TableComponent {
         const s = cfg?.initialSort;
         // NEW style
         if (Array.isArray(s))
-            return s.filter(x => !!x?.field);
+            return s.filter((x) => !!x?.field);
         if (s && typeof s === 'object' && s.field)
             return [s];
         // LEGACY fallback
         if (cfg?.initialSortField) {
-            return [{
+            return [
+                {
                     field: cfg.initialSortField,
                     order: (cfg.initialSortOrder ?? 1),
-                }];
+                },
+            ];
         }
         return [];
     }
     /**
-   * Applies initial sort once:
-   * - Uses tableConfiguration.initialSortField if provided
-   * - Otherwise uses the first available column field
-   * - Always ASC (order = 1)
-   *
-   * Runs only when:
-   * - we have data
-   * - we have columns/selectedColumns
-   * - it hasn't been applied yet for current dataset
-   */
+     * Applies initial sort once:
+     * - Uses tableConfiguration.initialSortField if provided
+     * - Otherwise uses the first available column field
+     * - Always ASC (order = 1)
+     *
+     * Runs only when:
+     * - we have data
+     * - we have columns/selectedColumns
+     * - it hasn't been applied yet for current dataset
+     */
     applyInitialSortIfNeeded() {
         if (this.initialSortApplied)
             return;
@@ -3288,18 +3296,20 @@ class TableComponent {
             this.initialSortApplied = true;
             return;
         }
-        const cols = (this.selectedColumns?.length ? this.selectedColumns : this.columns) ?? [];
+        const cols = (this.selectedColumns?.length ? this.selectedColumns : this.columns) ??
+            [];
         if (!cols.length)
             return;
         // 1) normalize config
         const cfgMeta = this.normalizeInitialSort(this.tableConfiguration);
         // 2) if nothing configured -> fallback first column ASC
         const fallbackField = cols[0]?.field;
-        const wantedMeta = (cfgMeta.length ? cfgMeta : [{ field: fallbackField, order: 1 }])
-            .filter(m => !!m?.field);
+        const wantedMeta = (cfgMeta.length ? cfgMeta : [{ field: fallbackField, order: 1 }]).filter((m) => !!m?.field);
         // 3) keep only fields that exist in columns
-        const validMeta = wantedMeta.filter(m => cols.some((c) => c?.field === m.field));
-        const finalMeta = validMeta.length ? validMeta : [{ field: fallbackField, order: 1 }];
+        const validMeta = wantedMeta.filter((m) => cols.some((c) => c?.field === m.field));
+        const finalMeta = validMeta.length
+            ? validMeta
+            : [{ field: fallbackField, order: 1 }];
         if (!finalMeta[0]?.field) {
             this.tableData = this.allData;
             this.totalRecords = this.tableData.length;
@@ -3327,7 +3337,9 @@ class TableComponent {
     onSearch(query) {
         const trimmed = (query ?? '').trim().toLowerCase();
         this.searchQuery = trimmed;
-        const baseData = Object.keys(this.currentFilters).length > 0 ? this.getFilteredData() : this.originalData;
+        const baseData = Object.keys(this.currentFilters).length > 0
+            ? this.getFilteredData()
+            : this.originalData;
         const searchableFields = (this.columns ?? [])
             .map((c) => (c?.field ?? '').trim())
             .filter((f) => !!f);
@@ -3373,7 +3385,9 @@ class TableComponent {
             return undefined;
         if (!path.includes('.'))
             return obj[path];
-        return path.split('.').reduce((acc, key) => (acc == null ? undefined : acc[key]), obj);
+        return path
+            .split('.')
+            .reduce((acc, key) => (acc == null ? undefined : acc[key]), obj);
     }
     matchesQuery(value, query) {
         if (value === null || value === undefined)
@@ -3400,18 +3414,31 @@ class TableComponent {
         return this.originalData.filter((item) => {
             return Object.keys(this.currentFilters).every((key) => {
                 const filterValue = this.currentFilters[key];
-                if (!filterValue || (Array.isArray(filterValue) && filterValue.length === 0))
+                if (!filterValue ||
+                    (Array.isArray(filterValue) && filterValue.length === 0))
                     return true;
                 const itemValue = this.getNestedValue(item, key);
+                // Ako je itemValue niz (kao u scopes)
+                if (Array.isArray(itemValue)) {
+                    return filterValue.some((option) => {
+                        const optionKey = option?.key || option;
+                        return itemValue.some((val) => val?.name?.toString().toLowerCase() ===
+                            optionKey?.toString().toLowerCase());
+                    });
+                }
+                // Ako je filterValue niz
                 if (Array.isArray(filterValue)) {
                     return filterValue.some((option) => {
                         const optionKey = option?.key || option;
-                        return itemValue?.toString().toLowerCase() === optionKey?.toString().toLowerCase();
+                        return (itemValue?.toString().toLowerCase() ===
+                            optionKey?.toString().toLowerCase());
                     });
                 }
+                // Single filter
                 const singleFilterValue = filterValue?.key || filterValue;
                 return singleFilterValue
-                    ? itemValue?.toString().toLowerCase() === singleFilterValue.toString().toLowerCase()
+                    ? itemValue?.toString().toLowerCase() ===
+                        singleFilterValue.toString().toLowerCase()
                     : true;
             });
         });
@@ -3478,7 +3505,10 @@ class TableComponent {
         return '';
     }
     compareStringsNatural(a, b) {
-        return a.localeCompare(b, undefined, { numeric: true, sensitivity: 'base' });
+        return a.localeCompare(b, undefined, {
+            numeric: true,
+            sensitivity: 'base',
+        });
     }
     // ============================================================
     // SELECTION / UI ACTIONS
@@ -3522,7 +3552,9 @@ class TableComponent {
      * Used by checkbox template to disable selection on specific rows.
      */
     isRowSelectable(event) {
-        return typeof event.data?.canSelect === 'boolean' ? event.data.canSelect : true;
+        return typeof event.data?.canSelect === 'boolean'
+            ? event.data.canSelect
+            : true;
     }
     /**
      * Some tables allow click on first N columns to open details.
@@ -3545,7 +3577,9 @@ class TableComponent {
     getNested(obj, path) {
         if (!obj || !path)
             return null;
-        return path.split('.').reduce((o, k) => (o != null ? o[k] : null), obj);
+        return path
+            .split('.')
+            .reduce((o, k) => (o != null ? o[k] : null), obj);
     }
     /**
      * Applies column selection coming from table-caption (array of field names).
@@ -3734,6 +3768,55 @@ function noDangerousCharsValidator() {
     };
 }
 
+var CompareOperatorType;
+(function (CompareOperatorType) {
+    CompareOperatorType["LESS_OR_EQUAL"] = "LESS_OR_EQUAL";
+    CompareOperatorType["LESS"] = "LESS";
+    CompareOperatorType["EQUAL"] = "EQUAL";
+    CompareOperatorType["MORE_OR_EQUAL"] = "MORE_OR_EQUAL";
+    CompareOperatorType["MORE"] = "MORE";
+})(CompareOperatorType || (CompareOperatorType = {}));
+function dateCompareValidator(fieldToCompare, comparison, errMessage) {
+    return (control) => {
+        if (!control.parent)
+            return null; // ako form group ne postoji
+        const compareControl = control.parent.get(fieldToCompare);
+        if (!compareControl)
+            return null; // polje za poređenje ne postoji
+        const controlValue = control.value ? new Date(control.value) : null;
+        const compareValue = compareControl.value
+            ? new Date(compareControl.value)
+            : null;
+        if (!controlValue || !compareValue)
+            return null; // nema vrednosti, ne validira
+        let valid = true;
+        switch (comparison) {
+            case CompareOperatorType.LESS:
+                valid = controlValue < compareValue;
+                break;
+            case CompareOperatorType.LESS_OR_EQUAL:
+                valid = controlValue <= compareValue;
+                break;
+            case CompareOperatorType.EQUAL:
+                valid = controlValue.getTime() === compareValue.getTime();
+                break;
+            case CompareOperatorType.MORE_OR_EQUAL:
+                valid = controlValue >= compareValue;
+                break;
+            case CompareOperatorType.MORE:
+                valid = controlValue > compareValue;
+                break;
+        }
+        if (!valid) {
+            return {
+                dateCompare: errMessage ||
+                    `Datum ne zadovoljava uslov ${comparison} u odnosu na ${fieldToCompare}`,
+            };
+        }
+        return null; // validno
+    };
+}
+
 class MetaFormService {
     router = inject(Router);
     formEvent = new Subject();
@@ -3808,8 +3891,7 @@ class MetaFormAbstract {
     onFormCancel = new EventEmitter();
     formActive$;
     formSub$;
-    constructor(fb, metaService, translateService, http // private env: EnvService
-    ) {
+    constructor(fb, metaService, translateService, http) {
         this.fb = fb;
         this.metaService = metaService;
         this.translateService = translateService;
@@ -3823,10 +3905,7 @@ class MetaFormAbstract {
     }
     createForm(controls) {
         controls?.forEach((control) => {
-            this.metaForm.addControl(control.configuration?.key, this.fb.control(getFieldType(control)
-            ///updateOn: blur only for controls with async validators. If added for all each tab/step toggle removes form value. Check why
-            // control.asyncValidators && { updateOn: 'blur' },
-            ));
+            this.metaForm.addControl(control.configuration?.key, this.fb.control(getFieldType(control)));
             //add validators
             this.addControlValidators(control);
             //disable non editable fields
@@ -3864,6 +3943,11 @@ class MetaFormAbstract {
                 validators.push(timePeriod(this.translateService.currentLang, control.validators.tpMin));
             control.validators.dueDate && validators.push(startDueDateValidator);
         }
+        if (control.validators?.compare) {
+            const compareConfig = control.validators.compare;
+            validators.push(dateCompareValidator(compareConfig.fieldToCompare, // napomena: ispravi typo 'feildToCompare'
+            compareConfig.comparisonOperator, compareConfig.errMessage));
+        }
         if (control?.mandatory) {
             validators.push(Validators.required);
         }
@@ -4386,6 +4470,7 @@ var ErrorType;
     ErrorType["MAX"] = "max";
     ErrorType["MIN"] = "min";
     ErrorType["DANGEROUS_CHARS"] = "dangerousChars";
+    ErrorType["DATE_COMPARE"] = "dateCompare";
 })(ErrorType || (ErrorType = {}));
 
 class InlineFieldError {
@@ -4437,6 +4522,7 @@ class InlineFieldError {
         //   return 'ENTRY OK';
         // }
         if (control?.errors) {
+            console.log('error type', Object.keys(control.errors)[0]);
             switch (Object.keys(control.errors)[0]) {
                 case ErrorType.REQUIRED:
                     return this.translateService.instant('VALIDATION_MESSAGE.THIS_FIELD_IS_REQUIRED');
@@ -4469,6 +4555,8 @@ class InlineFieldError {
                     return this.translateService.instant('VALIDATION_MESSAGE.VALUE_SHOULD_MATCH_TIMEPATTERN_LIMIT_MIN');
                 case ErrorType.BOTH_DATES:
                     return this.translateService.instant('VALIDATION_MESSAGE.BOTH_START_END_DATE_REQUIRED');
+                case ErrorType.DATE_COMPARE:
+                    return this.translateService.instant(control.errors['dateCompare']);
                 // add more cases for other validators as needed
                 case ErrorType.PATTERN:
                     const re = '^(https?://)?([\\da-z.-]+)\\.([a-z.]{2,6})[/\\w .-]*/?$';