Merge pull request #249 from leclercb/develop

Merge develop into master
leclercb · Jun 23, 2021 · bcfe9a7 · bcfe9a7
2 parents b51edd8 + 3dc0d0d
commit bcfe9a7
Show file tree

Hide file tree

Showing 4 changed files with 1,161 additions and 1,177 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 1.2.8
+
+## New Features
+
+* Improve calendar week list view
+
 # 1.2.7
 
 ## New Features

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "taskunifier-app",
     "description": "TaskUnifier - Task Management Application",
     "author": "BL-IT",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "private": true,
     "main": "public/electron.js",
     "homepage": "./",
@@ -20,20 +20,20 @@
         "postinstall": "husky install"
     },
     "dependencies": {
-        "@aws-amplify/datastore": "^3.0.3",
+        "@aws-amplify/datastore": "^3.1.1",
         "@craco/craco": "^6.1.2",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
         "@fortawesome/free-solid-svg-icons": "^5.15.3",
         "@fortawesome/react-fontawesome": "^0.1.14",
-        "antd": "^4.16.2",
-        "aws-amplify": "^4.0.3",
+        "antd": "^4.16.5",
+        "aws-amplify": "^4.1.1",
         "axios": "^0.21.1",
         "craco-antd": "^1.19.0",
         "electron-is-dev": "^2.0.0",
         "electron-log": "^4.3.5",
         "electron-updater": "^4.3.9",
         "fs-extra": "^10.0.0",
-        "googleapis": "^76.0.0",
+        "googleapis": "^78.0.0",
         "https-proxy-agent": "^5.0.0",
         "inputmask-core": "^2.2.0",
         "jspdf": "^2.3.1",
@@ -67,20 +67,20 @@
         "uuid": "^8.3.2"
     },
     "devDependencies": {
-        "@wojtekmaj/enzyme-adapter-react-17": "^0.6.1",
+        "@wojtekmaj/enzyme-adapter-react-17": "^0.6.2",
         "babel-eslint": "^10.1.0",
-        "babel-jest": "^27.0.2",
-        "electron": "^13.1.2",
-        "electron-builder": "^22.10.5",
+        "babel-jest": "^27.0.5",
+        "electron": "^13.1.4",
+        "electron-builder": "^22.11.7",
         "electron-devtools-installer": "^3.2.0",
         "enzyme": "^3.11.0",
         "enzyme-to-json": "^3.6.2",
-        "eslint": "^7.28.0",
+        "eslint": "^7.29.0",
         "eslint-plugin-react": "^7.24.0",
         "eslint-plugin-react-hooks": "^4.2.0",
         "husky": "^6.0.0",
         "react-test-renderer": "^17.0.2",
-        "typescript": "^4.3.2",
+        "typescript": "^4.3.4",
         "worker-loader": "^3.0.8"
     },
     "build": {

diff --git a/src/components/tasks/calendar/WeekListView.js b/src/components/tasks/calendar/WeekListView.js
@@ -3,6 +3,7 @@ import moment from 'moment';
 import PropTypes from 'prop-types';
 import { navigate } from 'react-big-calendar/lib/utils/constants';
 import { useDrag, useDrop } from 'react-dnd';
+import CalendarEventWrapper from 'components/tasks/calendar/CalendarEventWrapper';
 import { useTaskApi } from 'hooks/UseTaskApi';
 import 'components/tasks/calendar/WeekListView.css';
 
@@ -104,11 +105,9 @@ WeekListColumn.propTypes = {
     taskApi: PropTypes.object
 };
 
-function WeekListCell({ accessors, components, event, onDoubleClickEvent }) {
+function WeekListCell({ components, event, onDoubleClickEvent, onSelectEvent }) {
     const { event: Event } = components;
 
-    const title = accessors.title(event);
-
     // eslint-disable-next-line no-unused-vars
     const [collectedDragProps, drag] = useDrag({
         type: 'calendar-event',
@@ -118,20 +117,25 @@ function WeekListCell({ accessors, components, event, onDoubleClickEvent }) {
     });
 
     return (
-        <div
-            ref={drag}
-            style={{ cursor: 'pointer' }}
-            onDoubleClick={() => onDoubleClickEvent(event)}>
-            {Event ? <Event event={event} title={title} /> : title}
-        </div>
+        <CalendarEventWrapper event={event}>
+            <div
+                className="rbc-event"
+                ref={drag}
+                style={{ cursor: 'pointer' }}
+                onClick={() => onSelectEvent(event)}
+                onDoubleClick={() => onDoubleClickEvent(event)}>
+                <Event event={event} />
+            </div>
+        </CalendarEventWrapper>
     );
 }
 
 WeekListCell.propTypes = {
     accessors: PropTypes.object.isRequired,
     components: PropTypes.object.isRequired,
     event: PropTypes.object,
-    onDoubleClickEvent: PropTypes.func.isRequired
+    onDoubleClickEvent: PropTypes.func.isRequired,
+    onSelectEvent: PropTypes.func.isRequired
 };
 
 export default WeekListView;