@atlaskit/link-datasource 3.22.1 → 3.22.2

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/link-datasource
 
+## 3.22.2
+
+### Patch Changes
+
+- [#122399](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122399)
+  [`cbaab3690564b`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/cbaab3690564b) -
+  Behind FF: `enable_datasource_fetch_action_inputs` introduce logic to find fetchAction inputs from
+  the fetchSchema and its value from datasource item data
+- Updated dependencies
+
 ## 3.22.1
 
 ### Patch Changes

package/dist/cjs/state/actions/index.js

@@ -15,6 +15,7 @@ var _linkClientExtension = require("@atlaskit/link-client-extension");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../analytics");
 var _useErrorLogger2 = _interopRequireDefault(require("../../hooks/useErrorLogger"));
+var _index = require("../index");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
@@ -203,6 +204,11 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
     _useAtomicUpdateActio3 = _useAtomicUpdateActio2[0],
     schema = _useAtomicUpdateActio3.schema,
     fetchSchema = _useAtomicUpdateActio3.fetchSchema;
+  var item = (0, _platformFeatureFlags.fg)('enable_datasource_fetch_action_inputs') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  (0, _index.useDatasourceItem)({
+    id: ari
+  }) : undefined;
   var _useDatasourceClientE2 = (0, _linkClientExtension.useDatasourceClientExtension)(),
     executeAction = _useDatasourceClientE2.executeAtomicAction,
     invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
@@ -242,11 +248,37 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
       throw error;
     });
   }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
