@atlaskit/smart-card 40.19.0 → 40.19.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @atlaskit/smart-card
 
+## 40.19.1
+
+### Patch Changes
+
+- [`4f8a989dc9242`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4f8a989dc9242) -
+  Fix regex and tests
+- Updated dependencies
+
 ## 40.19.0
 
 ### Minor Changes

package/dist/cjs/state/helpers.js

@@ -40,6 +40,12 @@ var getThirdPartyARI = exports.getThirdPartyARI = function getThirdPartyARI(deta
     if (details !== null && details !== void 0 && details.entityData && 'thirdPartyAri' in details.entityData && details.entityData.thirdPartyAri) {
       return details.entityData.thirdPartyAri;
     }
+    if (details !== null && details !== void 0 && details.data && 'atlassian:ari' in details.data && typeof details.data['atlassian:ari'] === 'string') {
+      var ari = details.data['atlassian:ari'];
+      if (ari.includes('ari:third-party')) {
+        return ari;
+      }
+    }
   }
   return undefined;
 };
@@ -126,22 +132,24 @@ 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 = url.match(/(?!pages)(\d+)/);
-    if (pagesMatch && pagesMatch[0]) {
-      return pagesMatch[0];
+    var pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)(?:\/|$)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    var pageIdParam = url.match(/(?!pageId=)(\d+)/);
-    if (pageIdParam && pageIdParam[0]) {
-      return pageIdParam[0];
+    var pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
     }
 
     // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
-    var displayMatch = url.match(/(?!display\/)(\d+)/);
-    if (displayMatch && displayMatch[0]) {
-      return displayMatch[0];
+    var displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
     }
   } catch (_unused) {
     return undefined;
@@ -150,10 +158,19 @@ var extractPageIdFromURL = function extractPageIdFromURL(url) {
 };
 var extractContentIdFromURL = function extractContentIdFromURL(url) {
   try {
-    var contentId = url.match(/content\.id=(\d+)/);
-    if (contentId && contentId[1]) {
-      // contentId[1] contains just the number
-      return contentId[1];
+    var urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs and plugin servlet URLs)
+    var contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+
+    // Also support URLs where content.id is in the query string but not parsed by URL (edge case)
+    // e.g., /wiki/plugins/servlet/ac/com.atlassian.perspectiveretros/perspective-retros?content.id=5662725850
+    var match = url.match(/[?&]content\.id=(\d+)/);
+    if (match && match[1]) {
+      return match[1];
     }
   } catch (_unused2) {
     return undefined;
@@ -162,9 +179,30 @@ var extractContentIdFromURL = function extractContentIdFromURL(url) {
 };
 var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
   try {
-    var browseMatch = url.match(/[A-Z0-9]+-\d+/);
-    if (browseMatch && browseMatch[0]) {
-      return browseMatch[0];
+    var urlObj = new URL(url);
+
+    // Support any case for Jira keys (e.g., AI3W-864, ai3w-864, Ai3W-864)
+    var browseMatch = urlObj.pathname.match(/\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // /jira/browse/{issueKey}
+    var jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Query parameter ?selectedIssue={issueKey}
+    var selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Za-z0-9]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Query parameter ?issueKey={issueKey}
+    var issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Za-z0-9]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
     }
   } 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: "0.0.0-development"
+  packageVersion: "40.19.0"
 };
 var TrackQuickActionType = exports.TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

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

package/dist/es2019/state/helpers.js

@@ -32,6 +32,12 @@ export const getThirdPartyARI = details => {
     if (details !== null && details !== void 0 && details.entityData && 'thirdPartyAri' in details.entityData && details.entityData.thirdPartyAri) {
       return details.entityData.thirdPartyAri;
     }
+    if (details !== null && details !== void 0 && details.data && 'atlassian:ari' in details.data && typeof details.data['atlassian:ari'] === 'string') {
+      const ari = details.data['atlassian:ari'];
+      if (ari.includes('ari:third-party')) {
+        return ari;
+      }
+    }
   }
   return undefined;
 };
@@ -110,22 +116,24 @@ 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 = url.match(/(?!pages)(\d+)/);
-    if (pagesMatch && pagesMatch[0]) {
-      return pagesMatch[0];
+    const pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)(?:\/|$)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    const pageIdParam = url.match(/(?!pageId=)(\d+)/);
-    if (pageIdParam && pageIdParam[0]) {
-      return pageIdParam[0];
+    const pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
     }
 
     // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
