From 26798f1e93d437f0a2661333450c7b669e365de1 Mon Sep 17 00:00:00 2001
From: rotimi-best <best@classroomio.com>
Date: Thu, 26 Aug 2021 09:34:18 +0300
Subject: [PATCH] Fix bug of adding tutor to lesson

---
 .../Course/components/Lesson/store/lessons.js | 25 +-----------------
 .../Course/components/Navigation/index.svelte |  1 +
 .../components/People/InviationModal.svelte   |  8 +++---
 .../Course/components/People/store.js         |  7 +++++
 src/components/Course/store.js                | 26 ++++++++++++-------
 src/components/Form/Select.svelte             |  8 +++++-
 src/routes/courses/[id]/lessons/index.svelte  |  4 +--
 src/routes/courses/[id]/people.svelte         | 21 +++++++++------
 8 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/src/components/Course/components/Lesson/store/lessons.js b/src/components/Course/components/Lesson/store/lessons.js
index 48b7d362..1a88561e 100644
--- a/src/components/Course/components/Lesson/store/lessons.js
+++ b/src/components/Course/components/Lesson/store/lessons.js
@@ -17,29 +17,6 @@ export const lesson = writable({
 });
 export const isLessonDirty = writable(false);
 
-export const tutors = writable([
-  {
-    id: 1,
-    text: 'Sergey Semko',
-  },
-  {
-    id: 3,
-    text: 'Jonathan Nelson',
-  },
-  {
-    id: 4,
-    text: 'Sasha Pokidin',
-  },
-  {
-    id: 5,
-    text: 'Natasha Rudenko',
-  },
-  {
-    id: 6,
-    text: 'Yulia Marushko',
-  },
-]);
-
 export function handleAddLesson() {
   lessons.update((_lessons) => {
     return [
@@ -47,7 +24,7 @@ export function handleAddLesson() {
       {
         id: null,
         title: 'Untitled lesson',
-        profile: undefined,
+        // profile: undefined,
         call_url: undefined,
         lesson_at: new Date(),
         is_complete: false,
diff --git a/src/components/Course/components/Navigation/index.svelte b/src/components/Course/components/Navigation/index.svelte
index dfff99d2..783c086f 100644
--- a/src/components/Course/components/Navigation/index.svelte
+++ b/src/components/Course/components/Navigation/index.svelte
@@ -179,6 +179,7 @@
     position: sticky;
     top: 0;
     border-right: 1px solid var(--border-color);
+    background-color: rgb(250, 251, 252);
 
     &.hide {
       min-width: 0px;
diff --git a/src/components/Course/components/People/InviationModal.svelte b/src/components/Course/components/People/InviationModal.svelte
index aa39d666..1db34834 100644
--- a/src/components/Course/components/People/InviationModal.svelte
+++ b/src/components/Course/components/People/InviationModal.svelte
@@ -7,7 +7,7 @@
     addGroupMember,
     fetchGroup,
   } from '../../../../utils/services/courses';
-  import { invitationModal } from './store';
+  import { invitationModal, resetForm } from './store';
   import { validateForm } from '../../../Courses/functions';
   import { course, setCourseData } from '../../../Course/store';
 
@@ -56,16 +56,16 @@
         false
       );
 
-      $invitationModal.open = false;
+      resetForm();
     });
   }
 </script>
 
 <Modal
-  onClose={() => ($invitationModal.open = false)}
+  onClose={resetForm}
   bind:open={$invitationModal.open}
   width="w-2/5"
-  modalHeading="Create a Course"
+  modalHeading="Invite people"
 >
   <form on:submit|preventDefault={addPerson}>
     <TextArea
diff --git a/src/components/Course/components/People/store.js b/src/components/Course/components/People/store.js
index 37b2ec54..679df0ad 100644
--- a/src/components/Course/components/People/store.js
+++ b/src/components/Course/components/People/store.js
@@ -5,3 +5,10 @@ export const invitationModal = writable({
   tutors: '',
   students: '',
 });
+
+export const resetForm = () =>
+  invitationModal.update(() => ({
+    open: false,
+    tutors: '',
+    students: '',
+  }));
diff --git a/src/components/Course/store.js b/src/components/Course/store.js
index 3f8f15b5..577063a1 100644
--- a/src/components/Course/store.js
+++ b/src/components/Course/store.js
@@ -28,24 +28,27 @@ export const group = writable({
 
 export async function setCourseData(data, setLesson = true) {
   if (!data || !(Object.values(data) && Object.values(data).length)) return;
-  console.log(`setCourseData`, data);
+  // const tutorsById = {};
 
   if (data.group) {
-    const groupData = Object.assign(data.group, { tutors: [], students: [] });
+    const groupData = Object.assign(data.group, {
+      tutors: [],
+      students: [],
+      people: [],
+    });
 
     if (Array.isArray(groupData.members)) {
       for (const member of groupData.members) {
         if (member.role_id === ROLE.STUDENT) {
           groupData.students.push(member);
-          // } else if (member.profile) {
-        } else {
-          groupData.tutors.push({
-            ...member,
-            ...member.profile,
-            id: member.id,
-          });
+        } else if (member.profile) {
+          groupData.tutors.push(member.profile);
+
+          // tutorsById[member.profile.id] = member.profile;
         }
       }
+
+      groupData.people = groupData.members;
     }
 
     delete groupData.members;
@@ -56,7 +59,10 @@ export async function setCourseData(data, setLesson = true) {
     const orderedLessons = (data.lessons || []).sort(
       (a, b) => new Date(a.created_at) - new Date(b.created_at)
     );
-    // .map();
+    // .map((lesson) => ({
+    //   ...lesson,
+    //   profile: lesson.profile && tutorsById[lesson.profile.id],
+    // }));
     lessons.set(orderedLessons);
   }
 
diff --git a/src/components/Form/Select.svelte b/src/components/Form/Select.svelte
index 896c5545..45258919 100644
--- a/src/components/Form/Select.svelte
+++ b/src/components/Form/Select.svelte
@@ -1,10 +1,16 @@
 <script>
+  import { onMount } from 'svelte';
+
   export let label = '';
-  export let value = '';
+  export let value;
   export let options = [];
   export let labelKey = 'label';
   export let isRequired = false;
   export let onChange = () => {}; // This is to know if element is 'dirty'
+
+  // onMount(() => {
+  //   value = options[0];
+  // });
 </script>
 
 <label class="block">
diff --git a/src/routes/courses/[id]/lessons/index.svelte b/src/routes/courses/[id]/lessons/index.svelte
index aba0bb1d..49e89408 100644
--- a/src/routes/courses/[id]/lessons/index.svelte
+++ b/src/routes/courses/[id]/lessons/index.svelte
@@ -83,8 +83,6 @@
     const { data } = await fetchCourse(courseId);
     setCourseData(data);
   });
-
-  $: console.log(`$lessons`, $lessons);
 </script>
 
 <CourseContainer>
@@ -169,7 +167,7 @@
               {#if lessonEditing === index}
                 <Select
                   bind:value={lesson.profile}
-                  options={[...$group.tutors.filter((t) => !!t.profile)]}
+                  options={$group.tutors}
                   labelKey="fullname"
                 />
               {:else if !lesson.profile}
diff --git a/src/routes/courses/[id]/people.svelte b/src/routes/courses/[id]/people.svelte
index 49f0e4b3..09b02598 100644
--- a/src/routes/courses/[id]/people.svelte
+++ b/src/routes/courses/[id]/people.svelte
@@ -25,8 +25,7 @@
 
   function setPeople(group) {
     if (!group) return;
-    const { students, tutors } = group;
-    people = [...students, ...tutors].sort((a, b) => a.role_id - b.role_id);
+    people = (group.people || []).sort((a, b) => a.role_id - b.role_id);
     console.log(`group changed`, group);
   }
 
@@ -71,19 +70,25 @@
           <!-- <span class="flex-grow" /> -->
           {#if person.profile}
             <p class="text-lg w-1/4 break-all">{person.profile.fullname}</p>
+            <a
+              href="mailto:{person.profile.email}"
+              class="text-md w-1/4 mx-2 text-blue-600"
+            >
+              {person.profile.email}
+            </a>
           {:else}
             <p
               class="bg-yellow-500 w-1/4 text-sm text-center rounded-xl text-white"
             >
               Pending Invite
             </p>
+            <a
+              href="mailto:{person.email}"
+              class="text-md w-1/4 mx-2 text-blue-600"
+            >
+              {person.email}
+            </a>
           {/if}
-          <a
-            href="mailto:{person.email}"
-            class="text-md w-1/4 mx-2 text-blue-600"
-          >
-            {person.email}
-          </a>
           <p class="text-lg w-1/4 ">{ROLE_LABEL[person.role_id]}</p>
         </div>
       {/each}