From 8dd9190c86e7f42e1160cc4c6d8994d7f3d20495 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Sep 2024 03:00:00 +0000
Subject: [PATCH 1/8] chore(deps): bump next from 14.2.3 to 14.2.10

Bumps [next](https://github.com/vercel/next.js) from 14.2.3 to 14.2.10.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](https://github.com/vercel/next.js/compare/v14.2.3...v14.2.10)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 yarn.lock | 169 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 92 insertions(+), 77 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 3688f1ba7..5263d7f7c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4069,10 +4069,10 @@
     jsonc-parser "3.2.0"
     pluralize "8.0.0"
 
-"@next/env@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.3.tgz#d6def29d1c763c0afb397343a15a82e7d92353a0"
-  integrity sha512-W7fd7IbkfmeeY2gXrzJYDx8D2lWKbVoTIj1o1ScPHNzvp30s1AuoEFSdr39bC5sjxJaxTtq3OTCZboNp0lNWHA==
+"@next/env@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
+  integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
 
 "@next/eslint-plugin-next@14.0.4":
   version "14.0.4"
@@ -4088,50 +4088,50 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.3.tgz#db1a05eb88c0224089b815ad10ac128ec79c2cdb"
-  integrity sha512-3pEYo/RaGqPP0YzwnlmPN2puaF2WMLM3apt5jLW2fFdXD9+pqcoTzRk+iZsf8ta7+quAe4Q6Ms0nR0SFGFdS1A==
-
-"@next/swc-darwin-x64@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.3.tgz#a3f8af05b5f9a52ac3082e66ac29e125ab1d7b9c"
-  integrity sha512-6adp7waE6P1TYFSXpY366xwsOnEXM+y1kgRpjSRVI2CBDOcbRjsJ67Z6EgKIqWIue52d2q/Mx8g9MszARj8IEA==
-
-"@next/swc-linux-arm64-gnu@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.3.tgz#4e63f43879285b52554bfd39e6e0cc78a9b27bbf"
-  integrity sha512-cuzCE/1G0ZSnTAHJPUT1rPgQx1w5tzSX7POXSLaS7w2nIUJUD+e25QoXD/hMfxbsT9rslEXugWypJMILBj/QsA==
-
-"@next/swc-linux-arm64-musl@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.3.tgz#ebdaed26214448b1e6f2c3e8b3cd29bfba387990"
-  integrity sha512-0D4/oMM2Y9Ta3nGuCcQN8jjJjmDPYpHX9OJzqk42NZGJocU2MqhBq5tWkJrUQOQY9N+In9xOdymzapM09GeiZw==
-
-"@next/swc-linux-x64-gnu@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.3.tgz#19e3bcc137c3b582a1ab867106817e5c90a20593"
-  integrity sha512-ENPiNnBNDInBLyUU5ii8PMQh+4XLr4pG51tOp6aJ9xqFQ2iRI6IH0Ds2yJkAzNV1CfyagcyzPfROMViS2wOZ9w==
-
-"@next/swc-linux-x64-musl@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.3.tgz#794a539b98e064169cf0ff7741b2a4fb16adec7d"
-  integrity sha512-BTAbq0LnCbF5MtoM7I/9UeUu/8ZBY0i8SFjUMCbPDOLv+un67e2JgyN4pmgfXBwy/I+RHu8q+k+MCkDN6P9ViQ==
-
-"@next/swc-win32-arm64-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.3.tgz#eda9fa0fbf1ff9113e87ac2668ee67ce9e5add5a"
-  integrity sha512-AEHIw/dhAMLNFJFJIJIyOFDzrzI5bAjI9J26gbO5xhAKHYTZ9Or04BesFPXiAYXDNdrwTP2dQceYA4dL1geu8A==
-
-"@next/swc-win32-ia32-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.3.tgz#7c1190e3f640ab16580c6bdbd7d0e766b9920457"
-  integrity sha512-vga40n1q6aYb0CLrM+eEmisfKCR45ixQYXuBXxOOmmoV8sYST9k7E3US32FsY+CkkF7NtzdcebiFT4CHuMSyZw==
-
-"@next/swc-win32-x64-msvc@14.2.3":
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.3.tgz#2be4e39ee25bfbd85be78eea17c0e7751dc4323c"
-  integrity sha512-Q1/zm43RWynxrO7lW4ehciQVj+5ePBhOK+/K2P7pLFX3JaJ/IZVC69SHidrmZSOkqz7ECIOhhy7XhAFG4JYyHA==
+"@next/swc-darwin-arm64@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80"
+  integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==
+
+"@next/swc-darwin-x64@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8"
+  integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==
+
+"@next/swc-linux-arm64-gnu@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20"
+  integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==
+
+"@next/swc-linux-arm64-musl@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47"
+  integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==
+
+"@next/swc-linux-x64-gnu@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082"
+  integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==
+
+"@next/swc-linux-x64-musl@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3"
+  integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==
+
+"@next/swc-win32-arm64-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209"
+  integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==
+
+"@next/swc-win32-ia32-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041"
+  integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==
+
+"@next/swc-win32-x64-msvc@14.2.10":
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455"
+  integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==
 
 "@nivo/calendar@^0.87.0":
   version "0.87.0"
@@ -10701,21 +10701,11 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001520:
-  version "1.0.30001603"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001603.tgz#605046a5bdc95ba4a92496d67e062522dce43381"
-  integrity sha512-iL2iSS0eDILMb9n5yKQoTBim9jMZ0Yrk8g0N9K7UzYyWnfIKzXBZD5ngpM37ZcL/cv0Mli8XtVMRYMQAfFpi5Q==
-
-caniuse-lite@^1.0.30001524:
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001520, caniuse-lite@^1.0.30001524, caniuse-lite@^1.0.30001579:
   version "1.0.30001626"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001626.tgz#328623664a28493b4a9019af7ce03ea39fbe898c"
   integrity sha512-JRW7kAH8PFJzoPCJhLSHgDgKg5348hsQ68aqb+slnzuB5QFERv846oA/mRChmlLAOdEDeOkRn3ynb1gSFnjt3w==
 
-caniuse-lite@^1.0.30001579:
-  version "1.0.30001617"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001617.tgz#809bc25f3f5027ceb33142a7d6c40759d7a901eb"
-  integrity sha512-mLyjzNI9I+Pix8zwcrpxEbGlfqOkF9kM3ptzmKNw5tizSyYwMe+nGLTqMK9cO+0E+Bh6TsBxNAaHWEM8xwSsmA==
-
 capital-case@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/capital-case/-/capital-case-1.0.4.tgz#9d130292353c9249f6b00fa5852bee38a717e669"
@@ -20184,11 +20174,11 @@ next-tick@^1.1.0:
   integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
 
 next@^14.2.3:
-  version "14.2.3"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.3.tgz#f117dd5d5f20c307e7b8e4f9c1c97d961008925d"
-  integrity sha512-dowFkFTR8v79NPJO4QsBUtxv0g9BrS/phluVpMAt2ku7H+cbcBJlopXjkWlwxrk/xGqMemr7JkGPGemPrLLX7A==
+  version "14.2.10"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6"
+  integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==
   dependencies:
-    "@next/env" "14.2.3"
+    "@next/env" "14.2.10"
     "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
@@ -20196,15 +20186,15 @@ next@^14.2.3:
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.3"
-    "@next/swc-darwin-x64" "14.2.3"
-    "@next/swc-linux-arm64-gnu" "14.2.3"
-    "@next/swc-linux-arm64-musl" "14.2.3"
-    "@next/swc-linux-x64-gnu" "14.2.3"
-    "@next/swc-linux-x64-musl" "14.2.3"
-    "@next/swc-win32-arm64-msvc" "14.2.3"
-    "@next/swc-win32-ia32-msvc" "14.2.3"
-    "@next/swc-win32-x64-msvc" "14.2.3"
+    "@next/swc-darwin-arm64" "14.2.10"
+    "@next/swc-darwin-x64" "14.2.10"
+    "@next/swc-linux-arm64-gnu" "14.2.10"
+    "@next/swc-linux-arm64-musl" "14.2.10"
+    "@next/swc-linux-x64-gnu" "14.2.10"
+    "@next/swc-linux-x64-musl" "14.2.10"
+    "@next/swc-win32-arm64-msvc" "14.2.10"
+    "@next/swc-win32-ia32-msvc" "14.2.10"
+    "@next/swc-win32-x64-msvc" "14.2.10"
 
 ni18n@^1.1.0:
   version "1.1.0"
@@ -22121,7 +22111,7 @@ postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.31, postcss@^8.4.14, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.24:
+postcss@8.4.31:
   version "8.4.31"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.31.tgz#92b451050a9f914da6755af352bdc0192508656d"
   integrity sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==
@@ -22130,7 +22120,7 @@ postcss@8.4.31, postcss@^8.4.14, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
-postcss@^8.4.33:
+postcss@^8.4.14, postcss@^8.4.19, postcss@^8.4.21, postcss@^8.4.23, postcss@^8.4.24, postcss@^8.4.33:
   version "8.4.38"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.38.tgz#b387d533baf2054288e337066d81c6bee9db9e0e"
   integrity sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==
@@ -24684,7 +24674,16 @@ string-to-color@^2.2.2:
     lodash.words "^4.2.0"
     rgb-hex "^3.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -24794,7 +24793,14 @@ stringify-object@^3.3.0:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -26844,7 +26850,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -26862,6 +26868,15 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

From 5fc2a41dc89635dcd4803b42c00ae795463e3d8b Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Wed, 18 Sep 2024 18:24:15 +0200
Subject: [PATCH 2/8] fix: update the working time planned only when the
 selected plan has been changed

---
 .../lib/features/daily-plan/add-task-estimation-hours-modal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
index 92acf67a9..116f58b74 100644
--- a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
@@ -221,7 +221,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	// Update the working planned time
 	useEffect(() => {
 		setWorkTimePlanned(plan.workTimePlanned);
-	}, [plan]);
+	}, [plan.id, plan.workTimePlanned]);
 
 	const StartWorkingButton = (
 		<Button

From 41cf9eba892711bc770ba733c18d69463a818123 Mon Sep 17 00:00:00 2001
From: Innocent-akim <gentilakili98@gmail.com>
Date: Wed, 18 Sep 2024 22:57:37 +0200
Subject: [PATCH 3/8] fix: typing error member items lists

---
 .../manual-time/add-manual-time-modal.tsx     | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
index 490d14ce3..61a473a44 100644
--- a/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
+++ b/apps/web/lib/features/manual-time/add-manual-time-modal.tsx
@@ -144,10 +144,11 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 	}, [addManualTimeLoading, closeModal, timeLog]);
 
 	const memberItemsLists = {
-		Project: activeTeam?.projects,
-		Employee: activeTeam?.members,
+		Project: activeTeam?.projects as [],
+		Employee: activeTeam?.members as [],
 		Task: tasks
 	};
