✨ Add onlick event to achievement list entries

Author: TobseF

frontend/src/achievement.js

@@ -14,6 +14,7 @@ class Achievement extends PolymerElement {
         width: 360px;
         border-radius: 5px;
         padding: 8px;
+        cursor: pointer;
     }
 
     #footer {

src/main/java/org/cleancode/journal/component/AchievementComponent.java

@@ -1,21 +1,54 @@
 package org.cleancode.journal.component;
 
-import com.vaadin.flow.component.Tag;
+import com.vaadin.flow.component.*;
 import com.vaadin.flow.component.dependency.JsModule;
 import com.vaadin.flow.component.dependency.NpmPackage;
 import com.vaadin.flow.component.polymertemplate.PolymerTemplate;
+import com.vaadin.flow.shared.Registration;
 
 @Tag("achievement-line")
 @JsModule("./src/achievement.js")
 @NpmPackage(value = "@polymer/iron-icons", version = "3.0.0")
 public class AchievementComponent extends PolymerTemplate<AchievementModel> {
 
-    public AchievementComponent() {
+    private final String achievementId;
+
+    public AchievementComponent(String achievementId) {
+        this.achievementId = achievementId;
         setId("achievement");
     }
 
+    public String getAchievementId() {
+        return achievementId;
+    }
+
     @Override
     public AchievementModel getModel() {
         return super.getModel();
     }
+
+    public Registration addClickListener(ComponentEventListener<ClickEvent> listener) {
+        return addListener(ClickEvent.class, listener);
+    }
+
+    @DomEvent("click")
+    public static class ClickEvent extends ComponentEvent<AchievementComponent> {
+
+        private int x, y;
+
+        public ClickEvent(AchievementComponent source, boolean fromClient, @EventData("event.offsetX") int x, @EventData("event.offsetY") int y) {
+            super(source, fromClient);
+            this.x = x;
+            this.y = y;
+        }
+
+        public int getX() {
+            return x;
+        }
+
+        public int getY() {
+            return y;
+        }
+
+    }
 }

src/main/java/org/cleancode/journal/component/LogEntryComponent.java

@@ -16,4 +16,5 @@ public LogEntryComponent() {
     public LogEntryModel getModel() {
         return super.getModel();
     }
+
 }

src/main/java/org/cleancode/journal/service/AchievementService.java

@@ -6,6 +6,7 @@
 
 import javax.annotation.PostConstruct;
 import java.io.InputStreamReader;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -14,12 +15,14 @@
 public class AchievementService implements IAchievementService {
 
     private List<Achievement> achievements;
+    private HashMap<String, Achievement> achievementsById = new HashMap<>();
 
     @PostConstruct
     private void loadAchievementsFromFile() {
         Gson gson = new Gson();
         String gradeFilePath = "/achievements.json";
         achievements = List.of(gson.fromJson(new InputStreamReader(getClass().getResourceAsStream(gradeFilePath)), Achievement[].class));
+        achievements.forEach(achievement -> achievementsById.put(achievement.getId(), achievement));
     }
 
     @Override
@@ -32,6 +35,11 @@ public Map<Achievement.Group, List<Achievement>> loadAllAchievementsInGroups() {
         return loadAllAchievements().stream().collect(Collectors.groupingBy(Achievement::getGroup));
     }
 
+    @Override
+    public Achievement loadAchievementById(String achievementId) {
+        return achievementsById.get(achievementId);
+    }
+
     @Override
     public List<Achievement> loadAllAchievementsByGroup(Achievement.Group group) {
         return loadAllAchievementsInGroups().get(group);

src/main/java/org/cleancode/journal/service/IAchievementService.java

@@ -13,5 +13,7 @@ public interface IAchievementService extends Serializable {
 
     Map<Achievement.Group, List<Achievement>> loadAllAchievementsInGroups();
 
+    Achievement loadAchievementById(String achievementId);
+
     List<Achievement> loadAllAchievementsByGroup(Achievement.Group group);
 }

src/main/java/org/cleancode/journal/view/AchievementDialog.java

@@ -93,6 +93,15 @@ public AchievementDialog(IAchievementService achievementService, Profile profile
         content.add(actions);
     }
 
+    public AchievementDialog(IAchievementService achievementService, Profile profile) {
+        this(achievementService, profile, null);
+    }
+
+    public void setSelectedAchievemt(Achievement achievement) {
+        groupSelect.setValue(achievement.getGroup());
+        achievementSelect.setValue(achievement);
+    }
+
     private void selectedGroup(Achievement.Group group) {
         achievementSelect.setEnabled(true);
         achievementSelect.setItems(achievementService.loadAllAchievementsByGroup(group));

src/main/java/org/cleancode/journal/view/AchievementsView.java

@@ -1,9 +1,11 @@
 package org.cleancode.journal.view;
 
+import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.html.H3;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.Route;
 import org.cleancode.journal.component.AchievementComponent;
+import org.cleancode.journal.component.AchievementComponent.ClickEvent;
 import org.cleancode.journal.component.AddSpeedDial;
 import org.cleancode.journal.domain.Achievement;
 import org.cleancode.journal.domain.Profile;
@@ -17,7 +19,12 @@
 @Route(layout = MainView.class)
 public class AchievementsView extends VerticalLayout {
 
+    private final Profile profile;
+    private final IAchievementService achievementService;
+
     public AchievementsView(Profile profile, IGradeService gradeService, IAchievementService achievementService) {
+        this.profile = profile;
+        this.achievementService = achievementService;
 
         Map<Achievement.Group, List<Achievement>> achievements = achievementService.loadAllAchievementsInGroups();
 
@@ -34,18 +41,23 @@ public void addAchievements(List<Achievement> achievements) {
     }
 
     public void addAchievement(Achievement achievement) {
-
-        AchievementComponent achievementLine = new AchievementComponent();
+        AchievementComponent achievementLine = new AchievementComponent(achievement.getId());
         achievementLine.getModel().setTitle(getTranslation(achievement.getId()));
         Score score = achievement.getScore();
         achievementLine.getModel().setExperience("+" + score.getExperience() + " XP");
         achievementLine.getModel().setSkills(score.getSkills());
+        achievementLine.addClickListener((ComponentEventListener<ClickEvent>) event -> openAchievementDialog(achievement));
         add(achievementLine);
     }
 
+    private void openAchievementDialog(Achievement achievement) {
+        AchievementDialog achievementDialog = new AchievementDialog(achievementService, profile);
+        achievementDialog.setSelectedAchievemt(achievement);
+        achievementDialog.open();
+    }
+
     private String getTranslation(Achievement.Group group) {
         return getTranslation("achievement.group." + group.name().toLowerCase());
     }
 
-
 }