From 1f62f2035049c50ce2d9506373b961d8c5540d21 Mon Sep 17 00:00:00 2001
From: Samuel <samuel.oosterholt20001004@gmail.com>
Date: Tue, 16 Apr 2024 15:19:48 +0200
Subject: [PATCH] feat: client implementation of list sorting

---
 client/src/actions/lists.js                   | 32 ++++++++++
 client/src/api/lists.js                       |  3 +
 client/src/components/List/ActionsStep.jsx    | 46 +++++++++++----
 client/src/components/List/List.jsx           |  4 +-
 client/src/components/SortStep/SortStep.jsx   | 59 +++++++++++++++++++
 .../components/SortStep/SortStep.module.scss  |  0
 client/src/components/SortStep/index.js       |  3 +
 client/src/constants/ActionTypes.js           |  4 ++
 client/src/constants/EntryActionTypes.js      |  2 +
 client/src/containers/ListContainer.js        |  1 +
 client/src/entry-actions/lists.js             | 19 ++++++
 client/src/models/List.js                     |  3 +
 client/src/sagas/core/services/lists.js       | 20 +++++++
 client/src/sagas/core/watchers/lists.js       |  6 ++
 14 files changed, 190 insertions(+), 12 deletions(-)
 create mode 100644 client/src/components/SortStep/SortStep.jsx
 create mode 100644 client/src/components/SortStep/SortStep.module.scss
 create mode 100644 client/src/components/SortStep/index.js

diff --git a/client/src/actions/lists.js b/client/src/actions/lists.js
index 59f944f..a7d409d 100644
--- a/client/src/actions/lists.js
+++ b/client/src/actions/lists.js
@@ -89,6 +89,36 @@ const handleListDelete = (list) => ({
   },
 });
 
+const sortList = (id, data) => ({
+  type: ActionTypes.LIST_SORT,
+  payload: {
+    id,
+    data,
+  },
+});
+
+sortList.success = (list) => ({
+  type: ActionTypes.LIST_SORT__SUCCESS,
+  payload: {
+    list,
+  },
+});
+
+sortList.failure = (id, error) => ({
+  type: ActionTypes.LIST_SORT__FAILURE,
+  payload: {
+    id,
+    error,
+  },
+});
+
+const handleListSort = (list) => ({
+  type: ActionTypes.LIST_SORT_HANDLE,
+  payload: {
+    list,
+  },
+});
+
 export default {
   createList,
   handleListCreate,
@@ -96,4 +126,6 @@ export default {
   handleListUpdate,
   deleteList,
   handleListDelete,
+  sortList,
+  handleListSort
 };
diff --git a/client/src/api/lists.js b/client/src/api/lists.js
index 6c1ee6a..aa36f0a 100755
--- a/client/src/api/lists.js
+++ b/client/src/api/lists.js
@@ -7,10 +7,13 @@ const createList = (boardId, data, headers) =>
 
 const updateList = (id, data, headers) => socket.patch(`/lists/${id}`, data, headers);
 
+const sortList = (id, data, headers) => socket.post(`/lists/${id}/sort`, data, headers);
+
 const deleteList = (id, headers) => socket.delete(`/lists/${id}`, undefined, headers);
 
 export default {
   createList,
   updateList,
+  sortList,
   deleteList,
 };
diff --git a/client/src/components/List/ActionsStep.jsx b/client/src/components/List/ActionsStep.jsx
index 1e94d5a..3bbc28d 100755
--- a/client/src/components/List/ActionsStep.jsx
+++ b/client/src/components/List/ActionsStep.jsx
@@ -8,12 +8,14 @@ import { useSteps } from '../../hooks';
 import DeleteStep from '../DeleteStep';
 
 import styles from './ActionsStep.module.scss';
+import SortStep from "../SortStep";
 
 const StepTypes = {
   DELETE: 'DELETE',
+  SORT: 'SORT',
 };
 
-const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) => {
+const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onSort, onClose }) => {
   const [t] = useTranslation();
   const [step, openStep, handleBack] = useSteps();
 
@@ -31,16 +33,32 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
     openStep(StepTypes.DELETE);
   }, [openStep]);
 
