From 9670a87f5980e82518793e242a58c42c640fd76f Mon Sep 17 00:00:00 2001 From: Quentin Monmert Date: Sat, 15 Jan 2022 15:38:34 +0100 Subject: [PATCH 1/2] [Vue] Fix: this.userManagementService is not a function --- .../user-management/user-management-edit.component.ts.ejs | 2 +- .../user-management/user-management-view.component.ts.ejs | 2 +- .../admin/user-management/user-management.component.ts.ejs | 2 +- .../client/templates/vue/src/main/webapp/app/main.ts.ejs | 4 +++- .../user-management-edit.component.spec.ts.ejs | 2 +- .../user-management-view.component.spec.ts.ejs | 2 +- .../user-management/user-management.component.spec.ts.ejs | 2 +- 7 files changed, 9 insertions(+), 7 deletions(-) diff --git a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs index 9ab2ba950bd..c7e58c294ed 100644 --- a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-edit.component.ts.ejs @@ -37,7 +37,7 @@ const validations: any = { validations }) export default class <%=jhiPrefixCapitalized%>UserManagementEdit extends Vue { - @Inject('userService') private userManagementService: () => UserManagementService; + @Inject('userManagementService') private userManagementService: () => UserManagementService; @Inject('alertService') private alertService: () => AlertService; public userAccount: IUser; diff --git a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs index 720f7940187..9f88b192eb0 100644 --- a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management-view.component.ts.ejs @@ -5,7 +5,7 @@ import AlertService from '@/shared/alert/alert.service'; @Component export default class <%=jhiPrefixCapitalized%>UserManagementView extends Vue { - @Inject('userService') private userManagementService: () => UserManagementService; + @Inject('userManagementService') private userManagementService: () => UserManagementService; @Inject('alertService') private alertService: () => AlertService; public user: any = null; diff --git a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs index 682f9579f7f..c136a681e7d 100644 --- a/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/admin/user-management/user-management.component.ts.ejs @@ -7,7 +7,7 @@ import AlertService from '@/shared/alert/alert.service'; mixins: [Vue2Filters.mixin] }) export default class <%=jhiPrefixCapitalized%>UserManagementComponent extends Vue { - @Inject('userService') private userManagementService: () => UserManagementService; + @Inject('userManagementService') private userManagementService: () => UserManagementService; @Inject('alertService') private alertService: () => AlertService; public error = ''; diff --git a/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs index d0c9a9f3844..4b343831704 100644 --- a/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs @@ -20,6 +20,7 @@ import ConfigurationService from '@/admin/configuration/configuration.service'; <%_ if (!skipUserManagement) { _%> import ActivateService from './account/activate/activate.service'; import RegisterService from './account/register/register.service'; +import UserManagementService from './admin/user-management/user-management.service'; <%_ } _%> import LoginService from './account/login.service'; import AccountService from './account/account.service'; @@ -99,9 +100,10 @@ new Vue({ router, provide: { loginService: () => loginService, -<%_ if (!skipUserManagement) { _%> + <%_ if (!skipUserManagement) { _%> activateService: () => new ActivateService(), registerService: () => new RegisterService(), + userManagementService: () => new UserManagementService(), <%_ } _%> <%_ if (applicationTypeGateway && serviceDiscoveryType) { %> gatewayService: () => new GatewayService(), diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs index 5233a68b1d9..aaed1f02e1c 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-edit.component.spec.ts.ejs @@ -45,7 +45,7 @@ describe('UserManagementEdit Component', () => { <%_ } _%> localVue, provide: { - userService: () => new UserManagementService(), + userManagementService: () => new UserManagementService(), alertService: () => new AlertService(), } }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs index c072af8e495..3f38e514d3e 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management-view.component.spec.ts.ejs @@ -33,7 +33,7 @@ describe('UserManagementView Component', () => { let userManagementView: UserManagementViewClass; beforeEach(() => { - wrapper = shallowMount(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userService: () => new UserManagementService(), alertService: () => new AlertService(), } }); + wrapper = shallowMount(UserManagementView, { store, <% if (enableTranslation) { %>i18n, <% } %>localVue, provide: { userManagementService: () => new UserManagementService(), alertService: () => new AlertService(), } }); userManagementView = wrapper.vm; }); diff --git a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs index a5f343aba0c..cb9b75ad3c8 100644 --- a/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs +++ b/generators/client/templates/vue/src/test/javascript/spec/app/admin/user-management/user-management.component.spec.ts.ejs @@ -60,7 +60,7 @@ describe('UserManagement Component', () => { bModal: true }, provide: { - userService: () => new UserManagementService(), + userManagementService: () => new UserManagementService(), alertService: () => new AlertService(), } }); From dd8b789322bc9a3f800cb3872b92156c9b5c552c Mon Sep 17 00:00:00 2001 From: Quentin Monmert Date: Mon, 17 Jan 2022 08:43:06 +0100 Subject: [PATCH 2/2] [Vue] Fix indentation --- generators/client/templates/vue/src/main/webapp/app/main.ts.ejs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs b/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs index 4b343831704..ace2dcba23b 100644 --- a/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs +++ b/generators/client/templates/vue/src/main/webapp/app/main.ts.ejs @@ -100,7 +100,7 @@ new Vue({ router, provide: { loginService: () => loginService, - <%_ if (!skipUserManagement) { _%> +<%_ if (!skipUserManagement) { _%> activateService: () => new ActivateService(), registerService: () => new RegisterService(), userManagementService: () => new UserManagementService(),