Merge pull request #90 from amplication/bug/resolve-entity-fields

fix #89
amplication · Jun 15, 2020 · 7b2bfc1 · 7b2bfc1
2 parents 91c3868 + 9e0c4b9
commit 7b2bfc1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/packages/amplication-server/package.json b/packages/amplication-server/package.json
@@ -16,7 +16,7 @@
     "prisma:studio": "prisma studio --experimental",
     "prisma:generate": "prisma generate",
     "prisma:generate:watch": "prisma generate --watch",
-    "lint": "eslint '{src,apps,libs,test}/**/*.ts'",
+    "lint": "eslint \"{src,apps,libs,test}/**/*.ts\"",
     "lint:fix": "npm run lint -- --fix",
     "test": "jest",
     "test:watch": "jest --watch",

diff --git a/packages/amplication-server/src/core/block/dto/BlockTypeWhereInput.ts b/packages/amplication-server/src/core/block/dto/BlockTypeWhereInput.ts
@@ -1,7 +1,6 @@
 import { Field, InputType } from '@nestjs/graphql';
 import { WhereUniqueInput, DateTimeFilter, StringFilter } from 'src/dto';
 
-import { EnumBlockTypeFilter } from './EnumBlockTypeFilter';
 @InputType({
   isAbstract: true,
   description: undefined

diff --git a/packages/amplication-server/src/core/entity/EntityResolver.ts b/packages/amplication-server/src/core/entity/EntityResolver.ts
@@ -91,8 +91,8 @@ export class EntityResolver {
     return this.entityService.createVersion(args);
   }
 
-  @ResolveField(returns => [EntityField])
-  async entityFields(@Parent() entity: Entity) {
+  @ResolveField(() => [EntityField])
+  async fields(@Parent() entity: Entity) {
     if (entity.fields && entity.fields.length) {
       return entity.fields;
     }

diff --git a/packages/amplication-server/src/core/entity/entity.service.ts b/packages/amplication-server/src/core/entity/entity.service.ts
@@ -16,6 +16,8 @@ import {
   DeleteOneEntityArgs
 } from './dto';
 
+const NEW_VERSION_LABEL = 'Current Version';
+
 @Injectable()
 export class EntityService {
   constructor(private readonly prisma: PrismaService) {}
@@ -57,7 +59,7 @@ export class EntityService {
     // Creates first entry on EntityVersion by default when new entity is created
     await this.prisma.entityVersion.create({
       data: {
-        label: null,
+        label: NEW_VERSION_LABEL,
         versionNumber: 0,
         entity: {
           connect: {

diff --git a/packages/amplication-server/src/core/user/userResolver.ts b/packages/amplication-server/src/core/user/userResolver.ts
@@ -65,12 +65,12 @@ export class UserResolver {
     return this.userService.removeRole(args);
   }
 
-  @ResolveField(returns => [UserRole])
+  @ResolveField(() => [UserRole])
   async userRoles(@Parent() user: User) {
     return await this.userService.getRoles(user.id);
   }
 
-  @ResolveField(returns => Account)
+  @ResolveField(() => Account)
   async account(@Parent() user: User) {
     return await this.userService.getAccount(user.id);
   }