@atlaskit/editor-card-provider 6.8.12 → 6.8.13

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-card-provider
 
+## 6.8.13
+
+### Patch Changes
+
+- [`fdea0f8bc06c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fdea0f8bc06c4) -
+  Thread appearance parameter through provider to support ORS optimized response payloads for smart
+  card inline resolve optimization.
+- [`fdea0f8bc06c4`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fdea0f8bc06c4) -
+  Gate the appearance argument in fetchNodesData behind the
+  platform_smartlink_inline_resolve_optimization flag. Previously, appearance was unconditionally
+  passed to cardClient.fetchData, causing shouldUseParentFetchData to always be true via this path
+  and bypassing the editorCardProvider SSR cache and Confluence-specific optimizations when the flag
+  was off.
+- Updated dependencies
+
 ## 6.8.12
 
 ### Patch Changes

package/dist/cjs/provider.js

@@ -195,6 +195,9 @@ function isInternalUrl(url) {
 function isExternalUrl(url) {
   return !isInternalUrl(url);
 }
+function getAppearanceForNode(node) {
+  return node.type === 'blockCard' ? 'block' : node.type === 'embedCard' ? 'embed' : 'inline';
+}
 function isCardNode(node) {
   return ['inlineCard', 'blockCard', 'embedCard'].includes(node.type) && !!node.attrs && 'url' in node.attrs && typeof node.attrs.url === 'string';
 }
@@ -279,9 +282,10 @@ var EditorCardProvider = exports.EditorCardProvider = /*#__PURE__*/function (_No
   }, {
     key: "nodeDataKey",
     value: function nodeDataKey(node) {
-      // We can use URL as a key here, because CardClient returns the same data for the same URL
-      // regardless of the type of card (inline, block, embed).
-      return node.attrs.url;
+      if (!(0, _platformFeatureFlags.fg)('platform_smartlink_inline_resolve_optimization')) {
+        return node.attrs.url;
+      }
+      return "".concat(node.attrs.url, "|").concat(getAppearanceForNode(node));
     }
   }, {
     key: "fetchNodesData",
@@ -289,7 +293,8 @@ var EditorCardProvider = exports.EditorCardProvider = /*#__PURE__*/function (_No
       var _this3 = this;
       var promises = nodes.map(function (node) {
         var url = node.attrs.url;
-        return _this3.cardClient.fetchData(url);
+        var appearance = (0, _platformFeatureFlags.fg)('platform_smartlink_inline_resolve_optimization') ? getAppearanceForNode(node) : undefined;
+        return _this3.cardClient.fetchData(url, false, appearance);
       });
       return Promise.all(promises);
     }

package/dist/es2019/provider.js

@@ -118,6 +118,9 @@ export function isInternalUrl(url) {
 export function isExternalUrl(url) {
   return !isInternalUrl(url);
 }
+function getAppearanceForNode(node) {
+  return node.type === 'blockCard' ? 'block' : node.type === 'embedCard' ? 'embed' : 'inline';
+}
 function isCardNode(node) {
   return ['inlineCard', 'blockCard', 'embedCard'].includes(node.type) && !!node.attrs && 'url' in node.attrs && typeof node.attrs.url === 'string';
 }
@@ -187,14 +190,16 @@ export class EditorCardProvider extends NodeDataProvider {
     });
   }
   nodeDataKey(node) {
-    // We can use URL as a key here, because CardClient returns the same data for the same URL
-    // regardless of the type of card (inline, block, embed).
-    return node.attrs.url;
+    if (!fg('platform_smartlink_inline_resolve_optimization')) {
+      return node.attrs.url;
+    }
+    return `${node.attrs.url}|${getAppearanceForNode(node)}`;
   }
   fetchNodesData(nodes) {
     const promises = nodes.map(node => {
       const url = node.attrs.url;
-      return this.cardClient.fetchData(url);
+      const appearance = fg('platform_smartlink_inline_resolve_optimization') ? getAppearanceForNode(node) : undefined;
+      return this.cardClient.fetchData(url, false, appearance);
     });
     return Promise.all(promises);
   }

package/dist/esm/provider.js

@@ -187,6 +187,9 @@ export function isInternalUrl(url) {
 export function isExternalUrl(url) {
   return !isInternalUrl(url);
 }
+function getAppearanceForNode(node) {
+  return node.type === 'blockCard' ? 'block' : node.type === 'embedCard' ? 'embed' : 'inline';
+}
 function isCardNode(node) {
   return ['inlineCard', 'blockCard', 'embedCard'].includes(node.type) && !!node.attrs && 'url' in node.attrs && typeof node.attrs.url === 'string';
 }
@@ -271,9 +274,10 @@ export var EditorCardProvider = /*#__PURE__*/function (_NodeDataProvider) {
   }, {
     key: "nodeDataKey",
     value: function nodeDataKey(node) {
-      // We can use URL as a key here, because CardClient returns the same data for the same URL
-      // regardless of the type of card (inline, block, embed).
-      return node.attrs.url;
+      if (!fg('platform_smartlink_inline_resolve_optimization')) {
+        return node.attrs.url;
+      }
+      return "".concat(node.attrs.url, "|").concat(getAppearanceForNode(node));
     }
   }, {
     key: "fetchNodesData",
@@ -281,7 +285,8 @@ export var EditorCardProvider = /*#__PURE__*/function (_NodeDataProvider) {
       var _this3 = this;
       var promises = nodes.map(function (node) {
         var url = node.attrs.url;
-        return _this3.cardClient.fetchData(url);
+        var appearance = fg('platform_smartlink_inline_resolve_optimization') ? getAppearanceForNode(node) : undefined;
+        return _this3.cardClient.fetchData(url, false, appearance);
       });
       return Promise.all(promises);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-card-provider",
-	"version": "6.8.12",
+	"version": "6.8.13",
 	"description": "Contains the EditorCardProvider, for determining smart card behaviour in the editor.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"dataloader": "^2.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/link-provider": "^4.6.0",
+		"@atlaskit/link-provider": "^4.7.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
@@ -61,6 +61,9 @@
 		"avp_unfurl_shared_charts_embed_by_default_2": {
 			"type": "boolean"
 		},
+		"platform_smartlink_inline_resolve_optimization": {
+			"type": "boolean"
+		},
 		"loom-support-screenshot-sl-resolution": {
 			"type": "boolean"
 		}