-
Executed Tasks
-
Showing total executed tasks for specified time range
+
{t('Executed Tasks')}
+
{t('Showing total executed tasks for specified time range')}
-
),
cell: ({ row }) => {
- return 'project' in row.original.data ? (
-
- {row.original.data.project?.displayName}
-
+ return row.original.projectId &&
+ 'project' in row.original.data ? (
+
+
+ {row.original.data.project?.displayName}
+
+
) : (
{t('N/A')}
);
diff --git a/packages/react-ui/src/app/routes/platform/setup/license-key/index.tsx b/packages/react-ui/src/app/routes/platform/setup/license-key/index.tsx
index 2a5b51e096..007db4f4d3 100644
--- a/packages/react-ui/src/app/routes/platform/setup/license-key/index.tsx
+++ b/packages/react-ui/src/app/routes/platform/setup/license-key/index.tsx
@@ -34,7 +34,7 @@ import { ApEdition, ApFlagId, isNil } from '@activepieces/shared';
import { ActivateLicenseDialog } from './activate-license-dialog';
const LICENSE_PROPS_MAP = {
- gitSyncEnabled: 'Team Collaboration via Git',
+ environmentEnabled: 'Team Collaboration via Git',
analyticsEnabled: 'Analytics',
auditLogEnabled: 'Audit Log',
embeddingEnabled: 'Embedding',
diff --git a/packages/react-ui/src/app/routes/project-release/apply-plan.tsx b/packages/react-ui/src/app/routes/project-release/apply-plan.tsx
new file mode 100644
index 0000000000..990954f505
--- /dev/null
+++ b/packages/react-ui/src/app/routes/project-release/apply-plan.tsx
@@ -0,0 +1,106 @@
+import { useMutation } from '@tanstack/react-query';
+import { t } from 'i18next';
+import { useState, ReactNode } from 'react';
+
+import { Button, ButtonProps } from '@/components/ui/button';
+import { INTERNAL_ERROR_TOAST, useToast } from '@/components/ui/use-toast';
+import { ConnectGitDialog } from '@/features/git-sync/components/connect-git-dialog';
+import { gitSyncHooks } from '@/features/git-sync/lib/git-sync-hooks';
+import { projectReleaseApi } from '@/features/project-version/lib/project-release-api';
+import { authenticationSession } from '@/lib/authentication-session';
+import {
+ DiffReleaseRequest,
+ isNil,
+ ProjectReleaseType,
+} from '@activepieces/shared';
+
+import { CreateReleaseDialog } from './create-release-dialog';
+
+type ApplyButtonProps = ButtonProps & {
+ request: DiffReleaseRequest;
+ children: ReactNode;
+ onSuccess: () => void;
+ defaultName?: string;
+};
+
+export const ApplyButton = ({
+ request,
+ children,
+ onSuccess,
+ defaultName,
+ ...props
+}: ApplyButtonProps) => {
+ const { toast } = useToast();
+ const projectId = authenticationSession.getProjectId()!;
+ const { gitSync } = gitSyncHooks.useGitSync(projectId, !isNil(projectId));
+ const [dialogOpen, setDialogOpen] = useState(false);
+ const [syncPlan, setSyncPlan] = useState
(null);
+ const [loadingRequestId, setLoadingRequestId] = useState(null);
+
+ const { mutate: loadSyncPlan } = useMutation({
+ mutationFn: (request: DiffReleaseRequest) =>
+ projectReleaseApi.diff(request),
+ onSuccess: (plan) => {
+ if (!plan.operations || plan.operations.length === 0) {
+ toast({
+ title: t('No Changes Found'),
+ description: t('There are no differences to apply'),
+ variant: 'default',
+ });
+ setLoadingRequestId(null);
+ return;
+ }
+ setSyncPlan(plan);
+ setDialogOpen(true);
+ setLoadingRequestId(null);
+ },
+ onError: () => {
+ toast(INTERNAL_ERROR_TOAST);
+ setLoadingRequestId(null);
+ },
+ });
+
+ const [gitDialogOpen, setGitDialogOpen] = useState(false);
+ const showGitDialog =
+ isNil(gitSync) && request.type === ProjectReleaseType.GIT;
+ const requestId = JSON.stringify(request);
+ const isLoading = loadingRequestId === requestId;
+
+ return (
+ <>
+ {
+ if (showGitDialog) {
+ setGitDialogOpen(true);
+ } else {
+ setLoadingRequestId(requestId);
+ loadSyncPlan(request);
+ }
+ }}
+ >
+ {children}
+
+
+ {gitDialogOpen ? (
+ ;
+
+const CreateReleaseDialog = ({
+ open,
+ setOpen,
+ refetch,
+ plan,
+ defaultName = '',
+ diffRequest,
+}: CreateReleaseDialogProps) => {
+ const { platform } = platformHooks.useCurrentPlatform();
+ const { gitSync } = gitSyncHooks.useGitSync(
+ authenticationSession.getProjectId()!,
+ platform.environmentsEnabled,
+ );
+
+ const form = useForm({
+ resolver: zodResolver(formSchema),
+ defaultValues: {
+ name: defaultName,
+ description: '',
+ },
+ });
+
+ const { mutate: applyChanges, isPending } = useMutation({
+ mutationFn: async () => {
+ switch (diffRequest.type) {
+ case ProjectReleaseType.GIT:
+ if (!gitSync) {
+ throw new Error('Git sync is not connected');
+ }
+ await projectReleaseApi.create({
+ name: form.getValues('name'),
+ description: form.getValues('description'),
+ selectedFlowsIds: Array.from(selectedChanges),
+ repoId: gitSync.id,
+ type: diffRequest.type,
+ });
+ break;
+ case ProjectReleaseType.PROJECT:
+ if (!diffRequest.targetProjectId) {
+ throw new Error('Project ID is required');
+ }
+ await projectReleaseApi.create({
+ name: form.getValues('name'),
+ description: form.getValues('description'),
+ selectedFlowsIds: Array.from(selectedChanges),
+ targetProjectId: diffRequest.targetProjectId,
+ type: diffRequest.type,
+ });
+ break;
+ case ProjectReleaseType.ROLLBACK:
+ await projectReleaseApi.create({
+ name: form.getValues('name'),
+ description: form.getValues('description'),
+ selectedFlowsIds: Array.from(selectedChanges),
+ projectReleaseId: diffRequest.projectReleaseId,
+ type: diffRequest.type,
+ });
+ break;
+ }
+ },
+ onSuccess: () => {
+ refetch();
+ setOpen(false);
+ },
+ onError: (error) => {
+ console.error(error);
+ toast(INTERNAL_ERROR_TOAST);
+ },
+ });
+
+ const [selectedChanges, setSelectedChanges] = useState>(
+ new Set(plan?.operations.map((op) => op.flow.id) || []),
+ );
+
+ const handleSelectAll = (checked: boolean) => {
+ if (!plan) return;
+ setSelectedChanges(
+ new Set(checked ? plan.operations.map((op) => op.flow.id) : []),
+ );
+ };
+
+ return (
+ {
+ if (newOpenState) {
+ form.reset({
+ name: '',
+ description: '',
+ });
+ }
+ setOpen(newOpenState);
+ }}
+ >
+
+
+
+ {diffRequest.type === ProjectReleaseType.GIT
+ ? t('Create Git Release')
+ : diffRequest.type === ProjectReleaseType.PROJECT
+ ? t('Create Project Release')
+ : t('Rollback Release')}
+
+
+
+
+
+ {t('Name')}
+
+
+ {form.formState.errors.name && (
+
+ {form.formState.errors.name.message}
+
+ )}
+
+
+
+ {t('Description')}
+
+
+ {form.formState.errors.description && (
+
+ {form.formState.errors.description.message}
+
+ )}
+
+
+
+
+
+
+ {t('Changes')} ({selectedChanges.size}/
+ {plan?.operations.length || 0})
+
+
+
+ {plan?.operations.length ? (
+ plan.operations.map((operation) => (
+
{
+ setSelectedChanges(
+ new Set(
+ checked
+ ? [...selectedChanges, operation.flow.id]
+ : [...selectedChanges].filter(
+ (id) => id !== operation.flow.id,
+ ),
+ ),
+ );
+ }}
+ />
+ ))
+ ) : (
+
+ {t('No changes to apply')}
+
+ )}
+
+
+ setOpen(false)}
+ >
+ {t('Cancel')}
+
+ {
+ applyChanges();
+ }}
+ >
+ {t('Apply Changes')}
+
+
+
+
+ );
+};
+
+export { CreateReleaseDialog };
diff --git a/packages/react-ui/src/app/routes/project-release/create-release-dialog/operation-change.tsx b/packages/react-ui/src/app/routes/project-release/create-release-dialog/operation-change.tsx
new file mode 100644
index 0000000000..07f3a89fb4
--- /dev/null
+++ b/packages/react-ui/src/app/routes/project-release/create-release-dialog/operation-change.tsx
@@ -0,0 +1,61 @@
+import { UpdateIcon } from '@radix-ui/react-icons';
+import { Minus, Plus } from 'lucide-react';
+import React from 'react';
+
+import { Checkbox } from '@/components/ui/checkbox';
+import {
+ ProjectOperationType,
+ ProjectSyncPlanOperation,
+} from '@activepieces/ee-shared';
+
+const renderDiffInfo = (flowName: string, icon: React.ReactNode) => (
+
+
+ {icon}
+ {flowName}
+
+
+ {change.type === ProjectOperationType.CREATE_FLOW && (
+
+
+ {renderDiffInfo(
+ change.flow.displayName,
+
,
+ )}
+
+ )}
+ {change.type === ProjectOperationType.UPDATE_FLOW && (
+
+
+ )}
+ {change.type === ProjectOperationType.DELETE_FLOW && (
+
+
+ )}
+
+
+
+ downloadProjectRelease({ releaseId: release.id })}
+ >
+
+
+ {t('Download')}
+
+
+ );
+};
diff --git a/packages/react-ui/src/app/routes/project-release/index.tsx b/packages/react-ui/src/app/routes/project-release/index.tsx
new file mode 100644
index 0000000000..320787d1c7
--- /dev/null
+++ b/packages/react-ui/src/app/routes/project-release/index.tsx
@@ -0,0 +1,186 @@
+import { useQuery } from '@tanstack/react-query';
+import { ColumnDef } from '@tanstack/react-table';
+import { t } from 'i18next';
+import {
+ Plus,
+ ChevronDown,
+ Undo2,
+ GitBranch,
+ RotateCcw,
+ FolderOpenDot,
+} from 'lucide-react';
+
+import { Button } from '@/components/ui/button';
+import { DataTable, RowDataWithActions } from '@/components/ui/data-table';
+import { DataTableColumnHeader } from '@/components/ui/data-table/data-table-column-header';
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuTrigger,
+} from '@/components/ui/dropdown-menu';
+import { TableTitle } from '@/components/ui/table-title';
+import {
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from '@/components/ui/tooltip';
+import { projectReleaseApi } from '@/features/project-version/lib/project-release-api';
+import { formatUtils } from '@/lib/utils';
+import { ProjectRelease, ProjectReleaseType } from '@activepieces/shared';
+
+import { ApplyButton } from './apply-plan';
+import { DownloadButton } from './download-button';
+import { SelectionButton } from './selection-dialog';
+
+const ProjectReleasesPage = () => {
+ const { data, isLoading, refetch } = useQuery({
+ queryKey: ['project-releases'],
+ queryFn: () => projectReleaseApi.list(),
+ });
+
+ const columns: ColumnDef>[] = [
+ {
+ accessorKey: 'name',
+ accessorFn: (row) => row.name,
+ header: ({ column }) => (
+ {row.original.name}
,
+ },
+ {
+ accessorKey: 'type',
+ accessorFn: (row) => row.type,
+ header: ({ column }) => (
+
+ {isGit ? (
+
+ );
+ },
+ },
+ {
+ accessorKey: 'created',
+ accessorFn: (row) => row.created,
+ header: ({ column }) => (
+
+ {formatUtils.formatDate(new Date(row.original.created))}
+
+ ),
+ },
+ {
+ accessorKey: 'importedBy',
+ accessorFn: (row) => row.importedBy,
+ header: ({ column }) => (
+ {row.original.importedByUser?.email}
+ ),
+ },
+ ];
+
+ return (
+
+
+
+
{t('Project Releases')}
+
+ {t('Track and manage your project version history and deployments')}
+
+
+
+
+
+
+ {t('Create Release')}
+
+
+
+
+
+
+
+
+
+
+
+
+
{t('From Project')}
+
+
+
+
+
+
+
+
+
+
+
+
+ {t('Rollback')}
+
+
{
+ setOpen(true);
+ }}
+ >
+ {children}
+
+ {ReleaseType === ProjectReleaseType.PROJECT && (
+ ;
+
+type ProjectSelectionDialogProps = {
+ projectId: string;
+ open: boolean;
+ setOpen: (open: boolean) => void;
+ onSuccess: () => void;
+};
+
+export function ProjectSelectionDialog({
+ projectId,
+ open,
+ setOpen,
+ onSuccess,
+}: ProjectSelectionDialogProps) {
+ const { data: projects } = projectHooks.useProjects();
+ const [dialogOpen, setDialogOpen] = useState(false);
+ const [syncPlan, setSyncPlan] = useState(null);
+ const [loading, setLoading] = useState(false);
+
+ const { mutate: loadSyncPlan } = useMutation({
+ mutationFn: (request: DiffReleaseRequest) =>
+ projectReleaseApi.diff(request),
+ onSuccess: (plan) => {
+ if (!plan.operations || plan.operations.length === 0) {
+ toast({
+ title: t('No Changes Found'),
+ description: t('There are no differences to apply'),
+ variant: 'default',
+ });
+ setLoading(false);
+ return;
+ }
+ setSyncPlan(plan);
+ setLoading(false);
+ setOpen(false);
+ setDialogOpen(true);
+ },
+ onError: () => {
+ toast(INTERNAL_ERROR_TOAST);
+ setLoading(false);
+ },
+ });
+
+ const form = useForm({
+ resolver: typeboxResolver(FormSchema),
+ defaultValues: {
+ selectedProject: projects?.find((project) => project.id !== projectId)
+ ?.id,
+ },
+ });
+ const onSubmit = (data: FormSchema) => {
+ if (!data.selectedProject) {
+ form.setError('selectedProject', {
+ type: 'required',
+ message: t('Please select a project'),
+ });
+ return;
+ }
+ setLoading(true);
+ loadSyncPlan({
+ type: ProjectReleaseType.PROJECT,
+ targetProjectId: data.selectedProject,
+ });
+ };
+
+ return (
+ <>
+ {
+ setOpen(open);
+ if (open) {
+ form.reset();
+ }
+ }}
+ >
+
+
+ {t('Create Release')}
+
+
+
+
+
+
+ {dialogOpen && (
+
-
{t('Git Sync')}
+ {t('Environment')}
{t(
'This feature allows for the creation of an external backup, environments, and maintaining a version history',
@@ -75,16 +76,20 @@ const GitSyncPage = () => {
- {!gitSync &&
}
+ {!gitSync && (
+
+ )}
{gitSync && (
-
mutate()}
- className="w-32 text-destructive"
- variant={'basic'}
- >
- {t('Disconnect')}
-
+
+ mutate()}
+ className="w-32 text-destructive"
+ variant={'basic'}
+ >
+ {t('Disconnect')}
+
+
)}
@@ -96,14 +101,10 @@ const GitSyncPage = () => {
)}
-
- {gitSync && (
-
+
);
};
-export { GitSyncPage };
+export { EnvironmentPage };
diff --git a/packages/react-ui/src/app/routes/settings/environment/release-card.tsx b/packages/react-ui/src/app/routes/settings/environment/release-card.tsx
new file mode 100644
index 0000000000..2df1a79836
--- /dev/null
+++ b/packages/react-ui/src/app/routes/settings/environment/release-card.tsx
@@ -0,0 +1,63 @@
+import { useMutation } from '@tanstack/react-query';
+import { t } from 'i18next';
+import { Package } from 'lucide-react';
+
+import { Button } from '@/components/ui/button';
+import { Card } from '@/components/ui/card';
+import { toast, INTERNAL_ERROR_TOAST } from '@/components/ui/use-toast';
+import { projectHooks } from '@/hooks/project-hooks';
+import { projectApi } from '@/lib/project-api';
+import { cn } from '@/lib/utils';
+
+const ReleaseCard = () => {
+ const { project, refetch } = projectHooks.useCurrentProject();
+
+ const { mutate } = useMutation({
+ mutationFn: () => {
+ return projectApi.update(project.id, {
+ releasesEnabled: !project.releasesEnabled,
+ });
+ },
+ onSuccess: () => {
+ refetch();
+ toast({
+ title: t('Releases Enabled'),
+ description: t('You have successfully enabled releases'),
+ duration: 3000,
+ });
+ },
+ onError: () => {
+ toast(INTERNAL_ERROR_TOAST);
+ },
+ });
+
+ return (
+