From a98066955541292213584fb2d3a3e9d4bc2f5e60 Mon Sep 17 00:00:00 2001
From: Hazem Adel <hazemadelkhalel@gmail.com>
Date: Mon, 12 Jan 2026 19:52:44 +0200
Subject: [PATCH 1/2] fix: preserve template category order on template page
 (#10824)

---
 .../react-ui/src/app/routes/templates/all-categories-view.tsx | 4 +++-
 packages/react-ui/src/app/routes/templates/index.tsx          | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/react-ui/src/app/routes/templates/all-categories-view.tsx b/packages/react-ui/src/app/routes/templates/all-categories-view.tsx
index 6dd3d6aed8b..475679c943f 100644
--- a/packages/react-ui/src/app/routes/templates/all-categories-view.tsx
+++ b/packages/react-ui/src/app/routes/templates/all-categories-view.tsx
@@ -21,6 +21,7 @@ const AllCategoriesViewSkeleton = ({
 
 type AllCategoriesViewProps = {
   templatesByCategory: Record<string, Template[]>;
+  categories: string[];
   onCategorySelect: (category: string) => void;
   onTemplateSelect: (template: Template) => void;
   isLoading?: boolean;
@@ -29,6 +30,7 @@ type AllCategoriesViewProps = {
 
 export const AllCategoriesView = ({
   templatesByCategory,
+  categories,
   onCategorySelect,
   onTemplateSelect,
   isLoading = false,
@@ -40,7 +42,7 @@ export const AllCategoriesView = ({
 
   return (
     <div className="space-y-6">
-      {Object.keys(templatesByCategory).map((category) => {
+      {categories.map((category) => {
         const categoryTemplates = templatesByCategory[category];
 
         return (
diff --git a/packages/react-ui/src/app/routes/templates/index.tsx b/packages/react-ui/src/app/routes/templates/index.tsx
index cdae39b73e2..2c2d237c557 100644
--- a/packages/react-ui/src/app/routes/templates/index.tsx
+++ b/packages/react-ui/src/app/routes/templates/index.tsx
@@ -124,6 +124,7 @@ const TemplatesPage = () => {
         ) : showAllCategories ? (
           <AllCategoriesView
             templatesByCategory={templatesByCategory}
+            categories={categories}
             onCategorySelect={setCategory}
             onTemplateSelect={handleTemplateSelect}
             isLoading={showLoading}

From 6d276e29e548100159581182b029de8a68c3b435 Mon Sep 17 00:00:00 2001
From: Chaker Atallah <74781393+MrChaker@users.noreply.github.com>
Date: Mon, 12 Jan 2026 21:03:15 +0100
Subject: [PATCH 2/2] fix: add missing projectId in list project-releases query
 (#10823)

---
 .../react-ui/src/app/routes/project-release/index.tsx     | 5 ++++-
 .../features/project-releases/lib/project-release-api.ts  | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/react-ui/src/app/routes/project-release/index.tsx b/packages/react-ui/src/app/routes/project-release/index.tsx
index f6a26bc13b3..bd328468e61 100644
--- a/packages/react-ui/src/app/routes/project-release/index.tsx
+++ b/packages/react-ui/src/app/routes/project-release/index.tsx
@@ -53,7 +53,10 @@ const ProjectReleasesPage = () => {
   );
   const { data, isLoading, refetch } = useQuery({
     queryKey: ['project-releases'],
-    queryFn: () => projectReleaseApi.list(),
+    queryFn: () =>
+      projectReleaseApi.list({
+        projectId: authenticationSession.getProjectId()!,
+      }),
   });
   const { data: projects } = projectCollectionUtils.useAll();
   const columns: ColumnDef<RowDataWithActions<ProjectRelease>>[] = [
diff --git a/packages/react-ui/src/features/project-releases/lib/project-release-api.ts b/packages/react-ui/src/features/project-releases/lib/project-release-api.ts
index d2648d8dd67..4631f47ac9f 100644
--- a/packages/react-ui/src/features/project-releases/lib/project-release-api.ts
+++ b/packages/react-ui/src/features/project-releases/lib/project-release-api.ts
@@ -5,14 +5,18 @@ import {
   CreateProjectReleaseRequestBody,
   ProjectRelease,
   DiffReleaseRequest,
+  ListProjectReleasesRequest,
 } from '@activepieces/shared';
 
 export const projectReleaseApi = {
   async get(releaseId: string) {
     return await api.get<ProjectRelease>(`/v1/project-releases/${releaseId}`);
   },
-  async list() {
-    return await api.get<SeekPage<ProjectRelease>>(`/v1/project-releases`);
+  async list(query: ListProjectReleasesRequest) {
+    return await api.get<SeekPage<ProjectRelease>>(
+      `/v1/project-releases`,
+      query,
+    );
   },
   async create(requestBody: CreateProjectReleaseRequestBody) {
     return await api.post<ProjectRelease>('/v1/project-releases', requestBody);