+
 	const selectedValues = {
 		Teams: null,
 		Members: null,
@@ -164,15 +165,15 @@ export function AddManualTimeModal(props: IAddManualTimeModalProps) {
 		},
 		...(timeSheetStatus === 'ManagerTimesheet'
 			? [
-					{
-						label: t('manualTime.EMPLOYEE'),
-						placeholder: 'Select an employee',
-						isRequired: true,
-						valueKey: 'id',
-						displayKey: 'employee.fullName',
-						element: 'Employee'
-					}
-				]
+				{
+					label: t('manualTime.EMPLOYEE'),
+					placeholder: 'Select an employee',
+					isRequired: true,
+					valueKey: 'id',
+					displayKey: 'employee.fullName',
+					element: 'Employee'
+				}
+			]
 			: []),
 		{
 			label: t('manualTime.TASK'),

From a6b7ade960d55a57ba5b8845094be473c0f327a9 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 19 Sep 2024 12:21:02 +0200
Subject: [PATCH 4/8] refactor: use 'Calendar' / 'Plans' instead of 'Future' /
 'Future Plan'

---
 .../features/daily-plan/all-plans-modal.tsx    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/apps/web/lib/features/daily-plan/all-plans-modal.tsx b/apps/web/lib/features/daily-plan/all-plans-modal.tsx
index b12cf295f..1744d094b 100644
--- a/apps/web/lib/features/daily-plan/all-plans-modal.tsx
+++ b/apps/web/lib/features/daily-plan/all-plans-modal.tsx
@@ -16,6 +16,8 @@ interface IAllPlansModal {
 	isOpen: boolean;
 }
 
+type CalendarTab = 'Today' | 'Tomorrow' | 'Calendar';
+
 /**
  * A modal that displays all the plans available to the user (Today, Tomorrow and Future).
  *
@@ -62,15 +64,15 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 	}, [closeModal]);
 
 	// Define tabs for plan selection
-	const tabs = useMemo(() => ['Today', 'Tomorrow', 'Future'], []);
+	const tabs: CalendarTab[] = useMemo(() => ['Today', 'Tomorrow', 'Calendar'], []);
 
 	// State to track the active tab
 	const [selectedTab, setSelectedTab] = useState(tabs[0]);
 
 	// Handle tab switching
-	const handleTabClick = (tab: string) => {
+	const handleTabClick = (tab: CalendarTab) => {
 		setSelectedTab(tab);
-		setShowCalendar(tab === 'Future');
+		setShowCalendar(tab === 'Calendar');
 		setShowCustomPlan(false);
 	};
 
@@ -81,7 +83,7 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 				return todayPlan;
 			case 'Tomorrow':
 				return tomorrowPlan;
-			case 'Future':
+			case 'Calendar':
 				return selectedFuturePlan;
 			default:
 				return undefined;
@@ -112,7 +114,7 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 			<Card className="w-full  h-full overflow-hidden" shadow="custom">
 				<div className="w-full flex flex-col gap-3 ">
 					<div className="relative w-full h-12  flex items-center justify-center">
-						{selectedTab === 'Future' && showCustomPlan && (
+						{selectedTab === 'Calendar' && showCustomPlan && (
 							<Tooltip label="Go back to the calendar">
 								<button
 									onClick={() => {
@@ -130,10 +132,10 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 						)}
 
 						<Text.Heading as="h3" className="uppercase text-center">
-							{selectedTab == 'Future'
+							{selectedTab == 'Calendar'
 								? showCustomPlan && selectedFuturePlan
 									? `PLAN FOR ${new Date(selectedFuturePlan.date).toLocaleDateString('en-GB')}`
-									: `${selectedTab} PLAN`
+									: `PLANS`
 								: `${selectedTab}'S PLAN`}
 						</Text.Heading>
 					</div>
@@ -153,7 +155,7 @@ export const AllPlansModal = memo(function AllPlansModal(props: IAllPlansModal)
 					</div>
 
 					<div className="w-full flex   items-center justify-center h-[34rem]">
-						{selectedTab === 'Future' && showCalendar ? (
+						{selectedTab === 'Calendar' && showCalendar ? (
 							<div className="w-full h-full flex-col flex items-center justify-between">
 								<div className="w-full grow">
 									<div className="w-full h-full flex flex-col gap-4 items-center justify-center">

From ceb1058cd5771d8317fdc604408951a6c70144a3 Mon Sep 17 00:00:00 2001
From: "Thierry CH." <thierrybakera12@gmail.com>
Date: Thu, 19 Sep 2024 18:49:30 +0200
Subject: [PATCH 5/8] refactor: use last selected option on the create day plan
 modal (#3017)

* refactor: use last selected option on the create day plan modal

* center the loading icon

* update the lastSelected option onSelect
---
 apps/web/app/constants.ts                     |  1 +
 .../create-daily-plan-form-modal.tsx          | 81 +++++++++++--------
 2 files changed, 49 insertions(+), 33 deletions(-)

diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
index 82adf0d6b..796a3d032 100644
--- a/apps/web/app/constants.ts
+++ b/apps/web/app/constants.ts
@@ -284,6 +284,7 @@ export const DAILY_PLAN_SUGGESTION_MODAL_DATE = 'daily-plan-suggestion-modal-dat
 export const TASKS_ESTIMATE_HOURS_MODAL_DATE = 'tasks-estimate-hours-modal-date';
 export const DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE = 'daily-plan-estimate-hours-modal';
 export const DEFAULT_PLANNED_TASK_ID = 'default-planned-task-id';
+export const LAST_OPTION__CREATE_DAILY_PLAN_MODAL = 'last-option--create-daily-plan-modal';
 
 // OAuth provider's keys
 
diff --git a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
index f3ca4f409..282ef542a 100644
--- a/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
+++ b/apps/web/lib/features/daily-plan/create-daily-plan-form-modal.tsx
@@ -15,6 +15,7 @@ import stc from 'string-to-color';
 import { Check } from 'lucide-react';
 import { cn } from 'lib/utils';
 import { MdOutlineKeyboardArrowDown } from 'react-icons/md';
+import { LAST_OPTION__CREATE_DAILY_PLAN_MODAL } from '@app/constants';
 
 export function CreateDailyPlanFormModal({
 	open,
@@ -35,6 +36,9 @@ export function CreateDailyPlanFormModal({
 	const { user } = useAuthenticateUser();
 	const { activeTeam, activeTeamManagers } = useOrganizationTeams();
 	const { createDailyPlan, createDailyPlanLoading, profileDailyPlans } = useDailyPlan();
+	const latestOption: 'Select' | 'Select & Close' | null = window.localStorage.getItem(
+		LAST_OPTION__CREATE_DAILY_PLAN_MODAL
+	) as 'Select' | 'Select & Close';
 
 	const existingPlanDates = useMemo(
 		() => profileDailyPlans.items.map((plan) => new Date(plan.date)),
@@ -60,11 +64,15 @@ export function CreateDailyPlanFormModal({
 
 	const handleSelect = useCallback(() => {
 		reset();
+		window.localStorage.setItem(LAST_OPTION__CREATE_DAILY_PLAN_MODAL, 'Select');
 	}, [reset]);
 
 	const handleSelectAndClose = useCallback(() => {
-		handleCloseModal();
-	}, [handleCloseModal]);
+		if (!createDailyPlanLoading) {
+			handleCloseModal();
+		}
+		window.localStorage.setItem(LAST_OPTION__CREATE_DAILY_PLAN_MODAL, 'Select & Close');
+	}, [createDailyPlanLoading, handleCloseModal]);
 
 	const onSubmit = useCallback(
 		async (values: any) => {
@@ -99,6 +107,12 @@ export function CreateDailyPlanFormModal({
 		]
 	);
 
+	// Use the last selected option if there is one
+	const lastSelectedOption = useMemo(
+		() => (latestOption ? (latestOption == 'Select' ? handleSelect : handleSelectAndClose) : handleSelectAndClose),
+		[handleSelect, handleSelectAndClose, latestOption]
+	);
+
 	return (
 		<Modal isOpen={open} closeModal={handleCloseModal}>
 			<form className="w-[98%] md:w-[430px] relative" autoComplete="off" onSubmit={handleSubmit(onSubmit)}>
@@ -112,7 +126,7 @@ export function CreateDailyPlanFormModal({
 						</div>
 
 						{/* Form Fields */}
