Skip to content

Commit 984b893

Browse files
nicolas63nicolas63
authored
Fix Blazor app with mongo (jhipster#825)
* Fix Blazor app with mongo * Fix UT * fix format and UT * Fix format
1 parent b66d0f8 commit 984b893

File tree

11 files changed

+51
-24
lines changed

11 files changed

+51
-24
lines changed

‎generators/entity-client/templates/blazor/src/Project.Client/Models/Model.cs.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ using System.ComponentModel.DataAnnotations;
3434

3535
namespace <%= namespace %>.Client.Models
3636
{
37-
public class <%= asModel(entityClassName) %> : BaseModel<long>
37+
public class <%= asModel(entityClassName) %> : BaseModel<<%= primaryKeyType %>>
3838
{
3939
<%_ for (idx in fields){
4040
if (fields[idx].id) continue;
@@ -67,7 +67,7 @@ namespace <%= namespace %>.Client.Models
6767
if(otherEntityNamePascalized === 'User') { _%>
6868
public string UserId { get; set; }
6969
<%_ } else { _%>
70-
public long? <%= relationshipFieldNamePascalized %>Id { get; set; }
70+
public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>?<%_ } %> <%= relationshipFieldNamePascalized %>Id { get; set; }
7171
<%_ }
7272
}
7373
if(relationshipType === 'one-to-many') { _%>
@@ -79,7 +79,7 @@ namespace <%= namespace %>.Client.Models
7979
if(otherEntityNamePascalized === 'User') { _%>
8080
public string UserId { get; set; }
8181
<%_ } else { _%>
82-
public long? <%= relationshipFieldNamePascalized %>Id { get; set; }
82+
public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>?<%_ } %> <%= relationshipFieldNamePascalized %>Id { get; set; }
8383
<%_ }
8484
} else if (relationshipType === 'many-to-many') { _%>
8585
public IList<<%= asModel(otherEntityNamePascalized) %>> <%= relationshipFieldNamePascalizedPlural %> { get; set; } = new List<<%= asModel(otherEntityNamePascalized) %>>();

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/Entity.razor.cs.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
4545
<%= entityClassNamePluralized %> = await <%= entityClassName %>Service.GetAll();
4646
}
4747

48-
private async Task Delete(long <%= lowerCasedEntityClassPlural %>Id)
48+
private async Task Delete(<%= primaryKeyType %> <%= lowerCasedEntityClassPlural %>Id)
4949
{
5050
var deleteModal = ModalService.Show<DeleteModal>("Confirm delete operation");
5151
var deleteResult = await deleteModal.Result;

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/Entity.razor.ejs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ _%>
8888
<%_ if(relation.otherEntityNamePascalized === 'User') { _%>
8989
@if (<%= lowerCasedEntityClass %>.<%= relation.relationshipFieldNamePascalized %>Id != string.Empty)
9090
<%_ } else { _%>
91+
<%_ if(primaryKeyType !== 'string') { %>
9192
@if (<%= lowerCasedEntityClass %>.<%= relation.relationshipFieldNamePascalized %>Id != 0)
93+
<%_ } else { _%>
94+
@if (<%= lowerCasedEntityClass %>.<%= relation.relationshipFieldNamePascalized %>Id != null)
95+
<%_ } _%>
9296
<%_ } _%>
9397
{
9498
<div>

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/EntityDetail.razor.cs.ejs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
3030
public partial class <%= entityClassName %>Detail : ComponentBase
3131
{
3232
[Parameter]
33-
public int Id { get; set; }
33+
public <%= primaryKeyType %> Id { get; set; }
3434

3535
[Inject]
3636
public I<%= entityClassName %>Service <%= entityClassName %>Service { get; set; }
@@ -42,7 +42,11 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
4242

4343
protected override async Task OnInitializedAsync()
4444
{
45+
<%_ if(primaryKeyType !== 'string') { %>
4546
if (Id != 0)
47+
<%_ } else { _%>
48+
if (Id != null)
49+
<%_ } _%>
4650
{
4751
<%= entityClassName %> = await <%= entityClassName %>Service.Get(Id.ToString());
4852
}

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/EntityDetail.razor.ejs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,19 @@ const entityClassName = pascalizedEntityClass;
55
const entityVariableName = camelCasedEntityClass;
66
const entityClassNamePluralized = pascalizedEntityClassPlural;
77
_%>
8-
@page "/<%= lowerCasedEntityClass %>/{Id:int}/view"
8+
@page "/<%= lowerCasedEntityClass %>/{Id<%_ if(primaryKeyType !== 'string') { %>:<%= primaryKeyType %> <%_ } _%> }/view"
99
@using Microsoft.AspNetCore.Authorization
1010
@namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
1111

1212
@attribute [Authorize(Roles = "ROLE_USER")]
1313

1414
<div class="row justify-content-center">
1515
<div class="col-8">
16+
<%_ if(primaryKeyType !== 'string') { %>
1617
@if (<%= entityClassName %> != null && <%= entityClassName %>.Id != 0)
18+
<%_ } else { _%>
19+
@if (<%= entityClassName %> != null && <%= entityClassName %>.Id != null)
20+
<%_ } _%>
1721
{
1822
<div>
1923
<h2><span><%= entityClassName %></span>@<%= entityClassName %>.Id</h2>
@@ -37,7 +41,11 @@ _%>
3741
<%_ if(relation.otherEntityNamePascalized === 'User') { _%>
3842
@if (<%= entityClassName %>.<%= relation.relationshipFieldNamePascalized %>Id != string.Empty)
3943
<%_ } else { _%>
44+
<%_ if(primaryKeyType !== 'string') { %>
4045
@if (<%= entityClassName %>.<%= relation.relationshipFieldNamePascalized %>Id != 0)
46+
<%_ } else { _%>
47+
@if (<%= entityClassName %>.<%= relation.relationshipFieldNamePascalized %>Id != null)
48+
<%_ } _%>
4149
<%_ } _%>
4250
{
4351
<div>

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/EntityUpdate.razor.cs.ejs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
3838
public partial class <%= entityClassName %>Update : ComponentBase
3939
{
4040
[Parameter]
41-
public int Id { get; set; }
41+
public <%= primaryKeyType %> Id { get; set; }
4242

4343
[Inject]
4444
private I<%= entityClassName %>Service <%= entityClassName %>Service { get; set; }
@@ -71,15 +71,15 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
7171
public string <%= relation.otherEntityNamePascalized %>Id { get; set; }
7272
7373
<%_ } else { _%>
74-
public IEnumerable<long> <%= relation.otherEntityNamePascalized %>Ids { get; set; } = new List<long>();
74+
public IEnumerable<<%= primaryKeyType %>> <%= relation.otherEntityNamePascalized %>Ids { get; set; } = new List<<%= primaryKeyType %>>();
7575
76-
public long? <%= relation.otherEntityNamePascalized %>Id { get; set; }
76+
public <%= primaryKeyType _%> <%_ if(primaryKeyType !== 'string') { _%>?<%_ } %> <%= relation.otherEntityNamePascalized %>Id { get; set; }
7777
7878
<%_ } _%>
7979
<%_ } else if ((relation.relationshipType === 'many-to-many' || relation.relationshipType === 'one-to-many') && relation.ownerSide === true ) { _%>
80-
public IReadOnlyList<long> <%= relation.otherEntityNamePascalized %>Ids { get; set; } = new List<long>();
80+
public IReadOnlyList<<%= primaryKeyType %>> <%= relation.otherEntityNamePascalized %>Ids { get; set; } = new List<<%= primaryKeyType %>>();
8181
82-
public IReadOnlyList<long> Selected<%= relation.relationshipFieldNamePascalizedPlural %> { get; set; }
82+
public IReadOnlyList<<%= primaryKeyType %>> Selected<%= relation.relationshipFieldNamePascalizedPlural %> { get; set; }
8383
8484
<%_ }
8585
}); _%>
@@ -93,14 +93,18 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
9393
<%= relation.relationshipFieldNamePascalizedPlural %> = await <%= relation.otherEntityNamePascalized %>Service.GetAll();
9494
<%= relation.otherEntityNamePascalized %>Ids = <%= relation.relationshipFieldNamePascalizedPlural %>.Select(<%= relation.otherEntityNameLowerCased %> => <%= relation.otherEntityNameLowerCased %>.Id).ToList();
9595
<%_ }}); _%>
96+
<%_ if(primaryKeyType !== 'string') { %>
9697
if (Id != 0)
98+
<%_ } else { _%>
99+
if (Id != null)
100+
<%_ } _%>
97101
{
98102
<%= asModel(entityClassName) %> = await <%= entityClassName %>Service.Get(Id.ToString());
99103
<%_ relationships.forEach(relation => {
100104
if (relation.relationshipType === 'one-to-one' || relation.relationshipType === 'many-to-one') { _%>
101105
<%= relation.otherEntityNamePascalized %>Id = <%= asModel(entityClassName) %>.<%= relation.relationshipFieldNamePascalized %>Id;
102106
<%_ } else if ((relation.relationshipType === 'many-to-many' || relation.relationshipType === 'one-to-many') && relation.ownerSide === true ) { _%>
103-
Selected<%= relation.relationshipFieldNamePascalizedPlural %> = new List<long>(<%= asModel(entityClassName) %>.<%= relation.relationshipFieldNamePascalizedPlural %>.Select(<%= relation.otherEntityNameLowerCased %> => <%= relation.otherEntityNameLowerCased %>.Id));
107+
Selected<%= relation.relationshipFieldNamePascalizedPlural %> = new List<<%= primaryKeyType %>>(<%= asModel(entityClassName) %>.<%= relation.relationshipFieldNamePascalizedPlural %>.Select(<%= relation.otherEntityNameLowerCased %> => <%= relation.otherEntityNameLowerCased %>.Id));
104108
<%_ }
105109
}); _%>
106110
}
@@ -126,7 +130,11 @@ namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
126130
<%= asModel(entityClassName) %>.<%= relation.relationshipFieldNamePascalizedPlural %> = null;
127131
}
128132
<%_ }}); _%>
133+
<%_ if(primaryKeyType !== 'string') { %>
129134
if (Id != 0)
135+
<%_ } else { _%>
136+
if (Id != null)
137+
<%_ } _%>
130138
{
131139
await <%= entityClassName %>Service.Update(<%= asModel(entityClassName) %>);
132140
}

