@atlaskit/smart-card 40.10.1 → 40.10.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/smart-card
 
+## 40.10.2
+
+### Patch Changes
+
+- [`2115cfcea4013`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2115cfcea4013) -
+  Add Jira Issue ID, Confluence Content ID/Page ID, and helper methods to retrieve, as well as
+  include in component onclick result
+
 ## 40.10.1
 
 ### Patch Changes

package/analytics.spec.yaml

@@ -753,13 +753,25 @@ events:
         3P Workflows team
       attributes:
         <<: [*PackageMetaDataContext, *CommonContext, *ResolvedContext]
-        sourceURL:
+        firstPartyARI:
           required: true
           type: string
           description:
-            The first party URL for this Smart Link - this is NOT the URL the user clicked on, but
-            the URL of the page where the Smart Link is rendered
+            The first party ARI for this Smart Link - this is NOT the ARI of the link the user
+            clicked on, but the ARI of the page where the Smart Link is rendered
         thirdPartyARI:
           required: true
           type: string
           description: The third-party ARI for this Smart Link
+        jiraIssueId:
+          required: false
+          type: string
+          description: The Issue ID for the Jira specific ticket this Smart Link is pasted on
+        confluenceContentId:
+          required: false
+          type: string
+          description: The Content ID for the Confluence specific page this Smart Link is pasted on
+        confluencePageId:
+          required: false
+          type: string
+          description: The Page ID for the Confluence specific page this Smart Link is pasted on

package/dist/cjs/state/helpers.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isVisible = exports.isFinalState = exports.isAccessible = exports.hasResolved = exports.hasAuthScopeOverrides = exports.getThirdPartyARI = exports.getSubproduct = exports.getStatusDetails = exports.getServices = exports.getResourceType = exports.getProduct = exports.getObjectName = exports.getObjectIconUrl = exports.getObjectAri = exports.getExtensionKey = exports.getDefinitionId = exports.getDatasources = exports.getClickUrl = exports.getCanBeDatasource = exports.getByDefinitionId = void 0;
+exports.isVisible = exports.isFinalState = exports.isAccessible = exports.hasResolved = exports.hasAuthScopeOverrides = exports.getThirdPartyARI = exports.getSubproduct = exports.getStatusDetails = exports.getServices = exports.getResourceType = exports.getProduct = exports.getPageId = exports.getObjectName = exports.getObjectIconUrl = exports.getObjectAri = exports.getLinkClickAnalyticsThirdPartyAttributes = exports.getJiraIssueId = exports.getExtensionKey = exports.getDefinitionId = exports.getDatasources = exports.getContentId = exports.getClickUrl = exports.getCanBeDatasource = exports.getByDefinitionId = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _extractVisitUrl = require("../extractors/common/primitives/extractVisitUrl");
@@ -43,6 +43,45 @@ var getThirdPartyARI = exports.getThirdPartyARI = function getThirdPartyARI(deta
   }
   return undefined;
 };
