AI Agents & MCPs & AI Workflow Automation • (~400 MCP servers for AI agents) • AI Automation / AI Agent with MCPs • AI Workflows & AI Agents • MCPs for AI Agents
TypeScript ai-agentai-agent-toolsai-agentsai-agents-frameworkmcpmcp-servermcp-toolsmcpsn8n-alternativeno-code-automationworkflowworkflow-automationworkflows
fix(projects): show the project's External ID in project settings (#15776)
Bartosz Majewskie3b8c02cb4de
diff --git a/packages/web/src/app/components/project-layout/project-dashboard-page-header.tsx b/packages/web/src/app/components/project-layout/project-dashboard-page-header.tsxindex e2c7eb6fa74..71214ba911c 100644--- a/packages/web/src/app/components/project-layout/project-dashboard-page-header.tsx+++ b/packages/web/src/app/components/project-layout/project-dashboard-page-header.tsx@@ -187,9 +187,6 @@ export const ProjectDashboardPageHeader = ({open={settingsOpen}onClose={() => setSettingsOpen(false)}initialTab={settingsInitialTab}- initialValues={{- projectName: project?.displayName,- }}/></>);diff --git a/packages/web/src/app/components/project-settings/form-defaults.ts b/packages/web/src/app/components/project-settings/form-defaults.tsnew file mode 100644index 00000000000..c85ad85292a--- /dev/null+++ b/packages/web/src/app/components/project-settings/form-defaults.ts@@ -0,0 +1,16 @@+import type { ProjectWithLimits } from '@activepieces/shared';++import type { FormValues } from './general';++export function projectSettingsFormDefaults(+ project: ProjectWithLimits,+): FormValues {+ return {+ projectName: project.displayName,+ icon: project.icon,+ externalId: project.externalId ?? '',+ maxConcurrentJobs: project.maxConcurrentJobs,+ activeFlowsLimit: project.plan?.activeFlowsLimit ?? null,+ sensitive: project.sensitive ?? false,+ };+}diff --git a/packages/web/src/app/components/project-settings/index.tsx b/packages/web/src/app/components/project-settings/index.tsxindex 14aff949516..52bbb10ecef 100644--- a/packages/web/src/app/components/project-settings/index.tsx+++ b/packages/web/src/app/components/project-settings/index.tsx@@ -24,6 +24,7 @@ import { ProjectAvatar } from '../project-avatar';import { AlertsSettings } from './alerts';import { EnvironmentSettings } from './environment';+import { projectSettingsFormDefaults } from './form-defaults';import { GeneralSettings, FormValues } from './general';import { MembersSettings } from './members';import { PiecesSettings } from './pieces';@@ -34,17 +35,12 @@ interface ProjectSettingsDialogProps {open: boolean;onClose: () => void;initialTab?: TabId;- initialValues?: {- projectName?: string;- externalId?: string;- };}export function ProjectSettingsDialog({open,onClose,initialTab = 'general',- initialValues,}: ProjectSettingsDialogProps) {const [activeTab, setActiveTab] = useState<TabId>(initialTab);const { checkAccess } = useAuthorization();@@ -59,14 +55,7 @@ export function ProjectSettingsDialog({const platformRole = userHooks.getCurrentUserPlatformRole();const form = useForm<FormValues>({- defaultValues: {- projectName: initialValues?.projectName,- icon: project.icon,- externalId: initialValues?.externalId,- maxConcurrentJobs: project.maxConcurrentJobs,- activeFlowsLimit: project.plan?.activeFlowsLimit ?? null,- sensitive: project.sensitive ?? false,- },+ defaultValues: projectSettingsFormDefaults(project),disabled: checkAccess(Permission.WRITE_PROJECT) === false,});@@ -97,13 +86,8 @@ export function ProjectSettingsDialog({useEffect(() => {const dialogJustOpened = open && !previousOpenRef.current;- if (dialogJustOpened && !isNil(project)) {- form.reset({- ...initialValues,- icon: project.icon,- maxConcurrentJobs: project.maxConcurrentJobs,- activeFlowsLimit: project.plan?.activeFlowsLimit ?? null,- });+ if (dialogJustOpened) {+ form.reset(projectSettingsFormDefaults(project));setActiveTab(initialTab);}previousOpenRef.current = open;diff --git a/packages/web/src/app/routes/platform/projects/index.tsx b/packages/web/src/app/routes/platform/projects/index.tsxindex f78be6d7083..21fc24c05f7 100644--- a/packages/web/src/app/routes/platform/projects/index.tsx+++ b/packages/web/src/app/routes/platform/projects/index.tsx@@ -102,9 +102,10 @@ export default function ProjectsPage() {const [selectedRows, setSelectedRows] = useState<ProjectWithLimits[]>([]);const [editDialogOpen, setEditDialogOpen] = useState(false);- const [editDialogInitialValues, setEditDialogInitialValues] =- useState<any>(null);const [editDialogProjectId, setEditDialogProjectId] = useState<string>('');+ const editDialogProject = allProjects.find(+ (project) => project.id === editDialogProjectId,+ );const { data: allGlobalConnectionsPage } =globalConnectionsQueries.useGlobalConnections({request: { limit: 9999 },@@ -345,10 +346,6 @@ export default function ProjectsPage() {onClick={async (e) => {e.stopPropagation();e.preventDefault();- setEditDialogInitialValues({- projectName: row.displayName,- sensitive: row.sensitive,- });setEditDialogProjectId(row.id);setEditDialogOpen(true);}}@@ -444,7 +441,13 @@ export default function ProjectsPage() {onClose={() => {setEditDialogOpen(false);}}- initialValues={editDialogInitialValues}+ initialValues={+ editDialogProject && {+ projectName: editDialogProject.displayName,+ externalId: editDialogProject.externalId ?? undefined,+ sensitive: editDialogProject.sensitive,+ }+ }projectId={editDialogProjectId}/></div>diff --git a/packages/web/test/app/components/project-settings/form-defaults.test.ts b/packages/web/test/app/components/project-settings/form-defaults.test.tsnew file mode 100644index 00000000000..cffaba4bf95--- /dev/null+++ b/packages/web/test/app/components/project-settings/form-defaults.test.ts@@ -0,0 +1,85 @@+import { ColorName, PiecesFilterType, ProjectType } from '@activepieces/shared';+import type { ProjectWithLimits } from '@activepieces/shared';+import { describe, expect, it } from 'vitest';++import { projectSettingsFormDefaults } from '@/app/components/project-settings/form-defaults';++function makeProject(+ overrides: Partial<ProjectWithLimits> = {},+): ProjectWithLimits {+ return {+ id: 'proj1',+ created: '2024-01-01T00:00:00.000Z',+ updated: '2024-01-01T00:00:00.000Z',+ type: ProjectType.TEAM,+ ownerId: 'user1',+ displayName: 'Acme',+ platformId: 'platform1',+ maxConcurrentJobs: null,+ icon: { color: ColorName.BLUE },+ externalId: null,+ releasesEnabled: false,+ notifyFlowOwnerOnFailure: false,+ metadata: null,+ sensitive: false,+ plan: {+ id: 'plan1',+ created: '2024-01-01T00:00:00.000Z',+ updated: '2024-01-01T00:00:00.000Z',+ projectId: 'proj1',+ locked: false,+ name: 'default',+ piecesFilterType: PiecesFilterType.NONE,+ pieces: [],+ },+ analytics: {+ totalUsers: 0,+ activeUsers: 0,+ totalFlows: 0,+ activeFlows: 0,+ lastFlowUpdated: null,+ },+ ...overrides,+ };+}++const baseProject = makeProject();++describe('projectSettingsFormDefaults', () => {+ it('seeds externalId from the project', () => {+ const defaults = projectSettingsFormDefaults(+ makeProject({ externalId: 'org-3412321' }),+ );++ expect(defaults.externalId).toBe('org-3412321');+ });++ it('seeds an empty string when the project has no externalId', () => {+ const defaults = projectSettingsFormDefaults(+ makeProject({ externalId: null }),+ );++ expect(defaults.externalId).toBe('');+ });++ it('seeds every editable field from the project', () => {+ const defaults = projectSettingsFormDefaults(+ makeProject({+ displayName: 'Acme Prod',+ externalId: 'org-9',+ maxConcurrentJobs: 12,+ sensitive: true,+ plan: { ...baseProject.plan, activeFlowsLimit: 40 },+ }),+ );++ expect(defaults).toEqual({+ projectName: 'Acme Prod',+ icon: { color: ColorName.BLUE },+ externalId: 'org-9',+ maxConcurrentJobs: 12,+ activeFlowsLimit: 40,+ sensitive: true,+ });+ });+});