@atlaskit/smart-card 40.10.2 → 40.10.4

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/smart-card
 
+## 40.10.4
+
+### Patch Changes
+
+- [`72230d76e232a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/72230d76e232a) -
+  NAVX-1308 cleaning up platform-linking-slack-entity-support
+- Updated dependencies
+
+## 40.10.3
+
+### Patch Changes
+
+- [`eeed50fbee70e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/eeed50fbee70e) -
+  Updated SmartCard module for legal spec changes for 3P Click Analytics
+
 ## 40.10.2
 
 ### Patch Changes

package/analytics.spec.yaml

@@ -753,25 +753,21 @@ events:
         3P Workflows team
       attributes:
         <<: [*PackageMetaDataContext, *CommonContext, *ResolvedContext]
-        firstPartyARI:
-          required: true
-          type: string
-          description:
-            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
+        eventName:
+          required: true
           type: string
-          description: The Content ID for the Confluence specific page this Smart Link is pasted on
-        confluencePageId:
+          description:
+            The name of the event being tracked - for this event will always be
+            smartLinkClickAnalyticsThirdPartyWorkflows since there are multiple event types in the
+            same SQS pipeline
+        firstPartyIdentifier:
           required: false
           type: string
-          description: The Page ID for the Confluence specific page this Smart Link is pasted on
+          description:
+            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.

