From 37bd4d1349acf181be2bff23667401b20a4d863f Mon Sep 17 00:00:00 2001
From: Steven Correia <45617825+StevenJCorreia@users.noreply.github.com>
Date: Fri, 5 Sep 2025 07:55:20 -0400
Subject: [PATCH] feat: Restore toggleable due dates (#1332)

---
 .../components/cards/Card/ProjectContent.jsx  |  7 +++-
 .../cards/CardModal/ProjectContent.jsx        | 37 ++++++++++++++-----
 .../CardModal/ProjectContent.module.scss      |  6 +++
 .../cards/DueDateChip/DueDateChip.jsx         | 26 ++++++++++---
 .../cards/DueDateChip/DueDateChip.module.scss |  5 +++
 client/src/models/Card.js                     | 12 ++++++
 server/api/controllers/cards/create.js        |  5 +++
 server/api/controllers/cards/update.js        |  6 +++
 .../api/helpers/boards/import-from-trello.js  |  2 +-
 server/api/helpers/cards/create-one.js        |  8 ++++
 server/api/helpers/cards/duplicate-one.js     |  1 +
 server/api/helpers/cards/update-one.js        | 14 +++++++
 server/api/models/Card.js                     |  5 +++
 ...0905101408_restore_toggleable_due_dates.js | 23 ++++++++++++
 14 files changed, 140 insertions(+), 17 deletions(-)
 create mode 100644 server/db/migrations/20250905101408_restore_toggleable_due_dates.js

diff --git a/client/src/components/cards/Card/ProjectContent.jsx b/client/src/components/cards/Card/ProjectContent.jsx
index 952acc86..267549f0 100644
--- a/client/src/components/cards/Card/ProjectContent.jsx
+++ b/client/src/components/cards/Card/ProjectContent.jsx
@@ -187,7 +187,12 @@ const ProjectContent = React.memo(({ cardId }) => {
           )}
           {card.dueDate && (
             <span className={classNames(styles.attachment, styles.attachmentLeft)}>
-              <DueDateChip value={card.dueDate} size="tiny" withStatus={!card.isClosed} />
+              <DueDateChip
+                value={card.dueDate}
+                size="tiny"
+                isCompleted={card.isDueCompleted}
+                withStatus={!card.isClosed}
+              />
             </span>
           )}
           {card.stopwatch && (
diff --git a/client/src/components/cards/CardModal/ProjectContent.jsx b/client/src/components/cards/CardModal/ProjectContent.jsx
index 1fd7024e..668a0a19 100644
--- a/client/src/components/cards/CardModal/ProjectContent.jsx
+++ b/client/src/components/cards/CardModal/ProjectContent.jsx
@@ -7,7 +7,7 @@ import React, { useCallback, useContext, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import { useTranslation } from 'react-i18next';
-import { Button, Grid, Icon } from 'semantic-ui-react';
+import { Button, Checkbox, Grid, Icon } from 'semantic-ui-react';
 import { useDidUpdate } from '../../../lib/hooks';
 
 import selectors from '../../../selectors';
@@ -175,6 +175,14 @@ const ProjectContent = React.memo(() => {
     [dispatch],
   );
 
+  const handleDueCompletionChange = useCallback(() => {
+    dispatch(
+      entryActions.updateCurrentCard({
+        isDueCompleted: !card.isDueCompleted,
+      }),
+    );
+  }, [card.isDueCompleted, dispatch]);
+
   const handleToggleStopwatchClick = useCallback(() => {
     dispatch(
       entryActions.updateCurrentCard({
@@ -410,19 +418,30 @@ const ProjectContent = React.memo(() => {
                       context: 'title',
                     })}
                   </div>
-                  <span className={styles.attachment}>
+                  <span className={classNames(styles.attachment, styles.attachmentDueDate)}>
                     {canEditDueDate ? (
-                      <EditDueDatePopup cardId={card.id}>
-                        <DueDateChip
-                          withStatusIcon
-                          value={card.dueDate}
-                          withStatus={!card.isClosed}
-                        />
-                      </EditDueDatePopup>
+                      <>
+                        {!card.isClosed && (
+                          <Checkbox
+                            checked={card.isDueCompleted}
+                            disabled={!canEditDueDate}
+                            onChange={handleDueCompletionChange}
+                          />
+                        )}
+                        <EditDueDatePopup cardId={card.id}>
+                          <DueDateChip
+                            withStatusIcon
+                            value={card.dueDate}
+                            isCompleted={card.isDueCompleted}
+                            withStatus={!card.isClosed}
+                          />
+                        </EditDueDatePopup>
+                      </>
                     ) : (
                       <DueDateChip
                         withStatusIcon
                         value={card.dueDate}
+                        isCompleted={card.isDueCompleted}
                         withStatus={!card.isClosed}
                       />
                     )}
diff --git a/client/src/components/cards/CardModal/ProjectContent.module.scss b/client/src/components/cards/CardModal/ProjectContent.module.scss
index 63d442b9..8bdc3890 100644
--- a/client/src/components/cards/CardModal/ProjectContent.module.scss
+++ b/client/src/components/cards/CardModal/ProjectContent.module.scss
@@ -60,6 +60,12 @@
     vertical-align: top;
   }
 
+  .attachmentDueDate {
+    align-items: center;
+    display: flex;
+    gap: 4px;
+  }
+
   .attachments {
     display: inline-block;
     margin: 0 8px 8px 0;
diff --git a/client/src/components/cards/DueDateChip/DueDateChip.jsx b/client/src/components/cards/DueDateChip/DueDateChip.jsx
index bff0aa3a..6d9ce31b 100644
--- a/client/src/components/cards/DueDateChip/DueDateChip.jsx
+++ b/client/src/components/cards/DueDateChip/DueDateChip.jsx
@@ -24,6 +24,7 @@ const Sizes = {
 const Statuses = {
   DUE_SOON: 'dueSoon',
   OVERDUE: 'overdue',
+  COMPLETED: 'completed',
 };
 
 const LONG_DATE_FORMAT_BY_SIZE = {
@@ -47,9 +48,17 @@ const STATUS_ICON_PROPS_BY_STATUS = {
     name: 'hourglass end',
     color: 'red',
   },
+  [Statuses.COMPLETED]: {
+    name: 'checkmark',
+    color: 'green',
+  },
 };
 
-const getStatus = (date) => {
+const getStatus = (date, isCompleted) => {
+  if (isCompleted) {
+    return Statuses.COMPLETED;
+  }
+
   const secondsLeft = Math.floor((date.getTime() - new Date().getTime()) / 1000);
 
   if (secondsLeft <= 0) {
@@ -64,12 +73,12 @@ const getStatus = (date) => {
 };
 
 const DueDateChip = React.memo(
-  ({ value, size, isDisabled, withStatus, withStatusIcon, onClick }) => {
+  ({ value, size, isCompleted, isDisabled, withStatus, withStatusIcon, onClick }) => {
     const [t] = useTranslation();
     const forceUpdate = useForceUpdate();
 
     const statusRef = useRef(null);
-    statusRef.current = withStatus ? getStatus(value) : null;
+    statusRef.current = withStatus ? getStatus(value, isCompleted) : null;
 
     const intervalRef = useRef(null);
 
@@ -80,9 +89,13 @@ const DueDateChip = React.memo(
     );
 
     useEffect(() => {
-      if (withStatus && statusRef.current !== Statuses.OVERDUE) {
+      if (
+        withStatus &&
+        statusRef.current !== Statuses.OVERDUE &&
+        statusRef.current !== Statuses.COMPLETED
+      ) {
         intervalRef.current = setInterval(() => {
-          const status = getStatus(value);
+          const status = getStatus(value, isCompleted);
 
           if (status !== statusRef.current) {
             forceUpdate();
@@ -99,7 +112,7 @@ const DueDateChip = React.memo(
           clearInterval(intervalRef.current);
         }
       };
-    }, [value, withStatus, forceUpdate]);
+    }, [value, isCompleted, withStatus, forceUpdate]);
 
     const contentNode = (
       <span
@@ -134,6 +147,7 @@ const DueDateChip = React.memo(
 DueDateChip.propTypes = {
   value: PropTypes.instanceOf(Date).isRequired,
   size: PropTypes.oneOf(Object.values(Sizes)),
+  isCompleted: PropTypes.bool.isRequired,
   isDisabled: PropTypes.bool,
   withStatus: PropTypes.bool.isRequired,
   withStatusIcon: PropTypes.bool,
diff --git a/client/src/components/cards/DueDateChip/DueDateChip.module.scss b/client/src/components/cards/DueDateChip/DueDateChip.module.scss
index a37bb609..240ffbb6 100644
--- a/client/src/components/cards/DueDateChip/DueDateChip.module.scss
+++ b/client/src/components/cards/DueDateChip/DueDateChip.module.scss
@@ -62,4 +62,9 @@
     background: #db2828;
     color: #fff;
   }
+
+  .wrapperCompleted {
+    background: #21ba45;
+    color: #fff;
+  }
 }
diff --git a/client/src/models/Card.js b/client/src/models/Card.js
index e7da438f..717581d6 100755
--- a/client/src/models/Card.js
+++ b/client/src/models/Card.js
@@ -19,6 +19,7 @@ export default class extends BaseModel {
     name: attr(),
     description: attr(),
     dueDate: attr(),
+    isDueCompleted: attr(),
     stopwatch: attr(),
     isClosed: attr(),
     commentsTotal: attr({
@@ -323,6 +324,16 @@ export default class extends BaseModel {
             payload.data.listChangedAt = new Date(); // eslint-disable-line no-param-reassign
           }
 
+          if (payload.data.dueDate !== undefined) {
+            if (payload.data.dueDate) {
+              if (!cardModel.dueDate) {
+                payload.data.isDueCompleted = false; // eslint-disable-line no-param-reassign
+              }
+            } else {
+              payload.data.isDueCompleted = null; // eslint-disable-line no-param-reassign
+            }
+          }
+
           if (payload.data.isClosed !== undefined && payload.data.isClosed !== cardModel.isClosed) {
             cardModel.linkedTasks.update({
               isCompleted: payload.data.isClosed,
@@ -568,6 +579,7 @@ export default class extends BaseModel {
       name: this.name,
       description: this.description,
       dueDate: this.dueDate,
+      isDueCompleted: this.isDueCompleted,
       stopwatch: this.stopwatch,
       isClosed: this.isClosed,
       ...data,
diff --git a/server/api/controllers/cards/create.js b/server/api/controllers/cards/create.js
index 7ff91013..10ee39cb 100755
--- a/server/api/controllers/cards/create.js
+++ b/server/api/controllers/cards/create.js
@@ -49,6 +49,10 @@ module.exports = {
       type: 'string',
       custom: isDueDate,
     },
+    isDueCompleted: {
+      type: 'boolean',
+      allowNull: true,
+    },
     stopwatch: {
       type: 'json',
       custom: isStopwatch,
@@ -93,6 +97,7 @@ module.exports = {
       'name',
       'description',
       'dueDate',
+      'isDueCompleted',
       'stopwatch',
     ]);
 
diff --git a/server/api/controllers/cards/update.js b/server/api/controllers/cards/update.js
index c62baad9..1b3be1c6 100755
--- a/server/api/controllers/cards/update.js
+++ b/server/api/controllers/cards/update.js
@@ -70,6 +70,10 @@ module.exports = {
       custom: isDueDate,
       allowNull: true,
     },
+    isDueCompleted: {
+      type: 'boolean',
+      allowNull: true,
+    },
     stopwatch: {
       type: 'json',
       custom: isStopwatch,
@@ -136,6 +140,7 @@ module.exports = {
         'name',
         'description',
         'dueDate',
+        'isDueCompleted',
         'stopwatch',
       );
     }
@@ -195,6 +200,7 @@ module.exports = {
       'name',
       'description',
       'dueDate',
+      'isDueCompleted',
       'stopwatch',
       'isSubscribed',
     ]);
diff --git a/server/api/helpers/boards/import-from-trello.js b/server/api/helpers/boards/import-from-trello.js
index 155c1457..5fb379a5 100644
--- a/server/api/helpers/boards/import-from-trello.js
+++ b/server/api/helpers/boards/import-from-trello.js
@@ -67,7 +67,7 @@ module.exports = {
           name: trelloCard.name,
           description: trelloCard.desc || null,
           dueDate: trelloCard.due,
-          isClosed: trelloCard.dueComplete,
+          isDueCompleted: trelloCard.due && trelloCard.dueComplete,
           listChangedAt: new Date().toISOString(),
         };
 
diff --git a/server/api/helpers/cards/create-one.js b/server/api/helpers/cards/create-one.js
index c86a1d86..1f315e7c 100644
--- a/server/api/helpers/cards/create-one.js
+++ b/server/api/helpers/cards/create-one.js
@@ -25,6 +25,14 @@ module.exports = {
   async fn(inputs) {
     const { values } = inputs;
 
+    if (values.dueDate) {
+      if (_.isNil(values.isDueCompleted)) {
+        values.isDueCompleted = false;
+      }
+    } else {
+      delete values.isDueCompleted;
+    }
+
     if (sails.helpers.lists.isFinite(values.list)) {
       if (_.isUndefined(values.position)) {
         throw 'positionMustBeInValues';
diff --git a/server/api/helpers/cards/duplicate-one.js b/server/api/helpers/cards/duplicate-one.js
index 0777cf22..a6a4d7b2 100644
--- a/server/api/helpers/cards/duplicate-one.js
+++ b/server/api/helpers/cards/duplicate-one.js
@@ -90,6 +90,7 @@ module.exports = {
         'name',
         'description',
         'dueDate',
+        'isDueCompleted',
         'stopwatch',
         'isClosed',
       ]),
diff --git a/server/api/helpers/cards/update-one.js b/server/api/helpers/cards/update-one.js
index e84b7d96..5dee4f28 100644
--- a/server/api/helpers/cards/update-one.js
+++ b/server/api/helpers/cards/update-one.js
@@ -101,6 +101,20 @@ module.exports = {
       values.coverAttachmentId = values.coverAttachment.id;
     }
 
+    const dueDate = _.isUndefined(values.dueDate) ? inputs.record.dueDate : values.dueDate;
+
+    if (dueDate) {
+      const isDueCompleted = _.isUndefined(values.isDueCompleted)
+        ? inputs.record.isDueCompleted
+        : values.isDueCompleted;
+
+      if (_.isNull(isDueCompleted)) {
+        values.isDueCompleted = false;
+      }
+    } else {
+      values.isDueCompleted = null;
+    }
+
     let card;
     if (_.isEmpty(values)) {
       card = inputs.record;
diff --git a/server/api/models/Card.js b/server/api/models/Card.js
index 6b440370..0dd09b2c 100755
--- a/server/api/models/Card.js
+++ b/server/api/models/Card.js
@@ -45,6 +45,11 @@ module.exports = {
       type: 'ref',
       columnName: 'due_date',
     },
+    isDueCompleted: {
+      type: 'boolean',
+      allowNull: true,
+      columnName: 'is_due_completed',
+    },
     stopwatch: {
       type: 'json',
     },
diff --git a/server/db/migrations/20250905101408_restore_toggleable_due_dates.js b/server/db/migrations/20250905101408_restore_toggleable_due_dates.js
new file mode 100644
index 00000000..1b7a9a4b
--- /dev/null
+++ b/server/db/migrations/20250905101408_restore_toggleable_due_dates.js
@@ -0,0 +1,23 @@
+/*!
+ * Copyright (c) 2024 PLANKA Software GmbH
+ * Licensed under the Fair Use License: https://github.com/plankanban/planka/blob/master/LICENSE.md
+ */
+
+exports.up = async (knex) => {
+  await knex.schema.alterTable('card', (table) => {
+    /* Columns */
+
+    table.boolean('is_due_completed');
+  });
+
+  return knex('card')
+    .update({
+      isDueCompleted: false,
+    })
+    .whereNotNull('due_date');
+};
+
+exports.down = (knex) =>
+  knex.schema.table('card', (table) => {
+    table.dropColumn('is_due_completed');
+  });