+var getPageId = exports.getPageId = function getPageId(details) {
+  if ((0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractPageIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+var getContentId = exports.getContentId = function getContentId(details) {
+  if ((0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractContentIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+var getJiraIssueId = exports.getJiraIssueId = function getJiraIssueId(details) {
+  if ((0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'jira') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractJiraIssueIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
 var getObjectName = exports.getObjectName = function getObjectName(details) {
   return (details === null || details === void 0 ? void 0 : details.data) && 'name' in details.data && details.data.name || undefined;
 };
@@ -96,4 +135,111 @@ var getCanBeDatasource = exports.getCanBeDatasource = function getCanBeDatasourc
 };
 var hasAuthScopeOverrides = exports.hasAuthScopeOverrides = function hasAuthScopeOverrides(details) {
   return !!(details !== null && details !== void 0 && details.meta.hasScopeOverrides);
+};
+
+// Helper function to extract page ID from standard Confluence page URLs
+var extractPageIdFromURL = function extractPageIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Following this pattern for confluence URL -> /wiki/spaces/{space}/pages/{pageId}/{title}
+    var pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
+    }
+
+    // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
+    var pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
+    }
+
+    // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
+    var displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
+    }
+  } catch (_unused) {
+    return undefined;
+  }
+  return undefined;
+};
+
+// Helper function to extract content ID from app connector URLs
+var extractContentIdFromURL = function extractContentIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs)
+    var contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+  } catch (_unused2) {
+    return undefined;
+  }
+  return undefined;
+};
+var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Following this pattern for jira URL -> /browse/{issueKey} (most common)
+    // Example: https://product-fabric.atlassian.net/browse/AI3W-1064
+    var browseMatch = urlObj.pathname.match(/\/browse\/([A-Z]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> /jira/browse/{issueKey} (for some installations)
+    var jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Z]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?selectedIssue={issueKey}
+    var selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Z]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?issueKey={issueKey}
+    var issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Z]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
+    }
+  } catch (_unused3) {
+    return undefined;
+  }
+  return undefined;
+};
+var getLinkClickAnalyticsThirdPartyAttributes = exports.getLinkClickAnalyticsThirdPartyAttributes = function getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, details) {
+  return {
+    firstPartyARI: getObjectAri(details),
+    thirdPartyARI: thirdPartyARI,
+    jiraIssueId: getJiraIssueId(details),
+    confluenceContentId: getContentId(details),
+    confluencePageId: getPageId(details)
+  };
+};
+var getProductFromWindowUrl = function getProductFromWindowUrl() {
+  try {
+    var currentUrl = window.location.href;
+    var urlObj = new URL(currentUrl);
+    var hostname = urlObj.hostname.toLowerCase();
+    var pathname = urlObj.pathname.toLowerCase();
+
+    // Check for Confluence patterns
+    if (hostname.includes('confluence') || pathname.includes('/wiki/') || pathname.includes('/display/') || pathname.includes('/spaces/')) {
+      return 'confluence';
+    }
+
+    // Check for Jira patterns
+    if (hostname.includes('jira') || pathname.includes('/browse/') || pathname.includes('/projects/') || pathname.includes('/secure/')) {
+      return 'jira';
+    }
+  } catch (_unused4) {
+    return undefined;
+  }
+  return undefined;
 };

package/dist/cjs/utils/analytics/analytics.js

@@ -11,7 +11,7 @@ var ANALYTICS_CHANNEL = exports.ANALYTICS_CHANNEL = 'media';
 var context = exports.context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0"
+  packageVersion: "40.10.1"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/cjs/view/CardWithUrl/component.js

