Feature/269 confluence connector

src/features/access/components/connectorAdapters.tsx

@@ -1,8 +1,8 @@
 import { useAuth } from "../../../context/useAuth";
 import { TokenRow } from "../../settings/components/TokenRow";
-import { JiraCredentialAddForm } from "../../settings/components/jira/JiraCredentialAddForm";
-import { JiraCredentialRow } from "../../settings/components/jira/JiraCredentialRow";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService";
+import { AtlassianCredentialAddForm } from "../../settings/components/atlassian/AtlassianCredentialAddForm";
+import { AtlassianCredentialRow } from "../../settings/components/atlassian/AtlassianCredentialRow";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService";
 import type { AccessAddFormProps, AccessRowProps } from "../types";
 
 /**
@@ -18,20 +18,20 @@ export function GithubTokenRow({ entry, onSaved }: AccessRowProps<string>) {
   return <TokenRow name={entry.payload} onSaved={onSaved} />;
 }
 
-export function JiraAccessRow({ entry, onSaved }: AccessRowProps<JiraCredentialsDto>) {
-  return <JiraCredentialRow credential={entry.payload} onSaved={onSaved} />;
+export function AtlassianAccessRow({ entry, onSaved }: AccessRowProps<AtlassianCredentialDto>) {
+  return <AtlassianCredentialRow credential={entry.payload} onSaved={onSaved} />;
 }
 
 /**
- * The Jira form needs a default account email, which every other connector's
- * form does not — so the profile is read here rather than threaded through the
- * view and the registry.
+ * The Atlassian form needs a default account email, which every other
+ * connector's form does not — so the profile is read here rather than
+ * threaded through the view and the registry.
  */
