moved primary key field processing to bootstrap-app instead of bootst…

…rap-app-base
jhipster · Jan 8, 2025 · f16e838 · f16e838
1 parent f14ed9d
commit f16e838
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/generators/bootstrap-application/generator.ts b/generators/bootstrap-application/generator.ts
@@ -163,6 +163,13 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
   get postPreparingEachEntity() {
     return this.asPostPreparingEachEntityTaskGroup({
       processEntityPrimaryKeysDerivedProperties({ entity }) {
+        const primaryKey = entity.primaryKey;
+        if (!primaryKey || primaryKey.composite || !primaryKey.derived) {
+          return;
+        }
+        const derivedFields = primaryKey.derivedFields;
+        entity.fields.unshift(...derivedFields);
+
         if (!entity.primaryKey) return;
         derivedPrimaryKeyProperties(entity.primaryKey);
       },
@@ -173,14 +180,6 @@ export default class BootstrapApplicationGenerator extends BaseApplicationGenera
           preparePostEntityServerDerivedProperties(entity);
         }
       },
-      processDerivedPrimaryKeyFields({ entity }) {
-        const primaryKey = entity.primaryKey;
-        if (!primaryKey || primaryKey.composite || !primaryKey.derived) {
-          return;
-        }
-        const derivedFields = primaryKey.derivedFields;
-        entity.fields.unshift(...derivedFields);
-      },
     });
   }