@decaf-ts/for-angular 0.1.15 → 0.1.17

package/fesm2022/decaf-ts-for-angular.mjs

@@ -3893,11 +3893,15 @@ class NgxRepositoryDirective extends DecafComponent {
         if (!condition) {
             condition = this.buildCondition();
         }
+        // !! use where condition will make paginator ignores sortBy and col name
         return await this.repository
             .select()
-            .where(condition)
-            .orderBy([(this.sortBy || this.pk), sortDirection])
+            .orderBy((this.sortBy || this.pk), sortDirection)
             .paginate(limit);
+        // .select()
+        // .where(condition)
+        // .orderBy([(this.sortBy || this.pk) as keyof M, sortDirection])
+        // .paginate(limit);
     }
     async transactionBegin(data, repository, operation) {
         try {
@@ -5671,7 +5675,7 @@ class NgxModelPageDirective extends NgxPageDirective {
                     if (result?.[this.pk]) {
                         this.modelId = result[this.pk];
                     }
-                    if (redirect) {
+                    if (redirect && !isModalChild) {
                         this.location.back();
                     }
                 }
@@ -5799,6 +5803,7 @@ class NgxRenderableComponentDirective extends NgxModelPageDirective {
             component = this?.output?.component;
         if (!this.instance && component)
             this.instance = component;
+        const isModalChild = this.instance?.['isModalChild'] ?? false;
         if (this.instance && component) {
             const componentKeys = Object.keys(this.instance);
             for (const key of componentKeys) {
@@ -5810,6 +5815,7 @@ class NgxRenderableComponentDirective extends NgxModelPageDirective {
                         await this.handleEvent({
                             component: component.name || '',
                             name: key,
+                            isModalChild,
                             ...event,
                         });
                     });
@@ -13640,37 +13646,52 @@ let FileUploadComponent = class FileUploadComponent extends NgxFormFieldDirectiv
     async parseValue(revert = false) {
         if (!revert) {
             const files = this.files;
-            if (this.valueType === 'base64') {
-                return JSON.stringify(await this.getDataURLs(files));
-            }
-            else {
-                const data = [];
-                for (const file of files) {
-                    const source = await this.getDataURLs(file);
-                    data.push({
-                        name: file.name,
-                        size: file.size,
-                        type: file.type,
-                        source,
-                    });
+            if (files?.length) {
+                if (this.valueType === 'base64') {
+                    return JSON.stringify(await this.getDataURLs(files));
+                }
+                else {
+                    const data = [];
+                    for (const file of files) {
+                        const source = await this.getDataURLs(file);
+                        data.push({
+                            name: file.name,
+                            size: file.size,
+                            type: file.type,
+                            source,
+                        });
+                    }
+                    return JSON.stringify(data);
                 }
-                return JSON.stringify(data);
             }
         }
-        if (this.value && typeof this.value === Primitives.STRING) {
+        if (this.value) {
             try {
-                const value = JSON.parse(this.value);
+                let value;
+                try {
+                    value = JSON.parse(this.value);
+                }
+                catch (error) {
+                    value = this.value;
+                }
                 const files = Array.isArray(value) ? value : [value];
-                this.files = files.map((file) => {
-                    const mime = this.getFileMime(file)?.split('/') || [];
-                    const type = mime?.[0] === 'text' ? mime?.[1] : `${mime?.[0]}/${mime?.[1]}`;
-                    return {
-                        name: mime?.[0] || 'file',
-                        type: `${type}` || 'image/*',
-                        source: file,
-                    };
-                });
-                this.getPreview();
+                if (files?.length) {
+                    this.files = files
+                        .map((file) => {
+                        if (this.isBase64String(file)) {
+                            const mime = this.getFileMime(file)?.split('/') || [];
+                            const type = mime?.[0] === 'text' ? mime?.[1] : `${mime?.[0]}/${mime?.[1]}`;
+                            return {
+                                name: mime?.[0] || 'file',
+                                type: `${type}` || 'image/*',
+                                source: file,
+                            };
+                        }
+                        return false;
+                    })
+                        .filter(Boolean);
+                    this.getPreview();
+                }
             }
             catch (error) {
                 this.log.for(this.initialize).error(`Error parsing file list: ${error.message || error}`);