Fixes issue #481 re-adding skill after adding and removing

Author: gets0ul

client/src/components/EditProfileModal/index.jsx

@@ -62,22 +62,27 @@ export default function EditProfileModal({
    */
   const addSkill = (skill) => {
     // Verify that the skill does not already exist on the user
-    const exists = localUser.skills.find(
+    const index = localUser.skills.findIndex(
       (existingSkill) => existingSkill.externalId === skill.id
     );
+    const exists = localUser.skills[index];
 
-    if (exists) {
+    if (exists && !exists.isDeleted) {
       return;
     }
 
     const skills = JSON.parse(JSON.stringify(localUser.skills));
 
-    skills.push({
-      externalId: skill.id, // The skill id returned from EMSI becomes externalId in our db
-      isNew: true,
-      name: skill.name,
-      skillProviderId: config.EMSI_SKILLPROVIDER_ID,
-    });
+    if (exists) {
+      delete skills[index].isDeleted;
+    } else {
+      skills.push({
+        externalId: skill.id, // The skill id returned from EMSI becomes externalId in our db
+        isNew: true,
+        name: skill.name,
+        skillProviderId: config.EMSI_SKILLPROVIDER_ID,
+      });
+    }
 
     setLocalUser({ ...localUser, skills });
   };

client/src/components/ProfileCard/helper.js

@@ -198,9 +198,27 @@ export async function updateUserSkills(apiClient, { id, skills }) {
   for (let i = 0; i < skills.length; i++) {
     const skill = skills[i];
     if (skills[i].isDeleted) {
-      url = `${config.API_URL}/users/${id}/skills/${skill.id}`;
+      let skillId;
+      // check if there is an id
+      if (skills[i].id) {
+        skillId = skills[i].id;
+      } else {
+        // find the existing skill id to delete
+        // skill marked to be deleted can be without id when it came directly from react state (not database)
+        const existingSkill = await checkIfSkillExists(
+          apiClient,
+          skill.skillProviderId,
+          skill.externalId
+        );
+        if (existingSkill && existingSkill.length > 0) {
+          skillId = existingSkill[0].id;
+        }
+      }
+      if (skillId) {
+        url = `${config.API_URL}/users/${id}/skills/${skillId}`;
 
-      await apiClient.delete(url);
+        await apiClient.delete(url);
+      }
     } else if (skills[i].isNew) {
       let userSkill;
       // We first check if the skill is already defined in the database, before we add it to the user