Try to fix the master branch, as React Router had a patch release tha…

…t gets transitively pulled, and which makes compilation fail
jhipster · Sep 14, 2018 · 29b550c · 29b550c
1 parent da85270
commit 29b550c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...s/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs b/...s/entity-client/templates/react/src/main/webapp/app/entities/entity-delete-dialog.tsx.ejs
@@ -27,7 +27,7 @@ import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileNam
 import { IRootState } from 'app/shared/reducers';
 import { getEntity, deleteEntity } from './<%= entityFileName %>.reducer';
 
-export interface I<%= entityReactName %>DeleteDialogProps extends StateProps, DispatchProps, RouteComponentProps<{id: number}>  {}
+export interface I<%= entityReactName %>DeleteDialogProps extends StateProps, DispatchProps, RouteComponentProps<{id: string}>  {}
 
 export class <%= entityReactName %>DeleteDialog extends React.Component<I<%= entityReactName %>DeleteDialogProps> {
   componentDidMount() {

diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-detail.tsx.ejs
@@ -42,7 +42,7 @@ import { I<%= entityReactName %> } from 'app/shared/model/<%= entityModelFileNam
 // tslint:disable-next-line:no-unused-variable
 import { APP_DATE_FORMAT, APP_LOCAL_DATE_FORMAT } from 'app/config/constants';
 
-export interface I<%= entityReactName %>DetailProps extends StateProps, DispatchProps, RouteComponentProps<{id: number}>  {}
+export interface I<%= entityReactName %>DetailProps extends StateProps, DispatchProps, RouteComponentProps<{id: string}>  {}
 
 export class <%= entityReactName %>Detail extends React.Component<I<%= entityReactName %>DetailProps> {
 

diff --git a/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs b/generators/entity-client/templates/react/src/main/webapp/app/entities/entity-update.tsx.ejs
@@ -121,15 +121,15 @@ import { convertDateTimeFromServer } from 'app/shared/util/date-utils';
 import { mapIdList } from 'app/shared/util/entity-utils';
 <%_ } _%>
 
-export interface I<%= entityReactName %>UpdateProps extends StateProps, DispatchProps, RouteComponentProps<{id: number}>  {}
+export interface I<%= entityReactName %>UpdateProps extends StateProps, DispatchProps, RouteComponentProps<{id: string}>  {}
 
 export interface I<%= entityReactName %>UpdateState {
   isNew: boolean;
   <%_ manyToManyOwners.forEach(val => { _%>
   ids<%= val.relationshipName %>: any[];
   <%_ }) _%>
   <%_ relFieldNames.forEach(val => { _%>
-  <%= val.relationshipFieldName %>Id: number;
+  <%= val.relationshipFieldName %>Id: string;
   <%_ }) _%>
 }
 
@@ -142,7 +142,7 @@ export class <%= entityReactName %>Update extends React.Component<I<%= entityRea
       ids<%= val.relationshipName %>: [],
       <%_ }) _%>
       <%_ relFieldNames.forEach(val => { _%>
-      <%= val.relationshipFieldName %>Id: 0,
+      <%= val.relationshipFieldName %>Id: '0',
       <%_ }) _%>
       isNew: !this.props.match.params || !this.props.match.params.id,
     };
@@ -329,7 +329,7 @@ export class <%= entityReactName %>Update extends React.Component<I<%= entityRea
                   <%= fieldNameHumanized %>
                 </Translate>
               </Label>
-              <AvField id="<%= entityFileName %>-<%= fieldName %>" type="number" className="form-control" name="<%= fieldName %>" <%- include react_validators %> />
+              <AvField id="<%= entityFileName %>-<%= fieldName %>" type="string" className="form-control" name="<%= fieldName %>" <%- include react_validators %> />
             <%_
             } else if (['byte[]', 'ByteBuffer'].includes(fieldType)) {