@team-codeme/crud-forge 1.0.1 → 1.0.2

package/src/templates/angular/shared/base/base-list.component.ts.ejs

@@ -1,4 +1,4 @@
-import { Component, ViewChild, ElementRef, ChangeDetectorRef, DestroyRef, inject } from '@angular/core';
+import { Component, ViewChild, ElementRef, ChangeDetectorRef, DestroyRef, NgZone, inject } from '@angular/core';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort } from '@angular/material/sort';
 import { MatDrawer } from '@angular/material/sidenav';
@@ -48,6 +48,7 @@ export interface RowFlagOption {
 })
 export abstract class BaseListComponent<T extends { id?: number }> {
   protected readonly cdr = inject(ChangeDetectorRef);
+  protected readonly ngZone = inject(NgZone, { optional: true });
   protected readonly dialog = inject(MatDialog);
   protected readonly snackBar = inject(MatSnackBar);
 
@@ -85,9 +86,16 @@ export abstract class BaseListComponent<T extends { id?: number }> {
     if (!viewport) return;
     const update = (width: number) => {
       if (width <= 0) return;
-      this.compactView = width < <%= preferences.ui?.cardBreakpointPx || 640 %>;
-      this.viewMode = this.compactView ? 'card' : this.preferredViewMode;
-      this.cdr.markForCheck();
+      const apply = () => {
+        this.compactView = width < <%= preferences.ui?.cardBreakpointPx || 640 %>;
+        this.viewMode = this.compactView ? 'card' : this.preferredViewMode;
+        this.cdr.markForCheck();
+      };
+      if (this.ngZone) {
+        this.ngZone.run(apply);
+      } else {
+        apply();
+      }
     };
     update(viewport.getBoundingClientRect().width);
     if (typeof ResizeObserver !== 'undefined') {
@@ -116,6 +124,8 @@ export abstract class BaseListComponent<T extends { id?: number }> {
   exportAfterFilter = false;
   totalItems = 0;
   itemsPerPage = 10;
+  dataSource?: any;
+  protected rawRows: T[] = [];
   
   protected baseParentFilters: { [key: string]: string | number } = {};
   protected activeFilters: { [key: string]: string } = {};
@@ -301,14 +311,16 @@ export abstract class BaseListComponent<T extends { id?: number }> {
   }
 
   protected sortRowsForDisplay(rows: T[]): T[] {
-    return [...rows].sort((left, right) => {
-      const leftPinned = this.isPinned(left.id);
-      const rightPinned = this.isPinned(right.id);
-      if (leftPinned === rightPinned) {
-        return 0;
+    const pinned: T[] = [];
+    const unpinned: T[] = [];
+    for (const row of rows) {
+      if (this.isPinned(row.id)) {
+        pinned.push(row);
+      } else {
+        unpinned.push(row);
       }
-      return leftPinned ? -1 : 1;
-    });
+    }
+    return [...pinned, ...unpinned];
   }
 
   togglePin(element: T): void {
@@ -321,6 +333,10 @@ export abstract class BaseListComponent<T extends { id?: number }> {
     if (typeof localStorage !== 'undefined') {
       localStorage.setItem(this.storageKeyPinned, JSON.stringify(Array.from(this.pinnedIds)));
     }
+    if (this.dataSource) {
+      const baseline = this.rawRows.length > 0 ? this.rawRows : (this.rawRows = [...(this.dataSource.data ?? [])]);
+      this.dataSource.data = this.sortRowsForDisplay(baseline);
+    }
     this.cdr.markForCheck();
   }
 

package/src/utils/merger.js

@@ -60,7 +60,8 @@ function extractZones(content) {
 function mergeContent(oldContent, newContent) {
   const oldZones = extractZones(oldContent);
   if (Object.keys(oldZones).length === 0) {
-    return newContent; // No custom code to merge
+    // Preserve existing file content when no merge zones are present to protect developer customizations
+    return oldContent;
   }
 
   const lines = newContent.split(/\r?\n/);

package/test/list-state.js

@@ -133,6 +133,77 @@ async function main() {
   host.closeFormDrawer();
   assert.equal(host.selectedBook, null);
   assert.equal(host.formVisible, false);
-  console.log('List state tests passed: audit names/cache/fallback, column defaults/preferences, responsive saved view, observer cleanup, reused form defaults, and stale edit responses.');
+
+  // Issue 1: Record pinning position & restoration on unpin
+  const initialRows = [{ id: 10, title: 'Ten' }, { id: 20, title: 'Twenty' }, { id: 30, title: 'Thirty' }, { id: 40, title: 'Forty' }];
+  list.pinnedIds = new Set();
+  list.dataSource = { data: [...initialRows] };
+  list.rawRows = [...initialRows];
+
+  // Pin row 30: immediately shifts to top
+  list.togglePin({ id: 30 });
+  assert.deepEqual(Array.from(list.dataSource.data).map(r => r.id), [30, 10, 20, 40]);
+
+  // Pin row 40: grouped at top, unpinned preserve order
+  list.togglePin({ id: 40 });
+  assert.deepEqual(Array.from(list.dataSource.data).map(r => r.id), [30, 40, 10, 20]);
+
+  // Unpin row 30: returns to its original position in unpinned set
+  list.togglePin({ id: 30 });
+  assert.deepEqual(Array.from(list.dataSource.data).map(r => r.id), [40, 10, 20, 30]);
+
+  // Unpin row 40: returns to exact initial dataset
+  list.togglePin({ id: 40 });
+  assert.deepEqual(Array.from(list.dataSource.data).map(r => r.id), [10, 20, 30, 40]);
+
+  // Issue 2: Page size resets to default 10 and does not persist in localStorage across navigations
+  storage.set('book-page-size', '50');
+  const entityList = Object.create(List.prototype);
+  Object.assign(entityList, {
+    entityNameKebab: 'book',
+    itemsPerPage: 10,
+    paginator: { pageIndex: 0, pageSize: 25 },
+    activeFilters: {},
+    baseParentFilters: {},
+    getSortParameters: () => ['id,asc'],
+    restoreViewMode() {},
+    restoreColumnPreferences() {},
+    loadSearchState() {},
+    dialogData: null,
+    cdr: { markForCheck() {}, detectChanges() {} },
+    destroyRef: { destroyed: false },
+    bookService: { query: () => rx.of({ headers: new Map(), body: [] }) },
+  });
+  entityList.ngOnInit();
+  assert.equal(entityList.itemsPerPage, 10, 'ngOnInit does not override default page size from localStorage');
+  entityList.loadData();
+  assert.equal(entityList.itemsPerPage, 25, 'loadData updates itemsPerPage in-memory during interaction');
+  assert.equal(storage.get('book-page-size'), '50', 'loadData does not overwrite localStorage page size');
+
+  // Issue 3: Search bar clearing on search preference change
+  const Actions = load('entity/components/interaction/actions/_entity_-actions.component.ts.ejs', 'BookActionsComponent', {}, {}, locals);
+  const actions = Object.create(Actions.prototype);
+  const emittedSearches = [];
+  actions.searchChange = { emit: val => emittedSearches.push(val) };
+  actions.searchTerm = 'initial search';
+  actions.searchBy = 'title';
+  actions.onSearchByChange('author');
+  assert.equal(actions.searchTerm, '', 'ActionsComponent clears searchTerm on searchBy change');
+  assert.equal(emittedSearches.length, 1);
+  assert.equal(emittedSearches[0].searchBy, 'author');
+  assert.equal(emittedSearches[0].searchTerm, '');
+
+  // ListComponent.handleSearchChanged resets searchTerm when searchBy changes
+  entityList.searchBy = 'title';
+  entityList.searchTerm = 'existing';
+  entityList.storageKeySearchTerm = 'book-search-term';
+  entityList.storageKeySearchBy = 'book-search-by';
+  entityList.applySearchFilters = () => {};
+  entityList.refreshTrigger = { next() {} };
+  entityList.handleSearchChanged({ searchBy: 'code', searchTerm: 'existing' });
+  assert.equal(entityList.searchBy, 'code');
+  assert.equal(entityList.searchTerm, '', 'ListComponent resets searchTerm when search preference changes');
+
+  console.log('List state tests passed: audit names/cache/fallback, column defaults/preferences, responsive saved view, observer cleanup, reused form defaults, stale edit responses, row pinning, page-size reset, and search clearing.');
 }
 main().catch(error => { console.error(error); process.exitCode = 1; });

package/test/regeneration-isolation.js

@@ -0,0 +1,94 @@
+const assert = require('assert/strict');
+const fs = require('fs-extra');
+const path = require('path');
+const os = require('os');
+const { generate, parseJdl } = require('../src');
+const defaults = require('../src/config/default-values');
+const merger = require('../src/utils/merger');
+const { serviceFolder } = require('../src/generator/entity-layout');
+
+(async () => {
+  console.log('🧪 Testing Regeneration Isolation & Preservation...');
+
+  // 1. Merger preservation when no zones exist
+  {
+    const oldCode = 'export const customized = true;\n// Developer custom changes';
+    const newCode = 'export const customized = false;\n// Fresh template output';
+    const merged = merger.mergeContent(oldCode, newCode);
+    assert.strictEqual(merged, oldCode, 'Merger must preserve un-bracketed developer code when no zones exist');
+    console.log('✅ Merger preserves files without zone markers under merge policy.');
+  }
+
+  // 2. Double nesting check in serviceFolder
+  {
+    const folder1 = serviceFolder({ folderName: 'micro-functions', microservice: 'procurement-service' });
+    assert.strictEqual(folder1, 'micro-functions/procurement-service', 'serviceFolder should use microservice name without duplicating micro-functions');
+    const folder2 = serviceFolder({ folderName: 'procurement-module' });
+    assert.strictEqual(folder2, 'micro-functions/procurement-module', 'serviceFolder should correctly prefix module name');
+    console.log('✅ serviceFolder avoids micro-functions/micro-functions nesting.');
+  }
+
+  // 3. Incremental generation with Route & Navigation preservation
+  const root = await fs.mkdtemp(path.join(os.tmpdir(), 'crudforge-regen-'));
+  try {
+    const config = structuredClone(defaults);
+    config.output.directory = root;
+    config.output.overwritePolicy = 'merge';
+    config.fuse = {
+      ...config.fuse,
+      enabled: true,
+      cleanLayout: true,
+      includePrebuilt: false,
+      starterPackPath: path.resolve(__dirname, '../fuse-starter-pack/fuse-v21.1')
+    };
+
+    // First pass: Generate Service A (Identity Module)
+    const schemaA = parseJdl('entity Staff { name String }');
+    for (const entity of schemaA.entities) {
+      entity.folderName = 'identityModule';
+      entity.sourceName = 'Identity';
+      entity.microservice = 'identity-service';
+    }
+    await generate(schemaA, config);
+
+    const routesFile = path.join(root, 'src/app/domains/admin/routes.ts');
+    const navFile = path.join(root, 'src/app/domains/admin/layout/data/navigation.ts');
+    const routesPass1 = fs.readFileSync(routesFile, 'utf8');
+    const navPass1 = fs.readFileSync(navFile, 'utf8');
+
+    assert(routesPass1.includes('identity-module') || routesPass1.includes('staff.routes'), 'Pass 1 must include staff route');
+    assert(navPass1.includes('identity-module') || navPass1.includes('Staff'), 'Pass 1 must include Staff in navigation');
+
+    // Second pass: Generate Service B (Procurement Module)
+    const schemaB = parseJdl('entity PurchaseOrder { orderNumber String }');
+    for (const entity of schemaB.entities) {
+      entity.folderName = 'procurement-module';
+      entity.sourceName = 'Procurement';
+      entity.microservice = 'procurement-service';
+    }
+    await generate(schemaB, config);
+
+    const routesPass2 = fs.readFileSync(routesFile, 'utf8');
+    const navPass2 = fs.readFileSync(navFile, 'utf8');
+
+    // Verify both Service A and Service B routes and navigation exist in Pass 2
+    assert(routesPass2.includes('staff.routes'), 'Pass 2 must preserve staff route');
+    assert(routesPass2.includes('purchase-order.routes'), 'Pass 2 must include purchase-order route');
+    assert(navPass2.includes('PurchaseOrder') || navPass2.includes('procurement-module'), 'Pass 2 must include PurchaseOrder navigation');
+    assert(navPass2.includes('Staff') || navPass2.includes('identity-module'), 'Pass 2 must preserve Staff navigation');
+    console.log('✅ Incremental generation preserves routes and navigation for preexisting services.');
+
+    // 4. Screen Catalog CSV preservation
+    const csvFile = path.join(root, 'public/assets/screen-components.csv');
+    if (fs.existsSync(csvFile)) {
+      const csvContent = fs.readFileSync(csvFile, 'utf8');
+      assert(csvContent.includes('staff'), 'CSV catalog must retain staff screen');
+      assert(csvContent.includes('purchase-order'), 'CSV catalog must include purchase-order screen');
+      console.log('✅ Screen Catalog CSV accumulates and preserves screens across services.');
+    }
+
+    console.log('🎉 Regeneration isolation tests PASSED successfully!');
+  } finally {
+    await fs.remove(root);
+  }
+})();