generator-jhipster 7.8.1 → 7.9.0

package/generators/client/files-angular.js

@@ -17,16 +17,17 @@
  * limitations under the License.
  */
 const constants = require('../generator-constants');
+const { replaceAngularTranslations } = require('./transform-angular.cjs');
 
 const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, ANGULAR_DIR } = constants;
 const { OAUTH2, SESSION, JWT } = require('../../jdl/jhipster/authentication-types');
 const { GATEWAY } = require('../../jdl/jhipster/application-types');
 const { SPRING_WEBSOCKET } = require('../../jdl/jhipster/websocket-types');
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
+
 const files = {
+  _: {
+    transform: [replaceAngularTranslations],
+  },
   common: [
     {
       templates: [
@@ -43,7 +44,7 @@ const files = {
         'webpack/proxy.conf.js',
         'webpack/webpack.custom.js',
         '.browserslistrc',
-        { file: 'webpack/logo-jhipster.png', method: 'copy' },
+        'webpack/logo-jhipster.png',
       ],
     },
   ],
@@ -78,9 +79,9 @@ const files = {
         'entities/entity-routing.module.ts',
         // home module
         'home/home.module.ts',
-        { file: 'home/home.route.ts', method: 'processJs' },
+        'home/home.route.ts',
         'home/home.component.ts',
-        { file: 'home/home.component.html', method: 'processHtml' },
+        'home/home.component.html',
         // layouts
         'layouts/profiles/page-ribbon.component.ts',
         'layouts/profiles/profile.service.ts',
@@ -88,13 +89,13 @@ const files = {
         'layouts/main/main.component.ts',
         'layouts/main/main.component.html',
         'layouts/navbar/navbar.component.ts',
-        { file: 'layouts/navbar/navbar.component.html', method: 'processHtml' },
+        'layouts/navbar/navbar.component.html',
         'layouts/navbar/navbar.route.ts',
         'layouts/footer/footer.component.ts',
-        { file: 'layouts/footer/footer.component.html', method: 'processHtml' },
-        { file: 'layouts/error/error.route.ts', method: 'processJs' },
+        'layouts/footer/footer.component.html',
+        'layouts/error/error.route.ts',
         'layouts/error/error.component.ts',
-        { file: 'layouts/error/error.component.html', method: 'processHtml' },
+        'layouts/error/error.component.html',
         // login
         'login/login.service.ts',
       ],
@@ -114,9 +115,9 @@ const files = {
       condition: generator => generator.authenticationType !== OAUTH2,
       templates: [
         'login/login.module.ts',
-        { file: 'login/login.route.ts', method: 'processJs' },
+        'login/login.route.ts',
         'login/login.component.ts',
-        { file: 'login/login.component.html', method: 'processHtml' },
+        'login/login.component.html',
         'login/login.model.ts',
       ],
     },
@@ -131,45 +132,45 @@ const files = {
       path: ANGULAR_DIR,
       condition: generator => !generator.skipUserManagement,
       templates: [
-        { file: 'account/account.route.ts', method: 'processJs' },
+        'account/account.route.ts',
         'account/account.module.ts',
-        { file: 'account/activate/activate.route.ts', method: 'processJs' },
+        'account/activate/activate.route.ts',
         'account/activate/activate.component.ts',
-        { file: 'account/activate/activate.component.html', method: 'processHtml' },
+        'account/activate/activate.component.html',
         'account/activate/activate.service.ts',
-        { file: 'account/password/password.route.ts', method: 'processJs' },
+        'account/password/password.route.ts',
         'account/password/password-strength-bar/password-strength-bar.component.ts',
-        { file: 'account/password/password-strength-bar/password-strength-bar.component.html', method: 'processHtml' },
+        'account/password/password-strength-bar/password-strength-bar.component.html',
         'account/password/password-strength-bar/password-strength-bar.component.scss',
         'account/password/password.component.ts',
-        { file: 'account/password/password.component.html', method: 'processHtml' },
+        'account/password/password.component.html',
         'account/password/password.service.ts',
-        { file: 'account/register/register.route.ts', method: 'processJs' },
+        'account/register/register.route.ts',
         'account/register/register.component.ts',
-        { file: 'account/register/register.component.html', method: 'processHtml' },
+        'account/register/register.component.html',
         'account/register/register.service.ts',
         'account/register/register.model.ts',
-        { file: 'account/password-reset/init/password-reset-init.route.ts', method: 'processJs' },
+        'account/password-reset/init/password-reset-init.route.ts',
         'account/password-reset/init/password-reset-init.component.ts',
-        { file: 'account/password-reset/init/password-reset-init.component.html', method: 'processHtml' },
+        'account/password-reset/init/password-reset-init.component.html',
         'account/password-reset/init/password-reset-init.service.ts',
-        { file: 'account/password-reset/finish/password-reset-finish.route.ts', method: 'processJs' },
+        'account/password-reset/finish/password-reset-finish.route.ts',
         'account/password-reset/finish/password-reset-finish.component.ts',
-        { file: 'account/password-reset/finish/password-reset-finish.component.html', method: 'processHtml' },
+        'account/password-reset/finish/password-reset-finish.component.html',
         'account/password-reset/finish/password-reset-finish.service.ts',
-        { file: 'account/settings/settings.route.ts', method: 'processJs' },
+        'account/settings/settings.route.ts',
         'account/settings/settings.component.ts',
-        { file: 'account/settings/settings.component.html', method: 'processHtml' },
+        'account/settings/settings.component.html',
       ],
     },
     {
       condition: generator => generator.authenticationType === SESSION && !generator.skipUserManagement,
       path: ANGULAR_DIR,
       templates: [
-        { file: 'account/sessions/sessions.route.ts', method: 'processJs' },
+        'account/sessions/sessions.route.ts',
         'account/sessions/session.model.ts',
         'account/sessions/sessions.component.ts',
-        { file: 'account/sessions/sessions.component.html', method: 'processHtml' },
+        'account/sessions/sessions.component.html',
         'account/sessions/sessions.service.ts',
       ],
     },
@@ -179,10 +180,10 @@ const files = {
       condition: generator => !generator.applicationTypeMicroservice,
       path: ANGULAR_DIR,
       templates: [
-        { file: 'admin/admin-routing.module.ts', method: 'processJs' },
-        { file: 'admin/docs/docs.route.ts', method: 'processJs' },
-        { file: 'admin/docs/docs.module.ts', method: 'processJs' },
-        { file: 'admin/docs/docs.component.ts', method: 'processJs' },
+        'admin/admin-routing.module.ts',
+        'admin/docs/docs.route.ts',
+        'admin/docs/docs.module.ts',
+        'admin/docs/docs.component.ts',
         'admin/docs/docs.component.html',
         'admin/docs/docs.component.scss',
       ],
@@ -192,88 +193,60 @@ const files = {
       path: ANGULAR_DIR,
       templates: [
         // admin modules
-        { file: 'admin/configuration/configuration.route.ts', method: 'processJs' },
+        'admin/configuration/configuration.route.ts',
         'admin/configuration/configuration.module.ts',
         'admin/configuration/configuration.component.ts',
-        { file: 'admin/configuration/configuration.component.html', method: 'processHtml' },
+        'admin/configuration/configuration.component.html',
         'admin/configuration/configuration.service.ts',
         'admin/configuration/configuration.model.ts',
-        { file: 'admin/health/health.route.ts', method: 'processJs' },
+        'admin/health/health.route.ts',
         'admin/health/health.module.ts',
         'admin/health/health.component.ts',
-        { file: 'admin/health/health.component.html', method: 'processHtml' },
+        'admin/health/health.component.html',
         'admin/health/modal/health-modal.component.ts',
-        { file: 'admin/health/modal/health-modal.component.html', method: 'processHtml' },
+        'admin/health/modal/health-modal.component.html',
         'admin/health/health.service.ts',
         'admin/health/health.model.ts',
-        { file: 'admin/logs/logs.route.ts', method: 'processJs' },
+        'admin/logs/logs.route.ts',
         'admin/logs/logs.module.ts',
         'admin/logs/log.model.ts',
         'admin/logs/logs.component.ts',
-        { file: 'admin/logs/logs.component.html', method: 'processHtml' },
+        'admin/logs/logs.component.html',
         'admin/logs/logs.service.ts',
-        { file: 'admin/metrics/metrics.route.ts', method: 'processJs' },
+        'admin/metrics/metrics.route.ts',
         'admin/metrics/metrics.module.ts',
         'admin/metrics/metrics.component.ts',
-        { file: 'admin/metrics/metrics.component.html', method: 'processHtml', template: true },
+        'admin/metrics/metrics.component.html',
         'admin/metrics/metrics.service.ts',
         'admin/metrics/metrics.model.ts',
         'admin/metrics/blocks/jvm-memory/jvm-memory.component.ts',
-        { file: 'admin/metrics/blocks/jvm-memory/jvm-memory.component.html', method: 'processHtml', template: true },
+        'admin/metrics/blocks/jvm-memory/jvm-memory.component.html',
         'admin/metrics/blocks/jvm-threads/jvm-threads.component.ts',
-        { file: 'admin/metrics/blocks/jvm-threads/jvm-threads.component.html', method: 'processHtml', template: true },
+        'admin/metrics/blocks/jvm-threads/jvm-threads.component.html',
         'admin/metrics/blocks/metrics-cache/metrics-cache.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-cache/metrics-cache.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-cache/metrics-cache.component.html',
         'admin/metrics/blocks/metrics-datasource/metrics-datasource.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-datasource/metrics-datasource.component.html',
         'admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-endpoints-requests/metrics-endpoints-requests.component.html',
         'admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-garbagecollector/metrics-garbagecollector.component.html',
         'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-modal-threads/metrics-modal-threads.component.html',
         'admin/metrics/blocks/metrics-request/metrics-request.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-request/metrics-request.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-request/metrics-request.component.html',
         'admin/metrics/blocks/metrics-system/metrics-system.component.ts',
-        {
-          file: 'admin/metrics/blocks/metrics-system/metrics-system.component.html',
-          method: 'processHtml',
-          template: true,
-        },
+        'admin/metrics/blocks/metrics-system/metrics-system.component.html',
       ],
     },
     {
       condition: generator => generator.websocket === SPRING_WEBSOCKET,
       path: ANGULAR_DIR,
       templates: [
-        { file: 'admin/tracker/tracker.route.ts', method: 'processJs' },
+        'admin/tracker/tracker.route.ts',
         'admin/tracker/tracker.module.ts',
         'admin/tracker/tracker.component.ts',
-        { file: 'admin/tracker/tracker.component.html', method: 'processHtml' },
+        'admin/tracker/tracker.component.html',
         'core/tracker/tracker-activity.model.ts',
         'core/tracker/tracker.service.ts',
       ],
@@ -282,17 +255,17 @@ const files = {
       condition: generator => !generator.skipUserManagement,
       path: ANGULAR_DIR,
       templates: [
-        { file: 'admin/user-management/user-management.route.ts', method: 'processJs' },
+        'admin/user-management/user-management.route.ts',
         'admin/user-management/user-management.module.ts',
         'admin/user-management/user-management.model.ts',
         'admin/user-management/list/user-management.component.ts',
-        { file: 'admin/user-management/list/user-management.component.html', method: 'processHtml' },
+        'admin/user-management/list/user-management.component.html',
         'admin/user-management/detail/user-management-detail.component.ts',
-        { file: 'admin/user-management/detail/user-management-detail.component.html', method: 'processHtml' },
+        'admin/user-management/detail/user-management-detail.component.html',
         'admin/user-management/update/user-management-update.component.ts',
-        { file: 'admin/user-management/update/user-management-update.component.html', method: 'processHtml' },
+        'admin/user-management/update/user-management-update.component.html',
         'admin/user-management/delete/user-management-delete-dialog.component.ts',
-        { file: 'admin/user-management/delete/user-management-delete-dialog.component.html', method: 'processHtml' },
+        'admin/user-management/delete/user-management-delete-dialog.component.html',
         'admin/user-management/service/user-management.service.ts',
       ],
     },
@@ -300,11 +273,11 @@ const files = {
       condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
       path: ANGULAR_DIR,
       templates: [
-        { file: 'admin/gateway/gateway.route.ts', method: 'processJs' },
+        'admin/gateway/gateway.route.ts',
         'admin/gateway/gateway.module.ts',
         'admin/gateway/gateway-route.model.ts',
         'admin/gateway/gateway.component.ts',
-        { file: 'admin/gateway/gateway.component.html', method: 'processHtml' },
+        'admin/gateway/gateway.component.html',
         'admin/gateway/gateway-routes.service.ts',
       ],
     },
@@ -330,6 +303,7 @@ const files = {
         'config/font-awesome-icons.ts',
         'config/error.constants.ts',
         'config/input.constants.ts',
+        'config/navigation.constants.ts',
         'config/pagination.constants.ts',
         'config/authority.constants.ts',
 
@@ -370,6 +344,7 @@ const files = {
         'shared/date/format-medium-date.pipe.ts',
         'shared/date/format-medium-datetime.pipe.ts',
         'shared/sort/sort.directive.ts',
+        'shared/sort/sort.service.ts',
         'shared/sort/sort-by.directive.ts',
         'shared/pagination/item-count.component.ts',
         // alert service code
@@ -378,6 +353,11 @@ const files = {
         'shared/alert/alert-error.component.ts',
         'shared/alert/alert-error.component.html',
         'shared/alert/alert-error.model.ts',
+        // filtering options
+        'shared/filter/filter.component.html',
+        'shared/filter/filter.component.ts',
+        'shared/filter/filter.model.spec.ts',
+        'shared/filter/filter.model.ts',
       ],
     },
     {
@@ -531,5 +511,8 @@ module.exports = {
 };
 
 function writeFiles() {
-  return this.writeFilesToDisk(files, 'angular');
+  return this.writeFiles({
+    sections: files,
+    rootTemplatesPath: 'angular',
+  });
 }

package/generators/client/files-react.js

@@ -16,6 +16,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const { replaceReactTranslations } = require('./transform-react.cjs');
 const { SPRING_WEBSOCKET } = require('../../jdl/jhipster/websocket-types');
 const { OAUTH2, SESSION } = require('../../jdl/jhipster/authentication-types');
 const { GATEWAY } = require('../../jdl/jhipster/application-types');
@@ -23,11 +24,10 @@ const constants = require('../generator-constants');
 
 const { CLIENT_MAIN_SRC_DIR, CLIENT_TEST_SRC_DIR, REACT_DIR } = constants;
 
-/**
- * The default is to use a file path string. It implies use of the template method.
- * For any other config an object { file:.., method:.., template:.. } can be used
- */
 const files = {
+  _: {
+    transform: [replaceReactTranslations],
+  },
   common: [
     {
       templates: [
@@ -41,7 +41,7 @@ const files = {
         'webpack/webpack.dev.js',
         'webpack/webpack.prod.js',
         'webpack/utils.js',
-        { file: 'webpack/logo-jhipster.png', method: 'copy' },
+        'webpack/logo-jhipster.png',
       ],
     },
     {
@@ -58,9 +58,9 @@ const files = {
     {
       path: REACT_DIR,
       templates: [
-        { file: 'app.tsx', method: 'processJsx' },
-        { file: 'index.tsx', method: 'processJsx' },
-        { file: 'routes.tsx', method: 'processJsx' },
+        'app.tsx',
+        'index.tsx',
+        'routes.tsx',
         'setup-tests.ts',
         'typings.d.ts',
         'config/constants.ts',
@@ -91,33 +91,23 @@ const files = {
   reactEntities: [
     {
       path: REACT_DIR,
-      templates: [
-        'entities/reducers.ts',
-        { file: 'entities/menu.tsx', method: 'processJsx' },
-        { file: 'entities/routes.tsx', method: 'processJsx' },
-      ],
+      templates: ['entities/reducers.ts', 'entities/menu.tsx', 'entities/routes.tsx'],
     },
   ],
   reactMain: [
     {
       path: REACT_DIR,
-      templates: [
-        { file: 'modules/home/home.tsx', method: 'processJsx' },
-        { file: 'modules/login/logout.tsx', method: 'processJsx' },
-      ],
+      templates: ['modules/home/home.tsx', 'modules/login/logout.tsx'],
     },
     {
       condition: generator => generator.authenticationType !== OAUTH2,
       path: REACT_DIR,
-      templates: [
-        { file: 'modules/login/login.tsx', method: 'processJsx' },
-        { file: 'modules/login/login-modal.tsx', method: 'processJsx' },
-      ],
+      templates: ['modules/login/login.tsx', 'modules/login/login-modal.tsx'],
     },
     {
       condition: generator => generator.authenticationType === OAUTH2,
       path: REACT_DIR,
-      templates: [{ file: 'modules/login/login-redirect.tsx', method: 'processJsx' }],
+      templates: ['modules/login/login-redirect.tsx'],
     },
     {
       path: REACT_DIR,
@@ -150,33 +140,33 @@ const files = {
       condition: generator => !generator.skipUserManagement,
       path: REACT_DIR,
       templates: [
-        { file: 'modules/account/index.tsx', method: 'processJsx' },
-        { file: 'modules/account/activate/activate.tsx', method: 'processJsx' },
-        { file: 'modules/account/password/password.tsx', method: 'processJsx' },
-        { file: 'modules/account/register/register.tsx', method: 'processJsx' },
-        { file: 'modules/account/password-reset/init/password-reset-init.tsx', method: 'processJsx' },
-        { file: 'modules/account/password-reset/finish/password-reset-finish.tsx', method: 'processJsx' },
-        { file: 'modules/account/settings/settings.tsx', method: 'processJsx' },
-        { file: 'modules/account/register/register.reducer.ts', method: 'processJsx' },
-        { file: 'modules/account/activate/activate.reducer.ts', method: 'processJsx' },
-        { file: 'modules/account/password-reset/password-reset.reducer.ts', method: 'processJsx' },
-        { file: 'modules/account/password/password.reducer.ts', method: 'processJsx' },
-        { file: 'modules/account/settings/settings.reducer.ts', method: 'processJsx' },
+        'modules/account/index.tsx',
+        'modules/account/activate/activate.tsx',
+        'modules/account/password/password.tsx',
+        'modules/account/register/register.tsx',
+        'modules/account/password-reset/init/password-reset-init.tsx',
+        'modules/account/password-reset/finish/password-reset-finish.tsx',
+        'modules/account/settings/settings.tsx',
+        'modules/account/register/register.reducer.ts',
+        'modules/account/activate/activate.reducer.ts',
+        'modules/account/password-reset/password-reset.reducer.ts',
+        'modules/account/password/password.reducer.ts',
+        'modules/account/settings/settings.reducer.ts',
       ],
     },
     {
       condition: generator => generator.authenticationType === SESSION && !generator.skipUserManagement,
       path: REACT_DIR,
-      templates: [{ file: 'modules/account/sessions/sessions.tsx', method: 'processJsx' }, 'modules/account/sessions/sessions.reducer.ts'],
+      templates: ['modules/account/sessions/sessions.tsx', 'modules/account/sessions/sessions.reducer.ts'],
     },
   ],
   adminModule: [
     {
       path: REACT_DIR,
       templates: [
-        { file: 'modules/administration/index.tsx', method: 'processJsx' },
+        'modules/administration/index.tsx',
         'modules/administration/administration.reducer.ts',
-        { file: 'modules/administration/docs/docs.tsx', method: 'processJsx' },
+        'modules/administration/docs/docs.tsx',
         'modules/administration/docs/docs.scss',
       ],
     },
@@ -184,34 +174,34 @@ const files = {
       condition: generator => generator.withAdminUi,
       path: REACT_DIR,
       templates: [
-        { file: 'modules/administration/configuration/configuration.tsx', method: 'processJsx' },
-        { file: 'modules/administration/health/health.tsx', method: 'processJsx' },
-        { file: 'modules/administration/health/health-modal.tsx', method: 'processJsx' },
-        { file: 'modules/administration/logs/logs.tsx', method: 'processJsx' },
-        { file: 'modules/administration/metrics/metrics.tsx', method: 'processJsx' },
+        'modules/administration/configuration/configuration.tsx',
+        'modules/administration/health/health.tsx',
+        'modules/administration/health/health-modal.tsx',
+        'modules/administration/logs/logs.tsx',
+        'modules/administration/metrics/metrics.tsx',
       ],
     },
     {
       condition: generator => generator.websocket === SPRING_WEBSOCKET,
       path: REACT_DIR,
-      templates: [{ file: 'modules/administration/tracker/tracker.tsx', method: 'processJsx' }],
+      templates: ['modules/administration/tracker/tracker.tsx'],
     },
     {
       condition: generator => !generator.skipUserManagement,
       path: REACT_DIR,
       templates: [
-        { file: 'modules/administration/user-management/index.tsx', method: 'processJsx' },
-        { file: 'modules/administration/user-management/user-management.tsx', method: 'processJsx' },
-        { file: 'modules/administration/user-management/user-management-update.tsx', method: 'processJsx' },
-        { file: 'modules/administration/user-management/user-management-detail.tsx', method: 'processJsx' },
-        { file: 'modules/administration/user-management/user-management-delete-dialog.tsx', method: 'processJsx' },
+        'modules/administration/user-management/index.tsx',
+        'modules/administration/user-management/user-management.tsx',
+        'modules/administration/user-management/user-management-update.tsx',
+        'modules/administration/user-management/user-management-detail.tsx',
+        'modules/administration/user-management/user-management-delete-dialog.tsx',
         'modules/administration/user-management/user-management.reducer.ts',
       ],
     },
     {
       condition: generator => generator.applicationType === GATEWAY && generator.serviceDiscoveryType,
       path: REACT_DIR,
-      templates: [{ file: 'modules/administration/gateway/gateway.tsx', method: 'processJsx' }],
+      templates: ['modules/administration/gateway/gateway.tsx'],
     },
   ],
   reactShared: [
@@ -219,26 +209,26 @@ const files = {
       path: REACT_DIR,
       templates: [
         // layouts
-        { file: 'shared/layout/footer/footer.tsx', method: 'processJsx' },
-        { file: 'shared/layout/header/header.tsx', method: 'processJsx' },
-        { file: 'shared/layout/header/header-components.tsx', method: 'processJsx' },
+        'shared/layout/footer/footer.tsx',
+        'shared/layout/header/header.tsx',
+        'shared/layout/header/header-components.tsx',
         'shared/layout/menus/index.ts',
-        { file: 'shared/layout/menus/admin.tsx', method: 'processJsx' },
-        { file: 'shared/layout/menus/account.tsx', method: 'processJsx' },
-        { file: 'shared/layout/menus/entities.tsx', method: 'processJsx' },
-        { file: 'shared/layout/menus/menu-components.tsx', method: 'processJsx' },
-        { file: 'shared/layout/menus/menu-item.tsx', method: 'processJsx' },
-        { file: 'shared/layout/password/password-strength-bar.tsx', method: 'processJsx' },
+        'shared/layout/menus/admin.tsx',
+        'shared/layout/menus/account.tsx',
+        'shared/layout/menus/entities.tsx',
+        'shared/layout/menus/menu-components.tsx',
+        'shared/layout/menus/menu-item.tsx',
+        'shared/layout/password/password-strength-bar.tsx',
         // util
         'shared/util/date-utils.ts',
         'shared/util/pagination.constants.ts',
         'shared/util/entity-utils.ts',
         // components
-        { file: 'shared/auth/private-route.tsx', method: 'processJsx' },
-        { file: 'shared/error/error-boundary.tsx', method: 'processJsx' },
-        { file: 'shared/error/error-boundary-route.tsx', method: 'processJsx' },
-        { file: 'shared/error/page-not-found.tsx', method: 'processJsx' },
-        { file: 'shared/DurationFormat.tsx', method: 'processJsx' },
+        'shared/auth/private-route.tsx',
+        'shared/error/error-boundary.tsx',
+        'shared/error/error-boundary-routes.tsx',
+        'shared/error/page-not-found.tsx',
+        'shared/DurationFormat.tsx',
         // model
         'shared/model/user.model.ts',
       ],
@@ -246,7 +236,7 @@ const files = {
     {
       condition: generator => generator.enableTranslation,
       path: REACT_DIR,
-      templates: [{ file: 'shared/layout/menus/locale.tsx', method: 'processJsx' }],
+      templates: ['shared/layout/menus/locale.tsx'],
     },
     {
       condition: generator => generator.authenticationType === OAUTH2,
@@ -294,7 +284,7 @@ const files = {
         'shared/util/entity-utils.spec.ts',
         'shared/auth/private-route.spec.tsx',
         'shared/error/error-boundary.spec.tsx',
-        'shared/error/error-boundary-route.spec.tsx',
+        'shared/error/error-boundary-routes.spec.tsx',
         'shared/layout/header/header.spec.tsx',
         'shared/layout/menus/account.spec.tsx',
         'modules/administration/administration.reducer.spec.ts',
@@ -326,13 +316,6 @@ const files = {
       path: REACT_DIR,
       templates: ['shared/reducers/user-management.spec.ts'],
     },
-    // {
-    //     condition: generator => generator.authenticationType === 'session',
-    //     path: REACT_DIR,
-    //     templates: [
-    //         'modules/account/sessions/sessions.reducer.spec.ts',
-    //     ]
-    // },
     {
       condition: generator => generator.protractorTests,
       path: CLIENT_TEST_SRC_DIR,
@@ -372,9 +355,15 @@ function cleanup() {
   if (this.isJhipsterVersionLessThan('7.7.1')) {
     this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/entities/index.tsx`);
   }
+  if (this.isJhipsterVersionLessThan('7.8.2')) {
+    this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/shared/error/error-boundary-route.tsx`);
+    this.removeFile(`${CLIENT_MAIN_SRC_DIR}app/shared/error/error-boundary-route.spec.tsx`);
+  }
 }
 
 function writeFiles() {
-  // write React files
-  return this.writeFilesToDisk(files, 'react');
+  return this.writeFiles({
+    sections: files,
+    rootTemplatesPath: 'react',
+  });
 }