Merge pull request #41 from the-collab-lab/ym-urgency-label-fix

fix: address conditional logic to render inactive list items
the-collab-lab · May 25, 2023 · 0a186c1 · 0a186c1
2 parents fe6136e + 43843fd
commit 0a186c1
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/components/ListItem.jsx b/src/components/ListItem.jsx
@@ -36,19 +36,31 @@ export function ListItem({ item, listId }) {
  }, [checked, item.dateLastPurchased]);
 
  const purchaseUrgencyMessage = (item) => {
+ const dateLastPurchased = item.dateLastPurchased
+ ? item.dateLastPurchased
+ : item.dateCreated;
+
  const itemDays = getDaysBetweenDates(
  transformToJSDate(item.dateNextPurchased),
  new Date(),
  );
- const dateLastPurchased = item.dateLastPurchased;
 
- if (itemDays <= 7) {
+ const itemDaysSinceLastPurchased = getDaysBetweenDates(
+ transformToJSDate(dateLastPurchased),
+ new Date(),
+ );
+
+ if (
+ itemDays <= 7 ||
+ (transformToJSDate(item.dateNextPurchased) < new Date() &&
+ itemDaysSinceLastPurchased < 60)
+ ) {
  return 'S';
  } else if (itemDays > 7 && itemDays < 30) {
  return 'KS';
  } else if (itemDays >= 30 && itemDays < 60) {
  return 'NS';
- } else if (itemDays > 60 && !dateLastPurchased) {
+ } else {
  return 'I';
  }
  };