‎generators/entity-client/templates/blazor/src/Project.Client/Pages/Entities/Entity/EntityUpdate.razor.ejs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const entityVariableName = camelCasedEntityClass;
66
const entityClassNamePluralized = pascalizedEntityClassPlural;
77
_%>
88
@page "/<%= lowerCasedEntityClass %>/new"
9-
@page "/<%= lowerCasedEntityClass %>/{Id:int}/edit"
9+
@page "/<%= lowerCasedEntityClass %>/{Id<%_ if(primaryKeyType !== 'string') { %>:<%= primaryKeyType %> <%_ } _%> }/edit"
1010
@using Microsoft.AspNetCore.Authorization
1111
@namespace <%= namespace %>.Client.Pages.Entities.<%= entityClassName %>
1212

@@ -22,7 +22,11 @@ _%>
2222
<jhi-alert-error></jhi-alert-error>
2323
*@
2424

25+
<%_ if(primaryKeyType !== 'string') { %>
2526
@if (Id != 0)
27+
<%_ } else { _%>
28+
@if (Id != null)
29+
<%_ } _%>
2630
{
2731
<div class="form-group">
2832
<label for="id">ID</label>
@@ -55,7 +59,7 @@ _%>
5559
<option value="0"></option>
5660
@foreach (var <%= relation.otherEntityNameLowerCased %> in <%= relation.otherEntityNamePascalized %>Ids)
5761
{
58-
if (Id != 0 && <%= relation.otherEntityNameLowerCased %> == <%= asModel(entityClassName) %>?.<%= relation.relationshipFieldNamePascalized %>Id)
62+
if (Id <% if(primaryKeyType !== 'string') { %> != 0 <%_ } else { _%> != null <%_ } _%> && <%= relation.otherEntityNameLowerCased %> == <%= asModel(entityClassName) %>?.<%= relation.relationshipFieldNamePascalized %>Id)
5963
{
6064
<option selected="selected">@<%= relation.otherEntityNameLowerCased %></option>
6165
}
@@ -69,10 +73,10 @@ _%>
6973
<%_ } else if ((relation.relationshipType === 'many-to-many' || relation.relationshipType === 'one-to-many') && relation.ownerSide === true ) { _%>
7074
<div class="form-group">
7175
<label class="form-control-label" for="field_<%= relation.otherEntityNameLowerCased %>"><%= relation.relationshipFieldNamePascalizedPlural %></label>
72-
<Select class="form-control" name="<%= relation.otherEntityNameLowerCased %>" TValue="long" @bind-SelectedValues="Selected<%= relation.relationshipFieldNamePascalizedPlural %>" Multiple="true">
76+
<Select class="form-control" name="<%= relation.otherEntityNameLowerCased %>" TValue="<%= primaryKeyType %>" @bind-SelectedValues="Selected<%= relation.relationshipFieldNamePascalizedPlural %>" Multiple="true">
7377
@foreach (var <%= relation.otherEntityNameLowerCased %> in <%= relation.otherEntityNamePascalized %>Ids)
7478
{
75-
<SelectItem TValue="long" Value="@<%= relation.otherEntityNameLowerCased %>">@<%= relation.otherEntityNameLowerCased %></SelectItem>
79+
<SelectItem TValue="<%= primaryKeyType %>" Value="@<%= relation.otherEntityNameLowerCased %>">@<%= relation.otherEntityNameLowerCased %></SelectItem>
7680
}
7781
</Select>
7882
</div>

‎generators/entity-client/templates/blazor/src/Project.Client/Services/EntityServices/EntityService/EntityService.cs.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ using Microsoft.Extensions.Configuration;
2727

2828
namespace <%= namespace %>.Client.Services.EntityServices.<%= entityClassName %>
2929
{
30-
public class <%= entityClassName %>Service : AbstractEntityService<<%= asModel(entityClassName) %>, <%= asDto(entityClassName) %>, long>, I<%= entityClassName %>Service
30+
public class <%= entityClassName %>Service : AbstractEntityService<<%= asModel(entityClassName) %>, <%= asDto(entityClassName) %>, <%= primaryKeyType %>>, I<%= entityClassName %>Service
3131
{
3232
public <%= entityClassName %>Service(HttpClient httpClient, AuthenticationStateProvider authenticationStateProvider, IMapper mapper, IConfiguration configuration)
3333
: base(httpClient, authenticationStateProvider, mapper, configuration, "/api/<%= kebabCasedEntityClassPlural %>")

‎generators/entity-client/templates/blazor/test/Project.Client.Test/Pages/Entities/Entity/EntityDetailTest.cs.ejs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
6868
//Arrange
6969
var <%= lowerCasedEntityClass %> = _fixture.Create<<%= asModel(entityClassName) %>>();
7070
_<%= lowerCasedEntityClass %>Service.Setup(service => service.Get(It.IsAny<string>())).Returns(Task.FromResult(<%= lowerCasedEntityClass %>));
71-
var <%= lowerCasedEntityClass %>Detail = RenderComponent<<%= entityClassName %>Detail>(ComponentParameter.CreateParameter("Id", 1));
71+
var <%= lowerCasedEntityClass %>Detail = RenderComponent<<%= entityClassName %>Detail>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 1L <%_ } else { _%> "1" <%_ } _%>));
7272

7373
// Act
7474
var title = <%= lowerCasedEntityClass %>Detail.Find("h2");

‎generators/entity-client/templates/blazor/test/Project.Client.Test/Pages/Entities/Entity/EntityUpdateTest.cs.ejs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,11 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
113113
}); _%>
114114