-						<div className="flex flex-col w-full gap-3">
+						<div className="flex flex-col w-full gap-6">
 							{chooseMember && isManagerConnectedUser && (
 								<MembersList
 									activeTeam={activeTeam}
@@ -121,15 +135,6 @@ export function CreateDailyPlanFormModal({
 								/>
 							)}
 
-							{/* <InputField
-								type="number"
-								placeholder="Working time to plan"
-								className="mb-0 min-w-[350px]"
-								wrapperClassName="mb-0 rounded-lg"
-								// required
-								{...register('workTimePlanned')}
-							/> */}
-
 							{planMode === 'custom' && (
 								<div className="flex justify-center w-full">
 									<CustomCalendar
@@ -139,40 +144,50 @@ export function CreateDailyPlanFormModal({
 									/>
 								</div>
 							)}
-							<div className={clsxm(planMode === 'custom' ? 'flex justify-between gap-5' : '')}>
+							<div className={clsxm(planMode === 'custom' ? 'flex justify-between gap-5 h-10' : '')}>
 								<Button
 									variant="outline"
 									type="button"
-									className="px-7 py-4 font-normal rounded-xl text-md"
+									className="px-7 py-4 w-36 font-light rounded-md"
 									onClick={() => closeModal()}
 								>
 									Cancel
 								</Button>
-								<div className="relative w-40  inline-block text-left">
-									<Button
-										type="button"
-										className={clsxm(
-											'font-normal flex items-center justify-between w-full rounded-xl text-md',
-											createDailyPlanLoading ? 'justify-center' : 'justify-between'
-										)}
-										onClick={() => setIsOpen(!isOpen)}
-									>
-										{createDailyPlanLoading ? (
-											<ReloadIcon className="animate-spin mr-2 h-4 w-4" />
-										) : (
-											<>
-												<span>Select date</span>
+								<div
+									className={clsxm(
+										'w-40 relative font-medium h-full text-xs bg-primary  cursor-pointer inline-block items-center rounded-md border text-left'
+									)}
+								>
+									{createDailyPlanLoading ? (
+										<div className="w-full h-full flex items-center justify-center">
+											<ReloadIcon className="animate-spin text-white h-4 w-4" />
+										</div>
+									) : (
+										<div className="w-full  h-full items-center overflow-hidden justify-between flex">
+											<Button
+												onClick={lastSelectedOption}
+												className="w-full text-sm text-white h-full font-light flex items-center justify-center "
+											>
+												{latestOption ?? 'Select & close'}
+											</Button>
+
+											<div
+												onClick={() => setIsOpen(!isOpen)}
+												className=" flex items-center text-white justify-center w-8 h-full border-l"
+											>
 												<MdOutlineKeyboardArrowDown
+													size={10}
 													className={cn(
-														'h-6 w-6 transition-transform',
+														'w-6 h-6 flex items-center justify-center transition-transform font-light',
 														isOpen && 'rotate-180'
 													)}
 												/>
-											</>
-										)}
-									</Button>
+											</div>
+										</div>
+									)}
+
 									{isOpen && (
-										<div className="absolute right-0 w-full mt-2 p-2 origin-top-right bg-white divide-y divide-gray-100 rounded-md shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
+										<div className="absolute z-5 right-0 w-full mt-2 p-2 origin-top-right bg-white divide-y divide-gray-100 rounded-md shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none">
 											<div className="flex w-full flex-col items-center gap-1">
 												<Button
 													disabled={createDailyPlanLoading}

From 78df680548f8658a2dde156a833ee78f6bdcc3d6 Mon Sep 17 00:00:00 2001
From: "Thierry CH." <thierrybakera12@gmail.com>
Date: Thu, 19 Sep 2024 18:52:14 +0200
Subject: [PATCH 6/8] feat: disable actions on all past plans (#3050)

---
 .../add-task-estimation-hours-modal.tsx       | 207 ++++++++++++------
 1 file changed, 141 insertions(+), 66 deletions(-)

diff --git a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
index 116f58b74..8d57812f8 100644
--- a/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
+++ b/apps/web/lib/features/daily-plan/add-task-estimation-hours-modal.tsx
@@ -20,6 +20,7 @@ import { TaskDetailsModal } from './task-details-modal';
 import { Popover, Transition } from '@headlessui/react';
 import { ScrollArea, ScrollBar } from '@components/ui/scroll-bar';
 import { Cross2Icon } from '@radix-ui/react-icons';
+import { checkPastDate } from 'lib/utils';
 
 /**
  * A modal that allows user to add task estimation / planned work time, etc.
@@ -58,6 +59,15 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 	const currentDate = useMemo(() => new Date().toISOString().split('T')[0], []);
 	const requirePlan = useMemo(() => activeTeam?.requirePlanToTrack, [activeTeam?.requirePlanToTrack]);
 	const tasksEstimationTimes = useMemo(() => estimatedTotalTime(plan.tasks).timesEstimated / 3600, [plan.tasks]);
+	const totalWorkedTime = useMemo(
+		() =>
+			plan.tasks?.reduce((acc, cur) => {
+				const totalWorkedTime = cur.totalWorkedTime ?? 0;
+
+				return acc + totalWorkedTime;
+			}, 0),
+		[plan]
+	);
 	const [warning, setWarning] = useState('');
 	const [loading, setLoading] = useState(false);
 	const [defaultTask, setDefaultTask] = useState<ITeamTask | null>(null);
@@ -261,44 +271,76 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 						selectedPlan={plan}
 					/>
 				) : (
-					<div className=" w-full flex flex-col gap-2">
-						<span className="text-sm">
-							{t('timer.todayPlanSettings.WORK_TIME_PLANNED')} <span className="text-red-600">*</span>
-						</span>
-						<div className="w-full flex gap-3 h-[3rem]">
-							<InputField
-								type="number"
-								placeholder={t('timer.todayPlanSettings.WORK_TIME_PLANNED_PLACEHOLDER')}
-								className="h-full"
-								wrapperClassName=" h-full"
-								onChange={(e) => {
-									!isNaN(parseInt(e.target.value))
-										? setWorkTimePlanned(parseInt(e.target.value))
-										: setWorkTimePlanned(0);
-								}}
-								required
-								noWrapper
-								min={0}
-								value={
-									!isNaN(workTimePlanned) && workTimePlanned.toString() !== '0'
-										? workTimePlanned.toString().replace(/^0+/, '')
-										: isWorkingTimeInputFocused
-											? ''
-											: 0
-								}
-								onFocus={() => setWorkingTimeInputFocused(true)}
-								onBlur={() => setWorkingTimeInputFocused(false)}
-								defaultValue={plan.workTimePlanned ? parseInt(plan.workTimePlanned.toString()) : 0}
-							/>
-							<button
-								onClick={() => {
-									setShowSearchInput(true);
-								}}
-								className="h-full shrink-0 rounded-lg border w-10 flex items-center justify-center"
-							>
-								<AddIcon className="w-4 h-4 text-dark dark:text-white" />
-							</button>
+					<div
+						className={clsxm(
+							'w-full',
+							checkPastDate(plan.date) && 'flex items-center justify-between gap-2'
+						)}
+					>
+						<div className=" w-full flex flex-col gap-2">
+							{checkPastDate(plan.date) ? (
+								<span className="text-sm">{t('dailyPlan.PLANNED_TIME')}</span>
+							) : (
+								<span className="text-sm">
+									{t('timer.todayPlanSettings.WORK_TIME_PLANNED')}{' '}
+									<span className="text-red-600">*</span>
+								</span>
+							)}
+							<div className="w-full flex gap-3 h-[3rem]">
+								{checkPastDate(plan.date) ? (
+									<div className="w-full border rounded-lg px-3 items-center flex gap-3 h-full">
+										{formatIntegerToHour(tasksEstimationTimes)}
+									</div>
+								) : (
+									<InputField
+										type="number"
+										placeholder={t('timer.todayPlanSettings.WORK_TIME_PLANNED_PLACEHOLDER')}
+										className="h-full"
+										wrapperClassName=" h-full"
+										onChange={(e) => {
+											!isNaN(parseInt(e.target.value))
+												? setWorkTimePlanned(parseInt(e.target.value))
+												: setWorkTimePlanned(0);
+										}}
+										required
+										noWrapper
+										min={0}
+										value={
+											!isNaN(workTimePlanned) && workTimePlanned.toString() !== '0'
+												? workTimePlanned.toString().replace(/^0+/, '')
+												: isWorkingTimeInputFocused
+													? ''
+													: 0
+										}
+										onFocus={() => setWorkingTimeInputFocused(true)}
+										onBlur={() => setWorkingTimeInputFocused(false)}
+										defaultValue={
+											plan.workTimePlanned ? parseInt(plan.workTimePlanned.toString()) : 0
+										}
+										readOnly={checkPastDate(plan.date)}
+									/>
+								)}
+
+								{!checkPastDate(plan.date) && (
+									<button
+										onClick={() => {
+											setShowSearchInput(true);
+										}}
+										className="h-full shrink-0 rounded-lg border w-10 flex items-center justify-center"
+									>
+										<AddIcon className="w-4 h-4 text-dark dark:text-white" />
+									</button>
+								)}
+							</div>
 						</div>
+						{checkPastDate(plan.date) && (
+							<div className=" w-full flex flex-col gap-2">
+								<span className="text-sm">Tracked time</span>
+								<div className="w-full border rounded-lg px-3 items-center flex gap-3 h-[3rem]">
+									{formatIntegerToHour(totalWorkedTime ?? 0)}
+								</div>
+							</div>
+						)}
 					</div>
 				)}
 
@@ -308,10 +350,14 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 							<div className="w-full flex items-center justify-between gap-2">
 								<div className="flex items-center justify-center gap-1">
 									<span>{t('task.TITLE_PLURAL')}</span>
-									<span className="text-red-600">*</span>
+									{!checkPastDate(plan.date) && <span className="text-red-600">*</span>}
 								</div>
 								<div className="flex items-center justify-center gap-1">
-									<span>{t('dailyPlan.TOTAL_ESTIMATED')} :</span>
+									{checkPastDate(plan.date) ? (
+										<span>{t('dailyPlan.ESTIMATED')} :</span>
+									) : (
+										<span>{t('dailyPlan.TOTAL_ESTIMATED')} :</span>
+									)}
 									<span className=" font-medium">{formatIntegerToHour(tasksEstimationTimes)}</span>
 								</div>
 							</div>
@@ -333,7 +379,7 @@ export function AddTasksEstimationHoursModal(props: IAddTasksEstimationHoursModa
 							</div>
 						</div>
 						<div className="flex gap-2 items-center text-sm h-6 text-red-500">
-							{warning && (
+							{!checkPastDate(plan.date) && warning && (
 								<>
 									<PiWarningCircleFill />
 									<span className=" text-xs">{warning}</span>
@@ -584,6 +630,8 @@ function TaskCard(props: ITaskCardProps) {
 
 	const t = useTranslations();
 
+	const status = useTaskStatus();
+
 	/**
 	 * The function that adds the task to the selected plan
 	 */
@@ -599,11 +647,13 @@ function TaskCard(props: ITaskCardProps) {
 		}
 	}, [addTaskToPlan, plan.id, task.id]);
 
+	console.log(status.taskStatus);
+
 	return (
 		<Card
 			shadow="custom"
 			className={clsx(
-				'lg:flex  items-center justify-between py-3  md:px-4 hidden min-h-[4.5rem] w-full h-[4.5rem] dark:bg-[#1E2025] border-[0.05rem] dark:border-[#FFFFFF0D] relative !text-xs cursor-pointer',
+				'lg:flex  items-center gap-2 justify-between py-3  md:px-4 hidden min-h-[4.5rem] w-full h-[4.5rem] dark:bg-[#1E2025] border-[0.05rem] dark:border-[#FFFFFF0D] relative !text-xs cursor-pointer',
 				isTaskRenderedInTodayPlan && isDefaultTask && 'border-primary-light border-[0.15rem]'
 			)}
 		>
@@ -626,8 +676,22 @@ function TaskCard(props: ITaskCardProps) {
 					</Button>
 				) : (
 					<>
-						<div className="h-full flex items-center justify-center gap-1">
-							<span>{t('dailyPlan.ESTIMATED')} :</span> <TaskEstimate _task={task} />
+						<div className="h-full flex w-full items-center justify-between gap-1">
+							{checkPastDate(plan.date) ? (
+								<span
+									className="h-6 w-28 flex items-center justify-center"
+									style={{
+										backgroundColor: status.taskStatus.filter((s) => s.value === task.status)[0]
+											.color
+									}}
+								>
+									{task.status}
+								</span>
+							) : (
+								<span>{t('dailyPlan.ESTIMATED')} :</span>
+							)}
+
+							<TaskEstimate showEditAndSaveButton={!checkPastDate(plan.date)} _task={task} />
 						</div>
 						<span className="w-4 h-full flex items-center justify-center">
 							<TaskCardActions
@@ -713,33 +777,44 @@ function TaskCardActions(props: ITaskCardActionsProps) {
 						return (
 							<Card shadow="custom" className=" shadow-xlcard  !p-3 !rounded-lg !border-2">
 								<ul className=" flex flex-col justify-end gap-3">
-									<li onClick={openTaskDetailsModal} className="">
+									<li
+										onClick={openTaskDetailsModal}
+										className={clsxm('hover:font-semibold hover:transition-all')}
+									>
 										View
 									</li>
-									<li className={clsxm('hover:font-semibold hover:transition-all')}>Edit</li>
-
-									{selectedPlan && selectedPlan.id && (
-										<li>
-											{otherPlanIds.length ? (
-												<UnplanTask
-													taskId={task.id}
-													selectedPlanId={selectedPlan.id}
-													planIds={[selectedPlan.id, ...otherPlanIds]}
-													closeActionPopover={close}
-												/>
-											) : (
-												<span
-													onClick={() => unplanSelectedDate(close)}
-													className={clsxm(
-														' text-red-600',
-														!removeTaskFromPlanLoading &&
-															' hover:font-semibold hover:transition-all'
+									{checkPastDate(selectedPlan.date) ? null : (
+										<>
+											<li className={clsxm('hover:font-semibold hover:transition-all')}>Edit</li>
+
+											{selectedPlan.id && (
+												<li>
+													{otherPlanIds.length ? (
+														<UnplanTask
+															taskId={task.id}
+															selectedPlanId={selectedPlan.id}
+															planIds={[selectedPlan.id, ...otherPlanIds]}
+															closeActionPopover={close}
+														/>
+													) : (
+														<span
+															onClick={() => unplanSelectedDate(close)}
+															className={clsxm(
+																' text-red-600',
+																!removeTaskFromPlanLoading &&
+																	' hover:font-semibold hover:transition-all'
+															)}
+														>
+															{removeTaskFromPlanLoading ? (
+																<SpinnerLoader size={10} />
+															) : (
+																'Unplan'
+															)}
+														</span>
 													)}
-												>
-													{removeTaskFromPlanLoading ? <SpinnerLoader size={10} /> : 'Unplan'}
-												</span>
+												</li>
 											)}
-										</li>
+										</>
 									)}
 								</ul>
 							</Card>

From 3feb12192b4732d66bf5fdcd425cb1c7c57dbf55 Mon Sep 17 00:00:00 2001
From: "Gloire Mutaliko (Salva)"
 <86450367+GloireMutaliko21@users.noreply.github.com>
Date: Thu, 19 Sep 2024 18:52:36 +0200
Subject: [PATCH 7/8] fix: daily plans finders by team ID (#2973)

Co-authored-by: cedric karungu <ckarungu921@gmail.com>
---
 apps/web/app/api/daily-plan/[id]/route.ts     | 12 +++-
 apps/web/app/api/daily-plan/me/route.ts       | 12 +++-
 apps/web/app/api/daily-plan/route.ts          | 12 +++-
 .../app/api/daily-plan/task/[taskId]/route.ts | 12 +++-
 .../app/hooks/features/useAuthTeamTasks.ts    |  2 +-
 apps/web/app/hooks/features/useDailyPlan.ts   |  4 +-
 apps/web/app/interfaces/index.ts              |  3 +-
 .../web/app/services/client/api/daily-plan.ts | 29 +++++----
 .../services/server/requests/daily-plan.ts    | 60 +++++++++++++------
 apps/web/lib/app/init-state.tsx               |  6 +-
 .../task/daily-plan/task-estimated-count.tsx  |  9 +--
 apps/web/lib/features/task/task-filters.tsx   | 10 ++--
 12 files changed, 123 insertions(+), 48 deletions(-)

diff --git a/apps/web/app/api/daily-plan/[id]/route.ts b/apps/web/app/api/daily-plan/[id]/route.ts
index 121c01bae..85b714044 100644
--- a/apps/web/app/api/daily-plan/[id]/route.ts
+++ b/apps/web/app/api/daily-plan/[id]/route.ts
@@ -10,14 +10,22 @@ export async function GET(req: Request, { params }: INextParams) {
 		return;
 	}
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 	if (!user) return $res('Unauthorized');
 
 	const response = await getDayPlansByEmployee({
 		bearer_token: access_token,
 		employeeId: id,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);
diff --git a/apps/web/app/api/daily-plan/me/route.ts b/apps/web/app/api/daily-plan/me/route.ts
index 0624e2d6a..bcb6e6df7 100644
--- a/apps/web/app/api/daily-plan/me/route.ts
+++ b/apps/web/app/api/daily-plan/me/route.ts
@@ -5,14 +5,22 @@ import { NextResponse } from 'next/server';
 export async function GET(req: Request) {
 	const res = new NextResponse();
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 
 	if (!user) return $res('Unauthorized');
 
 	const response = await getMyDailyPlansRequest({
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);
diff --git a/apps/web/app/api/daily-plan/route.ts b/apps/web/app/api/daily-plan/route.ts
index e186506c8..fd3b0dfe3 100644
--- a/apps/web/app/api/daily-plan/route.ts
+++ b/apps/web/app/api/daily-plan/route.ts
@@ -19,13 +19,21 @@ export async function POST(req: Request) {
 export async function GET(req: Request) {
 	const res = new NextResponse();
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 	if (!user) return $res('Unauthorized');
 
 	const response = await getAllDayPlans({
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);
diff --git a/apps/web/app/api/daily-plan/task/[taskId]/route.ts b/apps/web/app/api/daily-plan/task/[taskId]/route.ts
index 3ee5a4878..b5f696ecb 100644
--- a/apps/web/app/api/daily-plan/task/[taskId]/route.ts
+++ b/apps/web/app/api/daily-plan/task/[taskId]/route.ts
@@ -10,7 +10,14 @@ export async function GET(req: Request, { params }: INextParams) {
 		return;
 	}
 
-	const { $res, user, tenantId, organizationId, access_token } = await authenticatedGuard(req, res);
+	const {
+		$res,
+		user,
+		tenantId,
+		organizationId,
+		teamId: organizationTeamId,
+		access_token
+	} = await authenticatedGuard(req, res);
 
 	if (!user) return $res('Unauthorized');
 
@@ -18,7 +25,8 @@ export async function GET(req: Request, { params }: INextParams) {
 		taskId,
 		bearer_token: access_token,
 		organizationId,
-		tenantId
+		tenantId,
+		organizationTeamId
 	});
 
 	return $res(response.data);
diff --git a/apps/web/app/hooks/features/useAuthTeamTasks.ts b/apps/web/app/hooks/features/useAuthTeamTasks.ts
index 79650d83f..19c4be674 100644
--- a/apps/web/app/hooks/features/useAuthTeamTasks.ts
+++ b/apps/web/app/hooks/features/useAuthTeamTasks.ts
@@ -29,7 +29,7 @@ export function useAuthTeamTasks(user: IUser | undefined) {
 
 	const planned = useMemo(() => {
 		const outStandingTasksCount = estimatedTotalTime(
-			outstandingPlans.map((plan) => plan.tasks?.map((task) => task))
+			outstandingPlans?.map((plan) => plan.tasks?.map((task) => task))
 		).totalTasks;
 
 		const todayTasksCOunt = getTotalTasks(todayPlan);
diff --git a/apps/web/app/hooks/features/useDailyPlan.ts b/apps/web/app/hooks/features/useDailyPlan.ts
index a8be0524c..611475022 100644
--- a/apps/web/app/hooks/features/useDailyPlan.ts
+++ b/apps/web/app/hooks/features/useDailyPlan.ts
@@ -301,6 +301,7 @@ export function useDailyPlan() {
 		);
 	}, [profileDailyPlans]);
 
+
 	const todayTasks = useMemo(() => {
 		return todayPlan
 			.map((plan) => {
@@ -355,8 +356,9 @@ export function useDailyPlan() {
 		if (firstLoad) {
 			getMyDailyPlans();
 			getAllDayPlans();
+			getEmployeeDayPlans(user?.employee.id || '');
 		}
-	}, [getMyDailyPlans, getAllDayPlans, firstLoad]);
+	}, [getMyDailyPlans, activeTeam?.id, getAllDayPlans, firstLoad, getEmployeeDayPlans, user?.employee.id]);
 
 	return {
 		dailyPlan,
diff --git a/apps/web/app/interfaces/index.ts b/apps/web/app/interfaces/index.ts
index c2a823b22..7f0e71466 100644
--- a/apps/web/app/interfaces/index.ts
+++ b/apps/web/app/interfaces/index.ts
@@ -33,7 +33,8 @@ export * from './ITheme';
 export * from './IRolePermissions';
 export * from './ITimer';
 export * from './IProject';
-export * from './ILiveKiteCredentials'
+export * from './ILiveKiteCredentials';
+export * from './IBaseModel';
 
 export * from './integrations/IGithubRepositories';
 export * from './integrations/IGithubMetadata';
diff --git a/apps/web/app/services/client/api/daily-plan.ts b/apps/web/app/services/client/api/daily-plan.ts
index 7ae9886d7..3a5a09d6e 100644
--- a/apps/web/app/services/client/api/daily-plan.ts
+++ b/apps/web/app/services/client/api/daily-plan.ts
@@ -3,23 +3,26 @@ import { deleteApi, get, post, put } from '../axios';
 import {
 	DeleteResponse,
 	ICreateDailyPlan,
+	ID,
 	IDailyPlan,
 	IDailyPlanTasksUpdate,
 	IRemoveTaskFromManyPlans,
 	IUpdateDailyPlan,
 	PaginationResponse
 } from '@app/interfaces';
-import { getOrganizationIdCookie, getTenantIdCookie } from '@app/helpers';
+import { getActiveTeamIdCookie, getOrganizationIdCookie, getTenantIdCookie } from '@app/helpers';
 
-export function getAllDayPlansAPI() {
+export function getAllDayPlansAPI(activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -30,15 +33,17 @@ export function getAllDayPlansAPI() {
 	return get<PaginationResponse<IDailyPlan>>(`/daily-plan?${query}`, { tenantId });
 }
 
-export function getMyDailyPlansAPI() {
+export function getMyDailyPlansAPI(activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -49,15 +54,17 @@ export function getMyDailyPlansAPI() {
 	return get<PaginationResponse<IDailyPlan>>(`/daily-plan/me?${query}`, { tenantId });
 }
 
-export function getDayPlansByEmployeeAPI(employeeId?: string) {
+export function getDayPlansByEmployeeAPI(employeeId?: string, activeTeamId?: ID) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user'];
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': activeTeamId || organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -71,10 +78,12 @@ export function getDayPlansByEmployeeAPI(employeeId?: string) {
 export function getPlansByTaskAPI(taskId?: string) {
 	const organizationId = getOrganizationIdCookie();
 	const tenantId = getTenantIdCookie();
+	const organizationTeamId = getActiveTeamIdCookie();
 
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	const query = qs.stringify(obj);
@@ -106,9 +115,9 @@ export function removeTaskFromPlanAPI(data: IDailyPlanTasksUpdate, planId: strin
 	return put<IDailyPlan>(`/daily-plan/${planId}/task`, { ...data, organizationId }, { tenantId });
 }
 
-export function removeManyTaskFromPlansAPI({ taskId, data }: { taskId: string, data: IRemoveTaskFromManyPlans }) {
+export function removeManyTaskFromPlansAPI({ taskId, data }: { taskId: string; data: IRemoveTaskFromManyPlans }) {
 	const organizationId = getOrganizationIdCookie();
-	return put<IDailyPlan[]>(`/daily-plan/${taskId}/remove`, { ...data, organizationId })
+	return put<IDailyPlan[]>(`/daily-plan/${taskId}/remove`, { ...data, organizationId });
 }
 
 export function deleteDailyPlanAPI(planId: string) {
diff --git a/apps/web/app/services/server/requests/daily-plan.ts b/apps/web/app/services/server/requests/daily-plan.ts
index cfe4655c7..1470e5c11 100644
--- a/apps/web/app/services/server/requests/daily-plan.ts
+++ b/apps/web/app/services/server/requests/daily-plan.ts
@@ -1,22 +1,31 @@
 import qs from 'qs';
-import { ICreateDailyPlan, IDailyPlan, IDailyPlanTasksUpdate, IRemoveTaskFromManyPlans, IUpdateDailyPlan } from '@app/interfaces/IDailyPlan';
+import {
+	ICreateDailyPlan,
+	IDailyPlan,
+	IDailyPlanTasksUpdate,
+	IRemoveTaskFromManyPlans,
+	IUpdateDailyPlan
+} from '@app/interfaces/IDailyPlan';
 import { serverFetch } from '../fetch';
-import { DeleteResponse } from '@app/interfaces';
+import { DeleteResponse, ID } from '@app/interfaces';
 
 export function getAllDayPlans({
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -35,17 +44,20 @@ export function getAllDayPlans({
 export function getMyDailyPlansRequest({
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -65,18 +77,21 @@ export function getDayPlansByEmployee({
 	employeeId,
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token,
 	relations = ['employee', 'tasks', 'employee.user', 'tasks.members', 'tasks.members.user']
 }: {
-	employeeId: string;
-	organizationId: string;
-	tenantId: string;
+	employeeId: ID;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 	relations?: string[];
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	relations.forEach((relation, i) => {
@@ -96,16 +111,19 @@ export function getPlansByTask({
 	taskId,
 	organizationId,
 	tenantId,
+	organizationTeamId,
 	bearer_token
 }: {
 	taskId: string;
-	organizationId: string;
-	tenantId: string;
+	organizationId: ID;
+	tenantId: ID;
+	organizationTeamId: ID;
 	bearer_token: string;
 }) {
 	const obj = {
 		'where[organizationId]': organizationId,
-		'where[tenantId]': tenantId
+		'where[tenantId]': tenantId,
+		'where[organizationTeamId]': organizationTeamId
 	} as Record<string, string>;
 
 	const query = qs.stringify(obj);
@@ -203,11 +221,19 @@ export function deleteDailyPlanRequest({ planId, bearer_token }: { planId: strin
 	});
 }
 
-export function deleteDailyPlansManyRequest({ bearer_token, taskId, data }: { bearer_token?: string, taskId: string, data: IRemoveTaskFromManyPlans }) {
+export function deleteDailyPlansManyRequest({
+	bearer_token,
+	taskId,
+	data
+}: {
+	bearer_token?: string;
+	taskId: string;
+	data: IRemoveTaskFromManyPlans;
+}) {
 	return serverFetch<IDailyPlan[]>({
 		method: 'PUT',
 		path: `/daily-plan/${taskId}/remove`,
 		body: data,
-		bearer_token,
+		bearer_token
 	});
 }
diff --git a/apps/web/lib/app/init-state.tsx b/apps/web/lib/app/init-state.tsx
index da6b9bbd4..e2bbf4574 100644
--- a/apps/web/lib/app/init-state.tsx
+++ b/apps/web/lib/app/init-state.tsx
@@ -54,7 +54,7 @@ function InitState() {
 	const { firstLoadIssueTypeData } = useIssueType();
 	const { firstLoadTaskRelatedIssueTypeData, loadTaskRelatedIssueTypeData } = useTaskRelatedIssueType();
 
-	const { firstLoadDailyPlanData } = useDailyPlan();
+	const { firstLoadDailyPlanData, getAllDayPlans, getMyDailyPlans, getEmployeeDayPlans } = useDailyPlan();
 	const { firstLoadTimeLogs } = useTimeLogs();
 
 	const { firstLoadDataEmployee } = useEmployee();
@@ -125,6 +125,10 @@ function InitState() {
 			useRefreshIntervalV2(loadTaskRelatedIssueTypeData, sixty_two_seconds, true);
 			useRefreshIntervalV2(loadTaskVersionData, sixty_two_seconds, true);
 
+			useRefreshIntervalV2(getAllDayPlans, sixty_two_seconds, true);
+			useRefreshIntervalV2(getMyDailyPlans, sixty_two_seconds, true);
+			useRefreshIntervalV2(getEmployeeDayPlans, sixty_two_seconds, true);
+
 			return <></>;
 		};
 		return Component;
diff --git a/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx b/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
index a608cc66f..37940098e 100644
--- a/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
+++ b/apps/web/lib/features/task/daily-plan/task-estimated-count.tsx
@@ -10,7 +10,7 @@ export function TaskEstimatedCount({ outstandingPlans }: ITaskEstimatedCount) {
 	const element = outstandingPlans?.map((plan: IDailyPlan) => plan.tasks?.map((task) => task));
 	const { timesEstimated, totalTasks } = estimatedTotalTime(element || []);
 	const { h: hour, m: minute } = secondsToTime(timesEstimated || 0);
-	const t = useTranslations()
+	const t = useTranslations();
 
 	return (
 		<div className="flex space-x-10">
@@ -31,7 +31,7 @@ export function TaskEstimatedCount({ outstandingPlans }: ITaskEstimatedCount) {
 
 export function estimatedTotalTime(data: any) {
 	// Flatten the data and reduce to calculate the sum of estimates without duplicates
-	const uniqueTasks = data.flat().reduce((acc: any, task: any) => {
+	const uniqueTasks = data?.flat().reduce((acc: any, task: any) => {
 		if (!acc[task.id]) {
 			acc[task.id] = task.estimate;
 		}
@@ -39,9 +39,10 @@ export function estimatedTotalTime(data: any) {
 	}, {});
 
 	// Calculate the total of estimates
-	const timesEstimated = Object.values(uniqueTasks)?.reduce((total: number, estimate: any) => total + estimate, 0);
+	const timesEstimated =
+		uniqueTasks && Object.values(uniqueTasks)?.reduce((total: number, estimate: any) => total + estimate, 0);
 	// Calculate the total of tasks
-	const totalTasks = Object.values(uniqueTasks)?.length;
+	const totalTasks = uniqueTasks && Object.values(uniqueTasks)?.length;
 
 	return { timesEstimated, totalTasks };
 }
diff --git a/apps/web/lib/features/task/task-filters.tsx b/apps/web/lib/features/task/task-filters.tsx
index c28d67e1f..08fd99a55 100644
--- a/apps/web/lib/features/task/task-filters.tsx
+++ b/apps/web/lib/features/task/task-filters.tsx
@@ -70,7 +70,7 @@ export function useTaskFilter(profile: I_UserProfilePage) {
 	);
 
 	// const [tab, setTab] = useState<ITab>(defaultValue || 'worked');
-	const [tab, setTab] = useLocalStorageState<ITab>('task-tab', 'worked')
+	const [tab, setTab] = useLocalStorageState<ITab>('task-tab', 'worked');
 	const [filterType, setFilterType] = useState<FilterType>(undefined);
 
 	const [statusFilter, setStatusFilter] = useState<StatusFilter>({} as StatusFilter);
@@ -125,7 +125,7 @@ export function useTaskFilter(profile: I_UserProfilePage) {
 			tab: 'dailyplan',
 			name: t('common.DAILYPLAN' as DottedLanguageObjectStringPaths),
 			description: t('task.tabFilter.DAILYPLAN_DESCRIPTION' as DottedLanguageObjectStringPaths),
-			count: profile.tasksGrouped.planned
+			count: isNaN(profile.tasksGrouped.planned) ? 0 : profile.tasksGrouped.planned
 		});
 		tabs.push({
 			tab: 'stats',
@@ -222,9 +222,9 @@ export function useTaskFilter(profile: I_UserProfilePage) {
 					.every((k) => {
 						return k === 'label'
 							? intersection(
-								statusFilters[k],
-								task['tags'].map((item) => item.name)
-							).length === statusFilters[k].length
+									statusFilters[k],
+									task['tags'].map((item) => item.name)
+								).length === statusFilters[k].length
 							: statusFilters[k].includes(task[k]);
 					});
 			});

From e1957ad97845134f283d20be3ecdfc1cbc0b54e8 Mon Sep 17 00:00:00 2001
From: CREDO23 <thierrybakera12@gmail.com>
Date: Thu, 19 Sep 2024 21:00:15 +0200
Subject: [PATCH 8/8] feat: should hide ouststanding notification after visit
 outstating tab

---
 apps/web/app/constants.ts                     |  1 +
 .../team/team-outstanding-notifications.tsx   | 23 +++++++++++++++----
 apps/web/lib/features/user-profile-plans.tsx  |  3 +++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apps/web/app/constants.ts b/apps/web/app/constants.ts
index 796a3d032..1b7659de6 100644
--- a/apps/web/app/constants.ts
+++ b/apps/web/app/constants.ts
@@ -285,6 +285,7 @@ export const TASKS_ESTIMATE_HOURS_MODAL_DATE = 'tasks-estimate-hours-modal-date'
 export const DAILY_PLAN_ESTIMATE_HOURS_MODAL_DATE = 'daily-plan-estimate-hours-modal';
 export const DEFAULT_PLANNED_TASK_ID = 'default-planned-task-id';
 export const LAST_OPTION__CREATE_DAILY_PLAN_MODAL = 'last-option--create-daily-plan-modal';
+export const HAS_VISITED_OUTSTANDING_TAB = 'has-visited-outstanding-tab';
 
 // OAuth provider's keys
 
diff --git a/apps/web/lib/features/team/team-outstanding-notifications.tsx b/apps/web/lib/features/team/team-outstanding-notifications.tsx
index 7dc1cd181..622d84cd4 100644
--- a/apps/web/lib/features/team/team-outstanding-notifications.tsx
+++ b/apps/web/lib/features/team/team-outstanding-notifications.tsx
@@ -7,6 +7,7 @@ import { useTranslations } from 'next-intl';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
 import { estimatedTotalTime } from '../task/daily-plan';
+import { HAS_VISITED_OUTSTANDING_TAB } from '@app/constants';
 
 interface IEmployeeWithOutstanding {
 	employeeId: string | undefined;
@@ -53,15 +54,22 @@ function UserOutstandingNotification({ outstandingPlans, user }: { outstandingPl
 	useEffect(() => {
 		const checkNotification = () => {
 			const alreadySeen = window && parseInt(window?.localStorage.getItem(DISMISSAL_TIMESTAMP_KEY) || '0', 10);
+			const hasVisitedOutstandingTab =
+				window && JSON.parse(window?.localStorage.getItem(HAS_VISITED_OUTSTANDING_TAB) as string);
 			const currentTime = new Date().getTime();
 
-			if (!alreadySeen || currentTime - alreadySeen > REAPPEAR_INTERVAL) {
+			if (hasVisitedOutstandingTab) {
+				setVisible(false);
+			} else if (!alreadySeen || currentTime - alreadySeen > REAPPEAR_INTERVAL) {
 				setVisible(true);
 			}
 		};
 
 		checkNotification();
-		const intervalId = setInterval(checkNotification, REAPPEAR_INTERVAL);
+		const intervalId = setInterval(function () {
+			window && window?.localStorage.setItem(HAS_VISITED_OUTSTANDING_TAB, JSON.stringify(false));
+			checkNotification();
+		}, REAPPEAR_INTERVAL);
 		return () => clearInterval(intervalId);
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
@@ -154,15 +162,22 @@ function ManagerOutstandingUsersNotification({ outstandingTasks }: { outstanding
 		const checkNotification = () => {
 			const alreadySeen =
 				window && parseInt(window?.localStorage.getItem(MANAGER_DISMISSAL_TIMESTAMP_KEY) || '0', 10);
+			const hasVisitedOutstandingTab =
+				window && JSON.parse(window?.localStorage.getItem(HAS_VISITED_OUTSTANDING_TAB) as string);
 			const currentTime = new Date().getTime();
 
-			if (!alreadySeen || currentTime - alreadySeen > REAPPEAR_INTERVAL) {
+			if (hasVisitedOutstandingTab) {
+				setVisible(false);
+			} else if (!alreadySeen || currentTime - alreadySeen > REAPPEAR_INTERVAL) {
 				setVisible(true);
 			}
 		};
 
 		checkNotification();
-		const intervalId = setInterval(checkNotification, REAPPEAR_INTERVAL);
+		const intervalId = setInterval(function () {
+			window && window?.localStorage.setItem(HAS_VISITED_OUTSTANDING_TAB, JSON.stringify(false));
+			checkNotification();
+		}, REAPPEAR_INTERVAL);
 		return () => clearInterval(intervalId);
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
diff --git a/apps/web/lib/features/user-profile-plans.tsx b/apps/web/lib/features/user-profile-plans.tsx
index bfd754d6a..503b05edd 100644
--- a/apps/web/lib/features/user-profile-plans.tsx
+++ b/apps/web/lib/features/user-profile-plans.tsx
@@ -35,6 +35,7 @@ import { checkPastDate } from 'lib/utils';
 
 import { DottedLanguageObjectStringPaths, useTranslations } from 'next-intl';
 import { useLocalStorageState } from '@app/hooks/useLocalStorageState';
+import { HAS_VISITED_OUTSTANDING_TAB } from '@app/constants';
 
 export type FilterTabs = 'Today Tasks' | 'Future Tasks' | 'Past Tasks' | 'All Tasks' | 'Outstanding';
 type FilterOutstanding = 'ALL' | 'DATE';
@@ -89,6 +90,8 @@ export function UserProfilePlans() {
 		} else if (currentTab === 'Future Tasks') {
 			setCurrentDataDailyPlan(futurePlans);
 			setFilterFuturePlanData(filterDailyPlan(date as any, futurePlans));
+		} else if (currentTab === 'Outstanding') {
+			window.localStorage.setItem(HAS_VISITED_OUTSTANDING_TAB, JSON.stringify(true));
 		}
 	}, [currentTab, setCurrentDataDailyPlan, date, currentDataDailyPlan, futurePlans, pastPlans, sortedPlans]);