remove the function getConfluenceSpaceUrl and replace call sites (#10056

)
dust-tt · Jan 20, 2025 · d2fdd61 · d2fdd61
1 parent 3423993
commit d2fdd61
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/connectors/src/connectors/confluence/lib/permissions.ts b/connectors/src/connectors/confluence/lib/permissions.ts
@@ -34,30 +34,23 @@ function isConfluenceSpaceModel(
   );
 }
 
-export function getConfluenceSpaceUrl(
-  space: ConfluenceSpace | ConfluenceSpaceType,
-  baseUrl: string
-) {
-  const urlSuffix = isConfluenceSpaceModel(space)
-    ? space.urlSuffix
-    : space._links.webui;
-  return `${baseUrl}/wiki${urlSuffix}`;
-}
-
 export function createContentNodeFromSpace(
   space: ConfluenceSpace | ConfluenceSpaceType,
   baseUrl: string,
   permission: ConnectorPermission,
   { isExpandable }: { isExpandable: boolean }
 ): ContentNode {
   const spaceId = isConfluenceSpaceModel(space) ? space.spaceId : space.id;
+  const urlSuffix = isConfluenceSpaceModel(space)
+    ? space.urlSuffix
+    : space._links.webui;
 
   return {
     internalId: makeSpaceInternalId(spaceId),
     parentInternalId: null,
     type: "folder",
     title: space.name || "Unnamed Space",
-    sourceUrl: getConfluenceSpaceUrl(space, baseUrl),
+    sourceUrl: `${baseUrl}/wiki${urlSuffix}`,
     expandable: isExpandable,
     permission,
     lastUpdatedAt: null,

diff --git a/connectors/src/connectors/confluence/temporal/activities.ts b/connectors/src/connectors/confluence/temporal/activities.ts
@@ -23,7 +23,6 @@ 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";
@@ -231,8 +230,7 @@ export async function confluenceUpsertSpaceFolderActivity({
     parentId: null,
     title: spaceName,
     mimeType: MIME_TYPES.CONFLUENCE.SPACE,
-    sourceUrl:
-      spaceInDb?.urlSuffix && getConfluenceSpaceUrl(spaceInDb, baseUrl),
+    sourceUrl: spaceInDb?.urlSuffix && `${baseUrl}/wiki${spaceInDb.urlSuffix}`,
   });
 }