From 1a899bfb4a8aa53a3c31522a4a913a81d3d0420d Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 9 Sep 2025 18:51:37 +0530
Subject: [PATCH 1/3] tooltp added over disabled

---
 .../organization-[organization]/+page.svelte  | 31 ++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 69a84cd8a..3c0da4065 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -84,6 +84,9 @@
         (isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE) ||
         !$canWriteProjects;
 
+    $: reachedProjectLimit = isCloud && getServiceLimit('projects') <= data.allProjectsCount;
+    $: projectsLimit = getServiceLimit('projects');
+
     $: $registerCommands([
         {
             label: 'Create project',
@@ -129,13 +132,27 @@
         <SearchQuery bind:this={searchQuery} placeholder="Search by name or ID" />
 
         {#if $canWriteProjects}
-            <Button
-                on:click={handleCreateProject}
-                event="create_project"
-                disabled={projectCreationDisabled}>
-                <Icon icon={IconPlus} slot="start" size="s" />
-                Create project
-            </Button>
+            {#if projectCreationDisabled && reachedProjectLimit}
+                <Tooltip placement="bottom">
+                    <div>
+                        <Button event="create_project" disabled>
+                            <Icon icon={IconPlus} slot="start" size="s" />
+                            Create project
+                        </Button>
+                    </div>
+                    <span slot="tooltip">
+                        You have reached your limit of {projectsLimit} projects. 
+                    </span>
+                </Tooltip>
+            {:else}
+                <Button
+                    on:click={handleCreateProject}
+                    event="create_project"
+                    disabled={projectCreationDisabled}>
+                    <Icon icon={IconPlus} slot="start" size="s" />
+                    Create project
+                </Button>
+            {/if}
         {/if}
     </Layout.Stack>
 

From 521b2899f656fd2243b6d4b75bc0a0bf66fda18c Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 9 Sep 2025 18:55:34 +0530
Subject: [PATCH 2/3] fix: project disabled on creating organization

---
 src/routes/(console)/organization-[organization]/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 3c0da4065..50ce72fab 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -80,11 +80,11 @@
     }
 
     $: projectCreationDisabled =
-        (isCloud && getServiceLimit('projects') <= data.allProjectsCount) ||
+        (isCloud && getServiceLimit('projects') <= data.projects.total) ||
         (isCloud && $readOnly && !GRACE_PERIOD_OVERRIDE) ||
         !$canWriteProjects;
 
-    $: reachedProjectLimit = isCloud && getServiceLimit('projects') <= data.allProjectsCount;
+    $: reachedProjectLimit = isCloud && getServiceLimit('projects') <= data.projects.total;
     $: projectsLimit = getServiceLimit('projects');
 
     $: $registerCommands([

From 1e99b585f60607f167a527f0a419b599bff9b8a0 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 9 Sep 2025 19:05:29 +0530
Subject: [PATCH 3/3] lint issue

---
 src/routes/(console)/organization-[organization]/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/(console)/organization-[organization]/+page.svelte b/src/routes/(console)/organization-[organization]/+page.svelte
index 50ce72fab..e223ec1fc 100644
--- a/src/routes/(console)/organization-[organization]/+page.svelte
+++ b/src/routes/(console)/organization-[organization]/+page.svelte
@@ -141,7 +141,7 @@
                         </Button>
                     </div>
                     <span slot="tooltip">
-                        You have reached your limit of {projectsLimit} projects. 
+                        You have reached your limit of {projectsLimit} projects.
                     </span>
                 </Tooltip>
             {:else}