-export function JiraAccessAddForm({ onClose, onSaved }: AccessAddFormProps) {
+export function AtlassianAccessAddForm({ onClose, onSaved }: AccessAddFormProps) {
   const { profile } = useAuth();
 
   return (
-    <JiraCredentialAddForm
+    <AtlassianCredentialAddForm
       defaultUserEmail={profile?.email ?? null}
       onClose={onClose}
       onSaved={onSaved}

src/features/access/registry.ts

@@ -1,10 +1,14 @@
 import { useMemo } from "react";
 import { GitBranch, Ticket } from "lucide-react";
 import { useGithubTokens } from "../settings/hooks/useGithubTokens";
-import { useJiraCredentials } from "../settings/hooks/useJiraCredentials";
+import { useAtlassianCredentials } from "../settings/hooks/useAtlassianCredentials";
 import { TokenAddForm } from "../settings/components/TokenAddForm";
-import { GithubTokenRow, JiraAccessAddForm, JiraAccessRow } from "./components/connectorAdapters";
-import type { JiraCredentialsDto } from "../../services/sources/jiraService";
+import {
+  GithubTokenRow,
+  AtlassianAccessAddForm,
+  AtlassianAccessRow,
+} from "./components/connectorAdapters";
+import type { AtlassianCredentialDto } from "../../services/sources/atlassianService";
 import type { AccessConnector } from "./types";
 
 /**
@@ -48,19 +52,19 @@ export const githubConnector = defineAccessConnector<string>({
   Row: GithubTokenRow,
 });
 
-export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
-  id: "jira",
-  label: "Jira",
+export const atlassianConnector = defineAccessConnector<AtlassianCredentialDto>({
+  id: "atlassian",
+  label: "Atlassian",
   icon: Ticket,
   noun: { one: "credential", many: "credentials" },
   addLabel: "Add credential",
   emptyTitle: "No credentials yet",
-  emptyDescription: "Add a Jira API token to connect and ingest Jira instances.",
+  emptyDescription: "Add an Atlassian API token to connect Jira instances and Confluence spaces.",
   useEntries: () => {
-    const { credentials, loaded, error, isRefreshing, reload } = useJiraCredentials();
+    const { credentials, loaded, error, isRefreshing, reload } = useAtlassianCredentials();
 
     // Credentials are keyed by `(userEmail, tokenName)` server-side; the same
-    // name may exist for two Jira accounts, so the key needs both.
+    // name may exist for two Atlassian accounts, so the key needs both.
     const entries = useMemo(
       () =>
         credentials.map((credential) => ({
@@ -72,8 +76,8 @@ export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
 
     return { entries, loaded, error, isRefreshing, reload };
   },
-  AddForm: JiraAccessAddForm,
-  Row: JiraAccessRow,
+  AddForm: AtlassianAccessAddForm,
+  Row: AtlassianAccessRow,
 });
 
 /**
@@ -83,4 +87,4 @@ export const jiraConnector = defineAccessConnector<JiraCredentialsDto>({
  * form — no new tab, no page change, no layout change. Keep the list short
  * enough that the source filter stays useful.
  */
-export const ACCESS_CONNECTORS: AccessConnector[] = [githubConnector, jiraConnector];
+export const ACCESS_CONNECTORS: AccessConnector[] = [githubConnector, atlassianConnector];

src/features/admin/components/CreateProjectWizard.tsx

@@ -13,19 +13,21 @@ import {
 import {
   addDraftSource,
   connectDraftSources,
+  createConfluenceDraft,
   createDraftSourceFromDiscovery,
   createJiraDraft,
   createUploadDraft,
   hasFailedSources,
+  isValidConfluenceSpaceId,
   removeDraftSource,
   setDraftSourceOwner,
   type DraftSource,
 } from "../projectSourcesDraft";
 import { sortOwnerOptions } from "../sourceOwners";
 import type { DiscoverySelection } from "../../data-ingestion/components/GithubRepositoryDiscovery";
 import type { SourceSystem } from "../../data-ingestion/types";
-import { useJiraCredentials } from "../../settings/hooks/useJiraCredentials";
-import type { JiraCredentialsDto } from "../../../services/sources/jiraService";
+import { useAtlassianCredentials } from "../../settings/hooks/useAtlassianCredentials";
+import type { AtlassianCredentialDto } from "../../../services/sources/atlassianService";
 import { useGithubTokens } from "../../settings/hooks/useGithubTokens";
 import { getDisplayName } from "../data";
 import type { AdminUser } from "../types";
@@ -72,8 +74,8 @@ const STEP_INDEX: Record<Exclude<WizardPhase, "provisioning">, number> = {
   review: 3,
 };
 
-// All three connectors can now be staged from the add-source sub-flow.
-const AVAILABLE_SOURCE_TYPES: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD"];
+// All four connectors can now be staged from the add-source sub-flow.
+const AVAILABLE_SOURCE_TYPES: SourceSystem[] = ["GITHUB", "JIRA", "UPLOAD", "CONFLUENCE"];
 
 /**
  * Transactional create-project wizard: everything is drafted locally across the
@@ -141,6 +143,10 @@ export function CreateProjectWizard({
   const [jiraUrl, setJiraUrl] = useState("");
   const [jiraCredentialName, setJiraCredentialName] = useState("");
 
+  const [confluenceBaseUrl, setConfluenceBaseUrl] = useState("");
+  const [confluenceSpaceId, setConfluenceSpaceId] = useState("");
+  const [confluenceCredentialName, setConfluenceCredentialName] = useState("");
+
   // Upload files staged in memory; uploaded during provisioning once a project
   // id exists.
   const [uploadFiles, setUploadFiles] = useState<File[]>([]);
@@ -181,14 +187,17 @@ export function CreateProjectWizard({
   };
 
   const isJiraDetail = isAddingSource && addStep === "detail" && addType === "JIRA";
+  const isConfluenceDetail = isAddingSource && addStep === "detail" && addType === "CONFLUENCE";
+  // Jira and Confluence share the same Atlassian credential store, so one
+  // instance of the hook backs both detail screens' pickers.
   const {
     credentials: jiraCredentials,
     loaded: jiraCredentialsLoaded,
     error: jiraCredentialsError,
     isRefreshing: jiraCredentialsLoading,
     reload: reloadJiraCredentials,
     addCredentialLocally,
-  } = useJiraCredentials(isOpen && isJiraDetail);
+  } = useAtlassianCredentials(isOpen && (isJiraDetail || isConfluenceDetail));
 
   // The token list arrives asynchronously; adopt the first token as soon as it
   // does (and heal a stale selection) so discovery is usable on the first open.
@@ -202,8 +211,10 @@ export function CreateProjectWizard({
     });
   }, [effectiveTokenNames]);
 
-  // Same adoption pattern for the Jira credential picker: select the first
-  // stored credential once the list arrives, keeping a still-valid choice.
+  // Same adoption pattern for the Jira and Confluence credential pickers:
+  // select the first stored credential once the list arrives, keeping a
+  // still-valid choice. Both fields share the list, so a credential just added
+  // from either detail screen is adopted here too.
   useEffect(() => {
     if (!jiraCredentialsLoaded || jiraCredentialsLoading) return;
 
@@ -214,6 +225,12 @@ export function CreateProjectWizard({
           ? current
           : jiraCredentials[0].displayName;
       });
+      setConfluenceCredentialName((current) => {
+        if (jiraCredentials.length === 0) return "";
+        return current && jiraCredentials.some((credential) => credential.displayName === current)
+          ? current
+          : jiraCredentials[0].displayName;
+      });
     });
   }, [jiraCredentials, jiraCredentialsLoaded, jiraCredentialsLoading]);
 
@@ -240,6 +257,12 @@ export function CreateProjectWizard({
     void Promise.resolve().then(loadManagerCandidates);
   }, [isOpen, loadManagerCandidates]);
 
+  const resetConfluenceDraftFields = () => {
+    setConfluenceBaseUrl("");
+    setConfluenceSpaceId("");
+    setConfluenceCredentialName("");
+  };
+
   const resetWizard = () => {
     setPhase("details");
     setName("");
@@ -255,6 +278,7 @@ export function CreateProjectWizard({
     setAddType("GITHUB");
     setGithubSelection([]);
     resetJiraDraftFields();
+    resetConfluenceDraftFields();
     setUploadFiles([]);
     setCreatedProjectId("");
   };
@@ -268,6 +292,7 @@ export function CreateProjectWizard({
   const resetSourceDraftFields = () => {
     setGithubSelection([]);
     resetJiraDraftFields();
+    resetConfluenceDraftFields();
     setUploadFiles([]);
   };
 
@@ -397,24 +422,40 @@ export function CreateProjectWizard({
     await loadTokenNames();
   };
 
-  const handleCredentialSaved = async (credential: JiraCredentialsDto) => {
+  const handleCredentialSaved = async (credential: AtlassianCredentialDto) => {
     addCredentialLocally(credential);
     setJiraCredentialName(credential.displayName);
     await reloadJiraCredentials();
   };
 
+  const handleConfluenceCredentialSaved = async (credential: AtlassianCredentialDto) => {
+    addCredentialLocally(credential);
+    setConfluenceCredentialName(credential.displayName);
+    await reloadJiraCredentials();
+  };
+
   const selectedJiraCredential = jiraCredentials.find(
     (credential) => credential.displayName === jiraCredentialName,
   );
 
+  const selectedConfluenceCredential = jiraCredentials.find(
+    (credential) => credential.displayName === confluenceCredentialName,
+  );
+
   const canAddSource =
     addType === "GITHUB"
       ? githubSelection.length > 0
       : addType === "JIRA"
         ? Boolean(jiraDisplayName.trim() && jiraUrl.trim() && selectedJiraCredential)
         : addType === "UPLOAD"
           ? uploadFiles.length > 0
-          : false;
+          : addType === "CONFLUENCE"
+            ? Boolean(
+                confluenceBaseUrl.trim() &&
+                isValidConfluenceSpaceId(confluenceSpaceId) &&
+                selectedConfluenceCredential,
+              )
+            : false;
 
   const commitAddSource = () => {
     if (!canAddSource) return;
@@ -442,6 +483,17 @@ export function CreateProjectWizard({
     } else if (addType === "UPLOAD") {
       const displayName = uploadFiles.length === 1 ? uploadFiles[0].name : "Uploaded documents";
       setSources((current) => addDraftSource(current, createUploadDraft(displayName, uploadFiles)));
+    } else if (addType === "CONFLUENCE" && selectedConfluenceCredential) {
+      setSources((current) =>
+        addDraftSource(
+          current,
+          createConfluenceDraft({
+            baseUrl: confluenceBaseUrl.trim(),
+            spaceId: confluenceSpaceId.trim(),
+            credentialName: selectedConfluenceCredential.displayName,
+          }),
+        ),
+      );
     }
 
     closeAddSource();
@@ -804,6 +856,21 @@ export function CreateProjectWizard({
                       current.filter((_, position) => position !== index),
                     ),
                 }}
+                confluence={{
+                  baseUrl: confluenceBaseUrl,
+                  spaceId: confluenceSpaceId,
+                  credentialName: confluenceCredentialName,
+                  credentials: jiraCredentials,
+                  credentialsLoaded: jiraCredentialsLoaded,
+                  credentialsLoading: jiraCredentialsLoading,
+                  credentialsError: jiraCredentialsError,
+                  defaultUserEmail: null,
+                  onBaseUrlChange: setConfluenceBaseUrl,
+                  onSpaceIdChange: setConfluenceSpaceId,
+                  onCredentialNameChange: setConfluenceCredentialName,
+                  onSubmit: commitAddSource,
+                  onCredentialSaved: handleConfluenceCredentialSaved,
+                }}
               />
             ) : (
               <WizardSourcesStep

src/features/admin/components/StagedSourceList.tsx

@@ -1,5 +1,6 @@
 import {
   AlertCircle,
+  BookOpen,
   Check,
   FileText,
   GitBranch,
@@ -55,6 +56,10 @@ function TypeIcon({ source }: { source: DraftSource }) {
     return <FileText className="h-4 w-4 text-app-text-muted" />;
   }
 
+  if (source.type === "CONFLUENCE") {
+    return <BookOpen className="h-4 w-4 text-app-text-muted" />;
+  }
+
   return <GitBranch className="h-4 w-4 text-app-text-muted" />;
 }
 
@@ -95,6 +100,10 @@ function sourceDetail(source: DraftSource): string {
     return source.url;
   }
 
+  if (source.type === "CONFLUENCE") {
+    return `${source.baseUrl} (${source.spaceId})`;
+  }
+
   return source.tokenName;
 }