From 4cf061bc9ff3660363c0d68f16b9206f6cb9ff80 Mon Sep 17 00:00:00 2001
From: Marian Zburlea <marianzburlea@gmail.com>
Date: Wed, 21 Aug 2019 06:46:27 +0100
Subject: [PATCH] feat: add order to section this closes #170

---
 src/component/course/course.component.jsx     |   6 +-
 .../lecture-item/lecture-item.component.jsx   |   4 +-
 .../lecture-item/lecture-item.style.js        |   6 +
 .../section-list/section-list.component.jsx   | 107 +++++++++++++-----
 4 files changed, 89 insertions(+), 34 deletions(-)

diff --git a/src/component/course/course.component.jsx b/src/component/course/course.component.jsx
index 34a62ac..4f30f58 100644
--- a/src/component/course/course.component.jsx
+++ b/src/component/course/course.component.jsx
@@ -62,7 +62,10 @@ const Course = ({ courseId }) => {
         console.error('Get lectureSnapshotList failed', e);
       }
 
-      const sectionCollection = db.collection('section').where('course.id', '==', courseId);
+      const sectionCollection = db
+        .collection('section')
+        .orderBy('order', 'asc')
+        .where('course.id', '==', courseId);
 
       const sectionSnapshotList = await sectionCollection.get();
       const sectionList = sectionSnapshotList.docs.map(d => {
@@ -131,7 +134,6 @@ const Course = ({ courseId }) => {
     <div>
       <HeaderTitle {...courseTitlePropList} />
       <p>{course.description}</p>
-      {console.log(course)}
       <DynamicForm schema={courseSchema} data={course} dbItem={courseDocument} />
       <HeaderTitle {...courseSettingsPropList} />
       <button onClick={handlePublish}>{course.published ? 'Unp' : 'P'}ublish Course</button>
diff --git a/src/component/lecture-item/lecture-item.component.jsx b/src/component/lecture-item/lecture-item.component.jsx
index 0be1b2f..4c61de9 100644
--- a/src/component/lecture-item/lecture-item.component.jsx
+++ b/src/component/lecture-item/lecture-item.component.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Link } from '@reach/router'
-import { StyledLectureItem } from './lecture-item.style';
+import { StyledLectureItem, StyledLink } from './lecture-item.style';
 
 const LectureItem = ({ id, title, description, remove, sectionId }) => {
   const handleRemove = () => {
@@ -9,7 +9,7 @@ const LectureItem = ({ id, title, description, remove, sectionId }) => {
   return (
     <StyledLectureItem>
       <button>☰</button>
-      <Link to={`/lecture/${id}`} title={description}>{title}</Link>
+      <StyledLink to={`/lecture/${id}`} title={description}>{title}</StyledLink>
       <button onClick={handleRemove}>&times;</button>
     </StyledLectureItem>
   )
diff --git a/src/component/lecture-item/lecture-item.style.js b/src/component/lecture-item/lecture-item.style.js
index 8008886..9709d89 100644
--- a/src/component/lecture-item/lecture-item.style.js
+++ b/src/component/lecture-item/lecture-item.style.js
@@ -1,4 +1,10 @@
 import styled from 'styled-components'
+import { Link } from '@reach/router';
+
+export const StyledLink = styled(Link)`
+  color: white;
+  text-decoration: none;
+`
 
 export const StyledLectureItem = styled.div`
   display: grid;
diff --git a/src/component/section-list/section-list.component.jsx b/src/component/section-list/section-list.component.jsx
index 5e414d7..2844c98 100644
--- a/src/component/section-list/section-list.component.jsx
+++ b/src/component/section-list/section-list.component.jsx
@@ -4,16 +4,17 @@ import { db, storage } from '../data/firebase'
 import SectionItem from '../section-item';
 import LecturePanel from '../lecture-panel';
 import LectureItem from '../lecture-item/lecture-item.component';
-import { removeLectureFromSectionAction } from '../course/section.action';
+import { removeLectureFromSectionAction, initSectionListAction } from '../course/section.action';
 import { WebInfoState } from '../web-info/web-info.context';
+import { DragDropContext, Droppable, Draggable } from 'react-beautiful-dnd'
 
 const SectionList = ({ data = [], handleUpdate, course = {} }) => {
   const [showAddLectureId, setShowAddLectureId] = useState('nimic')
   const { updateSectionList } = WebInfoState()
+  const sectionCollection = db.collection('section')
 
   const deleteItem = id => {
-    db
-      .collection('section')
+    sectionCollection
       .doc(id)
       // TODO, mark as deleted and never delete
       // some other logic should display data only if not marked as deleted
@@ -52,37 +53,83 @@ const SectionList = ({ data = [], handleUpdate, course = {} }) => {
     })
   }
 
+  const updateOrder = (a, b) => {
+    const list = [...data]
+    const [ first ] = list.splice(a, 1)
+    list
+      .splice(b, 0, first)
+      
+    const batch = db.batch()
+    list
+      .map((o, order) => ({ ...o, order}))
+      .forEach(({ id, order }) => {
+        batch.set(
+          sectionCollection.doc(id),
+          { order },
+          { merge: true }
+        )
+      })
+    batch.commit().then(r => {
+      updateSectionList(initSectionListAction(list))
+    })
+  }
+
+  const onDragEnd = ({ destination, source }) => {
+    if (!destination || destination.index === source.index) return
+    updateOrder(source.index, destination.index)
+  }
+  console.log(data)
+
   return (
     <StyledSectionList>
-      {data.map(({ title, description, id, lectureList }) => {
-        const section = {
-          title,
-          description,
-          id,
-        }
+      <DragDropContext onDragEnd={onDragEnd}>
+        <Droppable droppableId="list">
+          {(droppableProvided) => (
+            <div ref={droppableProvided.innerRef} {...droppableProvided.droppableProps}>
+              {data.map(({ title, description, id, lectureList }, index) => {
+                const section = {
+                  title,
+                  description,
+                  id,
+                }
 
-        const sectionItemPropList = {
-          ...section,
-          showAddLectureId,
-          setShowAddLectureId,
-          deleteItem,
-          handleUpdate
-        }
+                const sectionItemPropList = {
+                  ...section,
+                  showAddLectureId,
+                  setShowAddLectureId,
+                  deleteItem,
+                  handleUpdate
+                }
 
-        const lecturePanelPropList = {
-          section,
-          course,
-          showAddLectureId,
-          setShowAddLectureId,
-        }
-        return (
-          <StyledSectionItem key={id}>
-            <SectionItem {...sectionItemPropList} />
-            {id === showAddLectureId && <LecturePanel {...lecturePanelPropList} />}
-            {renderLectureList(lectureList, id)}
-          </StyledSectionItem>
-        )
-      })}
+                const lecturePanelPropList = {
+                  section,
+                  course,
+                  showAddLectureId,
+                  setShowAddLectureId,
+                }
+                return (
+                  <Draggable key={section.id} draggableId={section.id} index={index}>
+                    {(draggableProvided, draggableSnapshot) => (
+                      <div
+                        ref={draggableProvided.innerRef}
+                        {...draggableProvided.draggableProps}
+                        {...draggableProvided.dragHandleProps}
+                      >
+                        <StyledSectionItem key={id}>
+                        <SectionItem {...sectionItemPropList} />
+                        {id === showAddLectureId && <LecturePanel {...lecturePanelPropList} />}
+                        {renderLectureList(lectureList, id)}
+                      </StyledSectionItem>
+                    </div>
+                  )}
+                  </Draggable>
+                )
+              })}
+              {droppableProvided.placeholder}
+            </div>
+          )}
+        </Droppable>
+      </DragDropContext>
     </StyledSectionList>
   )
 }