generator-jhipster 7.2.0 → 7.4.1

package/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs

@@ -5,14 +5,17 @@ import { shallowMount, createLocalVue, Wrapper } from '@vue/test-utils';
 import axios from 'axios';
 import sinon from 'sinon';
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
+import { ToastPlugin } from 'bootstrap-vue';
 
 import * as config from '@/shared/config/config';
 import UserManagement from '@/admin/user-management/user-management.vue';
 import UserManagementClass from '@/admin/user-management/user-management.component';
 import UserManagementService from '@/admin/user-management/user-management.service';
+import AlertService from '@/shared/alert/alert.service';
 
 const localVue = createLocalVue();
 
+localVue.use(ToastPlugin);
 config.initVueApp(localVue);
 <%_ if (enableTranslation) { _%>
 const i18n = config.initI18N(localVue);
@@ -57,7 +60,8 @@ describe('UserManagement Component', () => {
         bModal: true
       },
       provide: {
-        userService: () => new UserManagementService()
+        userService: () => new UserManagementService(),
+        alertService: () => new AlertService(),
       }
     });
     userManagement = wrapper.vm;

package/generators/client/templates/vue/src/test/javascript/spec/app/core/jhi-navbar/jhi-navbar.component.spec.ts.ejs

@@ -94,15 +94,21 @@ let wrapper: Wrapper<JhiNavbarClass>;
     expect(accountService.hasAnyAuthorityAndCheckAuth).toHaveBeenCalled();
   });
 
