[Zucchini][Front][Back] Restitution de l'action effectuée lors de l'analyse sur la vue détail d'un scenario

zucchini-ui-backend/src/main/java/io/zucchiniui/backend/comment/domain/Comment.java

@@ -42,6 +42,8 @@ public class Comment extends BaseEntity<String> {
     @Embedded(concreteClass = HashSet.class)
     private Set<ItemReference> references;
 
+    private String analyseAction;
+
     /**
      * Private constructor for Morphia.
      */
@@ -54,11 +56,12 @@ private Comment() {
      * @param references References
      * @param content    Comment content
      */
-    public Comment(final Iterable<ItemReference> references, final String content) {
+    public Comment(final Iterable<ItemReference> references, final String content, final String analyseAction) {
         id = UUID.randomUUID().toString();
         date = ZonedDateTime.now();
         this.references = Sets.newHashSet(references);
         this.content = Objects.requireNonNull(content);
+        this.analyseAction = analyseAction;
     }
 
     public void setContent(final String content) {
@@ -81,9 +84,16 @@ public Set<ItemReference> getReferences() {
         return Collections.unmodifiableSet(references);
     }
 
+    public String getAnalyseAction() {
+        return analyseAction;
+    }
+
+    public void setAnalyseAction(String analyseAction) {
+        this.analyseAction = analyseAction;
+    }
+
     @Override
     protected String getEntityId() {
         return id;
     }
-
 }

zucchini-ui-backend/src/main/java/io/zucchiniui/backend/comment/rest/CommentResource.java

@@ -110,7 +110,7 @@ public Response create(@Valid @NotNull final CreateCommentRequest request) {
 
         LOGGER.info("Create comment with references {}", references);
 
-        final Comment comment = new Comment(references, request.getContent());
+        final Comment comment = new Comment(references, request.getContent(), request.getAnalyseAction());
         commentRepository.save(comment);
 
         final URI location = UriBuilder.fromUri(baseUri)

zucchini-ui-backend/src/main/java/io/zucchiniui/backend/comment/rest/CreateCommentRequest.java

@@ -8,6 +8,8 @@ public class CreateCommentRequest {
     @NotEmpty
     private String content;
 
+    private String analyseAction;
+
     public String getContent() {
         return content;
     }
@@ -16,4 +18,11 @@ public void setContent(final String content) {
         this.content = content;
     }
 
+    public String getAnalyseAction() {
+        return analyseAction;
+    }
+
+    public void setAnalyseAction(String analyseAction) {
+        this.analyseAction = analyseAction;
+    }
 }

zucchini-ui-backend/src/test/java/io/zucchiniui/backend/comment/domain/CommentTest.java

@@ -20,18 +20,21 @@ public class CommentTest {
 
     private static final String CONTENT = "content";
 
+    private static final String ANALYSE_ACTION = "analyseAction";
+
     @Test
     public void should_create_comment() throws Exception {
         // given
         final ZonedDateTime testStartDate = ZonedDateTime.now();
 
         // when
-        final Comment comment = new Comment(REFERENCES, CONTENT);
+        final Comment comment = new Comment(REFERENCES, CONTENT, ANALYSE_ACTION);
 
         // then
         assertThat(comment.getId()).isNotEmpty();
         Assertions.assertThat(comment.getReferences()).isEqualTo(REFERENCES);
         assertThat(comment.getContent()).isEqualTo(CONTENT);
+        assertThat(comment.getAnalyseAction()).isEqualTo(ANALYSE_ACTION);
         assertThat(comment.getDate()).isAfterOrEqualTo(testStartDate);
 
         assertThat(comment.getEntityId()).isEqualTo(comment.getId());
@@ -42,7 +45,7 @@ public void should_set_description() throws Exception {
         // given
         final String newContent = "newContent";
 
-        final Comment comment = new Comment(REFERENCES, CONTENT);
+        final Comment comment = new Comment(REFERENCES, CONTENT, ANALYSE_ACTION);
 
         // when
         comment.setContent(newContent);

zucchini-ui-frontend/src/api/scenarios.js

@@ -108,10 +108,13 @@ class ScenariosApi {
     });
   }
 
-  addComment({ scenarioId, comment }) {
+  addComment({ scenarioId, comment, analyseAction }) {
     return this.client.post({
       path: `/${scenarioId}/comments/create`,
-      body: { content: comment },
+      body: {
+        content: comment,
+        analyseAction: analyseAction
+      },
       hasOutput: false
     });
   }

zucchini-ui-frontend/src/scenario/components/Comment.jsx

@@ -11,6 +11,7 @@ export default class Comment extends React.PureComponent {
   static propTypes = {
     comment: PropTypes.object.isRequired,
     testRunId: PropTypes.string,
+    config: PropTypes.object,
     onChange: PropTypes.func.isRequired,
     onDelete: PropTypes.func.isRequired
   };
@@ -55,8 +56,7 @@ export default class Comment extends React.PureComponent {
   };
 
   render() {
-    const { comment, testRunId } = this.props;
-
+    const { comment, testRunId, config } = this.props;
     let testRunInfo = null;
     if (comment.testRunId === testRunId) {
       testRunInfo = <i>(tir de test actuel)</i>;
@@ -81,11 +81,26 @@ export default class Comment extends React.PureComponent {
       commentComponent = <CommentText comment={comment} onEdit={this.onEdit} onDelete={this.onDelete} />;
     }
 
+    let correctionAction = null;
+    if (comment.analyseAction != null) {
+      let action = config.correctionActionConfig.find(a => {
+        return a.actionCode == comment.analyseAction;
+      });
+      if (action != null) {
+        correctionAction = (
+          <div>
+            <b>Action pour analyse : </b> {action.actionLabel}
+          </div>
+        );
+      }
+    }
+
     return (
       <div>
         <h4>
           Le {toNiceDate(comment.date)} <small>{testRunInfo}</small>
         </h4>
+        {correctionAction}
         {commentComponent}
       </div>
     );

zucchini-ui-frontend/src/scenario/components/CommentContainer.js

@@ -5,13 +5,19 @@ import Comment from "./Comment";
 
 import { deleteComment, updateCommentThenReload } from "../redux";
 
+const selectConfig = createSelector(
+  state => state.scenario.config,
+  config => config
+);
+
 const selectTestRunId = createSelector(
   state => state.scenario.scenario.testRunId || null,
   testRunId => testRunId
 );
 
 const selectProps = createStructuredSelector({
-  testRunId: selectTestRunId
+  testRunId: selectTestRunId,
+  config: selectConfig
 });
 
 const CommentContainer = connect(selectProps, {

zucchini-ui-frontend/src/scenario/components/CommentList.jsx

@@ -9,6 +9,7 @@ export default class CommentList extends React.PureComponent {
   };
 
   render() {
+    console.log("CommentList", this.props);
     const { comments } = this.props;
 
     const commentList = comments.map(comment => {

zucchini-ui-frontend/src/scenario/components/ScenarioPage.jsx

@@ -147,7 +147,7 @@ export default class ScenarioPage extends React.Component {
         <hr />
 
         <h2>Commentaires</h2>
-        <CommentListContainer />
+        <CommentListContainer config={config} />
 
         <h4>Ajouter un nouveau commentaire</h4>
         <AddCommentFormContainer scenarioId={scenarioId} />

zucchini-ui-frontend/src/scenario/model.js

@@ -18,8 +18,8 @@ export function updateScenarioState({ scenarioId, newState }) {
   return scenariosApi.updateScenarioState({ scenarioId, newState });
 }
 
-export function addScenarioComment({ scenarioId, comment }) {
-  return scenariosApi.addComment({ scenarioId, comment });
+export function addScenarioComment({ scenarioId, comment, analyseAction }) {
+  return scenariosApi.addComment({ scenarioId, comment, analyseAction });
 }
 
 export function deleteScenario({ scenarioId }) {

zucchini-ui-frontend/src/scenario/redux.js

@@ -125,10 +125,11 @@ export function updateScenarioState({ scenarioId, newState }) {
   };
 }
 
-export function addScenarioComment({ scenarioId, comment }) {
+export function addScenarioComment({ scenarioId, comment, analyseAction }) {
+  console.log(analyseAction);
   return {
     type: ADD_SCENARIO_COMMENT,
-    payload: model.addScenarioComment({ scenarioId, comment }),
+    payload: model.addScenarioComment({ scenarioId, comment, analyseAction }),
     meta: {
       scenarioId
     }
@@ -153,9 +154,10 @@ export function updateScenarioStateAndComment({ scenarioId, newState, comment })
         newState
       })
     );
-
+    let analyseAction = newState.analyseAction;
+    console.log("updateScenarioStateAndComment", analyseAction);
     if (comment) {
-      await dispatch(addScenarioComment({ scenarioId, comment }));
+      await dispatch(addScenarioComment({ scenarioId, comment, analyseAction }));
     }
 
     await dispatch(loadScenarioPage({ scenarioId }));