-  if (step && step.type === StepTypes.DELETE) {
-    return (
-      <DeleteStep
-        title="common.deleteList"
-        content="common.areYouSureYouWantToDeleteThisList"
-        buttonContent="action.deleteList"
-        onConfirm={onDelete}
-        onBack={handleBack}
-      />
-    );
+  const handleSortClick = useCallback(() => {
+    openStep(StepTypes.SORT);
+  }, [openStep]);
+
+  if (step && step.type) {
+    switch (step.type){
+      case StepTypes.DELETE:
+        return (
+            <DeleteStep
+                title="common.deleteList"
+                content="common.areYouSureYouWantToDeleteThisList"
+                buttonContent="action.deleteList"
+                onConfirm={onDelete}
+                onBack={handleBack}
+            />
+        );
+      case StepTypes.SORT:
+        return (
+            <SortStep
+            title="common.sortList"
+            onSort={onSort}
+            onBack={handleBack}
+        />
+        );
+      default:
+    }
   }
 
   return (
@@ -52,6 +70,11 @@ const ActionsStep = React.memo(({ onNameEdit, onCardAdd, onDelete, onClose }) =>
       </Popup.Header>
       <Popup.Content>
         <Menu secondary vertical className={styles.menu}>
+          <Menu.Item className={styles.menuItem} onClick={handleSortClick}>
+            {t('action.sort', {
+              context: 'title',
+            })}
+          </Menu.Item>
           <Menu.Item className={styles.menuItem} onClick={handleEditNameClick}>
             {t('action.editTitle', {
               context: 'title',
@@ -77,6 +100,7 @@ ActionsStep.propTypes = {
   onNameEdit: PropTypes.func.isRequired,
   onCardAdd: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
+  onSort: PropTypes.func.isRequired,
   onClose: PropTypes.func.isRequired,
 };
 
diff --git a/client/src/components/List/List.jsx b/client/src/components/List/List.jsx
index f09116c..98d6941 100755
--- a/client/src/components/List/List.jsx
+++ b/client/src/components/List/List.jsx
@@ -16,7 +16,7 @@ import { ReactComponent as PlusMathIcon } from '../../assets/images/plus-math-ic
 import styles from './List.module.scss';
 
 const List = React.memo(
-  ({ id, index, name, isPersisted, cardIds, canEdit, onUpdate, onDelete, onCardCreate }) => {
+  ({ id, index, name, isPersisted, cardIds, canEdit, onUpdate, onDelete, onSort, onCardCreate }) => {
     const [t] = useTranslation();
     const [isAddCardOpened, setIsAddCardOpened] = useState(false);
 
@@ -114,6 +114,7 @@ const List = React.memo(
                     onNameEdit={handleNameEdit}
                     onCardAdd={handleCardAdd}
                     onDelete={onDelete}
+                    onSort={onSort}
                   >
                     <Button className={classNames(styles.headerButton, styles.target)}>
                       <Icon fitted name="pencil" size="small" />
@@ -160,6 +161,7 @@ List.propTypes = {
   canEdit: PropTypes.bool.isRequired,
   onUpdate: PropTypes.func.isRequired,
   onDelete: PropTypes.func.isRequired,
+  onSort: PropTypes.func.isRequired,
   onCardCreate: PropTypes.func.isRequired,
 };
 
diff --git a/client/src/components/SortStep/SortStep.jsx b/client/src/components/SortStep/SortStep.jsx
new file mode 100644
index 0000000..30fa599
--- /dev/null
+++ b/client/src/components/SortStep/SortStep.jsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useTranslation } from 'react-i18next';
+import {Button, Menu} from 'semantic-ui-react';
+import { Popup } from '../../lib/custom-ui';
+
+import styles from './SortStep.module.scss';
+
+const SortStep = React.memo(({ title, onSort, onBack }) => {
+  const [t] = useTranslation();
+
+  const handeClick = (sortType) => onSort({sortType})
+
+  return (
+    <>
+      <Popup.Header onBack={onBack}>
+        {t(title, {
+          context: 'title',
+        })}
+      </Popup.Header>
+      <Popup.Content>
+          <Menu secondary vertical className={styles.menu}>
+              <Menu.Item className={styles.menuItem} onClick={() => handeClick('createdat_asc')}>
+                  {t('action.sort.createdFirst', {
+                      context: 'title',
+                  })}
+              </Menu.Item>
+              <Menu.Item className={styles.menuItem} onClick={() => handeClick('createdat_desc')}>
+                  {t('action.sort.createdLast', {
+                      context: 'title',
+                  })}
+              </Menu.Item>
+              <Menu.Item className={styles.menuItem} onClick={() => handeClick('name_asc')}>
+                  {t('action.sort.name', {
+                      context: 'title',
+                  })}
+              </Menu.Item>
+              <Menu.Item className={styles.menuItem} onClick={() => handeClick('duedate_asc')}>
+                  {t('action.sort.due', {
+                      context: 'title',
+                  })}
+              </Menu.Item>
+          </Menu>
+      </Popup.Content>
+    </>
+  );
+});
+
+SortStep.propTypes = {
+  title: PropTypes.string.isRequired,
+  onSort: PropTypes.func.isRequired,
+  onBack: PropTypes.func,
+};
+
+SortStep.defaultProps = {
+  onBack: undefined,
+};
+
+export default SortStep;
diff --git a/client/src/components/SortStep/SortStep.module.scss b/client/src/components/SortStep/SortStep.module.scss
new file mode 100644
index 0000000..e69de29
diff --git a/client/src/components/SortStep/index.js b/client/src/components/SortStep/index.js
new file mode 100644
index 0000000..4388a89
--- /dev/null
+++ b/client/src/components/SortStep/index.js
@@ -0,0 +1,3 @@
+import SortStep from './SortStep';
+
+export default SortStep;
diff --git a/client/src/constants/ActionTypes.js b/client/src/constants/ActionTypes.js
index d5724e1..de01d6d 100644
--- a/client/src/constants/ActionTypes.js
+++ b/client/src/constants/ActionTypes.js
@@ -173,6 +173,10 @@ export default {
   LIST_UPDATE__SUCCESS: 'LIST_UPDATE__SUCCESS',
   LIST_UPDATE__FAILURE: 'LIST_UPDATE__FAILURE',
   LIST_UPDATE_HANDLE: 'LIST_UPDATE_HANDLE',
+  LIST_SORT: 'LIST_SORT',
+  LIST_SORT__SUCCESS: 'LIST_SORT__SUCCESS',
+  LIST_SORT__FAILURE: 'LIST_SORT__FAILURE',
+  LIST_SORT_HANDLE: 'LIST_SORT_HANDLE',
   LIST_DELETE: 'LIST_DELETE',
   LIST_DELETE__SUCCESS: 'LIST_DELETE__SUCCESS',
   LIST_DELETE__FAILURE: 'LIST_DELETE__FAILURE',
diff --git a/client/src/constants/EntryActionTypes.js b/client/src/constants/EntryActionTypes.js
index 9cd0694..60a9c46 100755
--- a/client/src/constants/EntryActionTypes.js
+++ b/client/src/constants/EntryActionTypes.js
@@ -120,6 +120,8 @@ export default {
   LIST_MOVE: `${PREFIX}/LIST_MOVE`,
   LIST_DELETE: `${PREFIX}/LIST_DELETE`,
   LIST_DELETE_HANDLE: `${PREFIX}/LIST_DELETE_HANDLE`,
+  LIST_SORT: `${PREFIX}/LIST_SORT`,
+  LIST_SORT_HANDLE: `${PREFIX}/LIST_SORT_HANDLE`,
 
   /* Cards */
 
diff --git a/client/src/containers/ListContainer.js b/client/src/containers/ListContainer.js
index cb2f6a0..d3e6491 100755
--- a/client/src/containers/ListContainer.js
+++ b/client/src/containers/ListContainer.js
@@ -34,6 +34,7 @@ const mapDispatchToProps = (dispatch, { id }) =>
     {
       onUpdate: (data) => entryActions.updateList(id, data),
       onDelete: () => entryActions.deleteList(id),
+      onSort: (data) => entryActions.sortList(id, data),
       onCardCreate: (data, autoOpen) => entryActions.createCard(id, data, autoOpen),
     },
     dispatch,
diff --git a/client/src/entry-actions/lists.js b/client/src/entry-actions/lists.js
index 97350c1..f914b80 100755
--- a/client/src/entry-actions/lists.js
+++ b/client/src/entry-actions/lists.js
@@ -51,6 +51,23 @@ const handleListDelete = (list) => ({
   },
 });
 
+const sortList = (id, data) => {
+  return ({
+    type: EntryActionTypes.LIST_SORT,
+    payload: {
+      id,
+      data
+    },
+  })};
+
+const handleListSort = (list) => ({
+  type: EntryActionTypes.LIST_SORT_HANDLE,
+  payload: {
+    list,
+  },
+});
+
+
 export default {
   createListInCurrentBoard,
   handleListCreate,
@@ -59,4 +76,6 @@ export default {
   moveList,
   deleteList,
   handleListDelete,
+  sortList,
+  handleListSort,
 };
diff --git a/client/src/models/List.js b/client/src/models/List.js
index b634a66..045622e 100755
--- a/client/src/models/List.js
+++ b/client/src/models/List.js
@@ -66,6 +66,9 @@ export default class extends BaseModel {
         List.withId(payload.id).deleteWithRelated();
 
         break;
+      // Possible improved flow for updating
+      // case ActionTypes.LIST_SORT__SUCCESS:
+      // case ActionTypes.LIST_SORT_HANDLE:
       case ActionTypes.LIST_DELETE__SUCCESS:
       case ActionTypes.LIST_DELETE_HANDLE: {
         const listModel = List.withId(payload.list.id);
diff --git a/client/src/sagas/core/services/lists.js b/client/src/sagas/core/services/lists.js
index d9dd718..6dd1e0d 100644
--- a/client/src/sagas/core/services/lists.js
+++ b/client/src/sagas/core/services/lists.js
@@ -61,6 +61,24 @@ export function* handleListUpdate(list) {
   yield put(actions.handleListUpdate(list));
 }
 
+export function* sortList(id, data) {
+  yield put(actions.sortList(id, data));
+
+  let list;
+  try {
+    ({ item: list } = yield call(request, api.sortList, id, data));
+  } catch (error) {
+    yield put(actions.sortList.failure(id, error));
+    return;
+  }
+
+  yield put(actions.sortList.success(list));
+}
+
+export function* handleListSort(list) {
+  yield put(actions.handleListSort(list));
+}
+
 export function* moveList(id, index) {
   const { boardId } = yield select(selectors.selectListById, id);
   const position = yield select(selectors.selectNextListPosition, boardId, index, id);
@@ -94,6 +112,8 @@ export default {
   handleListCreate,
   updateList,
   handleListUpdate,
+  sortList,
+  handleListSort,
   moveList,
   deleteList,
   handleListDelete,
diff --git a/client/src/sagas/core/watchers/lists.js b/client/src/sagas/core/watchers/lists.js
index 028881e..469e0e7 100644
--- a/client/src/sagas/core/watchers/lists.js
+++ b/client/src/sagas/core/watchers/lists.js
@@ -17,6 +17,12 @@ export default function* listsWatchers() {
     takeEvery(EntryActionTypes.LIST_UPDATE_HANDLE, ({ payload: { list } }) =>
       services.handleListUpdate(list),
     ),
+    takeEvery(EntryActionTypes.LIST_SORT, ({ payload: { id, data } }) =>
+        services.sortList(id, data),
+    ),
+    takeEvery(EntryActionTypes.LIST_SORT_HANDLE, ({ payload: { list } }) =>
+        services.handleListSort(list),
+    ),
     takeEvery(EntryActionTypes.LIST_MOVE, ({ payload: { id, index } }) =>
       services.moveList(id, index),
     ),