From a043f61ddc6fc704e5193ad1f616c9f5a1c50a3b Mon Sep 17 00:00:00 2001 From: "amplication[bot]" <100755160+amplication[bot]@users.noreply.github.com> Date: Sun, 17 Apr 2022 03:14:34 +0000 Subject: [PATCH] amplication-build-cl22psfk2162918501s64i8mfwj6 --- admin-ui/src/api/user/User.ts | 1 + admin-ui/src/api/user/UserCreateInput.ts | 1 + admin-ui/src/api/user/UserOrderByInput.ts | 1 + admin-ui/src/api/user/UserUpdateInput.ts | 1 + admin-ui/src/api/user/UserWhereInput.ts | 1 + admin-ui/src/user/UserCreate.tsx | 1 + admin-ui/src/user/UserEdit.tsx | 1 + admin-ui/src/user/UserList.tsx | 3 ++- admin-ui/src/user/UserShow.tsx | 3 ++- ampconfig.json | 2 +- server/prisma/schema.prisma | 1 + server/src/swagger.ts | 2 +- server/src/user/base/User.ts | 13 ++++++++++++- server/src/user/base/UserCreateInput.ts | 11 +++++++++++ server/src/user/base/UserOrderByInput.ts | 9 +++++++++ server/src/user/base/UserUpdateInput.ts | 11 +++++++++++ server/src/user/base/UserWhereInput.ts | 11 +++++++++++ server/src/user/base/user.controller.base.spec.ts | 4 ++++ server/src/user/base/user.controller.base.ts | 5 +++++ 19 files changed, 77 insertions(+), 5 deletions(-) diff --git a/admin-ui/src/api/user/User.ts b/admin-ui/src/api/user/User.ts index 798058f..d21cede 100644 --- a/admin-ui/src/api/user/User.ts +++ b/admin-ui/src/api/user/User.ts @@ -1,4 +1,5 @@ export type User = { + comments: string | null; createdAt: Date; firstName: string | null; id: string; diff --git a/admin-ui/src/api/user/UserCreateInput.ts b/admin-ui/src/api/user/UserCreateInput.ts index 2348030..653cb8b 100644 --- a/admin-ui/src/api/user/UserCreateInput.ts +++ b/admin-ui/src/api/user/UserCreateInput.ts @@ -1,4 +1,5 @@ export type UserCreateInput = { + comments?: string | null; firstName?: string | null; lastName?: string | null; password: string; diff --git a/admin-ui/src/api/user/UserOrderByInput.ts b/admin-ui/src/api/user/UserOrderByInput.ts index 36cee1e..d05ad94 100644 --- a/admin-ui/src/api/user/UserOrderByInput.ts +++ b/admin-ui/src/api/user/UserOrderByInput.ts @@ -1,6 +1,7 @@ import { SortOrder } from "../../util/SortOrder"; export type UserOrderByInput = { + comments?: SortOrder; createdAt?: SortOrder; firstName?: SortOrder; id?: SortOrder; diff --git a/admin-ui/src/api/user/UserUpdateInput.ts b/admin-ui/src/api/user/UserUpdateInput.ts index 2ec7caf..e7fec64 100644 --- a/admin-ui/src/api/user/UserUpdateInput.ts +++ b/admin-ui/src/api/user/UserUpdateInput.ts @@ -1,4 +1,5 @@ export type UserUpdateInput = { + comments?: string | null; firstName?: string | null; lastName?: string | null; password?: string; diff --git a/admin-ui/src/api/user/UserWhereInput.ts b/admin-ui/src/api/user/UserWhereInput.ts index 22c10cb..c21d40d 100644 --- a/admin-ui/src/api/user/UserWhereInput.ts +++ b/admin-ui/src/api/user/UserWhereInput.ts @@ -2,6 +2,7 @@ import { StringNullableFilter } from "../../util/StringNullableFilter"; import { StringFilter } from "../../util/StringFilter"; export type UserWhereInput = { + comments?: StringNullableFilter; firstName?: StringNullableFilter; id?: StringFilter; lastName?: StringNullableFilter; diff --git a/admin-ui/src/user/UserCreate.tsx b/admin-ui/src/user/UserCreate.tsx index def7787..3e0af79 100644 --- a/admin-ui/src/user/UserCreate.tsx +++ b/admin-ui/src/user/UserCreate.tsx @@ -15,6 +15,7 @@ export const UserCreate = (props: CreateProps): React.ReactElement => { return ( + diff --git a/admin-ui/src/user/UserEdit.tsx b/admin-ui/src/user/UserEdit.tsx index 8565bf9..8addbfb 100644 --- a/admin-ui/src/user/UserEdit.tsx +++ b/admin-ui/src/user/UserEdit.tsx @@ -13,6 +13,7 @@ export const UserEdit = (props: EditProps): React.ReactElement => { return ( + diff --git a/admin-ui/src/user/UserList.tsx b/admin-ui/src/user/UserList.tsx index aa820f4..736e85d 100644 --- a/admin-ui/src/user/UserList.tsx +++ b/admin-ui/src/user/UserList.tsx @@ -1,5 +1,5 @@ import * as React from "react"; -import { List, Datagrid, ListProps, DateField, TextField } from "react-admin"; +import { List, Datagrid, ListProps, TextField, DateField } from "react-admin"; import Pagination from "../Components/Pagination"; export const UserList = (props: ListProps): React.ReactElement => { @@ -12,6 +12,7 @@ export const UserList = (props: ListProps): React.ReactElement => { pagination={} > + diff --git a/admin-ui/src/user/UserShow.tsx b/admin-ui/src/user/UserShow.tsx index dc33a5b..dcb4901 100644 --- a/admin-ui/src/user/UserShow.tsx +++ b/admin-ui/src/user/UserShow.tsx @@ -3,14 +3,15 @@ import { Show, SimpleShowLayout, ShowProps, - DateField, TextField, + DateField, } from "react-admin"; export const UserShow = (props: ShowProps): React.ReactElement => { return ( + diff --git a/ampconfig.json b/ampconfig.json index d8f860b..cd9a039 100644 --- a/ampconfig.json +++ b/ampconfig.json @@ -3,7 +3,7 @@ "appInfo": { "name": "SaaS", "description": "Sample application for e-commerce", - "version": "517uoyce", + "version": "su9aoqz1", "id": "cl22o6zy9149638301s6se2017ma", "url": "https://app.amplication.com/cl22o6zy9149638301s6se2017ma", "settings": { diff --git a/server/prisma/schema.prisma b/server/prisma/schema.prisma index 689be44..4dd7f28 100644 --- a/server/prisma/schema.prisma +++ b/server/prisma/schema.prisma @@ -8,6 +8,7 @@ generator client { } model User { + comments String? createdAt DateTime @default(now()) firstName String? id String @id @default(cuid()) diff --git a/server/src/swagger.ts b/server/src/swagger.ts index edd64a6..6cae271 100644 --- a/server/src/swagger.ts +++ b/server/src/swagger.ts @@ -7,7 +7,7 @@ export const swaggerDocumentOptions = new DocumentBuilder() .setDescription( 'Sample application for e-commerce\n\n## Congratulations! Your application is ready.\n \nPlease note that all endpoints are secured with JWT Bearer authentication.\nBy default, your app comes with one user with the username "admin" and password "admin".\nLearn more in [our docs](https://docs.amplication.com)' ) - .setVersion("517uoyce") + .setVersion("su9aoqz1") .addBearerAuth() .build(); diff --git a/server/src/user/base/User.ts b/server/src/user/base/User.ts index 09cec87..640b35b 100644 --- a/server/src/user/base/User.ts +++ b/server/src/user/base/User.ts @@ -11,10 +11,21 @@ https://docs.amplication.com/docs/how-to/custom-code */ import { ObjectType, Field } from "@nestjs/graphql"; import { ApiProperty } from "@nestjs/swagger"; -import { IsDate, IsString, IsOptional } from "class-validator"; +import { IsString, IsOptional, IsDate } from "class-validator"; import { Type } from "class-transformer"; @ObjectType() class User { + @ApiProperty({ + required: false, + type: String, + }) + @IsString() + @IsOptional() + @Field(() => String, { + nullable: true, + }) + comments!: string | null; + @ApiProperty({ required: true, }) diff --git a/server/src/user/base/UserCreateInput.ts b/server/src/user/base/UserCreateInput.ts index c7e39cc..5296211 100644 --- a/server/src/user/base/UserCreateInput.ts +++ b/server/src/user/base/UserCreateInput.ts @@ -14,6 +14,17 @@ import { ApiProperty } from "@nestjs/swagger"; import { IsString, IsOptional } from "class-validator"; @InputType() class UserCreateInput { + @ApiProperty({ + required: false, + type: String, + }) + @IsString() + @IsOptional() + @Field(() => String, { + nullable: true, + }) + comments?: string | null; + @ApiProperty({ required: false, type: String, diff --git a/server/src/user/base/UserOrderByInput.ts b/server/src/user/base/UserOrderByInput.ts index 5aefc17..598c35a 100644 --- a/server/src/user/base/UserOrderByInput.ts +++ b/server/src/user/base/UserOrderByInput.ts @@ -18,6 +18,15 @@ import { SortOrder } from "../../util/SortOrder"; description: undefined, }) class UserOrderByInput { + @ApiProperty({ + required: false, + enum: ["asc", "desc"], + }) + @Field(() => SortOrder, { + nullable: true, + }) + comments?: SortOrder; + @ApiProperty({ required: false, enum: ["asc", "desc"], diff --git a/server/src/user/base/UserUpdateInput.ts b/server/src/user/base/UserUpdateInput.ts index c488046..71a9fd4 100644 --- a/server/src/user/base/UserUpdateInput.ts +++ b/server/src/user/base/UserUpdateInput.ts @@ -14,6 +14,17 @@ import { ApiProperty } from "@nestjs/swagger"; import { IsString, IsOptional } from "class-validator"; @InputType() class UserUpdateInput { + @ApiProperty({ + required: false, + type: String, + }) + @IsString() + @IsOptional() + @Field(() => String, { + nullable: true, + }) + comments?: string | null; + @ApiProperty({ required: false, type: String, diff --git a/server/src/user/base/UserWhereInput.ts b/server/src/user/base/UserWhereInput.ts index d75725a..b8ad64c 100644 --- a/server/src/user/base/UserWhereInput.ts +++ b/server/src/user/base/UserWhereInput.ts @@ -17,6 +17,17 @@ import { IsOptional } from "class-validator"; import { StringFilter } from "../../util/StringFilter"; @InputType() class UserWhereInput { + @ApiProperty({ + required: false, + type: StringNullableFilter, + }) + @Type(() => StringNullableFilter) + @IsOptional() + @Field(() => StringNullableFilter, { + nullable: true, + }) + comments?: StringNullableFilter; + @ApiProperty({ required: false, type: StringNullableFilter, diff --git a/server/src/user/base/user.controller.base.spec.ts b/server/src/user/base/user.controller.base.spec.ts index 4e2c6d7..aae8858 100644 --- a/server/src/user/base/user.controller.base.spec.ts +++ b/server/src/user/base/user.controller.base.spec.ts @@ -11,6 +11,7 @@ import { UserService } from "../user.service"; const nonExistingId = "nonExistingId"; const existingId = "existingId"; const CREATE_INPUT = { + comments: "exampleComments", createdAt: new Date(), firstName: "exampleFirstName", id: "exampleId", @@ -21,6 +22,7 @@ const CREATE_INPUT = { username: "exampleUsername", }; const CREATE_RESULT = { + comments: "exampleComments", createdAt: new Date(), firstName: "exampleFirstName", id: "exampleId", @@ -32,6 +34,7 @@ const CREATE_RESULT = { }; const FIND_MANY_RESULT = [ { + comments: "exampleComments", createdAt: new Date(), firstName: "exampleFirstName", id: "exampleId", @@ -43,6 +46,7 @@ const FIND_MANY_RESULT = [ }, ]; const FIND_ONE_RESULT = { + comments: "exampleComments", createdAt: new Date(), firstName: "exampleFirstName", id: "exampleId", diff --git a/server/src/user/base/user.controller.base.ts b/server/src/user/base/user.controller.base.ts index b8ba893..247e8f1 100644 --- a/server/src/user/base/user.controller.base.ts +++ b/server/src/user/base/user.controller.base.ts @@ -72,6 +72,7 @@ export class UserControllerBase { return await this.service.create({ data: data, select: { + comments: true, createdAt: true, firstName: true, id: true, @@ -112,6 +113,7 @@ export class UserControllerBase { const results = await this.service.findMany({ ...args, select: { + comments: true, createdAt: true, firstName: true, id: true, @@ -151,6 +153,7 @@ export class UserControllerBase { const result = await this.service.findOne({ where: params, select: { + comments: true, createdAt: true, firstName: true, id: true, @@ -211,6 +214,7 @@ export class UserControllerBase { where: params, data: data, select: { + comments: true, createdAt: true, firstName: true, id: true, @@ -251,6 +255,7 @@ export class UserControllerBase { return await this.service.delete({ where: params, select: { + comments: true, createdAt: true, firstName: true, id: true,