package/dist/cjs/extractors/flexible/utils.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.extractVoteCount = exports.extractViewCount = exports.extractUserAttributes = exports.extractTeamMemberCount = exports.extractTargetBranch = exports.extractSubscriberCount = exports.extractSubTasksProgress = exports.extractStoryPoints = exports.extractSourceBranch = exports.extractSmartLinkSentOn = exports.extractSmartLinkReactCount = exports.extractSmartLinkCommentCount = exports.extractSentOn = exports.extractReadTime = exports.extractReactCount = exports.extractProgrammingLanguage = exports.extractPersonAssignedToAsArray = exports.extractOwnedBy = exports.extractModifiedBy = exports.extractMetaTenantId = exports.extractMetaResourceType = exports.extractMetaObjectId = exports.extractLocation = exports.extractDueOn = exports.extractCreatedBy = exports.extractCommentCount = exports.extractChecklistProgress = exports.extractAttachmentCount = exports.extractAssignedTo = exports.extractAppliedToComponentsCount = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _linkExtractors = require("@atlaskit/link-extractors");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var extractLinkName = function extractLinkName(link) {
   if (link && (0, _typeof2.default)(link) === 'object' && link['@type'] === 'Link') {
     return link.name;
@@ -27,11 +26,9 @@ var extractSmartLinkCommentCount = exports.extractSmartLinkCommentCount = functi
   if (!response || !response.data) {
     return undefined;
   }
-  if ((0, _platformFeatureFlags.fg)('platform-linking-slack-entity-support')) {
-    if ((0, _linkExtractors.isEntityPresent)(response)) {
-      var entity = (0, _linkExtractors.extractEntity)(response);
-      return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
-    }
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    var entity = (0, _linkExtractors.extractEntity)(response);
+    return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractCommentCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -55,14 +52,12 @@ var extractSmartLinkReactCount = exports.extractSmartLinkReactCount = function e
   if (!response || !response.data) {
     return undefined;
   }
-  if ((0, _platformFeatureFlags.fg)('platform-linking-slack-entity-support')) {
-    if ((0, _linkExtractors.isEntityPresent)(response)) {
-      var entity = (0, _linkExtractors.extractEntity)(response);
-      var reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
-      return reactions === null || reactions === void 0 ? void 0 : reactions.reduce(function (total, reaction) {
-        return total + (reaction === null || reaction === void 0 ? void 0 : reaction.total);
-      }, 0);
-    }
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    var entity = (0, _linkExtractors.extractEntity)(response);
+    var reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
+    return reactions === null || reactions === void 0 ? void 0 : reactions.reduce(function (total, reaction) {
+      return total + (reaction === null || reaction === void 0 ? void 0 : reaction.total);
+    }, 0);
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractReactCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -152,11 +147,9 @@ var extractSmartLinkSentOn = exports.extractSmartLinkSentOn = function extractSm
   if (!response || !response.data) {
     return undefined;
   }
-  if ((0, _platformFeatureFlags.fg)('platform-linking-slack-entity-support')) {
-    if ((0, _linkExtractors.isEntityPresent)(response)) {
-      var _extractEntity;
-      return (_extractEntity = (0, _linkExtractors.extractEntity)(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
-    }
+  if ((0, _linkExtractors.isEntityPresent)(response)) {
+    var _extractEntity;
+    return (_extractEntity = (0, _linkExtractors.extractEntity)(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSentOn(response === null || response === void 0 ? void 0 : response.data);
 };

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.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;
+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.getFirstPartyIdentifier = exports.getExtensionKey = exports.getDefinitionId = exports.getDatasources = 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,44 +43,29 @@ 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);
-        }
-      }
-    }
+var getFirstPartyIdentifier = exports.getFirstPartyIdentifier = function getFirstPartyIdentifier() {
+  if (!(0, _platformFeatureFlags.fg)('platform_smartlink_3pclick_analytics')) {
+    return undefined;
   }
-  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);
-        }
-      }
+  var product = getProductFromWindowURL();
+  var currentURL = window.location.href;
+  if (product === 'confluence') {
+    var contentId = extractContentIdFromURL(currentURL);
+    if (contentId) {
+      return "ConfluenceContentId:".concat(contentId);
     }
-  }
-  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);
-        }
-      }
+    var pageId = extractPageIdFromURL(currentURL);
+    if (pageId) {
+      return "ConfluencePageId:".concat(pageId);
+    }
+  } else if (product === 'jira') {
+    var issueKey = extractJiraIssueIdFromURL(currentURL);
+    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;
@@ -213,16 +198,7 @@ var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
   }
   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() {
+var getProductFromWindowURL = function getProductFromWindowURL() {
   try {
     var currentUrl = window.location.href;
     var urlObj = new URL(currentUrl);

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.1"
+  packageVersion: "40.10.3"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

@@ -74,6 +74,7 @@ function Component(_ref) {
   var resourceType = (0, _helpers.getResourceType)(state.details);
   var services = (0, _helpers.getServices)(state.details);
   var thirdPartyARI = (0, _helpers.getThirdPartyARI)(state.details);
+  var firstPartyIdentifier = (0, _helpers.getFirstPartyIdentifier)();
   var isFlexibleUi = (0, _react.useMemo)(function () {
     return (0, _flexible.isFlexibleUiCard)(children, ui);
   }, [children, ui]);
@@ -103,9 +104,12 @@ function Component(_ref) {
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
             eventType: 'ui',
             attributes: {
-              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
+              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
+              firstPartyIdentifier: firstPartyIdentifier
             },
-            nonPrivacySafeAttributes: (0, _helpers.getLinkClickAnalyticsThirdPartyAttributes)(thirdPartyARI, state.details)
+            nonPrivacySafeAttributes: {
+              thirdPartyARI: thirdPartyARI
+            }
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }
@@ -150,7 +154,7 @@ function Component(_ref) {
       }
       (0, _click.fireLinkClickedEvent)(createAnalyticsEvent)(event);
     }
-  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI]);
+  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI, firstPartyIdentifier]);
   var handleAuthorize = (0, _react.useCallback)(function () {
     return actions.authorize(appearance);
   }, [actions, appearance]);

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

package/dist/es2019/extractors/flexible/utils.js

@@ -1,5 +1,4 @@
 import { extractEntity, extractPersonAssignedTo, extractPersonCreatedBy, extractPersonOwnedBy, extractPersonUpdatedBy, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
 const extractLinkName = link => {
   if (link && typeof link === 'object' && link['@type'] === 'Link') {
     return link.name;
@@ -17,11 +16,9 @@ export const extractSmartLinkCommentCount = response => {
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      const entity = extractEntity(response);
-      return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
-    }
+  if (isEntityPresent(response)) {
+    const entity = extractEntity(response);
+    return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractCommentCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -37,12 +34,10 @@ export const extractSmartLinkReactCount = response => {
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      const entity = extractEntity(response);
-      const reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
-      return reactions === null || reactions === void 0 ? void 0 : reactions.reduce((total, reaction) => total + (reaction === null || reaction === void 0 ? void 0 : reaction.total), 0);
-    }
+  if (isEntityPresent(response)) {
+    const entity = extractEntity(response);
+    const reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
+    return reactions === null || reactions === void 0 ? void 0 : reactions.reduce((total, reaction) => total + (reaction === null || reaction === void 0 ? void 0 : reaction.total), 0);
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractReactCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -121,11 +116,9 @@ export const extractSmartLinkSentOn = response => {
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      var _extractEntity;
-      return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
-    }
+  if (isEntityPresent(response)) {
+    var _extractEntity;
+    return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSentOn(response === null || response === void 0 ? void 0 : response.data);
 };

package/dist/es2019/state/helpers.js

@@ -35,44 +35,29 @@ 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);
-        }
-      }
-    }
+export const getFirstPartyIdentifier = () => {
+  if (!fg('platform_smartlink_3pclick_analytics')) {
+    return undefined;
   }
-  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);
-        }
-      }
+  const product = getProductFromWindowURL();
+  const currentURL = window.location.href;
+  if (product === 'confluence') {
+    const contentId = extractContentIdFromURL(currentURL);
+    if (contentId) {
+      return `ConfluenceContentId:${contentId}`;
     }
-  }
-  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);
-        }
-      }
+    const pageId = extractPageIdFromURL(currentURL);
+    if (pageId) {
+      return `ConfluencePageId:${pageId}`;
     }
+  } else if (product === 'jira') {
+    const issueKey = extractJiraIssueIdFromURL(currentURL);
+    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 => {
@@ -197,14 +182,7 @@ const extractJiraIssueIdFromURL = url => {
   }
   return undefined;
 };
-export const getLinkClickAnalyticsThirdPartyAttributes = (thirdPartyARI, details) => ({
-  firstPartyARI: getObjectAri(details),
-  thirdPartyARI: thirdPartyARI,
-  jiraIssueId: getJiraIssueId(details),
-  confluenceContentId: getContentId(details),
-  confluencePageId: getPageId(details)
-});
-const getProductFromWindowUrl = () => {
+const getProductFromWindowURL = () => {
   try {
     const currentUrl = window.location.href;
     const urlObj = new URL(currentUrl);

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.1"
+  packageVersion: "40.10.3"
 };
 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, getLinkClickAnalyticsThirdPartyAttributes, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
+import { getClickUrl, getDefinitionId, getExtensionKey, getFirstPartyIdentifier, 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';
@@ -69,6 +69,7 @@ function Component({
   const resourceType = getResourceType(state.details);
   const services = getServices(state.details);
   const thirdPartyARI = getThirdPartyARI(state.details);
+  const firstPartyIdentifier = getFirstPartyIdentifier();
   let isFlexibleUi = useMemo(() => isFlexibleUiCard(children, ui), [children, ui]);
   const actionOptions = combineActionOptions({
     actionOptions: actionOptionsProp,
@@ -96,9 +97,12 @@ function Component({
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
             eventType: 'ui',
             attributes: {
-              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
+              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
+              firstPartyIdentifier: firstPartyIdentifier
             },
-            nonPrivacySafeAttributes: getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, state.details)
+            nonPrivacySafeAttributes: {
+              thirdPartyARI: thirdPartyARI
+            }
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }
@@ -143,7 +147,7 @@ function Component({
       }
       fireLinkClickedEvent(createAnalyticsEvent)(event);
     }
-  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI]);
+  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI, firstPartyIdentifier]);
   const handleAuthorize = useCallback(() => actions.authorize(appearance), [actions, appearance]);
   const handleRetry = useCallback(() => {
     actions.reload();

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

package/dist/esm/extractors/flexible/utils.js

@@ -1,6 +1,5 @@
 import _typeof from "@babel/runtime/helpers/typeof";
 import { extractEntity, extractPersonAssignedTo, extractPersonCreatedBy, extractPersonOwnedBy, extractPersonUpdatedBy, isEntityPresent } from '@atlaskit/link-extractors';
-import { fg } from '@atlaskit/platform-feature-flags';
 var extractLinkName = function extractLinkName(link) {
   if (link && _typeof(link) === 'object' && link['@type'] === 'Link') {
     return link.name;
@@ -20,11 +19,9 @@ export var extractSmartLinkCommentCount = function extractSmartLinkCommentCount(
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      var entity = extractEntity(response);
-      return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
-    }
+  if (isEntityPresent(response)) {
+    var entity = extractEntity(response);
+    return entity && 'commentCount' in entity && typeof entity.commentCount === 'number' ? entity === null || entity === void 0 ? void 0 : entity.commentCount : undefined;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractCommentCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -48,14 +45,12 @@ export var extractSmartLinkReactCount = function extractSmartLinkReactCount(resp
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      var entity = extractEntity(response);
-      var reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
-      return reactions === null || reactions === void 0 ? void 0 : reactions.reduce(function (total, reaction) {
-        return total + (reaction === null || reaction === void 0 ? void 0 : reaction.total);
-      }, 0);
-    }
+  if (isEntityPresent(response)) {
+    var entity = extractEntity(response);
+    var reactions = entity && 'reactions' in entity && Array.isArray(entity.reactions) ? entity.reactions : undefined;
+    return reactions === null || reactions === void 0 ? void 0 : reactions.reduce(function (total, reaction) {
+      return total + (reaction === null || reaction === void 0 ? void 0 : reaction.total);
+    }, 0);
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractReactCount(response === null || response === void 0 ? void 0 : response.data);
 };
@@ -145,11 +140,9 @@ export var extractSmartLinkSentOn = function extractSmartLinkSentOn(response) {
   if (!response || !response.data) {
     return undefined;
   }
-  if (fg('platform-linking-slack-entity-support')) {
-    if (isEntityPresent(response)) {
-      var _extractEntity;
-      return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
-    }
+  if (isEntityPresent(response)) {
+    var _extractEntity;
+    return (_extractEntity = extractEntity(response)) === null || _extractEntity === void 0 ? void 0 : _extractEntity.createdAt;
   }
   return (response === null || response === void 0 ? void 0 : response.data) && extractSentOn(response === null || response === void 0 ? void 0 : response.data);
 };

package/dist/esm/state/helpers.js

@@ -36,44 +36,29 @@ 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);
-        }
-      }
-    }
+export var getFirstPartyIdentifier = function getFirstPartyIdentifier() {
+  if (!fg('platform_smartlink_3pclick_analytics')) {
+    return undefined;
   }
-  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);
-        }
-      }
+  var product = getProductFromWindowURL();
+  var currentURL = window.location.href;
+  if (product === 'confluence') {
+    var contentId = extractContentIdFromURL(currentURL);
+    if (contentId) {
+      return "ConfluenceContentId:".concat(contentId);
     }
-  }
-  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);
-        }
-      }
+    var pageId = extractPageIdFromURL(currentURL);
+    if (pageId) {
+      return "ConfluencePageId:".concat(pageId);
+    }
+  } else if (product === 'jira') {
+    var issueKey = extractJiraIssueIdFromURL(currentURL);
+    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;
@@ -206,16 +191,7 @@ var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
   }
   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() {
+var getProductFromWindowURL = function getProductFromWindowURL() {
   try {
     var currentUrl = window.location.href;
     var urlObj = new URL(currentUrl);

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.1"
+  packageVersion: "40.10.3"
 };
 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, getLinkClickAnalyticsThirdPartyAttributes, getObjectAri, getObjectIconUrl, getObjectName, getResourceType, getServices, getThirdPartyARI, isFinalState } from '../../state/helpers';
+import { getClickUrl, getDefinitionId, getExtensionKey, getFirstPartyIdentifier, 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';
@@ -65,6 +65,7 @@ function Component(_ref) {
   var resourceType = getResourceType(state.details);
   var services = getServices(state.details);
   var thirdPartyARI = getThirdPartyARI(state.details);
+  var firstPartyIdentifier = getFirstPartyIdentifier();
   var isFlexibleUi = useMemo(function () {
     return isFlexibleUiCard(children, ui);
   }, [children, ui]);
@@ -94,9 +95,12 @@ function Component(_ref) {
             actionSubjectId: 'smartlinkClickAnalyticsWorkflows',
             eventType: 'ui',
             attributes: {
-              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows'
+              eventName: 'smartLinkClickAnalyticsThirdPartyWorkflows',
+              firstPartyIdentifier: firstPartyIdentifier
             },
-            nonPrivacySafeAttributes: getLinkClickAnalyticsThirdPartyAttributes(thirdPartyARI, state.details)
+            nonPrivacySafeAttributes: {
+              thirdPartyARI: thirdPartyARI
+            }
           });
           smartlinkClickAnalyticsEvent.fire('media');
         }
@@ -141,7 +145,7 @@ function Component(_ref) {
       }
       fireLinkClickedEvent(createAnalyticsEvent)(event);
     }
-  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI]);
+  }, [fireEvent, id, isFlexibleUi, appearance, definitionId, onClick, url, state.details, ari, name, isPreviewPanelAvailable, openPreviewPanel, createAnalyticsEvent, thirdPartyARI, firstPartyIdentifier]);
   var handleAuthorize = useCallback(function () {
     return actions.authorize(appearance);
   }, [actions, appearance]);

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.1",
+  packageVersion: "40.10.3",
   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::9e03e5e3a6be04ef3aa7e2d7a018d8a7>>
+ * @codegen <<SignedSource::2d9f03b82528803f03b90d6cae5d690d>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -231,11 +231,9 @@ export type SmartLinkRenderFailedAttributesType = {
     id: string | null;
 };
 export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
-    firstPartyARI: string;
     thirdPartyARI: string;
-    jiraIssueId: string | null;
-    confluenceContentId: string | null;
-    confluencePageId: string | null;
+    eventName: string;
+    firstPartyIdentifier: string | null;
 };
 export type AnalyticsEventAttributes = {
     /**

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

@@ -9,9 +9,7 @@ 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 getFirstPartyIdentifier: () => 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;
@@ -26,10 +24,3 @@ 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::9e03e5e3a6be04ef3aa7e2d7a018d8a7>>
+ * @codegen <<SignedSource::2d9f03b82528803f03b90d6cae5d690d>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen smart-card
  */
 export type PackageMetaDataContextType = {
@@ -231,11 +231,9 @@ export type SmartLinkRenderFailedAttributesType = {
     id: string | null;
 };
 export type SmartLinkClickedSmartlinkClickAnalyticsWorkflowsAttributesType = {
-    firstPartyARI: string;
     thirdPartyARI: string;
-    jiraIssueId: string | null;
-    confluenceContentId: string | null;
-    confluencePageId: string | null;
+    eventName: string;
+    firstPartyIdentifier: string | null;
 };
 export type AnalyticsEventAttributes = {
     /**

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

@@ -9,9 +9,7 @@ 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 getFirstPartyIdentifier: () => 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;
@@ -26,10 +24,3 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "40.10.2",
+	"version": "40.10.4",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -36,7 +36,7 @@
 		"@atlaskit/css": "^0.12.0",
 		"@atlaskit/dropdown-menu": "^16.3.0",
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
-		"@atlaskit/form": "^12.0.0",
+		"@atlaskit/form": "^12.1.0",
 		"@atlaskit/frontend-utilities": "^3.1.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^27.12.0",
@@ -96,7 +96,7 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/css-reset": "^7.3.0",
-		"@atlaskit/media-test-helpers": "^38.0.0",
+		"@atlaskit/media-test-helpers": "^39.0.0",
 		"@atlaskit/react-ufo": "^4.3.0",
 		"@atlaskit/ssr": "workspace:^",
 		"@atlaskit/visual-regression": "workspace:^",
@@ -226,9 +226,6 @@
 		"platform_editor_inline_card_selected_state_fix": {
 			"type": "boolean"
 		},
-		"platform-linking-slack-entity-support": {
-			"type": "boolean"
-		},
 		"navx-1184-fix-smart-link-a11y-interactive-states": {
 			"type": "boolean"
 		},