@atlaskit/link-datasource 3.0.1 → 3.0.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/link-datasource
 
+## 3.0.2
+
+### Patch Changes
+
+- [#141472](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141472)
+  [`fa7d87963ed8a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fa7d87963ed8a) -
+  Uses `objectTypesEntity` when available in DS data response as the Actions `entityType`. When
+  `entityType` is undefined it will not make request to `discoverActions`.
+- Updated dependencies
+
 ## 3.0.1
 
 ### Patch Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -226,6 +226,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       _extensionKey,
       auth,
       _providerName,
+      objectTypesEntity,
       _yield$getDatasourceD5,
       items,
       nextPageCursor,
@@ -280,27 +281,28 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           _extensionKey = _yield$getDatasourceD4.extensionKey;
           auth = _yield$getDatasourceD4.auth;
           _providerName = _yield$getDatasourceD4.providerName;
+          objectTypesEntity = _yield$getDatasourceD4.objectTypesEntity;
           _yield$getDatasourceD5 = _yield$getDatasourceD3.data;
           items = _yield$getDatasourceD5.items;
           nextPageCursor = _yield$getDatasourceD5.nextPageCursor;
           _totalCount = _yield$getDatasourceD5.totalCount;
           schema = _yield$getDatasourceD5.schema;
           if (!((_currentAbortControll = currentAbortController) !== null && _currentAbortControll !== void 0 && _currentAbortControll.signal.aborted)) {
-            _context2.next = 28;
+            _context2.next = 29;
             break;
           }
           throw new Error('Aborted');
-        case 28:
+        case 29:
           setExtensionKey(_extensionKey);
           setProviderName(_providerName);
           if (!(access === 'unauthorized' || access === 'forbidden')) {
-            _context2.next = 34;
+            _context2.next = 35;
             break;
           }
           setStatus(access);
           setAuthDetails(auth || initialEmptyArray);
           return _context2.abrupt("return");
-        case 34:
+        case 35:
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
@@ -315,7 +317,10 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
              * Product is typed as any.
              */
             integrationKey = product;
-            entityType = _destinationObjectTypes !== null && _destinationObjectTypes !== void 0 && _destinationObjectTypes.length ? _destinationObjectTypes[0] : undefined;
+            /**
+             * When `entityType` is undefined, we should not discover actions it prevents unnecessary requests to Actions service
+             */
+            entityType = objectTypesEntity;
             newIds = onAddItems(items, typeof integrationKey === 'string' ? integrationKey : undefined, entityType);
             setResponseItemIds(function (currentIds) {
               return [].concat((0, _toConsumableArray2.default)(currentIds), (0, _toConsumableArray2.default)(newIds));
@@ -357,38 +362,38 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 59;
+          _context2.next = 60;
           break;
-        case 47:
-          _context2.prev = 47;
+        case 48:
+          _context2.prev = 48;
           _context2.t0 = _context2["catch"](10);
           if (!(_context2.t0.message === 'Aborted')) {
-            _context2.next = 51;
+            _context2.next = 52;
             break;
           }
           return _context2.abrupt("return");
-        case 51:
+        case 52:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 55;
+            _context2.next = 56;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 55:
+        case 56:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 58;
+            _context2.next = 59;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 58:
-          setStatus('rejected');
         case 59:
+          setStatus('rejected');
+        case 60:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[10, 47]]);
+    }, _callee2, null, [[10, 48]]);
   })), [captureError, parameters, fieldKeys, nextCursor, responseItems, setResponseItemIds, onAddItems, getDatasourceData, datasourceId, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray, discoverActions]);
   var reset = (0, _react.useCallback)(function (options) {
     setResponseItems(initialEmptyArray);

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -163,7 +163,8 @@ export const useDatasourceTableState = ({
           product,
           extensionKey,
           auth,
-          providerName
+          providerName,
+          objectTypesEntity
         },
         data: {
           items,
@@ -199,7 +200,11 @@ export const useDatasourceTableState = ({
          * Product is typed as any.
          */
         const integrationKey = product;
-        const entityType = destinationObjectTypes !== null && destinationObjectTypes !== void 0 && destinationObjectTypes.length ? destinationObjectTypes[0] : undefined;
+
+        /**
+         * When `entityType` is undefined, we should not discover actions it prevents unnecessary requests to Actions service
+         */
+        const entityType = objectTypesEntity;
         const newIds = onAddItems(items, typeof integrationKey === 'string' ? integrationKey : undefined, entityType);
         setResponseItemIds(currentIds => [...currentIds, ...newIds]);
         if (fg('platform-datasources-enable-two-way-sync')) {

package/dist/esm/hooks/useDatasourceTableState.js

@@ -219,6 +219,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       _extensionKey,
       auth,
       _providerName,
+      objectTypesEntity,
       _yield$getDatasourceD5,
       items,
       nextPageCursor,
@@ -273,27 +274,28 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           _extensionKey = _yield$getDatasourceD4.extensionKey;
           auth = _yield$getDatasourceD4.auth;
           _providerName = _yield$getDatasourceD4.providerName;
+          objectTypesEntity = _yield$getDatasourceD4.objectTypesEntity;
           _yield$getDatasourceD5 = _yield$getDatasourceD3.data;
           items = _yield$getDatasourceD5.items;
           nextPageCursor = _yield$getDatasourceD5.nextPageCursor;
           _totalCount = _yield$getDatasourceD5.totalCount;
           schema = _yield$getDatasourceD5.schema;
           if (!((_currentAbortControll = currentAbortController) !== null && _currentAbortControll !== void 0 && _currentAbortControll.signal.aborted)) {
-            _context2.next = 28;
+            _context2.next = 29;
             break;
           }
           throw new Error('Aborted');
-        case 28:
+        case 29:
           setExtensionKey(_extensionKey);
           setProviderName(_providerName);
           if (!(access === 'unauthorized' || access === 'forbidden')) {
-            _context2.next = 34;
+            _context2.next = 35;
             break;
           }
           setStatus(access);
           setAuthDetails(auth || initialEmptyArray);
           return _context2.abrupt("return");
-        case 34:
+        case 35:
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
@@ -308,7 +310,10 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
              * Product is typed as any.
              */
             integrationKey = product;
-            entityType = _destinationObjectTypes !== null && _destinationObjectTypes !== void 0 && _destinationObjectTypes.length ? _destinationObjectTypes[0] : undefined;
+            /**
+             * When `entityType` is undefined, we should not discover actions it prevents unnecessary requests to Actions service
+             */
+            entityType = objectTypesEntity;
             newIds = onAddItems(items, typeof integrationKey === 'string' ? integrationKey : undefined, entityType);
             setResponseItemIds(function (currentIds) {
               return [].concat(_toConsumableArray(currentIds), _toConsumableArray(newIds));
@@ -350,38 +355,38 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 59;
+          _context2.next = 60;
           break;
-        case 47:
-          _context2.prev = 47;
+        case 48:
+          _context2.prev = 48;
           _context2.t0 = _context2["catch"](10);
           if (!(_context2.t0.message === 'Aborted')) {
-            _context2.next = 51;
+            _context2.next = 52;
             break;
           }
           return _context2.abrupt("return");
-        case 51:
+        case 52:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 55;
+            _context2.next = 56;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 55:
+        case 56:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 58;
+            _context2.next = 59;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 58:
-          setStatus('rejected');
         case 59:
+          setStatus('rejected');
+        case 60:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[10, 47]]);
+    }, _callee2, null, [[10, 48]]);
   })), [captureError, parameters, fieldKeys, nextCursor, responseItems, setResponseItemIds, onAddItems, getDatasourceData, datasourceId, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray, discoverActions]);
   var reset = useCallback(function (options) {
     setResponseItems(initialEmptyArray);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.0.1",
+	"version": "3.0.2",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -48,7 +48,7 @@
 		"@atlaskit/flag": "^15.8.0",
 		"@atlaskit/form": "^10.5.0",
 		"@atlaskit/heading": "^2.4.0",
-		"@atlaskit/icon": "^22.17.0",
+		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/icon-object": "^6.5.0",
 		"@atlaskit/image": "^1.3.0",
 		"@atlaskit/inline-edit": "^13.7.0",
@@ -57,7 +57,7 @@
 		"@atlaskit/jql-editor": "^4.7.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^2.1.0",
 		"@atlaskit/layering": "^0.4.0",
-		"@atlaskit/link-client-extension": "^2.3.0",
+		"@atlaskit/link-client-extension": "^2.4.0",
 		"@atlaskit/linking-common": "^5.11.0",
 		"@atlaskit/linking-types": "^9.0.0",
 		"@atlaskit/logo": "^14.2.0",
@@ -71,14 +71,14 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^1.1.0",
 		"@atlaskit/primitives": "^12.1.0",
-		"@atlaskit/select": "^17.17.0",
+		"@atlaskit/select": "^17.19.0",
 		"@atlaskit/smart-card": "^28.1.0",
 		"@atlaskit/smart-user-picker": "6.10.2",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/tag": "^12.6.0",
 		"@atlaskit/textfield": "6.5.1",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@atlaskit/ufo": "^0.3.0",
 		"@atlaskit/width-detector": "^4.3.0",
@@ -100,7 +100,7 @@
 	"devDependencies": {
 		"@af/integration-testing": "*",
 		"@af/visual-regression": "*",
-		"@atlaskit/link-provider": "^1.15.0",
+		"@atlaskit/link-provider": "^1.16.0",
 		"@atlaskit/link-test-helpers": "^7.5.0",
 		"@atlaskit/ssr": "*",
 		"@atlaskit/visual-regression": "*",