@@ -68,12 +68,12 @@ function Component(_ref) {
     isPreviewPanelAvailable = _useSmartLink.isPreviewPanelAvailable,
     openPreviewPanel = _useSmartLink.openPreviewPanel;
   var ari = (0, _helpers.getObjectAri)(state.details);
-  var thirdPartyARI = (0, _helpers.getThirdPartyARI)(state.details);
   var name = (0, _helpers.getObjectName)(state.details);
   var definitionId = (0, _helpers.getDefinitionId)(state.details);
   var extensionKey = (0, _helpers.getExtensionKey)(state.details);
   var resourceType = (0, _helpers.getResourceType)(state.details);
   var services = (0, _helpers.getServices)(state.details);
+  var thirdPartyARI = (0, _helpers.getThirdPartyARI)(state.details);
   var isFlexibleUi = (0, _react.useMemo)(function () {
     return (0, _flexible.isFlexibleUiCard)(children, ui);
   }, [children, ui]);
@@ -93,7 +93,6 @@ function Component(_ref) {
     });
     if ((0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics')) {
       if (thirdPartyARI && thirdPartyARI.startsWith(thirdPartyARIPrefix)) {
-        var sourceURL = window.location.href;
         var clickURL = (0, _helpers.getClickUrl)(url, state.details);
         if (clickURL === url) {
           // For questions or concerns about this event,
@@ -106,10 +105,7 @@ function Component(_ref) {
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
             },
-            nonPrivacySafeAttributes: {
-              sourceURL: sourceURL,
-              thirdPartyARI: thirdPartyARI
-            }
+            nonPrivacySafeAttributes: (0, _helpers.getLinkClickAnalyticsThirdPartyAttributes)(thirdPartyARI, state.details)
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }

package/dist/cjs/view/LinkUrl/index.js

@@ -19,7 +19,7 @@ var _excluded = ["href", "children", "checkSafety", "onClick", "testId", "isLink
   _excluded2 = ["isLinkSafe", "showSafetyWarningModal"];
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0",
+  packageVersion: "40.10.1",
   componentName: 'linkUrl'
 };
 var Anchor = (0, _click.withLinkClickedEvent)('a');

package/dist/es2019/state/helpers.js

@@ -35,6 +35,45 @@ export const getThirdPartyARI = details => {
   }
   return undefined;
 };
+export const getPageId = details => {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    const currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractPageIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+export const getContentId = details => {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    const currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractContentIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+export const getJiraIssueId = details => {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    const currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'jira') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractJiraIssueIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
 export const getObjectName = details => (details === null || details === void 0 ? void 0 : details.data) && 'name' in details.data && details.data.name || undefined;
 export const getObjectIconUrl = details => {
   if (details !== null && details !== void 0 && details.data && 'icon' in details.data && details.data.icon) {
@@ -80,4 +119,109 @@ export const getCanBeDatasource = details => {
   const datasources = getDatasources(details);
   return !!datasources && datasources.length > 0;
 };
-export const hasAuthScopeOverrides = details => !!(details !== null && details !== void 0 && details.meta.hasScopeOverrides);
+export const hasAuthScopeOverrides = details => !!(details !== null && details !== void 0 && details.meta.hasScopeOverrides);
+
+// Helper function to extract page ID from standard Confluence page URLs
+const extractPageIdFromURL = url => {
+  try {
+    const urlObj = new URL(url);
+
+    // Following this pattern for confluence URL -> /wiki/spaces/{space}/pages/{pageId}/{title}
+    const pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
+    }
+
+    // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
+    const pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
+    }
+
+    // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
+    const displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+};
+
+// Helper function to extract content ID from app connector URLs
+const extractContentIdFromURL = url => {
+  try {
+    const urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs)
+    const contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+};
+const extractJiraIssueIdFromURL = url => {
+  try {
+    const urlObj = new URL(url);
+
+    // Following this pattern for jira URL -> /browse/{issueKey} (most common)
+    // Example: https://product-fabric.atlassian.net/browse/AI3W-1064
+    const browseMatch = urlObj.pathname.match(/\/browse\/([A-Z]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> /jira/browse/{issueKey} (for some installations)
+    const jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Z]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?selectedIssue={issueKey}
+    const selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Z]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?issueKey={issueKey}
+    const issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Z]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+};
+export const getLinkClickAnalyticsThirdPartyAttributes = (thirdPartyARI, details) => ({
+  firstPartyARI: getObjectAri(details),
+  thirdPartyARI: thirdPartyARI,
+  jiraIssueId: getJiraIssueId(details),
+  confluenceContentId: getContentId(details),
+  confluencePageId: getPageId(details)
+});
+const getProductFromWindowUrl = () => {
+  try {
+    const currentUrl = window.location.href;
+    const urlObj = new URL(currentUrl);
+    const hostname = urlObj.hostname.toLowerCase();
+    const pathname = urlObj.pathname.toLowerCase();
+
+    // Check for Confluence patterns
+    if (hostname.includes('confluence') || pathname.includes('/wiki/') || pathname.includes('/display/') || pathname.includes('/spaces/')) {
+      return 'confluence';
+    }
+
+    // Check for Jira patterns
+    if (hostname.includes('jira') || pathname.includes('/browse/') || pathname.includes('/projects/') || pathname.includes('/secure/')) {
+      return 'jira';
+    }
+  } catch {
+    return undefined;
+  }
+  return undefined;
+};

package/dist/es2019/utils/analytics/analytics.js

@@ -2,7 +2,7 @@ export const ANALYTICS_CHANNEL = 'media';
 export const context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0"
+  packageVersion: "40.10.1"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/es2019/view/CardWithUrl/component.js

@@ -5,7 +5,7 @@ import { useAnalyticsEvents } from '../../common/analytics/generated/use-analyti
 import { CardDisplay } from '../../constants';
 import { useSmartLink } from '../../state';
 import { succeedUfoExperience } from '../../state/analytics';
-import { getClickUrl, getDefinitionId, getExtensionKey, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
+import { getClickUrl, getDefinitionId, getExtensionKey, getLinkClickAnalyticsThirdPartyAttributes, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
 import { SmartLinkModalProvider } from '../../state/modal';
 import { isSpecialClick, isSpecialEvent, isSpecialKey } from '../../utils';
 import { combineActionOptions } from '../../utils/actions/combine-action-options';
@@ -63,12 +63,12 @@ function Component({
     openPreviewPanel
   } = useSmartLink(id, url);
   const ari = getObjectAri(state.details);
-  const thirdPartyARI = getThirdPartyARI(state.details);
   const name = getObjectName(state.details);
   const definitionId = getDefinitionId(state.details);
   const extensionKey = getExtensionKey(state.details);
   const resourceType = getResourceType(state.details);
   const services = getServices(state.details);
+  const thirdPartyARI = getThirdPartyARI(state.details);
   let isFlexibleUi = useMemo(() => isFlexibleUiCard(children, ui), [children, ui]);
   const actionOptions = combineActionOptions({
     actionOptions: actionOptionsProp,
@@ -86,7 +86,6 @@ function Component({
     });
     if (fg('platform_smartlink_3pclick_analytics')) {
       if (thirdPartyARI && thirdPartyARI.startsWith(thirdPartyARIPrefix)) {
-        const sourceURL = window.location.href;
         const clickURL = getClickUrl(url, state.details);
         if (clickURL === url) {
           // For questions or concerns about this event,
@@ -99,10 +98,7 @@ function Component({
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
             },
-            nonPrivacySafeAttributes: {
-              sourceURL: sourceURL,
-              thirdPartyARI: thirdPartyARI
-            }
+            nonPrivacySafeAttributes: getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, state.details)
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }

package/dist/es2019/view/LinkUrl/index.js

@@ -9,7 +9,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 const PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0",
+  packageVersion: "40.10.1",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');

package/dist/esm/state/helpers.js

@@ -36,6 +36,45 @@ export var getThirdPartyARI = function getThirdPartyARI(details) {
   }
   return undefined;
 };
+export var getPageId = function getPageId(details) {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractPageIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+export var getContentId = function getContentId(details) {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'confluence') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractContentIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
+export var getJiraIssueId = function getJiraIssueId(details) {
+  if (fg('platform_smartlink_3pclick_analytics')) {
+    var currentProduct = getProductFromWindowUrl();
+    if (currentProduct === 'jira') {
+      if (details !== null && details !== void 0 && details.data && 'url' in details.data) {
+        if (typeof details.data.url === 'string') {
+          return extractJiraIssueIdFromURL(details.data.url);
+        }
+      }
+    }
+  }
+  return undefined;
+};
 export var getObjectName = function getObjectName(details) {
   return (details === null || details === void 0 ? void 0 : details.data) && 'name' in details.data && details.data.name || undefined;
 };
@@ -89,4 +128,111 @@ export var getCanBeDatasource = function getCanBeDatasource(details) {
 };
 export var hasAuthScopeOverrides = function hasAuthScopeOverrides(details) {
   return !!(details !== null && details !== void 0 && details.meta.hasScopeOverrides);
+};
+
+// Helper function to extract page ID from standard Confluence page URLs
+var extractPageIdFromURL = function extractPageIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Following this pattern for confluence URL -> /wiki/spaces/{space}/pages/{pageId}/{title}
+    var pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
+    }
+
+    // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
+    var pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
+    }
+
+    // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
+    var displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
+    }
+  } catch (_unused) {
+    return undefined;
+  }
+  return undefined;
+};
+
+// Helper function to extract content ID from app connector URLs
+var extractContentIdFromURL = function extractContentIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs)
+    var contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+  } catch (_unused2) {
+    return undefined;
+  }
+  return undefined;
+};
+var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
+  try {
+    var urlObj = new URL(url);
+
+    // Following this pattern for jira URL -> /browse/{issueKey} (most common)
+    // Example: https://product-fabric.atlassian.net/browse/AI3W-1064
+    var browseMatch = urlObj.pathname.match(/\/browse\/([A-Z]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> /jira/browse/{issueKey} (for some installations)
+    var jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Z]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?selectedIssue={issueKey}
+    var selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Z]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Following this pattern for jira URL -> Query parameter ?issueKey={issueKey}
+    var issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Z]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
+    }
+  } catch (_unused3) {
+    return undefined;
+  }
+  return undefined;
+};
+export var getLinkClickAnalyticsThirdPartyAttributes = function getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, details) {
+  return {
+    firstPartyARI: getObjectAri(details),
+    thirdPartyARI: thirdPartyARI,
+    jiraIssueId: getJiraIssueId(details),
+    confluenceContentId: getContentId(details),
+    confluencePageId: getPageId(details)
+  };
+};
+var getProductFromWindowUrl = function getProductFromWindowUrl() {
+  try {
+    var currentUrl = window.location.href;
+    var urlObj = new URL(currentUrl);
+    var hostname = urlObj.hostname.toLowerCase();
+    var pathname = urlObj.pathname.toLowerCase();
+
+    // Check for Confluence patterns
+    if (hostname.includes('confluence') || pathname.includes('/wiki/') || pathname.includes('/display/') || pathname.includes('/spaces/')) {
+      return 'confluence';
+    }
+
+    // Check for Jira patterns
+    if (hostname.includes('jira') || pathname.includes('/browse/') || pathname.includes('/projects/') || pathname.includes('/secure/')) {
+      return 'jira';
+    }
+  } catch (_unused4) {
+    return undefined;
+  }
+  return undefined;
 };

