@decaf-ts/for-angular 0.1.16 → 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,
                         });
                     });