@atlaskit/smart-card 40.10.5 → 40.10.6

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @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

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

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

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.4"
+  packageVersion: "40.10.5"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

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

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.4",
+  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.5",
+	"version": "40.10.6",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -52,7 +52,7 @@
 		"@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.7.0",
 		"@atlaskit/lozenge": "^13.0.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"