Skip to content

[pull] main from activepieces:main #918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jan 12, 2026
Merged

[pull] main from activepieces:main #918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a980669
fix: preserve template category order on template page (#10824)
hazemadelkhalel Jan 12, 2026
6d276e2
fix: add missing projectId in list project-releases query (#10823)
MrChaker Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/react-ui/src/app/routes/project-release/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>>[] = [
Expand Down
4 changes: 3 additions & 1 deletion packages/react-ui/src/app/routes/templates/all-categories-view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const AllCategoriesViewSkeleton = ({

type AllCategoriesViewProps = {
templatesByCategory: Record<string, Template[]>;
categories: string[];
onCategorySelect: (category: string) => void;
onTemplateSelect: (template: Template) => void;
isLoading?: boolean;
Expand All @@ -29,6 +30,7 @@ type AllCategoriesViewProps = {

export const AllCategoriesView = ({
templatesByCategory,
categories,
onCategorySelect,
onTemplateSelect,
isLoading = false,
Expand All @@ -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 (
Expand Down
1 change: 1 addition & 0 deletions packages/react-ui/src/app/routes/templates/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ const TemplatesPage = () => {
) : showAllCategories ? (
<AllCategoriesView
templatesByCategory={templatesByCategory}
categories={categories}
onCategorySelect={setCategory}
onTemplateSelect={handleTemplateSelect}
isLoading={showLoading}
Expand Down
8 changes: 6 additions & 2 deletions packages/react-ui/src/features/project-releases/lib/project-release-api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading