@atlaskit/smart-card 40.10.4 → 40.10.6

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/smart-card
 
+## 40.10.6
+
+### Patch Changes
+
+- [`1d8918dd67a21`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/1d8918dd67a21) -
+  Update smartLinkClickedSmartLinkClickAnalyticsWorkflowsAttributesType to include clickedAt field
+  in yaml file and codegen'd file as well as update component to pass it along as
+  Date.now().toString()
+
+## 40.10.5
+
+### Patch Changes
+
+- [`2a46c52a9d189`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2a46c52a9d189) -
+  NAVX-1307 cleaning up smart-links-noun-support
+- [`f72b5d8c897b8`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f72b5d8c897b8) -
+  [ux] Add ownedBy support for passionfruit-object-provider smart-link resolver under
+  `passionfruit_ask_smart_links_enabled` feature-gate
+- Updated dependencies
+
 ## 40.10.4
 
 ### Patch Changes

package/analytics.spec.yaml

@@ -771,3 +771,7 @@ events:
             A null-capable field representing the Confluence content ID, Confluence page ID, or Jira
             issue key. This can be null if it is a value for an unsupported 1P provider (eg,
             Bitbucket, Loom), and will be prefixed by an identifier based on the source product.
+        clickedAt:
+          required: true
+          type: string
+          description: The timestamp when the event was clicked

package/dist/cjs/extractors/action/extract-invoke-copy-link-action.js

@@ -8,7 +8,6 @@ exports.extractInvokeCopyLinkAction = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _index = require("../../index");
 var _helpers = require("../../state/helpers");
 var _canShowAction = require("../../utils/actions/can-show-action");
@@ -20,8 +19,7 @@ var extractInvokeCopyLinkAction = exports.extractInvokeCopyLinkAction = function
   if (!(0, _canShowAction.canShowAction)(_index.CardAction.CopyLinkAction, actionOptions)) {
     return;
   }
-  var data = response.data;
-  var url = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkUrl)(response) : (0, _linkExtractors.extractLink)(data);
+  var url = (0, _linkExtractors.extractSmartLinkUrl)(response);
   if (!url) {
     return;
   }

package/dist/cjs/extractors/action/extract-invoke-download-action.js

@@ -8,13 +8,11 @@ exports.extractInvokeDownloadAction = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _index = require("../../index");
 var _helpers = require("../../state/helpers");
 var _utils = require("../../utils");
 var _canShowAction = require("../../utils/actions/can-show-action");
 var _extractActions = require("../common/actions/extractActions");
