From ea81e3f0a8e784d6ee90ee51fdef27f7e1263074 Mon Sep 17 00:00:00 2001 From: Carlos Quintero Date: Mon, 7 Nov 2022 22:46:05 -0500 Subject: [PATCH 1/2] update milestones fields and validators --- src/entities/projectVerificationForm.ts | 5 ++++- src/server/components/VerificationFormMilestones.tsx | 10 ++++++++++ src/utils/validators/graphqlQueryValidators.ts | 2 ++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/entities/projectVerificationForm.ts b/src/entities/projectVerificationForm.ts index da16a4de3..e40d7cebf 100644 --- a/src/entities/projectVerificationForm.ts +++ b/src/entities/projectVerificationForm.ts @@ -74,13 +74,16 @@ export class ProjectContacts { export class Milestones { @Field(type => String, { nullable: true }) foundationDate?: String; - @Field({ nullable: true }) mission?: string; @Field({ nullable: true }) achievedMilestones?: string; @Field(type => [String], { nullable: true }) achievedMilestonesProofs?: string[]; + @Field(type => String, { nullable: true }) + problem?: string; + @Field(type => String, { nullable: true }) + plans?: string; } @ObjectType() diff --git a/src/server/components/VerificationFormMilestones.tsx b/src/server/components/VerificationFormMilestones.tsx index 1cbf83f97..a975ef0c8 100644 --- a/src/server/components/VerificationFormMilestones.tsx +++ b/src/server/components/VerificationFormMilestones.tsx @@ -13,6 +13,8 @@ const VerificationFormMilestones = props => { proofs.push(props.record.params[key]); } }); + const problem = props?.record?.params?.['milestones.problem'] || ''; + const plans = props?.record?.params?.['milestones.plans'] || ''; const foundationDate = props?.record?.params?.['milestones.foundationDate'] || ''; const achievedMilestones = @@ -23,6 +25,10 @@ const VerificationFormMilestones = props => {
+
+ + {problem} +
{foundationDate} @@ -35,6 +41,10 @@ const VerificationFormMilestones = props => { {achievedMilestones}
+
+ + {plans} +
diff --git a/src/utils/validators/graphqlQueryValidators.ts b/src/utils/validators/graphqlQueryValidators.ts index 9798e76d0..7fcc6d65f 100644 --- a/src/utils/validators/graphqlQueryValidators.ts +++ b/src/utils/validators/graphqlQueryValidators.ts @@ -121,6 +121,8 @@ const milestonesValidator = Joi.object({ mission: Joi.string().allow(''), achievedMilestones: Joi.string().allow(''), achievedMilestonesProofs: Joi.array()?.items(Joi.string()).max(5), + problem: Joi.string().allow(''), + plans: Joi.string().allow(''), }); const managingFundsValidator = Joi.object({ From 6cb998d771798625dc80b8162c9d325dad3ec7d1 Mon Sep 17 00:00:00 2001 From: Mohammad Ranjbar Z Date: Tue, 22 Nov 2022 10:54:20 +0300 Subject: [PATCH 2/2] 1.7.4 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 30b0ef3c4..d7cf8decc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "giveth-graphql-api", - "version": "1.7.3", + "version": "1.7.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "giveth-graphql-api", - "version": "1.7.3", + "version": "1.7.4", "hasInstallScript": true, "license": "ISC", "dependencies": { diff --git a/package.json b/package.json index 3a068d924..3029b284a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "giveth-graphql-api", - "version": "1.7.3", + "version": "1.7.4", "description": "Backend GraphQL server for Giveth originally forked from Topia", "main": "./dist/index.js", "dependencies": {