From a355f157bfc2bf655a66148c90676984b94d9503 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Wed, 14 Oct 2020 12:00:03 +0530 Subject: [PATCH 1/4] fix: git#870-Error initially after activating a challenge - fixed the wrong link --- src/components/ChallengesComponent/ChallengeCard/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ChallengesComponent/ChallengeCard/index.js b/src/components/ChallengesComponent/ChallengeCard/index.js index c832e5af..d25b6564 100644 --- a/src/components/ChallengesComponent/ChallengeCard/index.js +++ b/src/components/ChallengesComponent/ChallengeCard/index.js @@ -248,7 +248,7 @@ class ChallengeCard extends React.Component { onCancel={reloadChallengeList} closeText='Close' okText='View Challenge' - okLink='./view' + okLink={`/projects/${challenge.projectId}/challenges/${challenge.id}/view`} onClose={this.resetModal} /> ) } From 39a10a6263f9203db6252ed5cff8dc5bb15467db Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 15 Oct 2020 23:07:26 +0530 Subject: [PATCH 2/4] feat: git#876-Save button for saving challenge in New status --- src/components/ChallengeEditor/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ChallengeEditor/index.js b/src/components/ChallengeEditor/index.js index 8f6d4433..1f646f9c 100644 --- a/src/components/ChallengeEditor/index.js +++ b/src/components/ChallengeEditor/index.js @@ -1179,16 +1179,16 @@ class ChallengeEditor extends Component { {!isLoading && } {!isLoading && (!isActive) && (!isCompleted) &&
- + +
+
+
{ isDraft &&
}
} {!isLoading && isActive &&
-
- -
{isTask && (
From 9642b32181e7932e3f3a0de4a5ab8f3d216688e3 Mon Sep 17 00:00:00 2001 From: Vikas Agarwal Date: Thu, 15 Oct 2020 23:08:37 +0530 Subject: [PATCH 3/4] fix: git#848-No validation message displayed when user clicks on the Save draft --- src/components/ChallengeEditor/TagsField/index.js | 7 ++++--- src/components/ChallengeEditor/index.js | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/components/ChallengeEditor/TagsField/index.js b/src/components/ChallengeEditor/TagsField/index.js index cb6a4d88..68ff0910 100644 --- a/src/components/ChallengeEditor/TagsField/index.js +++ b/src/components/ChallengeEditor/TagsField/index.js @@ -6,6 +6,7 @@ import styles from './Tags-Field.module.scss' const TagsField = ({ challengeTags, challenge, onUpdateMultiSelect, readOnly }) => { const mapOps = item => ({ label: item.name, value: item.id }) + const existingTags = (challenge.tags && challenge.tags.length) ? challenge.tags.join(',') : '' return ( <>
@@ -15,19 +16,19 @@ const TagsField = ({ challengeTags, challenge, onUpdateMultiSelect, readOnly })
{readOnly ? ( - {(challenge.tags && challenge.tags.length) ? challenge.tags.join(', ') : ''} + {existingTags} ) : (