-  it('logout should clear credentials', () => {
+  it('logout should clear credentials', async () => {
     store.commit('authenticated', { login: 'test' });
-<%_ if (!authenticationTypeJwt) { _%>
-    loginService.logout.mockReturnValue(Promise.resolve());
+<%_ if (authenticationTypeOauth2) { _%>
+    const logoutUrl = '/to-match';
+    loginService.logout.mockReturnValue(Promise.resolve({ data: { logoutUrl } }));
+<%_ } else if (!authenticationTypeJwt) { _%>
+    loginService.logout.mockReturnValue(Promise.resolve({}));
 <%_ } _%>
-    jhiNavbar.logout();
+    await jhiNavbar.logout();
 
 <%_ if (!authenticationTypeJwt) { _%>
     expect(loginService.logout).toHaveBeenCalled();
+  <%_ if (authenticationTypeOauth2) { _%>
+    expect(router.currentRoute.path).toBe(logoutUrl);
+  <%_ } _%>
 <%_ } else { _%>
     expect(jhiNavbar.authenticated).toBeFalsy();
 <%_ } _%>

package/generators/client/templates/vue/src/test/javascript/spec/app/entities/entities-menu.spec.ts.ejs

@@ -0,0 +1,52 @@
+import { createLocalVue, shallowMount, Wrapper } from '@vue/test-utils';
+import EntitiesMenu from '@/entities/entities-menu.vue';
+import EntitiesMenuClass from '@/entities/entities-menu.component';
+import * as config from '@/shared/config/config';
+
+const localVue = createLocalVue();
+config.initVueApp(localVue);
+const i18n = config.initI18N(localVue);
+localVue.component('b-dropdown-item', {});
+localVue.component('font-awesome-icon', {});
+
+describe('EntitiesMenu', () => {
+  let translationService;
+
+  beforeEach(() => {
+    translationService = { loadTranslations: jest.fn() };
+  });
+
+  describe('using microfrontendI18n', () => {
+    beforeEach(() => {
+      shallowMount<EntitiesMenuClass>(EntitiesMenu, {
+        i18n,
+        localVue,
+        provide: {
+          translationService: () => translationService,
+          microfrontendI18n: true,
+        },
+      });
+    });
+
+    it('should load translations', () => {
+      expect(translationService.loadTranslations).toHaveBeenCalled();
+    });
+  });
+
+  describe('not using microfrontendI18n', () => {
+    beforeEach(() => {
+      shallowMount<EntitiesMenuClass>(EntitiesMenu, {
+        i18n,
+        localVue,
+        provide: {
+          translationService: () => translationService,
+          microfrontendI18n: false,
+        },
+      });
+    });
+
+    it('should not load translations', () => {
+      expect(translationService.loadTranslations).not.toHaveBeenCalled();
+    });
+  });
+});

package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.component.ts.ejs

@@ -0,0 +1,4 @@
+import { Component, Vue } from 'vue-property-decorator';
+
+@Component
+export default class EntitiesMenu extends Vue {}

package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-menu.vue.ejs

@@ -0,0 +1,7 @@
+<template>
+  <div>
+    <!-- jhipster-needle-add-entity-to-menu - JHipster will add entities to the menu here -->
+  </div>
+</template>
+
+<script lang="ts" src="./entities-menu.component.ts"></script>

package/generators/client/templates/vue/src/test/javascript/spec/app/microfrontends/entities-router.ts.ejs

@@ -0,0 +1 @@
+export default [];

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/alert/alert.service.spec.ts.ejs

@@ -0,0 +1,124 @@
+import sinon from 'sinon';
+
+import AlertService from '@/shared/alert/alert.service';
+import Vue from 'vue';
+import { createLocalVue, mount, shallowMount } from '@vue/test-utils';
+<%_ if (enableTranslation) { _%>
+const translationStub = sinon.stub();
+<%_ } _%> 
+const toastStub = sinon.stub();
+
+const vueInstance = {
+  <% if (enableTranslation) { %>$t: translationStub,<% } %>
+  $root: {
+    $bvToast: {
+      toast: toastStub,
+    },
+  },
+};
+
+describe('Alert Service test suite', () => {
+  let alertService: AlertService;
+
+  beforeEach(() => {
+    <%_ if (enableTranslation) { _%>
+    translationStub.reset();
+    <%_ } _%> 
+    toastStub.reset();
+    alertService = new AlertService();
+  });
+
+  it('should show error toast with translation/message', async () => {
+    const message = 'translatedMessage';
+    <%_ if (enableTranslation) { _%>
+    const translationKey = 'err.code';
+
+    // GIVEN
+    translationStub.withArgs(translationKey).returns(message);
+    <%_ } _%>
+    
+    // WHEN
+    alertService.showError((<any>vueInstance) as Vue, <% if (enableTranslation) { %>translationKey<%} else {%>message<% } %>);
+
+    //THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(translationKey).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
+
+  it('should show not reachable toast when http status = 0', async () => {
+    <%_ if (enableTranslation) { _%>
+    const translationKey = 'error.server.not.reachable';
+    <%_ } _%>
+    const message = 'Server not reachable';
+    const httpErrorResponse = {
+      status: 0,
+    };
+    <%_ if (enableTranslation) { _%>
+    // GIVEN
+    translationStub.withArgs(translationKey).returns(message);
+    <%_ } _%>
+
+    // WHEN
+    alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
+
+    //THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(translationKey).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
+
+  it('should show parameterized error toast when http status = 400 and entity headers', async () => {
+    <%_ if (enableTranslation) { _%>
+    const translationKey = 'error.update';
+    <%_ } _%>
+    const message = 'Updation Error';
+    const httpErrorResponse = {
+      status: 400,
+      headers: {
+        'x-jhipsterapp-error': <% if (enableTranslation) { %>translationKey<% } else {%>message<% } %>,
+        'x-jhipsterapp-params': 'dummyEntity',
+      },
+    };
+    <%_ if (enableTranslation) { _%>
+    // GIVEN
+    translationStub.withArgs(translationKey).returns(message);
+    translationStub.withArgs('global.menu.entities.dummyEntity').returns('DummyEntity');
+    <%_ } _%>
+
+    // WHEN
+    alertService.showHttpError((<any>vueInstance) as Vue, httpErrorResponse);
+
+    //THEN
+    <%_ if (enableTranslation) { _%>
+    expect(translationStub.withArgs(translationKey, { entityName: 'DummyEntity' }).callCount).toEqual(1);
+    <%_ } _%>
+    expect(
+      toastStub.calledOnceWith(message, {
+        toaster: 'b-toaster-top-center',
+        title: 'Error',
+        variant: 'danger',
+        solid: true,
+        autoHideDelay: 5000,
+      })
+    ).toBeTruthy();
+  });
+});

package/generators/client/templates/vue/src/test/javascript/spec/app/shared/config/axios-interceptor.spec.ts.ejs

@@ -1,5 +1,4 @@
 import * as setupAxiosConfig from '@/shared/config/axios-interceptor';
-import { SERVER_API_URL } from '@/constants';
 import * as sinon from 'sinon';
 import axios from 'axios';
 import MockAdapter from "axios-mock-adapter";

package/generators/client/templates/vue/tsconfig.json.ejs

@@ -1,5 +1,7 @@
 {
     "compilerOptions": {
+        "baseUrl": "<%= CLIENT_MAIN_SRC_DIR %>app",
+        "outDir": "<%= BUILD_DIR %>out-tsc/dist",
         "target": "es5",
         "esModuleInterop": true,
         "allowSyntheticDefaultImports": true,
@@ -8,25 +10,19 @@
         "sourceMap": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
-        "removeComments": false,
-        "noImplicitAny": false,
-        "skipLibCheck": true,
-        "suppressImplicitAnyIndexErrors": true,
-        "outDir": "<%= DIST_DIR %>app",
         "lib": ["es7", "dom"],
         "typeRoots": [
             "node_modules/@types"
         ],
-        "baseUrl": "./",
         "paths": {
-            "@/*": ["<%= CLIENT_MAIN_SRC_DIR %>app/*"]
+            "@/*": ["*"]
         },
+        types: ["node"],
         "importHelpers": false,
         "allowJs": true
     },
     "include": [
-        "<%= CLIENT_MAIN_SRC_DIR %>app",
-        "<%= CLIENT_TEST_SRC_DIR %>spec"
+        "<%= CLIENT_MAIN_SRC_DIR %>app"
     ],
-    "exclude": ["node_modules"<% if (!cypressTests) { %>,"<%= CLIENT_TEST_SRC_DIR %>cypress"<% } %>]
+    "exclude": ["node_modules"<% if (cypressTests) { %>,"<%= CLIENT_TEST_SRC_DIR %>cypress"<% } %>]
 }

package/generators/client/templates/vue/tsconfig.spec.json.ejs

@@ -0,0 +1,37 @@
+<%#
+ Copyright 2013-2021 the original author or authors from the JHipster project.
+
+ This file is part of the JHipster project, see https://www.jhipster.tech/
+ for more information.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+      https://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-%>
+{
+  "extends": "./tsconfig",
+  "compilerOptions": {
+    "outDir": "<%= BUILD_DIR %>out-tsc/spec",
+<%_ if (microfrontend && applicationTypeGateway) { _%>
+    "paths": {
+  <%_ for (const remote of microfrontends) { _%>
+      "@<%= remote.lowercaseBaseName %>/*": ["<%= CLIENT_TEST_SRC_DIR %>spec/app/microfrontends/*"],
+  <%_ } _%>
+      "@/*": ["*"]
+    },
+<%_ } _%>
+    "types": ["jest", "node"]
+  },
+  "include": [
+    "<%= CLIENT_MAIN_SRC_DIR %>app/**/*",
+    "<%= CLIENT_TEST_SRC_DIR %>spec/**/*"
+  ]
+}

package/generators/client/templates/vue/webpack/config.js.ejs

@@ -0,0 +1,50 @@
+'use strict';
+
+const path = require('path');
+
+<%_ if (buildToolUnknown) { _%>
+const packageJson = require('./../package.json');
+<%_ } _%>
+
+module.exports = {
+  serverApiUrl: '',
+<%_ if (buildToolUnknown) { _%>
+  version: packageJson.version,
+<%_ } else { _%>
+  // APP_VERSION is passed as an environment variable from the Gradle / Maven build tasks.
+  version: process.env.hasOwnProperty('APP_VERSION') ? process.env.APP_VERSION : 'UNKNOWN',
+<%_ } _%>
+
+  dev: {
+    hotReload: <%= !microfrontend %>,
+
+    // https://webpack.js.org/configuration/devtool/#development
+    devtool: 'cheap-module-source-map',
+
+    // If you have problems debugging vue-files in devtools,
+    // set this to false - it *may* help
+    // https://vue-loader.vuejs.org/en/options.html#cachebusting
+    cacheBusting: true,
+
+    cssSourceMap: true
+  },
+
+  build: {
+    productionSourceMap: true,
+    // https://webpack.js.org/configuration/devtool/#production
+    devtool: 'source-map',
+
+    // Gzip off by default as many popular static hosts such as
+    // Surge or Netlify already gzip all static assets for you.
+    // Before setting to `true`, make sure to:
+    // npm install --save-dev compression-webpack-plugin
+    productionGzip: false,
+    productionGzipExtensions: ['js', 'css'],
+
+    // Run the build command with an extra argument to
+    // View the bundle analyzer report after build finishes:
+    // `npm run build --report`
+    // Set to `true` or `false` to always turn it on or off
+    bundleAnalyzerReport: process.env.npm_config_report
+  }
+};

package/generators/client/templates/vue/webpack/vue.utils.js.ejs

@@ -1,17 +1,14 @@
 'use strict';
 const path = require('path');
-const config = require('./env');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const packageConfig = require('../package.json');
 const sass = require('sass');
 
-exports.assetsPath = function(_path) {
-  const assetsSubDirectory = process.env.NODE_ENV === 'production' ? config.build.assetsSubDirectory : config.dev.assetsSubDirectory;
+const packageConfig = require('../package.json');
+const config = require('./config');
 
-  return path.posix.join(assetsSubDirectory, _path);
-};
+const sourceMapEnabled = production => (production ? config.build.productionSourceMap : config.dev.cssSourceMap);
 
-exports.cssLoaders = function(options) {
+const cssLoaders = options => {
   options = options || {};
 
   const cssLoader = {
@@ -19,14 +16,14 @@ exports.cssLoaders = function(options) {
     options: {
       sourceMap: options.sourceMap,
       esModule: false,
-    }
+    },
   };
 
   const postcssLoader = {
     loader: 'postcss-loader',
     options: {
-      sourceMap: options.sourceMap
-    }
+      sourceMap: options.sourceMap,
+    },
   };
 
   // generate loader string to be used with extract text plugin
@@ -37,8 +34,8 @@ exports.cssLoaders = function(options) {
       loaders.push({
         loader: loader + '-loader',
         options: Object.assign({}, loaderOptions, {
-          sourceMap: options.sourceMap
-        })
+          sourceMap: options.sourceMap,
+        }),
       });
     }
 
@@ -55,40 +52,44 @@ exports.cssLoaders = function(options) {
     sass: generateLoaders('sass', { indentedSyntax: true, implementation: sass }),
     scss: generateLoaders('sass', { implementation: sass }),
     stylus: generateLoaders('stylus'),
-    styl: generateLoaders('stylus')
+    styl: generateLoaders('stylus'),
   };
 };
 
 // Generate loaders for standalone style files (outside of .vue)
-exports.styleLoaders = function(options) {
+const styleLoaders = options => {
   const output = [];
-  const loaders = exports.cssLoaders(options);
+  const loaders = cssLoaders(options);
 
   for (const extension in loaders) {
     const loader = loaders[extension];
     output.push({
       test: new RegExp('\\.' + extension + '$'),
-      use: loader
+      use: loader,
     });
   }
 
   return output;
 };
 
-exports.createNotifierCallback = () => {
-  const notifier = require('node-notifier');
-
-  return (severity, errors) => {
-    if (severity !== 'error') return;
-
-    const error = errors[0];
-    const filename = error.file && error.file.split('!').pop();
-
-    notifier.notify({
-      title: packageConfig.name,
-      message: severity + ': ' + error.name,
-      subtitle: filename || '',
-      icon: path.join(__dirname, 'logo.png')
-    });
-  };
+const vueLoaderConfig = production => ({
+  loaders: cssLoaders({
+    sourceMap: sourceMapEnabled(production),
+    extract: production,
+  }),
+  cssSourceMap: sourceMapEnabled(production),
+  cacheBusting: config.dev.cacheBusting,
+  transformToRequire: {
+    video: ['src', 'poster'],
+    source: 'src',
+    img: 'src',
+    image: 'xlink:href',
+  },
+  hotReload: config.dev.hotReload,
+});
+
+module.exports = {
+  cssLoaders,
+  styleLoaders,
+  vueLoaderConfig,
 };