package/dist/esm/utils/analytics/analytics.js

@@ -4,7 +4,7 @@ export var ANALYTICS_CHANNEL = 'media';
 export var context = {
   componentName: 'smart-cards',
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0"
+  packageVersion: "40.10.1"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/esm/view/CardWithUrl/component.js

@@ -5,7 +5,7 @@ import { useAnalyticsEvents } from '../../common/analytics/generated/use-analyti
 import { CardDisplay } from '../../constants';
 import { useSmartLink } from '../../state';
 import { succeedUfoExperience } from '../../state/analytics';
-import { getClickUrl, getDefinitionId, getExtensionKey, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
+import { getClickUrl, getDefinitionId, getExtensionKey, getLinkClickAnalyticsThirdPartyAttributes, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
 import { SmartLinkModalProvider } from '../../state/modal';
 import { isSpecialClick, isSpecialEvent, isSpecialKey } from '../../utils';
 import { combineActionOptions } from '../../utils/actions/combine-action-options';
@@ -59,12 +59,12 @@ function Component(_ref) {
     isPreviewPanelAvailable = _useSmartLink.isPreviewPanelAvailable,
     openPreviewPanel = _useSmartLink.openPreviewPanel;
   var ari = getObjectAri(state.details);
-  var thirdPartyARI = getThirdPartyARI(state.details);
   var name = getObjectName(state.details);
   var definitionId = getDefinitionId(state.details);
   var extensionKey = getExtensionKey(state.details);
   var resourceType = getResourceType(state.details);
   var services = getServices(state.details);
+  var thirdPartyARI = getThirdPartyARI(state.details);
   var isFlexibleUi = useMemo(function () {
     return isFlexibleUiCard(children, ui);
   }, [children, ui]);
@@ -84,7 +84,6 @@ function Component(_ref) {
     });
     if (fg('platform_smartlink_3pclick_analytics')) {
       if (thirdPartyARI && thirdPartyARI.startsWith(thirdPartyARIPrefix)) {
-        var sourceURL = window.location.href;
         var clickURL = getClickUrl(url, state.details);
         if (clickURL === url) {
           // For questions or concerns about this event,
@@ -97,10 +96,7 @@ function Component(_ref) {
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
             },
-            nonPrivacySafeAttributes: {
-              sourceURL: sourceURL,
-              thirdPartyARI: thirdPartyARI
-            }
+            nonPrivacySafeAttributes: getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, state.details)
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }

package/dist/esm/view/LinkUrl/index.js

@@ -12,7 +12,7 @@ import LinkWarningModal from './LinkWarningModal';
 import { useLinkWarningModal } from './LinkWarningModal/hooks/use-link-warning-modal';
 var PACKAGE_DATA = {
   packageName: "@atlaskit/smart-card",
-  packageVersion: "40.10.0",
+  packageVersion: "40.10.1",
   componentName: 'linkUrl'
 };
 var Anchor = withLinkClickedEvent('a');

package/dist/types/common/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::18e5687cdc42ba3ac58b306a03a60d9d>>
+ * @codegen <<SignedSource::9e03e5e3a6be04ef3aa7e2d7a018d8a7>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -231,8 +231,11 @@ export type SmartLinkRenderFailedAttributesType = {
     id: string | null;
 };
 export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
-    sourceURL: string;
+    firstPartyARI: string;
     thirdPartyARI: string;
+    jiraIssueId: string | null;
+    confluenceContentId: string | null;
+    confluencePageId: string | null;
 };
 export type AnalyticsEventAttributes = {
     /**

package/dist/types/state/helpers.d.ts

@@ -9,6 +9,9 @@ export declare const getDefinitionId: (details?: JsonLd.Response) => string | un
 export declare const getExtensionKey: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectAri: (details?: JsonLd.Response) => string | undefined;
 export declare const getThirdPartyARI: (details?: SmartLinkResponse) => string | undefined;
+export declare const getPageId: (details?: JsonLd.Response) => string | undefined;
+export declare const getContentId: (details?: JsonLd.Response) => string | undefined;
+export declare const getJiraIssueId: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectName: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectIconUrl: (details?: JsonLd.Response) => string | undefined;
 export declare const getResourceType: (details?: JsonLd.Response) => string | undefined;
@@ -23,3 +26,10 @@ export declare const isFinalState: (status: CardType) => boolean;
 export declare const getDatasources: (details?: JsonLdDatasourceResponse) => DatasourceResolveResponse[] | undefined;
 export declare const getCanBeDatasource: (details?: JsonLdDatasourceResponse) => boolean;
 export declare const hasAuthScopeOverrides: (details?: JsonLd.Response) => boolean;
+export declare const getLinkClickAnalyticsThirdPartyAttributes: (thirdPartyARI: string | undefined, details?: JsonLd.Response) => {
+    firstPartyARI: string | undefined;
+    thirdPartyARI: string | undefined;
+    jiraIssueId: string | undefined;
+    confluenceContentId: string | undefined;
+    confluencePageId: string | undefined;
+};

package/dist/types-ts4.5/common/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::18e5687cdc42ba3ac58b306a03a60d9d>>
+ * @codegen <<SignedSource::9e03e5e3a6be04ef3aa7e2d7a018d8a7>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -231,8 +231,11 @@ export type SmartLinkRenderFailedAttributesType = {
     id: string | null;
 };
 export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
-    sourceURL: string;
+    firstPartyARI: string;
     thirdPartyARI: string;
+    jiraIssueId: string | null;
+    confluenceContentId: string | null;
+    confluencePageId: string | null;
 };
 export type AnalyticsEventAttributes = {
     /**

package/dist/types-ts4.5/state/helpers.d.ts

@@ -9,6 +9,9 @@ export declare const getDefinitionId: (details?: JsonLd.Response) => string | un
 export declare const getExtensionKey: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectAri: (details?: JsonLd.Response) => string | undefined;
 export declare const getThirdPartyARI: (details?: SmartLinkResponse) => string | undefined;
+export declare const getPageId: (details?: JsonLd.Response) => string | undefined;
+export declare const getContentId: (details?: JsonLd.Response) => string | undefined;
+export declare const getJiraIssueId: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectName: (details?: JsonLd.Response) => string | undefined;
 export declare const getObjectIconUrl: (details?: JsonLd.Response) => string | undefined;
 export declare const getResourceType: (details?: JsonLd.Response) => string | undefined;
@@ -23,3 +26,10 @@ export declare const isFinalState: (status: CardType) => boolean;
 export declare const getDatasources: (details?: JsonLdDatasourceResponse) => DatasourceResolveResponse[] | undefined;
 export declare const getCanBeDatasource: (details?: JsonLdDatasourceResponse) => boolean;
 export declare const hasAuthScopeOverrides: (details?: JsonLd.Response) => boolean;
+export declare const getLinkClickAnalyticsThirdPartyAttributes: (thirdPartyARI: string | undefined, details?: JsonLd.Response) => {
+    firstPartyARI: string | undefined;
+    thirdPartyARI: string | undefined;
+    jiraIssueId: string | undefined;
+    confluenceContentId: string | undefined;
+    confluencePageId: string | undefined;
+};

package/hooks/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/hooks.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/hooks.d.ts"
       ]

package/hover-card/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/hoverCard.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/hoverCard.d.ts"
       ]

package/link-url/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/linkUrl.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/linkUrl.d.ts"
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "40.10.1",
+	"version": "40.10.2",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -97,7 +97,7 @@
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/css-reset": "^7.3.0",
 		"@atlaskit/media-test-helpers": "^38.0.0",
-		"@atlaskit/react-ufo": "^4.2.0",
+		"@atlaskit/react-ufo": "^4.3.0",
 		"@atlaskit/ssr": "workspace:^",
 		"@atlaskit/visual-regression": "workspace:^",
 		"@atlassian/analytics-tooling": "^0.5.0",

package/ssr/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/ssr.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/ssr.d.ts"
       ]

package/types/package.json

@@ -8,7 +8,7 @@
   ],
   "types": "../dist/types/types.d.ts",
   "typesVersions": {
-    ">=4.5 <5.4": {
+    ">=4.5 <5.9": {
       "*": [
         "../dist/types-ts4.5/types.d.ts"
       ]