angular: convert entity-navbar-items.ts to needles

Author: mshima

generators/angular/generator.ts

@@ -109,7 +109,29 @@ export default class AngularGenerator extends BaseApplicationGenerator<DefaultTa
           const ignoreNonExisting = chalk.yellow('Reference to entities not added to menu.');
           const editCallback = addToEntitiesMenu(param);
           this.editFile(filePath, { ignoreNonExisting }, editCallback);
+
+          this.editFile(
+            `${application.clientSrcDir}app/entities/entity-navbar-items.ts`,
+            createNeedleCallback({
+              needle: 'add-entity-navbar',
+              contentToAdd: param.entities
+                .filter(e => !e.adminEntity)
+                .map(entity => ({
+                  contentToCheck: `name: '${entity.entityAngularName}',`,
+                  content: `{
+  name: '${entity.entityAngularName}',
+  route: '/${entity.entityPage}',${
+    application.enableTranslation
+      ? `
+  translationKey: 'global.menu.entities.${entity.entityTranslationKey}',`
+      : ''
+  }
+  },`,
+                })),
+            }),
+          );
         };
+
         source.addAdminRoute = (args: Omit<Parameters<typeof addRoute>[0], 'needle'>) =>
           this.editFile(
             `${application.srcMainWebapp}app/admin/admin.routes.ts`,
@@ -250,9 +272,6 @@ export default class AngularGenerator extends BaseApplicationGenerator<DefaultTa
 
   get default() {
     return this.asDefaultTaskGroup({
-      loadEntities({ application, entities }) {
-        application.angularEntities = entities.filter(entity => !entity.builtIn && !entity.skipClient) as AngularEntity[];
-      },
       queueTranslateTransform({ application }) {
         const { enableTranslation, jhiPrefix } = application;
         this.queueTransformStream(

generators/angular/templates/src/main/webapp/app/entities/entity-navbar-items.ts.ejs

@@ -19,13 +19,5 @@
 import NavbarItem from 'app/layouts/navbar/navbar-item.model';
 
 export const EntityNavbarItems: NavbarItem[] = [
-<%_ for (const entity of angularEntities) { _%>
-  {
-    name: '<%= entity.entityAngularName %>',
-    route: '/<%= entity.entityPage %>',
-  <%_ if (enableTranslation) { _%>
-    translationKey: 'global.menu.entities.<%= entity.entityTranslationKey %>',
-  <%_ } _%>
-  },
-<%_ } _%>
+  /* jhipster-needle-add-entity-navbar - JHipster will add entity navbar items here */
 ];

generators/angular/types.d.ts

@@ -26,10 +26,7 @@ export interface AngularEntity extends Entity {
    * @param fields returns the import of enums that are referenced by the fields
    * @returns {typeImports:Map} the fields that potentially contains some enum types
    */
-  generateEntityClientEnumImports: (fields: any) => Map<any, any>;
+  generateEntityClientEnumImports?: (fields: any) => Map<any, any>;
 }
 
-export type AngularApplication = {
-  /** @experimental to be replaced with needles */
-  angularEntities: AngularEntity[];
-} & ApplicationType<AngularEntity>;
+export type AngularApplication = ApplicationType<AngularEntity>;

generators/app/__snapshots__/generator.spec.ts.snap

@@ -218,7 +218,6 @@ exports[`generator - app with default config should match snapshot 1`] = `
   "addOpenapiGeneratorPlugin": undefined,
   "addPrettierExtensions": [Function],
   "addSpringMilestoneRepository": false,
-  "angularEntities": [],
   "angularLocaleId": "en",
   "anyEntityHasRelationshipWithUser": false,
   "applicationType": "monolith",
@@ -896,7 +895,6 @@ exports[`generator - app with gateway should match snapshot 1`] = `
   "addOpenapiGeneratorPlugin": undefined,
   "addPrettierExtensions": [Function],
   "addSpringMilestoneRepository": false,
-  "angularEntities": [],
   "angularLocaleId": "en",
   "anyEntityHasRelationshipWithUser": false,
   "applicationType": "gateway",