upsert the sourceUrl for confluence spaces

dust-tt · Jan 16, 2025 · fcfcf69 · fcfcf69
1 parent 1fd2e88
commit fcfcf69
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/connectors/src/connectors/confluence/temporal/activities.ts b/connectors/src/connectors/confluence/temporal/activities.ts
@@ -23,6 +23,7 @@ import {
   makePageInternalId,
   makeSpaceInternalId,
 } from "@connectors/connectors/confluence/lib/internal_ids";
+import { getConfluenceSpaceUrl } from "@connectors/connectors/confluence/lib/permissions";
 import { makeConfluenceDocumentUrl } from "@connectors/connectors/confluence/temporal/workflow_ids";
 import { dataSourceConfigFromConnector } from "@connectors/lib/api/data_source_config";
 import { concurrentExecutor } from "@connectors/lib/async_utils";
@@ -209,20 +210,29 @@ export async function confluenceUpsertSpaceFolderActivity({
   connectorId,
   spaceId,
   spaceName,
+  baseUrl,
 }: {
   connectorId: ModelId;
   spaceId: string;
   spaceName: string;
+  baseUrl: string;
 }) {
   const connector = await fetchConfluenceConnector(connectorId);
 
+  const spaceInDb = await ConfluenceSpace.findOne({
+    attributes: ["urlSuffix"],
+    where: { connectorId, spaceId },
+  });
+
   await upsertDataSourceFolder({
     dataSourceConfig: dataSourceConfigFromConnector(connector),
     folderId: makeSpaceInternalId(spaceId),
     parents: [makeSpaceInternalId(spaceId)],
     parentId: null,
     title: spaceName,
     mimeType: MIME_TYPES.CONFLUENCE.SPACE,
+    sourceUrl:
+      spaceInDb?.urlSuffix && getConfluenceSpaceUrl(spaceInDb, baseUrl),
   });
 }
 

diff --git a/connectors/src/connectors/confluence/temporal/workflows.ts b/connectors/src/connectors/confluence/temporal/workflows.ts
@@ -148,7 +148,7 @@ export async function confluenceSpaceSyncWorkflow(
   const confluenceConfig = await fetchConfluenceConfigurationActivity(
     params.connectorId
   );
-  const { cloudId: confluenceCloudId } = confluenceConfig;
+  const { cloudId: confluenceCloudId, url: baseUrl } = confluenceConfig;
 
   const spaceName = await confluenceGetSpaceNameActivity({
     ...params,
@@ -163,6 +163,7 @@ export async function confluenceSpaceSyncWorkflow(
     connectorId,
     spaceId,
     spaceName,
+    baseUrl,
   });
 
   const allowedRootPageIds = await fetchAndUpsertRootPagesActivity({