-    const displayMatch = url.match(/(?!display\/)(\d+)/);
-    if (displayMatch && displayMatch[0]) {
-      return displayMatch[0];
+    const displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
     }
   } catch {
     return undefined;
@@ -134,10 +142,19 @@ const extractPageIdFromURL = url => {
 };
 const extractContentIdFromURL = url => {
   try {
-    const contentId = url.match(/content\.id=(\d+)/);
-    if (contentId && contentId[1]) {
-      // contentId[1] contains just the number
-      return contentId[1];
+    const urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs and plugin servlet URLs)
+    const contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+
+    // Also support URLs where content.id is in the query string but not parsed by URL (edge case)
+    // e.g., /wiki/plugins/servlet/ac/com.atlassian.perspectiveretros/perspective-retros?content.id=5662725850
+    const match = url.match(/[?&]content\.id=(\d+)/);
+    if (match && match[1]) {
+      return match[1];
     }
   } catch {
     return undefined;
@@ -146,9 +163,30 @@ const extractContentIdFromURL = url => {
 };
 const extractJiraIssueIdFromURL = url => {
   try {
-    const browseMatch = url.match(/[A-Z0-9]+-\d+/);
-    if (browseMatch && browseMatch[0]) {
-      return browseMatch[0];
+    const urlObj = new URL(url);
+
+    // Support any case for Jira keys (e.g., AI3W-864, ai3w-864, Ai3W-864)
+    const browseMatch = urlObj.pathname.match(/\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // /jira/browse/{issueKey}
+    const jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Query parameter ?selectedIssue={issueKey}
+    const selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Za-z0-9]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Query parameter ?issueKey={issueKey}
+    const issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Za-z0-9]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
     }
   } 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: "0.0.0-development"
+  packageVersion: "40.19.0"
 };
 export let TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

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

package/dist/esm/state/helpers.js

@@ -33,6 +33,12 @@ export var getThirdPartyARI = function getThirdPartyARI(details) {
     if (details !== null && details !== void 0 && details.entityData && 'thirdPartyAri' in details.entityData && details.entityData.thirdPartyAri) {
       return details.entityData.thirdPartyAri;
     }
+    if (details !== null && details !== void 0 && details.data && 'atlassian:ari' in details.data && typeof details.data['atlassian:ari'] === 'string') {
+      var ari = details.data['atlassian:ari'];
+      if (ari.includes('ari:third-party')) {
+        return ari;
+      }
+    }
   }
   return undefined;
 };
@@ -119,22 +125,24 @@ 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 = url.match(/(?!pages)(\d+)/);
-    if (pagesMatch && pagesMatch[0]) {
-      return pagesMatch[0];
+    var pagesMatch = urlObj.pathname.match(/\/wiki\/spaces\/[^\/]+\/pages\/(\d+)(?:\/|$)/);
+    if (pagesMatch && pagesMatch[1]) {
+      return pagesMatch[1];
     }
 
     // Following this pattern for confluence URL -> /wiki/pages/viewpage.action?pageId={pageId}
-    var pageIdParam = url.match(/(?!pageId=)(\d+)/);
-    if (pageIdParam && pageIdParam[0]) {
-      return pageIdParam[0];
+    var pageIdParam = urlObj.searchParams.get('pageId');
+    if (pageIdParam) {
+      return pageIdParam;
     }
 
     // Following this pattern for confluence URL -> /wiki/display/{space}/{pageId}
-    var displayMatch = url.match(/(?!display\/)(\d+)/);
-    if (displayMatch && displayMatch[0]) {
-      return displayMatch[0];
+    var displayMatch = urlObj.pathname.match(/\/wiki\/display\/[^\/]+\/(\d+)/);
+    if (displayMatch && displayMatch[1]) {
+      return displayMatch[1];
     }
   } catch (_unused) {
     return undefined;
@@ -143,10 +151,19 @@ var extractPageIdFromURL = function extractPageIdFromURL(url) {
 };
 var extractContentIdFromURL = function extractContentIdFromURL(url) {
   try {
-    var contentId = url.match(/content\.id=(\d+)/);
-    if (contentId && contentId[1]) {
-      // contentId[1] contains just the number
-      return contentId[1];
+    var urlObj = new URL(url);
+
+    // Pattern: ?content.id={contentId} (for app connector URLs and plugin servlet URLs)
+    var contentId = urlObj.searchParams.get('content.id');
+    if (contentId) {
+      return contentId;
+    }
+
+    // Also support URLs where content.id is in the query string but not parsed by URL (edge case)
+    // e.g., /wiki/plugins/servlet/ac/com.atlassian.perspectiveretros/perspective-retros?content.id=5662725850
+    var match = url.match(/[?&]content\.id=(\d+)/);
+    if (match && match[1]) {
+      return match[1];
     }
   } catch (_unused2) {
     return undefined;
@@ -155,9 +172,30 @@ var extractContentIdFromURL = function extractContentIdFromURL(url) {
 };
 var extractJiraIssueIdFromURL = function extractJiraIssueIdFromURL(url) {
   try {
-    var browseMatch = url.match(/[A-Z0-9]+-\d+/);
-    if (browseMatch && browseMatch[0]) {
-      return browseMatch[0];
+    var urlObj = new URL(url);
+
+    // Support any case for Jira keys (e.g., AI3W-864, ai3w-864, Ai3W-864)
+    var browseMatch = urlObj.pathname.match(/\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (browseMatch && browseMatch[1]) {
+      return browseMatch[1];
+    }
+
+    // /jira/browse/{issueKey}
+    var jiraBrowseMatch = urlObj.pathname.match(/\/jira\/browse\/([A-Za-z0-9]+-\d+)/);
+    if (jiraBrowseMatch && jiraBrowseMatch[1]) {
+      return jiraBrowseMatch[1];
+    }
+
+    // Query parameter ?selectedIssue={issueKey}
+    var selectedIssue = urlObj.searchParams.get('selectedIssue');
+    if (selectedIssue && /^[A-Za-z0-9]+-\d+$/.test(selectedIssue)) {
+      return selectedIssue;
+    }
+
+    // Query parameter ?issueKey={issueKey}
+    var issueKeyParam = urlObj.searchParams.get('issueKey');
+    if (issueKeyParam && /^[A-Za-z0-9]+-\d+$/.test(issueKeyParam)) {
+      return issueKeyParam;
     }
   } 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: "0.0.0-development"
+  packageVersion: "40.19.0"
 };
 export var TrackQuickActionType = /*#__PURE__*/function (TrackQuickActionType) {
   TrackQuickActionType["StatusUpdate"] = "StatusUpdate";

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/smart-card",
-	"version": "40.19.0",
+	"version": "40.19.1",
 	"description": "Smart card component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -68,7 +68,7 @@
 		"@atlaskit/textarea": "^8.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/theme": "^20.0.0",
-		"@atlaskit/tmp-editor-statsig": "^12.4.0",
+		"@atlaskit/tmp-editor-statsig": "^12.5.0",
 		"@atlaskit/tokens": "^6.2.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/ufo": "^0.4.0",