-var _extractDownloadUrl = require("../common/download/extractDownloadUrl");
 var extractInvokeDownloadAction = exports.extractInvokeDownloadAction = function extractInvokeDownloadAction(_ref) {
   var actionOptions = _ref.actionOptions,
     appearance = _ref.appearance,
@@ -28,7 +26,7 @@ var extractInvokeDownloadAction = exports.extractInvokeDownloadAction = function
     return action['@type'] === 'DownloadAction';
   });
   if (downloadActionExists) {
-    var downloadUrl = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkDownloadUrl)(response) : (0, _extractDownloadUrl.extractDownloadUrl)(data);
+    var downloadUrl = (0, _linkExtractors.extractSmartLinkDownloadUrl)(response);
     return {
       actionFn: function () {
         var _actionFn = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {

package/dist/cjs/extractors/action/extract-invoke-preview-action.js

@@ -8,7 +8,6 @@ exports.extractInvokePreviewAction = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _index = require("../../index");
 var _helpers = require("../../state/helpers");
 var _canShowAction = require("../../utils/actions/can-show-action");
@@ -34,12 +33,11 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
   var meta = response.meta;
   var src = (_extractPreviewData = (0, _linkExtractors.extractPreview)(data, 'web')) === null || _extractPreviewData === void 0 ? void 0 : _extractPreviewData.src;
   if (src) {
-    var url = (0, _linkExtractors.extractLink)(data);
     var extensionKey = (0, _helpers.getExtensionKey)(response);
     return {
       actionFn: function () {
         var _actionFn = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-          var _extractSmartLinkProv, _extractProvider, _extractSmartLinkEmbe;
+          var _extractSmartLinkProv, _extractSmartLinkEmbe;
           return _regenerator.default.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -52,12 +50,12 @@ var extractInvokePreviewAction = exports.extractInvokePreviewAction = function e
                   isSupportTheming: (0, _extractIsSupportTheming.extractIsSupportTheming)(meta),
                   isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta),
                   linkIcon: (0, _icon.extractLinkIcon)(response),
-                  providerName: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (_extractSmartLinkProv = (0, _linkExtractors.extractSmartLinkProvider)(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = (0, _linkExtractors.extractProvider)(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text,
+                  providerName: (_extractSmartLinkProv = (0, _linkExtractors.extractSmartLinkProvider)(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text,
                   onClose: onClose,
                   origin: origin,
-                  src: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (_extractSmartLinkEmbe = (0, _linkExtractors.extractSmartLinkEmbed)(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : src,
-                  title: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkTitle)(response) : (0, _linkExtractors.extractTitle)(data),
-                  url: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkUrl)(response) : url
+                  src: (_extractSmartLinkEmbe = (0, _linkExtractors.extractSmartLinkEmbed)(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src,
+                  title: (0, _linkExtractors.extractSmartLinkTitle)(response),
+                  url: (0, _linkExtractors.extractSmartLinkUrl)(response)
                 }));
               case 1:
               case "end":

package/dist/cjs/extractors/common/primitives/extractSummary.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractSummary = exports.extractSmartLinkSummary = void 0;
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * Return link summary
  */
@@ -20,11 +19,9 @@ var extractSummary = exports.extractSummary = function extractSummary(jsonLd) {
  * Return link summary
  */
 var extractSmartLinkSummary = exports.extractSmartLinkSummary = function extractSmartLinkSummary(response) {
-  if ((0, _platformFeatureFlags.fg)('smart_links_noun_support')) {
-    if ((0, _linkExtractors.isEntityPresent)(response)) {
-      var _extractEntity;
-      return (_extractEntity = (0, _linkExtractors.extractEntity)(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
-    }
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    var _extractEntity;
+    return (_extractEntity = (0, _linkExtractors.extractEntity)(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSummary(response.data);
 };

package/dist/cjs/extractors/embed/index.js

@@ -1,27 +1,14 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.extractEmbedProps = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _jsonld = require("../../utils/jsonld");
 var _context = require("../common/context");
 var _extractIsSupportTheming = require("../common/meta/extractIsSupportTheming");
 var _extractIsTrusted = require("../common/meta/extractIsTrusted");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform, iframeUrlType) {
-  var preview = (0, _linkExtractors.extractPreview)(jsonLd, platform, iframeUrlType);
-  if (preview && preview.src) {
-    return _objectSpread(_objectSpread({}, preview), {}, {
-      src: preview.src
-    });
-  }
-};
 var extractEmbedProps = exports.extractEmbedProps = function extractEmbedProps(response, platform, iframeUrlType) {
   var meta = response === null || response === void 0 ? void 0 : response.meta;
   var jsonLd = (response === null || response === void 0 ? void 0 : response.data) || (0, _jsonld.getEmptyJsonLd)();
@@ -29,7 +16,7 @@ var extractEmbedProps = exports.extractEmbedProps = function extractEmbedProps(r
     link: (0, _linkExtractors.extractSmartLinkUrl)(response) || '',
     title: (0, _linkExtractors.extractSmartLinkTitle)(response),
     context: (0, _context.extractSmartLinkContext)(response),
-    preview: (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkEmbed)(response, iframeUrlType) : extractEmbedPreview(jsonLd, platform, iframeUrlType),
+    preview: (0, _linkExtractors.extractSmartLinkEmbed)(response, iframeUrlType),
     isTrusted: (0, _extractIsTrusted.extractIsTrusted)(meta),
     isSupportTheming: (0, _extractIsSupportTheming.extractIsSupportTheming)(meta),
     type: (0, _linkExtractors.extractType)(jsonLd)

package/dist/cjs/extractors/flexible/actions/extract-view-related-links-action.js

@@ -5,13 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractViewRelatedLinksAction = void 0;
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var extractViewRelatedLinksAction = exports.extractViewRelatedLinksAction = function extractViewRelatedLinksAction(response) {
   var _response$meta;
   if (!(response !== null && response !== void 0 && (_response$meta = response.meta) !== null && _response$meta !== void 0 && (_response$meta = _response$meta.supportedFeature) !== null && _response$meta !== void 0 && _response$meta.includes('RelatedLinks'))) {
     return;
   }
-  var ari = (0, _platformFeatureFlags.fg)('smart_links_noun_support') ? (0, _linkExtractors.extractSmartLinkAri)(response) : (0, _linkExtractors.extractAri)(response.data);
+  var ari = (0, _linkExtractors.extractSmartLinkAri)(response);
   if (!ari) {
     return;
   }

package/dist/cjs/extractors/flexible/extract-preview.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.extractSmartLinkPreviewImage = exports.default = void 0;
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../constants");
 var extractPreview = function extractPreview(data) {
   if (!data) {
@@ -29,10 +28,6 @@ var extractSmartLinkPreviewImage = exports.extractSmartLinkPreviewImage = functi
     var _entity$thumbnail;
     var entity = (0, _linkExtractors.extractEntity)(response);
     var url = entity === null || entity === void 0 || (_entity$thumbnail = entity.thumbnail) === null || _entity$thumbnail === void 0 ? void 0 : _entity$thumbnail.externalUrl;
-    if (!url && !(0, _platformFeatureFlags.fg)('smart_links_noun_support')) {
-      var provider = (0, _linkExtractors.extractEntityProvider)(response);
-      url = provider === null || provider === void 0 ? void 0 : provider.image;
-    }
     return url ? {
       type: _constants.MediaType.Image,
       url: url

package/dist/cjs/state/helpers.js

@@ -50,9 +50,11 @@ var getFirstPartyIdentifier = exports.getFirstPartyIdentifier = function getFirs
   var product = getProductFromWindowURL();
   var currentURL = window.location.href;
   if (product === 'confluence') {
-    var contentId = extractContentIdFromURL(currentURL);
-    if (contentId) {
-      return "ConfluenceContentId:".concat(contentId);
+    if (currentURL.includes('content.id')) {
+      var contentId = extractContentIdFromURL(currentURL);
+      if (contentId) {
+        return "ConfluenceContentId:".concat(contentId);
+      }
     }
     var pageId = extractPageIdFromURL(currentURL);
     if (pageId) {
@@ -63,9 +65,8 @@ var getFirstPartyIdentifier = exports.getFirstPartyIdentifier = function getFirs
     if (issueKey) {
       return "JiraIssueKey:".concat(issueKey);
     }
-  } else {
-    return undefined;
   }
+  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;
@@ -125,40 +126,34 @@ var hasAuthScopeOverrides = exports.hasAuthScopeOverrides = function hasAuthScop
 // 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];
+    var pagesMatch = url.match(/(?!pages)(\d+)/);
+    if (pagesMatch && pagesMatch[0]) {
+      return pagesMatch[0];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    var pageIdParam = urlObj.searchParams.get('pageId');
-    if (pageIdParam) {
-      return pageIdParam;
+    var pageIdParam = url.match(/(?!pageId=)(\d+)/);
+    if (pageIdParam && pageIdParam[0]) {
+      return pageIdParam[0];
     }
 
     // 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];
+    var displayMatch = url.match(/(?!display\/)(\d+)/);
+    if (displayMatch && displayMatch[0]) {
+      return displayMatch[0];
     }
   } 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;
+    var contentId = url.match(/content\.id=(\d+)/);
+    if (contentId && contentId[1]) {
+      // contentId[1] contains just the number
+      return contentId[1];
     }
   } catch (_unused2) {
     return undefined;
@@ -167,31 +162,9 @@ var extractContentIdFromURL = function extractContentIdFromURL(url) {
 };
 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;
+    var browseMatch = url.match(/[A-Z0-9]+-\d+/);
+    if (browseMatch && browseMatch[0]) {
+      return browseMatch[0];
     }
   } catch (_unused3) {
     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.3"
+  packageVersion: "40.10.5"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/cjs/view/BlockCard/views/utils/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.titleBlockOptions = exports.getSimulatedBetterMetadata = exports.PreviewBlockOptions = exports.FlexibleCardUiOptions = void 0;
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _constants = require("../../../../constants");
 var _utils = require("../../../../extractors/flexible/utils");
 var _helpers = require("../../../../state/helpers");
@@ -73,6 +74,26 @@ var getSimulatedBetterMetadata = exports.getSimulatedBetterMetadata = function g
           name: _constants.ElementName.AppliedToComponentsCount
         }].concat(baseBottomMetaData)
       };
+    case 'passionfruit-object-provider':
+      if ((0, _platformFeatureFlags.fg)('passionfruit_ask_smart_links_enabled')) {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: (0, _utils.extractOwnedBy)(data) ? [{
+            name: _constants.ElementName.OwnedByGroup
+          }, {
+            name: _constants.ElementName.OwnedBy
+          }].concat(baseTopMetadata) : defaultTopMetadata,
+          bottomMetadata: [{
+            name: _constants.ElementName.AppliedToComponentsCount
+          }].concat(baseBottomMetaData)
+        };
+      } else {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: defaultTopMetadata,
+          bottomMetadata: defaultBottomMetadata
+        };
+      }
     case 'confluence-object-provider':
       return {
         titleMetadata: defaultTitleMetadata,

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

@@ -102,10 +102,11 @@ function Component(_ref) {
             action: 'clicked',
             actionSubject: 'smartLink',
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
-            eventType: 'ui',
+            eventType: 'screen',
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
-              firstPartyIdentifier: firstPartyIdentifier
+              firstPartyIdentifier: firstPartyIdentifier,
+              clickedAt: Date.now().toString()
             },
             nonPrivacySafeAttributes: {
               thirdPartyARI: thirdPartyARI

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.3",
+  packageVersion: "40.10.5",
   componentName: 'linkUrl'
 };
 var Anchor = (0, _click.withLinkClickedEvent)('a');

package/dist/es2019/extractors/action/extract-invoke-copy-link-action.js

@@ -1,5 +1,4 @@
-import { extractLink, extractSmartLinkUrl } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkUrl } from '@atlaskit/link-extractors';
 import { ActionName, CardAction } from '../../index';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../state/helpers';
 import { canShowAction } from '../../utils/actions/can-show-action';
@@ -12,8 +11,7 @@ export const extractInvokeCopyLinkAction = ({
   if (!canShowAction(CardAction.CopyLinkAction, actionOptions)) {
     return;
   }
-  const data = response.data;
-  const url = fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : extractLink(data);
+  const url = extractSmartLinkUrl(response);
   if (!url) {
     return;
   }

package/dist/es2019/extractors/action/extract-invoke-download-action.js

@@ -1,11 +1,9 @@
 import { extractSmartLinkDownloadUrl } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ActionName, CardAction } from '../../index';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../state/helpers';
 import { downloadUrl as download } from '../../utils';
 import { canShowAction } from '../../utils/actions/can-show-action';
 import { getActionsFromJsonLd } from '../common/actions/extractActions';
-import { extractDownloadUrl } from '../common/download/extractDownloadUrl';
 export const extractInvokeDownloadAction = ({
   actionOptions,
   appearance,
@@ -18,7 +16,7 @@ export const extractInvokeDownloadAction = ({
   const data = response.data;
   const downloadActionExists = getActionsFromJsonLd(data).find(action => action['@type'] === 'DownloadAction');
   if (downloadActionExists) {
-    const downloadUrl = fg('smart_links_noun_support') ? extractSmartLinkDownloadUrl(response) : extractDownloadUrl(data);
+    const downloadUrl = extractSmartLinkDownloadUrl(response);
     return {
       actionFn: async () => download(downloadUrl),
       actionSubjectId: 'downloadDocument',

package/dist/es2019/extractors/action/extract-invoke-preview-action.js

@@ -1,5 +1,4 @@
-import { extractLink, extractPreview as extractPreviewData, extractProvider, extractSmartLinkEmbed, extractSmartLinkProvider, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractPreview as extractPreviewData, extractSmartLinkEmbed, extractSmartLinkProvider, extractSmartLinkTitle, extractSmartLinkUrl } from '@atlaskit/link-extractors';
 import { ActionName, CardAction } from '../../index';
 import { getExtensionKey } from '../../state/helpers';
 import { canShowAction } from '../../utils/actions/can-show-action';
@@ -27,11 +26,10 @@ export const extractInvokePreviewAction = param => {
   const meta = response.meta;
   const src = (_extractPreviewData = extractPreviewData(data, 'web')) === null || _extractPreviewData === void 0 ? void 0 : _extractPreviewData.src;
   if (src) {
-    const url = extractLink(data);
     const extensionKey = getExtensionKey(response);
     return {
       actionFn: async () => {
-        var _extractSmartLinkProv, _extractProvider, _extractSmartLinkEmbe;
+        var _extractSmartLinkProv, _extractSmartLinkEmbe;
         return openEmbedModal({
           fireEvent,
           extensionKey,
@@ -41,12 +39,12 @@ export const extractInvokePreviewAction = param => {
           isSupportTheming: extractIsSupportTheming(meta),
           isTrusted: extractIsTrusted(meta),
           linkIcon: extractLinkIcon(response),
-          providerName: fg('smart_links_noun_support') ? (_extractSmartLinkProv = extractSmartLinkProvider(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text,
+          providerName: (_extractSmartLinkProv = extractSmartLinkProvider(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text,
           onClose,
           origin,
-          src: fg('smart_links_noun_support') ? (_extractSmartLinkEmbe = extractSmartLinkEmbed(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : src,
-          title: fg('smart_links_noun_support') ? extractSmartLinkTitle(response) : extractTitle(data),
-          url: fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : url
+          src: (_extractSmartLinkEmbe = extractSmartLinkEmbed(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src,
+          title: extractSmartLinkTitle(response),
+          url: extractSmartLinkUrl(response)
         });
       },
       actionSubjectId: 'invokePreviewScreen',

package/dist/es2019/extractors/common/primitives/extractSummary.js

@@ -1,6 +1,4 @@
 import { extractEntity, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Return link summary
  */
@@ -15,11 +13,9 @@ export const extractSummary = jsonLd => {
  * Return link summary
  */
 export const extractSmartLinkSummary = response => {
-  if (fg('smart_links_noun_support')) {
-    if (isEntityPresent(response)) {
-      var _extractEntity;
-      return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
-    }
+  if (isEntityPresent(response)) {
+    var _extractEntity;
+    return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSummary(response.data);
 };

package/dist/es2019/extractors/embed/index.js

@@ -1,18 +1,8 @@
-import { extractPreview, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
 import { getEmptyJsonLd } from '../../utils/jsonld';
 import { extractSmartLinkContext } from '../common/context';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
-const extractEmbedPreview = (jsonLd, platform, iframeUrlType) => {
-  const preview = extractPreview(jsonLd, platform, iframeUrlType);
-  if (preview && preview.src) {
-    return {
-      ...preview,
-      src: preview.src
-    };
-  }
-};
 export const extractEmbedProps = (response, platform, iframeUrlType) => {
   const meta = response === null || response === void 0 ? void 0 : response.meta;
   const jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
@@ -20,7 +10,7 @@ export const extractEmbedProps = (response, platform, iframeUrlType) => {
     link: extractSmartLinkUrl(response) || '',
     title: extractSmartLinkTitle(response),
     context: extractSmartLinkContext(response),
-    preview: fg('smart_links_noun_support') ? extractSmartLinkEmbed(response, iframeUrlType) : extractEmbedPreview(jsonLd, platform, iframeUrlType),
+    preview: extractSmartLinkEmbed(response, iframeUrlType),
     isTrusted: extractIsTrusted(meta),
     isSupportTheming: extractIsSupportTheming(meta),
     type: extractType(jsonLd)

package/dist/es2019/extractors/flexible/actions/extract-view-related-links-action.js

@@ -1,11 +1,10 @@
-import { extractAri, extractSmartLinkAri } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkAri } from '@atlaskit/link-extractors';
 export const extractViewRelatedLinksAction = response => {
   var _response$meta, _response$meta$suppor;
   if (!(response !== null && response !== void 0 && (_response$meta = response.meta) !== null && _response$meta !== void 0 && (_response$meta$suppor = _response$meta.supportedFeature) !== null && _response$meta$suppor !== void 0 && _response$meta$suppor.includes('RelatedLinks'))) {
     return;
   }
-  const ari = fg('smart_links_noun_support') ? extractSmartLinkAri(response) : extractAri(response.data);
+  const ari = extractSmartLinkAri(response);
   if (!ari) {
     return;
   }

package/dist/es2019/extractors/flexible/extract-preview.js

@@ -1,5 +1,4 @@
-import { extractEntity, extractEntityProvider, extractImage, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractEntity, extractImage, isEntityPresent } from '@atlaskit/link-extractors';
 import { MediaType } from '../../constants';
 const extractPreview = data => {
   if (!data) {
@@ -24,10 +23,6 @@ export const extractSmartLinkPreviewImage = response => {
     var _entity$thumbnail;
     const entity = extractEntity(response);
     let url = entity === null || entity === void 0 ? void 0 : (_entity$thumbnail = entity.thumbnail) === null || _entity$thumbnail === void 0 ? void 0 : _entity$thumbnail.externalUrl;
-    if (!url && !fg('smart_links_noun_support')) {
-      const provider = extractEntityProvider(response);
-      url = provider === null || provider === void 0 ? void 0 : provider.image;
-    }
     return url ? {
       type: MediaType.Image,
       url

package/dist/es2019/state/helpers.js

@@ -42,9 +42,11 @@ export const getFirstPartyIdentifier = () => {
   const product = getProductFromWindowURL();
   const currentURL = window.location.href;
   if (product === 'confluence') {
-    const contentId = extractContentIdFromURL(currentURL);
-    if (contentId) {
-      return `ConfluenceContentId:${contentId}`;
+    if (currentURL.includes('content.id')) {
+      const contentId = extractContentIdFromURL(currentURL);
+      if (contentId) {
+        return `ConfluenceContentId:${contentId}`;
+      }
     }
     const pageId = extractPageIdFromURL(currentURL);
     if (pageId) {
@@ -55,9 +57,8 @@ export const getFirstPartyIdentifier = () => {
     if (issueKey) {
       return `JiraIssueKey:${issueKey}`;
     }
-  } else {
-    return undefined;
   }
+  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 => {
@@ -109,40 +110,34 @@ export const hasAuthScopeOverrides = details => !!(details !== null && details !
 // 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];
+    const pagesMatch = url.match(/(?!pages)(\d+)/);
+    if (pagesMatch && pagesMatch[0]) {
+      return pagesMatch[0];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    const pageIdParam = urlObj.searchParams.get('pageId');
-    if (pageIdParam) {
-      return pageIdParam;
+    const pageIdParam = url.match(/(?!pageId=)(\d+)/);
+    if (pageIdParam && pageIdParam[0]) {
+      return pageIdParam[0];
     }
 
     // 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];
+    const displayMatch = url.match(/(?!display\/)(\d+)/);
+    if (displayMatch && displayMatch[0]) {
+      return displayMatch[0];
     }
   } 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;
+    const contentId = url.match(/content\.id=(\d+)/);
+    if (contentId && contentId[1]) {
+      // contentId[1] contains just the number
+      return contentId[1];
     }
   } catch {
     return undefined;
@@ -151,31 +146,9 @@ const extractContentIdFromURL = url => {
 };
 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;
+    const browseMatch = url.match(/[A-Z0-9]+-\d+/);
+    if (browseMatch && browseMatch[0]) {
+      return browseMatch[0];
     }
   } catch {
     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.3"
+  packageVersion: "40.10.5"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/es2019/view/BlockCard/views/utils/index.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ElementName, MediaPlacement, SmartLinkPosition, SmartLinkSize } from '../../../../constants';
 import { extractOwnedBy } from '../../../../extractors/flexible/utils';
 import { getExtensionKey } from '../../../../state/helpers';
@@ -67,6 +68,26 @@ export const getSimulatedBetterMetadata = cardDetails => {
           name: ElementName.AppliedToComponentsCount
         }, ...baseBottomMetaData]
       };
+    case 'passionfruit-object-provider':
+      if (fg('passionfruit_ask_smart_links_enabled')) {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: extractOwnedBy(data) ? [{
+            name: ElementName.OwnedByGroup
+          }, {
+            name: ElementName.OwnedBy
+          }, ...baseTopMetadata] : defaultTopMetadata,
+          bottomMetadata: [{
+            name: ElementName.AppliedToComponentsCount
+          }, ...baseBottomMetaData]
+        };
+      } else {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: defaultTopMetadata,
+          bottomMetadata: defaultBottomMetadata
+        };
+      }
     case 'confluence-object-provider':
       return {
         titleMetadata: defaultTitleMetadata,

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

@@ -95,10 +95,11 @@ function Component({
             action: 'clicked',
             actionSubject: 'smartLink',
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
-            eventType: 'ui',
+            eventType: 'screen',
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
-              firstPartyIdentifier: firstPartyIdentifier
+              firstPartyIdentifier: firstPartyIdentifier,
+              clickedAt: Date.now().toString()
             },
             nonPrivacySafeAttributes: {
               thirdPartyARI: thirdPartyARI

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.3",
+  packageVersion: "40.10.5",
   componentName: 'linkUrl'
 };
 const Anchor = withLinkClickedEvent('a');

package/dist/esm/extractors/action/extract-invoke-copy-link-action.js

@@ -1,7 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { extractLink, extractSmartLinkUrl } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkUrl } from '@atlaskit/link-extractors';
 import { ActionName, CardAction } from '../../index';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../state/helpers';
 import { canShowAction } from '../../utils/actions/can-show-action';
@@ -13,8 +12,7 @@ export var extractInvokeCopyLinkAction = function extractInvokeCopyLinkAction(_r
   if (!canShowAction(CardAction.CopyLinkAction, actionOptions)) {
     return;
   }
-  var data = response.data;
-  var url = fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : extractLink(data);
+  var url = extractSmartLinkUrl(response);
   if (!url) {
     return;
   }

package/dist/esm/extractors/action/extract-invoke-download-action.js

@@ -1,13 +1,11 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extractSmartLinkDownloadUrl } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { ActionName, CardAction } from '../../index';
 import { getDefinitionId, getExtensionKey, getResourceType } from '../../state/helpers';
 import { downloadUrl as download } from '../../utils';
 import { canShowAction } from '../../utils/actions/can-show-action';
 import { getActionsFromJsonLd } from '../common/actions/extractActions';
-import { extractDownloadUrl } from '../common/download/extractDownloadUrl';
 export var extractInvokeDownloadAction = function extractInvokeDownloadAction(_ref) {
   var actionOptions = _ref.actionOptions,
     appearance = _ref.appearance,
@@ -21,7 +19,7 @@ export var extractInvokeDownloadAction = function extractInvokeDownloadAction(_r
     return action['@type'] === 'DownloadAction';
   });
   if (downloadActionExists) {
-    var downloadUrl = fg('smart_links_noun_support') ? extractSmartLinkDownloadUrl(response) : extractDownloadUrl(data);
+    var downloadUrl = extractSmartLinkDownloadUrl(response);
     return {
       actionFn: function () {
         var _actionFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {

package/dist/esm/extractors/action/extract-invoke-preview-action.js

@@ -1,7 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { extractLink, extractPreview as extractPreviewData, extractProvider, extractSmartLinkEmbed, extractSmartLinkProvider, extractSmartLinkTitle, extractSmartLinkUrl, extractTitle } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractPreview as extractPreviewData, extractSmartLinkEmbed, extractSmartLinkProvider, extractSmartLinkTitle, extractSmartLinkUrl } from '@atlaskit/link-extractors';
 import { ActionName, CardAction } from '../../index';
 import { getExtensionKey } from '../../state/helpers';
 import { canShowAction } from '../../utils/actions/can-show-action';
@@ -27,12 +26,11 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
   var meta = response.meta;
   var src = (_extractPreviewData = extractPreviewData(data, 'web')) === null || _extractPreviewData === void 0 ? void 0 : _extractPreviewData.src;
   if (src) {
-    var url = extractLink(data);
     var extensionKey = getExtensionKey(response);
     return {
       actionFn: function () {
         var _actionFn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-          var _extractSmartLinkProv, _extractProvider, _extractSmartLinkEmbe;
+          var _extractSmartLinkProv, _extractSmartLinkEmbe;
           return _regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
@@ -45,12 +43,12 @@ export var extractInvokePreviewAction = function extractInvokePreviewAction(para
                   isSupportTheming: extractIsSupportTheming(meta),
                   isTrusted: extractIsTrusted(meta),
                   linkIcon: extractLinkIcon(response),
-                  providerName: fg('smart_links_noun_support') ? (_extractSmartLinkProv = extractSmartLinkProvider(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text : (_extractProvider = extractProvider(data)) === null || _extractProvider === void 0 ? void 0 : _extractProvider.text,
+                  providerName: (_extractSmartLinkProv = extractSmartLinkProvider(response)) === null || _extractSmartLinkProv === void 0 ? void 0 : _extractSmartLinkProv.text,
                   onClose: onClose,
                   origin: origin,
-                  src: fg('smart_links_noun_support') ? (_extractSmartLinkEmbe = extractSmartLinkEmbed(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src : src,
-                  title: fg('smart_links_noun_support') ? extractSmartLinkTitle(response) : extractTitle(data),
-                  url: fg('smart_links_noun_support') ? extractSmartLinkUrl(response) : url
+                  src: (_extractSmartLinkEmbe = extractSmartLinkEmbed(response)) === null || _extractSmartLinkEmbe === void 0 ? void 0 : _extractSmartLinkEmbe.src,
+                  title: extractSmartLinkTitle(response),
+                  url: extractSmartLinkUrl(response)
                 }));
               case 1:
               case "end":

package/dist/esm/extractors/common/primitives/extractSummary.js

@@ -1,6 +1,4 @@
 import { extractEntity, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
-
 /**
  * Return link summary
  */
@@ -15,11 +13,9 @@ export var extractSummary = function extractSummary(jsonLd) {
  * Return link summary
  */
 export var extractSmartLinkSummary = function extractSmartLinkSummary(response) {
-  if (fg('smart_links_noun_support')) {
-    if (isEntityPresent(response)) {
-      var _extractEntity;
-      return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
-    }
+  if (isEntityPresent(response)) {
+    var _extractEntity;
+    return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.description;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSummary(response.data);
 };

package/dist/esm/extractors/embed/index.js

@@ -1,20 +1,8 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-import { extractPreview, extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkEmbed, extractSmartLinkTitle, extractSmartLinkUrl, extractType } from '@atlaskit/link-extractors';
 import { getEmptyJsonLd } from '../../utils/jsonld';
 import { extractSmartLinkContext } from '../common/context';
 import { extractIsSupportTheming } from '../common/meta/extractIsSupportTheming';
 import { extractIsTrusted } from '../common/meta/extractIsTrusted';
-var extractEmbedPreview = function extractEmbedPreview(jsonLd, platform, iframeUrlType) {
-  var preview = extractPreview(jsonLd, platform, iframeUrlType);
-  if (preview && preview.src) {
-    return _objectSpread(_objectSpread({}, preview), {}, {
-      src: preview.src
-    });
-  }
-};
 export var extractEmbedProps = function extractEmbedProps(response, platform, iframeUrlType) {
   var meta = response === null || response === void 0 ? void 0 : response.meta;
   var jsonLd = (response === null || response === void 0 ? void 0 : response.data) || getEmptyJsonLd();
@@ -22,7 +10,7 @@ export var extractEmbedProps = function extractEmbedProps(response, platform, if
     link: extractSmartLinkUrl(response) || '',
     title: extractSmartLinkTitle(response),
     context: extractSmartLinkContext(response),
-    preview: fg('smart_links_noun_support') ? extractSmartLinkEmbed(response, iframeUrlType) : extractEmbedPreview(jsonLd, platform, iframeUrlType),
+    preview: extractSmartLinkEmbed(response, iframeUrlType),
     isTrusted: extractIsTrusted(meta),
     isSupportTheming: extractIsSupportTheming(meta),
     type: extractType(jsonLd)

package/dist/esm/extractors/flexible/actions/extract-view-related-links-action.js

@@ -1,11 +1,10 @@
-import { extractAri, extractSmartLinkAri } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractSmartLinkAri } from '@atlaskit/link-extractors';
 export var extractViewRelatedLinksAction = function extractViewRelatedLinksAction(response) {
   var _response$meta;
   if (!(response !== null && response !== void 0 && (_response$meta = response.meta) !== null && _response$meta !== void 0 && (_response$meta = _response$meta.supportedFeature) !== null && _response$meta !== void 0 && _response$meta.includes('RelatedLinks'))) {
     return;
   }
-  var ari = fg('smart_links_noun_support') ? extractSmartLinkAri(response) : extractAri(response.data);
+  var ari = extractSmartLinkAri(response);
   if (!ari) {
     return;
   }

package/dist/esm/extractors/flexible/extract-preview.js

@@ -1,5 +1,4 @@
-import { extractEntity, extractEntityProvider, extractImage, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
+import { extractEntity, extractImage, isEntityPresent } from '@atlaskit/link-extractors';
 import { MediaType } from '../../constants';
 var extractPreview = function extractPreview(data) {
   if (!data) {
@@ -24,10 +23,6 @@ export var extractSmartLinkPreviewImage = function extractSmartLinkPreviewImage(
     var _entity$thumbnail;
     var entity = extractEntity(response);
     var url = entity === null || entity === void 0 || (_entity$thumbnail = entity.thumbnail) === null || _entity$thumbnail === void 0 ? void 0 : _entity$thumbnail.externalUrl;
-    if (!url && !fg('smart_links_noun_support')) {
-      var provider = extractEntityProvider(response);
-      url = provider === null || provider === void 0 ? void 0 : provider.image;
-    }
     return url ? {
       type: MediaType.Image,
       url: url

package/dist/esm/state/helpers.js

@@ -43,9 +43,11 @@ export var getFirstPartyIdentifier = function getFirstPartyIdentifier() {
   var product = getProductFromWindowURL();
   var currentURL = window.location.href;
   if (product === 'confluence') {
-    var contentId = extractContentIdFromURL(currentURL);
-    if (contentId) {
-      return "ConfluenceContentId:".concat(contentId);
+    if (currentURL.includes('content.id')) {
+      var contentId = extractContentIdFromURL(currentURL);
+      if (contentId) {
+        return "ConfluenceContentId:".concat(contentId);
+      }
     }
     var pageId = extractPageIdFromURL(currentURL);
     if (pageId) {
@@ -56,9 +58,8 @@ export var getFirstPartyIdentifier = function getFirstPartyIdentifier() {
     if (issueKey) {
       return "JiraIssueKey:".concat(issueKey);
     }
-  } else {
-    return undefined;
   }
+  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;
@@ -118,40 +119,34 @@ export var hasAuthScopeOverrides = function hasAuthScopeOverrides(details) {
 // 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];
+    var pagesMatch = url.match(/(?!pages)(\d+)/);
+    if (pagesMatch && pagesMatch[0]) {
+      return pagesMatch[0];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    var pageIdParam = urlObj.searchParams.get('pageId');
-    if (pageIdParam) {
-      return pageIdParam;
+    var pageIdParam = url.match(/(?!pageId=)(\d+)/);
+    if (pageIdParam && pageIdParam[0]) {
+      return pageIdParam[0];
     }
 
     // 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];
+    var displayMatch = url.match(/(?!display\/)(\d+)/);
+    if (displayMatch && displayMatch[0]) {
+      return displayMatch[0];
     }
   } 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;
+    var contentId = url.match(/content\.id=(\d+)/);
+    if (contentId && contentId[1]) {
+      // contentId[1] contains just the number
+      return contentId[1];
     }
   } catch (_unused2) {
     return undefined;
@@ -160,31 +155,9 @@ var extractContentIdFromURL = function extractContentIdFromURL(url) {
 };
 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;
+    var browseMatch = url.match(/[A-Z0-9]+-\d+/);
+    if (browseMatch && browseMatch[0]) {
+      return browseMatch[0];
     }
   } catch (_unused3) {
     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.3"
+  packageVersion: "40.10.5"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

package/dist/esm/view/BlockCard/views/utils/index.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { ElementName, MediaPlacement, SmartLinkPosition, SmartLinkSize } from '../../../../constants';
 import { extractOwnedBy } from '../../../../extractors/flexible/utils';
 import { getExtensionKey } from '../../../../state/helpers';
@@ -67,6 +68,26 @@ export var getSimulatedBetterMetadata = function getSimulatedBetterMetadata(card
           name: ElementName.AppliedToComponentsCount
         }].concat(baseBottomMetaData)
       };
+    case 'passionfruit-object-provider':
+      if (fg('passionfruit_ask_smart_links_enabled')) {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: extractOwnedBy(data) ? [{
+            name: ElementName.OwnedByGroup
+          }, {
+            name: ElementName.OwnedBy
+          }].concat(baseTopMetadata) : defaultTopMetadata,
+          bottomMetadata: [{
+            name: ElementName.AppliedToComponentsCount
+          }].concat(baseBottomMetaData)
+        };
+      } else {
+        return {
+          titleMetadata: defaultTitleMetadata,
+          topMetadata: defaultTopMetadata,
+          bottomMetadata: defaultBottomMetadata
+        };
+      }
     case 'confluence-object-provider':
       return {
         titleMetadata: defaultTitleMetadata,

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

@@ -93,10 +93,11 @@ function Component(_ref) {
             action: 'clicked',
             actionSubject: 'smartLink',
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
-            eventType: 'ui',
+            eventType: 'screen',
             attributes: {
               eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
-              firstPartyIdentifier: firstPartyIdentifier
+              firstPartyIdentifier: firstPartyIdentifier,
+              clickedAt: Date.now().toString()
             },
             nonPrivacySafeAttributes: {
               thirdPartyARI: thirdPartyARI

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.3",
+  packageVersion: "40.10.5",
   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::2d9f03b82528803f03b90d6cae5d690d>>
+ * @codegen <<SignedSource::8ebf07690deae06cee97fcbba4bb8eb0>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -234,6 +234,7 @@ export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
     thirdPartyARI: string;
     eventName: string;
     firstPartyIdentifier: string | null;
+    clickedAt: string;
 };
 export type AnalyticsEventAttributes = {
     /**

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::2d9f03b82528803f03b90d6cae5d690d>>
+ * @codegen <<SignedSource::8ebf07690deae06cee97fcbba4bb8eb0>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -234,6 +234,7 @@ export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
     thirdPartyARI: string;
     eventName: string;
     firstPartyIdentifier: string | null;
+    clickedAt: string;
 };
 export type AnalyticsEventAttributes = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "40.10.4",
+	"version": "40.10.6",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
 		"@atlaskit/avatar": "^25.1.0",
 		"@atlaskit/avatar-group": "^12.2.0",
 		"@atlaskit/badge": "^18.1.0",
-		"@atlaskit/button": "^23.3.0",
+		"@atlaskit/button": "^23.4.0",
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/css": "^0.12.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
@@ -52,9 +52,9 @@
 		"@atlaskit/link-client-extension": "^5.0.0",
 		"@atlaskit/link-extractors": "^2.4.0",
 		"@atlaskit/link-test-helpers": "^8.3.0",
-		"@atlaskit/linking-common": "^9.2.0",
+		"@atlaskit/linking-common": "^9.3.0",
 		"@atlaskit/linking-types": "^14.0.0",
-		"@atlaskit/logo": "^19.6.0",
+		"@atlaskit/logo": "^19.7.0",
 		"@atlaskit/lozenge": "^13.0.0",
 		"@atlaskit/menu": "^8.3.0",
 		"@atlaskit/modal-dialog": "^14.3.0",
@@ -86,7 +86,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^3.4.0",
+		"@atlaskit/link-provider": "^3.5.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -190,9 +190,6 @@
 		"platform_smart_links_controlled_dsp_export_view": {
 			"type": "boolean"
 		},
-		"smart_links_noun_support": {
-			"type": "boolean"
-		},
 		"platform-linking-ai-summary-migration-to-convo-ai": {
 			"type": "boolean"
 		},
@@ -235,6 +232,9 @@
 		"platform_smartlink_3pclick_analytics": {
 			"type": "boolean"
 		},
+		"passionfruit_ask_smart_links_enabled": {
+			"type": "boolean"
+		},
 		"ptc-enable-embed-team-smart-links": {
 			"type": "boolean"
 		}