115115
var <%= entityVariableName %>ToUpdate = _fixture.Create<<%= asModel(entityClassName) %>>();
116-
<%= entityVariableName %>ToUpdate.Id = 1;
116+
<%= entityVariableName %>ToUpdate.Id = <% if(primaryKeyType !== 'string') { _%> 1 <%_ } else { _%> "1" <%_ } _%>;
117117

118118
_<%= entityVariableName %>Service.Setup(service => service.Get(It.IsAny<string>())).Returns(Task.FromResult(<%= entityVariableName %>ToUpdate));
119119

120-
var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", 1));
120+
var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 1L <%_ } else { _%> "1" <%_ } _%>));
121121

122122
// Act
123123
var <%= entityVariableName %>Form = update<%= entityClassName %>Page.Find("form");
@@ -141,7 +141,7 @@ namespace <%= namespace %>.Client.Test.Pages.Entities.<%= entityClassName %>
141141
<%_ }
142142
}); _%>
143143

144-
var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", 0));
144+
var update<%= entityClassName %>Page = RenderComponent<<%= namespace %>.Client.Pages.Entities.<%= entityClassName %>.<%= entityClassName %>Update>(ComponentParameter.CreateParameter("Id", <% if(primaryKeyType !== 'string') { _%> 0L <%_ } else { _%> null <%_ } _%>));
145145

146146
// Act
147147
var <%= entityVariableName %>Form = update<%= entityClassName %>Page.Find("form");

0 commit comments

Comments
 (0)