-  var executeFetch = (0, _react.useCallback)(function (inputs) {
+  var executeFetch = (0, _react.useCallback)(function (controlledInputs) {
     if (!fetchSchema) {
       throw new Error('No supporting action schema found.');
     }
 
+    /**
+     * controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
+     */
+    var inputs = controlledInputs;
+    /**
+     * When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
+     */
+    if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && (0, _platformFeatureFlags.fg)('enable_datasource_fetch_action_inputs')) {
+      var inputKeys = Object.keys(fetchSchema.inputs);
+      /**
+       * If present return the input value from the datasource item
+       * e.g. this could be the issueKey or projectId of a Jira issue
+       */
+      inputs = inputKeys.reduce(function (acc, key) {
+        var _item$data;
+        var value = item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 || (_item$data = _item$data[key]) === null || _item$data === void 0 ? void 0 : _item$data.data;
+        if (typeof value === 'string' || typeof value === 'number') {
+          acc[key] = value;
+        }
+        /**
+         * This allows for the schema and data from the BE to dynamically set the action inputs
+         */
+        return acc;
+      }, {});
+    }
+
     // A generic type can allow us here to define the inputs and outputs
     return executeAction({
       integrationKey: integrationKey,
@@ -268,7 +300,7 @@ var useExecuteAtomicAction = exports.useExecuteAtomicAction = function useExecut
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [fetchSchema, executeAction, integrationKey, ari, fireEvent, captureError]);
+  }, [fetchSchema, executeAction, integrationKey, ari, item, fireEvent, captureError]);
   return _objectSpread(_objectSpread({}, schema && {
     execute: execute
   }), fetchSchema && {

package/dist/cjs/ui/issue-like-table/edit-type/icon/index.js

@@ -55,7 +55,7 @@ var IconEditType = function IconEditType(props) {
     autoFocus: true,
     blurInputOnSelect: true,
     defaultMenuIsOpen: true
-    // We can't update the status if we don't have an ID - however the ID
+    // We can't update this field if we don't have an ID - however the ID
     // is typed optional.
     ,
     options: (0, _platformFeatureFlags.fg)('platform-datasources-inline-edit-id-checks') ? options.filter(function (option) {

package/dist/es2019/state/actions/index.js

@@ -4,6 +4,7 @@ import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import useErrorLogger from '../../hooks/useErrorLogger';
+import { useDatasourceItem } from '../index';
 
 /**
  * Atomic actions available for an integration (by field)
@@ -185,6 +186,11 @@ export const useExecuteAtomicAction = ({
     fieldKey,
     integrationKey
   });
+  const item = fg('enable_datasource_fetch_action_inputs') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useDatasourceItem({
+    id: ari
+  }) : undefined;
   const {
     executeAtomicAction: executeAction,
     invalidateDatasourceDataCacheByAri
@@ -227,11 +233,37 @@ export const useExecuteAtomicAction = ({
       throw error;
     });
   }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
-  const executeFetch = useCallback(inputs => {
+  const executeFetch = useCallback(controlledInputs => {
     if (!fetchSchema) {
       throw new Error('No supporting action schema found.');
     }
 
+    /**
+     * controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
+     */
+    let inputs = controlledInputs;
+    /**
+     * When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
+     */
+    if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && fg('enable_datasource_fetch_action_inputs')) {
+      const inputKeys = Object.keys(fetchSchema.inputs);
+      /**
+       * If present return the input value from the datasource item
+       * e.g. this could be the issueKey or projectId of a Jira issue
+       */
+      inputs = inputKeys.reduce((acc, key) => {
+        var _item$data, _item$data$key;
+        const value = item === null || item === void 0 ? void 0 : (_item$data = item.data) === null || _item$data === void 0 ? void 0 : (_item$data$key = _item$data[key]) === null || _item$data$key === void 0 ? void 0 : _item$data$key.data;
+        if (typeof value === 'string' || typeof value === 'number') {
+          acc[key] = value;
+        }
+        /**
+         * This allows for the schema and data from the BE to dynamically set the action inputs
+         */
+        return acc;
+      }, {});
+    }
+
     // A generic type can allow us here to define the inputs and outputs
     return executeAction({
       integrationKey,
@@ -253,7 +285,7 @@ export const useExecuteAtomicAction = ({
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [fetchSchema, executeAction, integrationKey, ari, fireEvent, captureError]);
+  }, [fetchSchema, executeAction, integrationKey, ari, item, fireEvent, captureError]);
   return {
     ...(schema && {
       execute

package/dist/es2019/ui/issue-like-table/edit-type/icon/index.js

@@ -48,7 +48,7 @@ const IconEditType = props => {
     autoFocus: true,
     blurInputOnSelect: true,
     defaultMenuIsOpen: true
-    // We can't update the status if we don't have an ID - however the ID
+    // We can't update this field if we don't have an ID - however the ID
     // is typed optional.
     ,
     options: fg('platform-datasources-inline-edit-id-checks') ? options.filter(option => option.id) : options,

package/dist/esm/state/actions/index.js

@@ -10,6 +10,7 @@ import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import useErrorLogger from '../../hooks/useErrorLogger';
+import { useDatasourceItem } from '../index';
 
 /**
  * Atomic actions available for an integration (by field)
@@ -197,6 +198,11 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
     _useAtomicUpdateActio3 = _useAtomicUpdateActio2[0],
     schema = _useAtomicUpdateActio3.schema,
     fetchSchema = _useAtomicUpdateActio3.fetchSchema;
+  var item = fg('enable_datasource_fetch_action_inputs') ?
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useDatasourceItem({
+    id: ari
+  }) : undefined;
   var _useDatasourceClientE2 = useDatasourceClientExtension(),
     executeAction = _useDatasourceClientE2.executeAtomicAction,
     invalidateDatasourceDataCacheByAri = _useDatasourceClientE2.invalidateDatasourceDataCacheByAri;
@@ -236,11 +242,37 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
       throw error;
     });
   }, [schema, executeAction, integrationKey, fieldKey, ari, invalidateDatasourceDataCacheByAri, fireEvent, captureError]);
-  var executeFetch = useCallback(function (inputs) {
+  var executeFetch = useCallback(function (controlledInputs) {
     if (!fetchSchema) {
       throw new Error('No supporting action schema found.');
     }
 
+    /**
+     * controlled inputs are useful for search fields, where a variable query is passed to the fetchAction
+     */
+    var inputs = controlledInputs;
+    /**
+     * When FF is on and `controlledInputs` are not provided we look for required inputs in the fetchSchema
+     */
+    if (!Object.keys(inputs).length && fetchSchema.inputs && !!Object.keys(fetchSchema.inputs).length && fg('enable_datasource_fetch_action_inputs')) {
+      var inputKeys = Object.keys(fetchSchema.inputs);
+      /**
+       * If present return the input value from the datasource item
+       * e.g. this could be the issueKey or projectId of a Jira issue
+       */
+      inputs = inputKeys.reduce(function (acc, key) {
+        var _item$data;
+        var value = item === null || item === void 0 || (_item$data = item.data) === null || _item$data === void 0 || (_item$data = _item$data[key]) === null || _item$data === void 0 ? void 0 : _item$data.data;
+        if (typeof value === 'string' || typeof value === 'number') {
+          acc[key] = value;
+        }
+        /**
+         * This allows for the schema and data from the BE to dynamically set the action inputs
+         */
+        return acc;
+      }, {});
+    }
+
     // A generic type can allow us here to define the inputs and outputs
     return executeAction({
       integrationKey: integrationKey,
@@ -262,7 +294,7 @@ export var useExecuteAtomicAction = function useExecuteAtomicAction(_ref5) {
       // Rethrow up to component for flags and other handling
       throw error;
     });
-  }, [fetchSchema, executeAction, integrationKey, ari, fireEvent, captureError]);
+  }, [fetchSchema, executeAction, integrationKey, ari, item, fireEvent, captureError]);
   return _objectSpread(_objectSpread({}, schema && {
     execute: execute
   }), fetchSchema && {

package/dist/esm/ui/issue-like-table/edit-type/icon/index.js

@@ -45,7 +45,7 @@ var IconEditType = function IconEditType(props) {
     autoFocus: true,
     blurInputOnSelect: true,
     defaultMenuIsOpen: true
-    // We can't update the status if we don't have an ID - however the ID
+    // We can't update this field if we don't have an ID - however the ID
     // is typed optional.
     ,
     options: fg('platform-datasources-inline-edit-id-checks') ? options.filter(function (option) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.22.1",
+	"version": "3.22.2",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -45,17 +45,17 @@
 		"@atlaskit/badge": "^18.1.0",
 		"@atlaskit/button": "^21.1.0",
 		"@atlaskit/css": "^0.10.0",
-		"@atlaskit/datetime-picker": "^16.0.0",
+		"@atlaskit/datetime-picker": "^16.1.0",
 		"@atlaskit/dropdown-menu": "^13.0.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/empty-state": "^9.0.0",
-		"@atlaskit/flag": "^16.1.0",
+		"@atlaskit/flag": "^16.2.0",
 		"@atlaskit/form": "^12.0.0",
 		"@atlaskit/heading": "^5.1.0",
 		"@atlaskit/icon": "^24.1.0",
 		"@atlaskit/icon-object": "^7.0.0",
 		"@atlaskit/image": "^2.0.0",
-		"@atlaskit/inline-edit": "^15.0.0",
+		"@atlaskit/inline-edit": "^15.1.0",
 		"@atlaskit/intl-messages-provider": "^2.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
 		"@atlaskit/jql-editor": "^5.0.0",
@@ -165,6 +165,9 @@
 		"enable_datasource_supporting_actions": {
 			"type": "boolean"
 		},
+		"enable_datasource_fetch_action_inputs": {
+			"type": "boolean"
+		},
 		"platform-datasources-enable-two-way-sync-statuses": {
 			"type": "boolean"
 		},