@atlaskit/link-datasource 2.8.0 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 2.9.0
+
+### Minor Changes
+
+- [#123321](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/123321)
+  [`f932f3070f30d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/f932f3070f30d) -
+  Added `react-sweet-state` which will be fully integrated in issue like table in the next
+  changeset.
+
 ## 2.8.0
 
 ### Minor Changes

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -12,7 +12,9 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = require("react");
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _linkClientExtension = require("@atlaskit/link-client-extension");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
+var _state = require("../state");
 var _useErrorLogger2 = _interopRequireDefault(require("./useErrorLogger"));
 var useDatasourceTableState = exports.useDatasourceTableState = function useDatasourceTableState(_ref) {
   var datasourceId = _ref.datasourceId,
@@ -25,6 +27,8 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       datasourceId: datasourceId
     }),
     captureError = _useErrorLogger.captureError;
+  var _useDatasourceActions = (0, _state.useDatasourceActions)(),
+    onAddItems = _useDatasourceActions.onAddItems;
   var idFieldCount = 1;
   var keyFieldCount = 1;
   var _useState = (0, _react.useState)([]),
@@ -52,42 +56,45 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
     authDetails = _useState12[0],
     setAuthDetails = _useState12[1];
-  var _useState13 = (0, _react.useState)([]),
+  var _useState13 = (0, _react.useState)(initialEmptyArray),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
     responseItems = _useState14[0],
     setResponseItems = _useState14[1];
-  var _useState15 = (0, _react.useState)(true),
+  var _useState15 = (0, _react.useState)(initialEmptyArray),
     _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    hasNextPage = _useState16[0],
-    setHasNextPage = _useState16[1];
-  var _useState17 = (0, _react.useState)(undefined),
+    setResponseItemIds = _useState16[1];
+  var _useState17 = (0, _react.useState)(true),
     _useState18 = (0, _slicedToArray2.default)(_useState17, 2),
-    nextCursor = _useState18[0],
-    setNextCursor = _useState18[1];
-  var _useState19 = (0, _react.useState)([]),
+    hasNextPage = _useState18[0],
+    setHasNextPage = _useState18[1];
+  var _useState19 = (0, _react.useState)(undefined),
     _useState20 = (0, _slicedToArray2.default)(_useState19, 2),
-    columns = _useState20[0],
-    setColumns = _useState20[1];
-  var _useState21 = (0, _react.useState)(undefined),
+    nextCursor = _useState20[0],
+    setNextCursor = _useState20[1];
+  var _useState21 = (0, _react.useState)([]),
     _useState22 = (0, _slicedToArray2.default)(_useState21, 2),
-    totalCount = _useState22[0],
-    setTotalCount = _useState22[1];
-  var _useState23 = (0, _react.useState)(false),
+    columns = _useState22[0],
+    setColumns = _useState22[1];
+  var _useState23 = (0, _react.useState)(undefined),
     _useState24 = (0, _slicedToArray2.default)(_useState23, 2),
-    shouldForceRequest = _useState24[0],
-    setShouldForceRequest = _useState24[1];
-  var _useState25 = (0, _react.useState)([]),
+    totalCount = _useState24[0],
+    setTotalCount = _useState24[1];
+  var _useState25 = (0, _react.useState)(false),
     _useState26 = (0, _slicedToArray2.default)(_useState25, 2),
-    destinationObjectTypes = _useState26[0],
-    setDestinationObjectTypes = _useState26[1];
-  var _useState27 = (0, _react.useState)(),
+    shouldForceRequest = _useState26[0],
+    setShouldForceRequest = _useState26[1];
+  var _useState27 = (0, _react.useState)([]),
     _useState28 = (0, _slicedToArray2.default)(_useState27, 2),
-    extensionKey = _useState28[0],
-    setExtensionKey = _useState28[1];
-  var _useState29 = (0, _react.useState)(undefined),
+    destinationObjectTypes = _useState28[0],
+    setDestinationObjectTypes = _useState28[1];
+  var _useState29 = (0, _react.useState)(),
     _useState30 = (0, _slicedToArray2.default)(_useState29, 2),
-    providerName = _useState30[0],
-    setProviderName = _useState30[1];
+    extensionKey = _useState30[0],
+    setExtensionKey = _useState30[1];
+  var _useState31 = (0, _react.useState)(undefined),
+    _useState32 = (0, _slicedToArray2.default)(_useState31, 2),
+    providerName = _useState32[0],
+    setProviderName = _useState32[1];
   var abortController = (0, _react.useRef)(new AbortController());
   var _useDatasourceClientE = (0, _linkClientExtension.useDatasourceClientExtension)(),
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
@@ -215,6 +222,7 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
       nextPageCursor,
       _totalCount,
       schema,
+      newIds,
       isUserLoadingNextPage,
       currentLoadedItemCount,
       newlyLoadedItemCount,
@@ -289,6 +297,12 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             }
             return [].concat((0, _toConsumableArray2.default)(currentResponseItems), (0, _toConsumableArray2.default)(items));
           });
+          if ((0, _platformFeatureFlags.fg)('enable_datasource_react_sweet_state')) {
+            newIds = onAddItems(items);
+            setResponseItemIds(function (currentIds) {
+              return [].concat((0, _toConsumableArray2.default)(currentIds), (0, _toConsumableArray2.default)(newIds));
+            });
+          }
           setHasNextPage(Boolean(nextPageCursor));
           if (fieldKeys.length > 0) {
             setLastRequestedFieldKeys(fieldKeys);
@@ -296,9 +310,9 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           if ((isSchemaFromData && schema || fullSchema.properties.length > 0) && items.length > 0) {
             applySchemaProperties(schema || fullSchema, fieldKeys);
           }
-          isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
+          isUserLoadingNextPage = responseItems.length !== 0 && !shouldRequestFirstPage;
           if (isUserLoadingNextPage) {
-            currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
+            currentLoadedItemCount = responseItems.length;
             newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
             fireEvent('track.nextItem.loaded', {
               extensionKey: _extensionKey,
@@ -307,41 +321,42 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 57;
+          _context2.next = 58;
           break;
-        case 45:
-          _context2.prev = 45;
+        case 46:
+          _context2.prev = 46;
           _context2.t0 = _context2["catch"](10);
           if (!(_context2.t0.message === 'Aborted')) {
-            _context2.next = 49;
+            _context2.next = 50;
             break;
           }
           return _context2.abrupt("return");
-        case 49:
+        case 50:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 53;
+            _context2.next = 54;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 53:
+        case 54:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 56;
+            _context2.next = 57;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 56:
-          setStatus('rejected');
         case 57:
+          setStatus('rejected');
+        case 58:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[10, 45]]);
-  })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
+    }, _callee2, null, [[10, 46]]);
+  })), [captureError, parameters, fieldKeys, nextCursor, responseItems, setResponseItemIds, onAddItems, getDatasourceData, datasourceId, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   var reset = (0, _react.useCallback)(function (options) {
     setResponseItems(initialEmptyArray);
+    setResponseItemIds(initialEmptyArray);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);

package/dist/cjs/state/index.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useDatasourceItem = exports.useDatasourceActions = exports.actions = exports.StoreContainer = exports.Store = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _reactSweetState = require("react-sweet-state");
+var _uuid = require("uuid");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+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; }
+var getInitialState = function getInitialState() {
+  return {
+    items: {}
+  };
+};
+var actions = exports.actions = {
+  onAddItems: function onAddItems(items) {
+    return function (_ref) {
+      var setState = _ref.setState,
+        getState = _ref.getState;
+      var oldItems = _objectSpread({}, getState().items);
+      var _items$reduce = items.reduce(function (_ref2, item) {
+          var _item$ari;
+          var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+            ids = _ref3[0],
+            itemMap = _ref3[1];
+          var ari = typeof ((_item$ari = item['ari']) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? item['ari'].data : undefined;
+          var id = ari !== null && ari !== void 0 ? ari : (0, _uuid.v4)();
+          return [[].concat((0, _toConsumableArray2.default)(ids), [id]), _objectSpread(_objectSpread({}, itemMap), {}, (0, _defineProperty2.default)({}, id, _objectSpread(_objectSpread({}, oldItems[id]), item)))];
+        }, [[], oldItems]),
+        _items$reduce2 = (0, _slicedToArray2.default)(_items$reduce, 2),
+        newItemIds = _items$reduce2[0],
+        newItems = _items$reduce2[1];
+      setState({
+        items: newItems
+      });
+      return newItemIds;
+    };
+  }
+};
+var Store = exports.Store = (0, _reactSweetState.createStore)({
+  name: 'datasource-store',
+  initialState: getInitialState(),
+  actions: actions
+});
+var useDatasourceItem = exports.useDatasourceItem = (0, _reactSweetState.createStateHook)(Store, {
+  selector: function selector(state, _ref4) {
+    var id = _ref4.id;
+    return state.items[id];
+  }
+});
+var useDatasourceActions = exports.useDatasourceActions = (0, _reactSweetState.createActionsHook)(Store);
+var Container = (0, _reactSweetState.createContainer)(Store);
+var StoreContainer = exports.StoreContainer = function StoreContainer(_ref5) {
+  var children = _ref5.children;
+  if ((0, _platformFeatureFlags.fg)('enable_datasource_react_sweet_state')) {
+    return /*#__PURE__*/_react.default.createElement(Container, {
+      scope: "datasource"
+    }, children);
+  }
+  return children;
+};

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -30,6 +30,7 @@ var _useAssetsClient2 = require("../../../hooks/useAssetsClient");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _cmdbService = require("../../../services/cmdbService.utils");
+var _state = require("../../../state");
 var _accessRequired = require("../../../ui/common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
 var _cancelButton = require("../../common/modal/cancel-button");
@@ -66,7 +67,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = (0, _react.useState)((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = (0, _react.useState)(
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -125,7 +128,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       aql: aql || '',
       schemaId: schemaId || '',
       workspaceId: workspaceId || ''
-    }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+    }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
       version: VERSION_TWO
     } : {});
   }, [aql, schemaId, workspaceId]);
@@ -209,7 +212,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   (0, _react.useEffect)(function () {
-    if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter')) {
+    if ((0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter')) {
       var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
       setVisibleColumnKeys(newVisibleColumnKeys);
     } else {
@@ -268,7 +271,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
           workspaceId: workspaceId,
           aql: aql,
           schemaId: schemaId
-        }, (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+        }, (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_add_version_parameter') ? {
           version: VERSION_TWO
         } : {}),
         views: [{
@@ -390,5 +393,5 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 var AssetsConfigModal = exports.AssetsConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(function (props) {
-  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _react2.jsx)(PlainAssetsConfigModal, props)));
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _react2.jsx)(PlainAssetsConfigModal, props))));
 });

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -23,6 +23,7 @@ var _datasourceExperienceId = require("../../../contexts/datasource-experience-i
 var _userInteractions = require("../../../contexts/user-interactions");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _useAvailableSites2 = require("../../../services/useAvailableSites");
+var _state = require("../../../state");
 var _accessRequired = require("../../common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
 var _noInstances = require("../../common/error-state/no-instances");
@@ -351,7 +352,7 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
 });
 var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(function (props) {
   var _props$viewMode;
-  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal') ? (0, _react2.jsx)(_datasourceContext.DatasourceContextProvider, {
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal') ? (0, _react2.jsx)(_datasourceContext.DatasourceContextProvider, {
     datasourceId: props.datasourceId,
     initialVisibleColumnKeys: props.visibleColumnKeys,
     initialColumnCustomSizes: props.columnCustomSizes,
@@ -363,5 +364,5 @@ var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = (0, _ana
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
   }, (0, _react2.jsx)(PlainConfluenceSearchConfigModal, props))) :
   // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
-  (0, _react2.jsx)(_ModalOld.PlainConfluenceSearchConfigModal, props)));
+  (0, _react2.jsx)(_ModalOld.PlainConfluenceSearchConfigModal, props))));
 });

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -19,6 +19,7 @@ var _fetchMessagesForLocale = require("../../common/utils/locale/fetch-messages-
 var _datasourceExperienceId = require("../../contexts/datasource-experience-id");
 var _useDatasourceTableState = require("../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../i18n/en"));
+var _state = require("../../state");
 var _styled = require("../../ui/issue-like-table/styled");
 var _assetsModal = require("../assets-modal");
 var _accessRequired = require("../common/error-state/access-required");
@@ -121,7 +122,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var forcedReset = (0, _react.useCallback)(function () {
     reset({
       shouldForceRequest: true,
-      shouldResetColumns: (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID
+      shouldResetColumns: (0, _platformFeatureFlags.fg)('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === _assetsModal.ASSETS_LIST_OF_LINKS_DATASOURCE_ID
     });
   }, [reset, datasourceId]);
   var onRefresh = (0, _react.useCallback)(function () {
@@ -192,5 +193,5 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   })));
 };
 var DatasourceTableView = exports.DatasourceTableView = (0, _analyticsNext.withAnalyticsContext)(_constants.componentMetadata.tableView)(function (props) {
-  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(DatasourceTableViewWithoutAnalytics, props));
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(DatasourceTableViewWithoutAnalytics, props)));
 });

package/dist/cjs/ui/jira-issues-modal/modal/index.js

@@ -30,6 +30,7 @@ var _userInteractions = require("../../../contexts/user-interactions");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
 var _useAvailableSites2 = require("../../../services/useAvailableSites");
+var _state = require("../../../state");
 var _accessRequired = require("../../common/error-state/access-required");
 var _messages = require("../../common/error-state/messages");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
@@ -500,7 +501,7 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
 });
 var JiraIssuesConfigModal = exports.JiraIssuesConfigModal = (0, _analyticsNext.withAnalyticsContext)(contextData)(function (props) {
   var _props$viewMode;
-  return (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal') ? (0, _react2.jsx)(_useViewModeContext2.DatasourceViewModeProvider, {
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal') ? (0, _react2.jsx)(_useViewModeContext2.DatasourceViewModeProvider, {
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, (0, _react2.jsx)(PlainJiraIssuesConfigModal, props)) : (0, _react2.jsx)(_ModalOld.PlainJiraIssuesConfigModalOld, props)));
+  }, (0, _react2.jsx)(PlainJiraIssuesConfigModal, props)) : (0, _react2.jsx)(_ModalOld.PlainJiraIssuesConfigModalOld, props))));
 });

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -1,7 +1,9 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
+import { useDatasourceActions } from '../state';
 import useErrorLogger from './useErrorLogger';
 export const useDatasourceTableState = ({
   datasourceId,
@@ -16,6 +18,9 @@ export const useDatasourceTableState = ({
   } = useErrorLogger({
     datasourceId
   });
+  const {
+    onAddItems
+  } = useDatasourceActions();
   const idFieldCount = 1;
   const keyFieldCount = 1;
   const [initialEmptyArray] = useState([]);
@@ -26,7 +31,8 @@ export const useDatasourceTableState = ({
   });
   const [status, setStatus] = useState('empty');
   const [authDetails, setAuthDetails] = useState([]);
-  const [responseItems, setResponseItems] = useState([]);
+  const [responseItems, setResponseItems] = useState(initialEmptyArray);
+  const [, setResponseItemIds] = useState(initialEmptyArray);
   const [hasNextPage, setHasNextPage] = useState(true);
   const [nextCursor, setNextCursor] = useState(undefined);
   const [columns, setColumns] = useState([]);
@@ -157,7 +163,6 @@ export const useDatasourceTableState = ({
           schema
         }
       } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-
       /**
        * Let the response finish and store in cache, but throw error if signal is aborted
        */
@@ -180,6 +185,10 @@ export const useDatasourceTableState = ({
         }
         return [...currentResponseItems, ...items];
       });
+      if (fg('enable_datasource_react_sweet_state')) {
+        const newIds = onAddItems(items);
+        setResponseItemIds(currentIds => [...currentIds, ...newIds]);
+      }
       setHasNextPage(Boolean(nextPageCursor));
       if (fieldKeys.length > 0) {
         setLastRequestedFieldKeys(fieldKeys);
@@ -187,9 +196,9 @@ export const useDatasourceTableState = ({
       if ((isSchemaFromData && schema || fullSchema.properties.length > 0) && items.length > 0) {
         applySchemaProperties(schema || fullSchema, fieldKeys);
       }
-      const isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
+      const isUserLoadingNextPage = responseItems.length !== 0 && !shouldRequestFirstPage;
       if (isUserLoadingNextPage) {
-        const currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
+        const currentLoadedItemCount = responseItems.length;
         const newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
         fireEvent('track.nextItem.loaded', {
           extensionKey,
@@ -219,9 +228,10 @@ export const useDatasourceTableState = ({
       }
       setStatus('rejected');
     }
-  }, [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
+  }, [captureError, parameters, fieldKeys, nextCursor, responseItems, setResponseItemIds, onAddItems, getDatasourceData, datasourceId, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   const reset = useCallback(options => {
     setResponseItems(initialEmptyArray);
+    setResponseItemIds(initialEmptyArray);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);

package/dist/es2019/state/index.js

@@ -0,0 +1,55 @@
+import React from 'react';
+import { createActionsHook, createContainer, createStateHook, createStore } from 'react-sweet-state';
+import { v4 as uuidv4 } from 'uuid';
+import { fg } from '@atlaskit/platform-feature-flags';
+const getInitialState = () => ({
+  items: {}
+});
+export const actions = {
+  onAddItems: items => ({
+    setState,
+    getState
+  }) => {
+    const oldItems = {
+      ...getState().items
+    };
+    const [newItemIds, newItems] = items.reduce(([ids, itemMap], item) => {
+      var _item$ari;
+      const ari = typeof ((_item$ari = item['ari']) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? item['ari'].data : undefined;
+      const id = ari !== null && ari !== void 0 ? ari : uuidv4();
+      return [[...ids, id], {
+        ...itemMap,
+        [id]: {
+          ...oldItems[id],
+          ...item
+        }
+      }];
+    }, [[], oldItems]);
+    setState({
+      items: newItems
+    });
+    return newItemIds;
+  }
+};
+export const Store = createStore({
+  name: 'datasource-store',
+  initialState: getInitialState(),
+  actions
+});
+export const useDatasourceItem = createStateHook(Store, {
+  selector: (state, {
+    id
+  }) => state.items[id]
+});
+export const useDatasourceActions = createActionsHook(Store);
+const Container = createContainer(Store);
+export const StoreContainer = ({
+  children
+}) => {
+  if (fg('enable_datasource_react_sweet_state')) {
+    return /*#__PURE__*/React.createElement(Container, {
+      scope: "datasource"
+    }, children);
+  }
+  return children;
+};

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -12,7 +12,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -27,6 +27,7 @@ import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
@@ -54,7 +55,9 @@ const PlainAssetsConfigModal = props => {
   const [aql, setAql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql);
   const [schemaId, setSchemaId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
   const apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  const [visibleColumnKeys, setVisibleColumnKeys] = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
+  const [visibleColumnKeys, setVisibleColumnKeys] = useState(
+  // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+  fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys);
   const [isNewSearch, setIsNewSearch] = useState(false);
   const [errorState, setErrorState] = useState();
   const {
@@ -105,7 +108,7 @@ const PlainAssetsConfigModal = props => {
     aql: aql || '',
     schemaId: schemaId || '',
     workspaceId: workspaceId || '',
-    ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+    ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
       version: VERSION_TWO
     } : {})
   }), [aql, schemaId, workspaceId]);
@@ -190,7 +193,7 @@ const PlainAssetsConfigModal = props => {
     setIsNewSearch(false);
   }, []);
   useEffect(() => {
-    if (getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter')) {
+    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
       const newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
       setVisibleColumnKeys(newVisibleColumnKeys);
     } else {
@@ -249,7 +252,7 @@ const PlainAssetsConfigModal = props => {
           workspaceId,
           aql,
           schemaId,
-          ...(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+          ...(fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
             version: VERSION_TWO
           } : {})
         },
@@ -374,4 +377,4 @@ const contextData = {
     ...analyticsContextAttributes
   }
 };
-export const AssetsConfigModal = withAnalyticsContext(contextData)(props => jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props))));
+export const AssetsConfigModal = withAnalyticsContext(contextData)(props => jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props)))));

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -21,6 +21,7 @@ import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-exp
 import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { NoInstancesView } from '../../common/error-state/no-instances';
@@ -342,7 +343,7 @@ const contextData = {
 };
 export const ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(props => {
   var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
     datasourceId: props.datasourceId,
     initialVisibleColumnKeys: props.visibleColumnKeys,
     initialColumnCustomSizes: props.columnCustomSizes,
@@ -354,5 +355,5 @@ export const ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(pro
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
   }, jsx(PlainConfluenceSearchConfigModal, props))) :
   // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
-  jsx(PlainConfluenceSearchConfigModalOld, props)));
+  jsx(PlainConfluenceSearchConfigModalOld, props))));
 });

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';
 import { startUfoExperience } from '../../analytics/ufoExperiences';
@@ -18,6 +18,7 @@ import { fetchMessagesForLocale } from '../../common/utils/locale/fetch-messages
 import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
 import i18nEN from '../../i18n/en';
+import { StoreContainer } from '../../state';
 import { ScrollableContainerHeight } from '../../ui/issue-like-table/styled';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
 import { AccessRequired } from '../common/error-state/access-required';
@@ -115,7 +116,7 @@ const DatasourceTableViewWithoutAnalytics = ({
   const forcedReset = useCallback(() => {
     reset({
       shouldForceRequest: true,
-      shouldResetColumns: getBooleanFF('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
+      shouldResetColumns: fg('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
     });
   }, [reset, datasourceId]);
   const onRefresh = useCallback(() => {
@@ -185,4 +186,4 @@ const DatasourceTableViewWithoutAnalytics = ({
     url: url
   })));
 };
-export const DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(props => jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props)));
+export const DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(props => jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props))));

package/dist/es2019/ui/jira-issues-modal/modal/index.js

@@ -29,6 +29,7 @@ import { UserInteractionsProvider, useUserInteractions } from '../../../contexts
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { loadingErrorMessages } from '../../common/error-state/messages';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
@@ -494,7 +495,7 @@ const contextData = {
 };
 export const JiraIssuesConfigModal = withAnalyticsContext(contextData)(props => {
   var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceViewModeProvider, {
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceViewModeProvider, {
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, jsx(PlainJiraIssuesConfigModal, props)) : jsx(PlainJiraIssuesConfigModalOld, props)));
+  }, jsx(PlainJiraIssuesConfigModal, props)) : jsx(PlainJiraIssuesConfigModalOld, props))));
 });

package/dist/esm/hooks/useDatasourceTableState.js

@@ -5,7 +5,9 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE, useDatasourceClientExtension } from '@atlaskit/link-client-extension';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
+import { useDatasourceActions } from '../state';
 import useErrorLogger from './useErrorLogger';
 export var useDatasourceTableState = function useDatasourceTableState(_ref) {
   var datasourceId = _ref.datasourceId,
@@ -18,6 +20,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       datasourceId: datasourceId
     }),
     captureError = _useErrorLogger.captureError;
+  var _useDatasourceActions = useDatasourceActions(),
+    onAddItems = _useDatasourceActions.onAddItems;
   var idFieldCount = 1;
   var keyFieldCount = 1;
   var _useState = useState([]),
@@ -45,42 +49,45 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     _useState12 = _slicedToArray(_useState11, 2),
     authDetails = _useState12[0],
     setAuthDetails = _useState12[1];
-  var _useState13 = useState([]),
+  var _useState13 = useState(initialEmptyArray),
     _useState14 = _slicedToArray(_useState13, 2),
     responseItems = _useState14[0],
     setResponseItems = _useState14[1];
-  var _useState15 = useState(true),
+  var _useState15 = useState(initialEmptyArray),
     _useState16 = _slicedToArray(_useState15, 2),
-    hasNextPage = _useState16[0],
-    setHasNextPage = _useState16[1];
-  var _useState17 = useState(undefined),
+    setResponseItemIds = _useState16[1];
+  var _useState17 = useState(true),
     _useState18 = _slicedToArray(_useState17, 2),
-    nextCursor = _useState18[0],
-    setNextCursor = _useState18[1];
-  var _useState19 = useState([]),
+    hasNextPage = _useState18[0],
+    setHasNextPage = _useState18[1];
+  var _useState19 = useState(undefined),
     _useState20 = _slicedToArray(_useState19, 2),
-    columns = _useState20[0],
-    setColumns = _useState20[1];
-  var _useState21 = useState(undefined),
+    nextCursor = _useState20[0],
+    setNextCursor = _useState20[1];
+  var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    totalCount = _useState22[0],
-    setTotalCount = _useState22[1];
-  var _useState23 = useState(false),
+    columns = _useState22[0],
+    setColumns = _useState22[1];
+  var _useState23 = useState(undefined),
     _useState24 = _slicedToArray(_useState23, 2),
-    shouldForceRequest = _useState24[0],
-    setShouldForceRequest = _useState24[1];
-  var _useState25 = useState([]),
+    totalCount = _useState24[0],
+    setTotalCount = _useState24[1];
+  var _useState25 = useState(false),
     _useState26 = _slicedToArray(_useState25, 2),
-    destinationObjectTypes = _useState26[0],
-    setDestinationObjectTypes = _useState26[1];
-  var _useState27 = useState(),
+    shouldForceRequest = _useState26[0],
+    setShouldForceRequest = _useState26[1];
+  var _useState27 = useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    extensionKey = _useState28[0],
-    setExtensionKey = _useState28[1];
-  var _useState29 = useState(undefined),
+    destinationObjectTypes = _useState28[0],
+    setDestinationObjectTypes = _useState28[1];
+  var _useState29 = useState(),
     _useState30 = _slicedToArray(_useState29, 2),
-    providerName = _useState30[0],
-    setProviderName = _useState30[1];
+    extensionKey = _useState30[0],
+    setExtensionKey = _useState30[1];
+  var _useState31 = useState(undefined),
+    _useState32 = _slicedToArray(_useState31, 2),
+    providerName = _useState32[0],
+    setProviderName = _useState32[1];
   var abortController = useRef(new AbortController());
   var _useDatasourceClientE = useDatasourceClientExtension(),
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
@@ -208,6 +215,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       nextPageCursor,
       _totalCount,
       schema,
+      newIds,
       isUserLoadingNextPage,
       currentLoadedItemCount,
       newlyLoadedItemCount,
@@ -282,6 +290,12 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             }
             return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
           });
+          if (fg('enable_datasource_react_sweet_state')) {
+            newIds = onAddItems(items);
+            setResponseItemIds(function (currentIds) {
+              return [].concat(_toConsumableArray(currentIds), _toConsumableArray(newIds));
+            });
+          }
           setHasNextPage(Boolean(nextPageCursor));
           if (fieldKeys.length > 0) {
             setLastRequestedFieldKeys(fieldKeys);
@@ -289,9 +303,9 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if ((isSchemaFromData && schema || fullSchema.properties.length > 0) && items.length > 0) {
             applySchemaProperties(schema || fullSchema, fieldKeys);
           }
-          isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
+          isUserLoadingNextPage = responseItems.length !== 0 && !shouldRequestFirstPage;
           if (isUserLoadingNextPage) {
-            currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
+            currentLoadedItemCount = responseItems.length;
             newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
             fireEvent('track.nextItem.loaded', {
               extensionKey: _extensionKey,
@@ -300,41 +314,42 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 57;
+          _context2.next = 58;
           break;
-        case 45:
-          _context2.prev = 45;
+        case 46:
+          _context2.prev = 46;
           _context2.t0 = _context2["catch"](10);
           if (!(_context2.t0.message === 'Aborted')) {
-            _context2.next = 49;
+            _context2.next = 50;
             break;
           }
           return _context2.abrupt("return");
-        case 49:
+        case 50:
           captureError('onNextPage', _context2.t0);
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
-            _context2.next = 53;
+            _context2.next = 54;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 53:
+        case 54:
           if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
-            _context2.next = 56;
+            _context2.next = 57;
             break;
           }
           setStatus('forbidden');
           return _context2.abrupt("return");
-        case 56:
-          setStatus('rejected');
         case 57:
+          setStatus('rejected');
+        case 58:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[10, 45]]);
-  })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
+    }, _callee2, null, [[10, 46]]);
+  })), [captureError, parameters, fieldKeys, nextCursor, responseItems, setResponseItemIds, onAddItems, getDatasourceData, datasourceId, applySchemaProperties, fireEvent, fullSchema, initialEmptyArray]);
   var reset = useCallback(function (options) {
     setResponseItems(initialEmptyArray);
+    setResponseItemIds(initialEmptyArray);
     setHasNextPage(true);
     setNextCursor(undefined);
     setTotalCount(undefined);

package/dist/esm/state/index.js

@@ -0,0 +1,61 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+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) { _defineProperty(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; }
+import React from 'react';
+import { createActionsHook, createContainer, createStateHook, createStore } from 'react-sweet-state';
+import { v4 as uuidv4 } from 'uuid';
+import { fg } from '@atlaskit/platform-feature-flags';
+var getInitialState = function getInitialState() {
+  return {
+    items: {}
+  };
+};
+export var actions = {
+  onAddItems: function onAddItems(items) {
+    return function (_ref) {
+      var setState = _ref.setState,
+        getState = _ref.getState;
+      var oldItems = _objectSpread({}, getState().items);
+      var _items$reduce = items.reduce(function (_ref2, item) {
+          var _item$ari;
+          var _ref3 = _slicedToArray(_ref2, 2),
+            ids = _ref3[0],
+            itemMap = _ref3[1];
+          var ari = typeof ((_item$ari = item['ari']) === null || _item$ari === void 0 ? void 0 : _item$ari.data) === 'string' ? item['ari'].data : undefined;
+          var id = ari !== null && ari !== void 0 ? ari : uuidv4();
+          return [[].concat(_toConsumableArray(ids), [id]), _objectSpread(_objectSpread({}, itemMap), {}, _defineProperty({}, id, _objectSpread(_objectSpread({}, oldItems[id]), item)))];
+        }, [[], oldItems]),
+        _items$reduce2 = _slicedToArray(_items$reduce, 2),
+        newItemIds = _items$reduce2[0],
+        newItems = _items$reduce2[1];
+      setState({
+        items: newItems
+      });
+      return newItemIds;
+    };
+  }
+};
+export var Store = createStore({
+  name: 'datasource-store',
+  initialState: getInitialState(),
+  actions: actions
+});
+export var useDatasourceItem = createStateHook(Store, {
+  selector: function selector(state, _ref4) {
+    var id = _ref4.id;
+    return state.items[id];
+  }
+});
+export var useDatasourceActions = createActionsHook(Store);
+var Container = createContainer(Store);
+export var StoreContainer = function StoreContainer(_ref5) {
+  var children = _ref5.children;
+  if (fg('enable_datasource_react_sweet_state')) {
+    return /*#__PURE__*/React.createElement(Container, {
+      scope: "datasource"
+    }, children);
+  }
+  return children;
+};

package/dist/esm/ui/assets-modal/modal/index.js

@@ -16,7 +16,7 @@ import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
@@ -31,6 +31,7 @@ import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { PermissionError } from '../../../services/cmdbService.utils';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../../ui/common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { CancelButton } from '../../common/modal/cancel-button';
@@ -62,7 +63,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     schemaId = _useState4[0],
     setSchemaId = _useState4[1];
   var apiVersion = initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.version;
-  var _useState5 = useState(getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
+  var _useState5 = useState(
+    // eslint-disable-next-line @atlaskit/platform/no-preconditioning
+    fg('platform.linking-platform.datasource-assets_add_version_parameter') && apiVersion !== VERSION_TWO ? [] : initialVisibleColumnKeys),
     _useState6 = _slicedToArray(_useState5, 2),
     visibleColumnKeys = _useState6[0],
     setVisibleColumnKeys = _useState6[1];
@@ -121,7 +124,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       aql: aql || '',
       schemaId: schemaId || '',
       workspaceId: workspaceId || ''
-    }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+    }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
       version: VERSION_TWO
     } : {});
   }, [aql, schemaId, workspaceId]);
@@ -205,7 +208,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
-    if (getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter')) {
+    if (fg('platform.linking-platform.datasource-assets_add_version_parameter')) {
       var newVisibleColumnKeys = initialVisibleColumnKeys && initialVisibleColumnKeys.length > 0 && apiVersion === VERSION_TWO ? initialVisibleColumnKeys : defaultVisibleColumnKeys;
       setVisibleColumnKeys(newVisibleColumnKeys);
     } else {
@@ -264,7 +267,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
           workspaceId: workspaceId,
           aql: aql,
           schemaId: schemaId
-        }, getBooleanFF('platform.linking-platform.datasource-assets_add_version_parameter') ? {
+        }, fg('platform.linking-platform.datasource-assets_add_version_parameter') ? {
           version: VERSION_TWO
         } : {}),
         views: [{
@@ -386,5 +389,5 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 export var AssetsConfigModal = withAnalyticsContext(contextData)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props)));
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainAssetsConfigModal, props))));
 });

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -25,6 +25,7 @@ import { DatasourceExperienceIdProvider } from '../../../contexts/datasource-exp
 import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
 import { NoInstancesView } from '../../common/error-state/no-instances';
@@ -348,7 +349,7 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
 });
 export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(function (props) {
   var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
     datasourceId: props.datasourceId,
     initialVisibleColumnKeys: props.visibleColumnKeys,
     initialColumnCustomSizes: props.columnCustomSizes,
@@ -360,5 +361,5 @@ export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(funct
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
   }, jsx(PlainConfluenceSearchConfigModal, props))) :
   // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
-  jsx(PlainConfluenceSearchConfigModalOld, props)));
+  jsx(PlainConfluenceSearchConfigModalOld, props))));
 });

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -8,7 +8,7 @@ import { useCallback, useEffect, useRef } from 'react';
 import { css, jsx } from '@emotion/react';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';
 import { startUfoExperience } from '../../analytics/ufoExperiences';
@@ -18,6 +18,7 @@ import { fetchMessagesForLocale } from '../../common/utils/locale/fetch-messages
 import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../contexts/datasource-experience-id';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
 import i18nEN from '../../i18n/en';
+import { StoreContainer } from '../../state';
 import { ScrollableContainerHeight } from '../../ui/issue-like-table/styled';
 import { ASSETS_LIST_OF_LINKS_DATASOURCE_ID } from '../assets-modal';
 import { AccessRequired } from '../common/error-state/access-required';
@@ -113,7 +114,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   var forcedReset = useCallback(function () {
     reset({
       shouldForceRequest: true,
-      shouldResetColumns: getBooleanFF('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
+      shouldResetColumns: fg('platform.linking-platform.datasource-assets_update_refresh_button_dt3qk') && datasourceId === ASSETS_LIST_OF_LINKS_DATASOURCE_ID
     });
   }, [reset, datasourceId]);
   var onRefresh = useCallback(function () {
@@ -184,5 +185,5 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
   })));
 };
 export var DatasourceTableView = withAnalyticsContext(componentMetadata.tableView)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props));
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(DatasourceTableViewWithoutAnalytics, props)));
 });

package/dist/esm/ui/jira-issues-modal/modal/index.js

@@ -33,6 +33,7 @@ import { UserInteractionsProvider, useUserInteractions } from '../../../contexts
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
 import { useAvailableSites } from '../../../services/useAvailableSites';
+import { StoreContainer } from '../../../state';
 import { AccessRequired } from '../../common/error-state/access-required';
 import { loadingErrorMessages } from '../../common/error-state/messages';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
@@ -498,7 +499,7 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
 });
 export var JiraIssuesConfigModal = withAnalyticsContext(contextData)(function (props) {
   var _props$viewMode;
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceViewModeProvider, {
+  return jsx(StoreContainer, null, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform-datasources-use-refactored-config-modal') ? jsx(DatasourceViewModeProvider, {
     viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, jsx(PlainJiraIssuesConfigModal, props)) : jsx(PlainJiraIssuesConfigModalOld, props)));
+  }, jsx(PlainJiraIssuesConfigModal, props)) : jsx(PlainJiraIssuesConfigModalOld, props))));
 });

package/dist/types/state/index.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="react" />
+import { type Action } from 'react-sweet-state';
+import { type DatasourceDataResponseItem } from '@atlaskit/linking-types';
+export interface State {
+    items: Record<string, DatasourceDataResponseItem>;
+}
+export declare const actions: {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+};
+export declare const Store: import("react-sweet-state").Store<State, {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+}>;
+export declare const useDatasourceItem: import("react-sweet-state").HookStateFunction<DatasourceDataResponseItem | undefined, {
+    id: string;
+}>;
+export declare const useDatasourceActions: import("react-sweet-state").HookActionsFunction<import("react-sweet-state").BoundActions<State, {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+}>>;
+export declare const StoreContainer: ({ children }: {
+    children: JSX.Element;
+}) => JSX.Element;

package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { PopupComponentProps } from '@atlaskit/popup';
-export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "role" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
+export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "data-testid" | "tabIndex" | "role" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;

package/dist/types-ts4.5/state/index.d.ts

@@ -0,0 +1,21 @@
+/// <reference types="react" />
+import { type Action } from 'react-sweet-state';
+import { type DatasourceDataResponseItem } from '@atlaskit/linking-types';
+export interface State {
+    items: Record<string, DatasourceDataResponseItem>;
+}
+export declare const actions: {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+};
+export declare const Store: import("react-sweet-state").Store<State, {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+}>;
+export declare const useDatasourceItem: import("react-sweet-state").HookStateFunction<DatasourceDataResponseItem | undefined, {
+    id: string;
+}>;
+export declare const useDatasourceActions: import("react-sweet-state").HookActionsFunction<import("react-sweet-state").BoundActions<State, {
+    onAddItems: (items: DatasourceDataResponseItem[]) => Action<State, void, string[]>;
+}>>;
+export declare const StoreContainer: ({ children }: {
+    children: JSX.Element;
+}) => JSX.Element;

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { PopupComponentProps } from '@atlaskit/popup';
-export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "role" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
+export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "id" | "children" | "style" | "data-testid" | "tabIndex" | "role" | "shouldFitContainer" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "2.8.0",
+	"version": "2.9.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -85,6 +85,7 @@
 		"debounce-promise": "^3.1.2",
 		"lodash": "^4.17.21",
 		"react-dom": "^16.8.0",
+		"react-sweet-state": "^2.6.5",
 		"tiny-invariant": "^1.2.0",
 		"use-debounce": "^3.4.0",
 		"uuid": "^3.1.0"
@@ -151,6 +152,9 @@
 		"./elements": "./src/elements.ts"
 	},
 	"platform-feature-flags": {
+		"enable_datasource_react_sweet_state": {
+			"type": "boolean"
+		},
 		"platform.linking-platform.datasource.add-timezone-header": {
 			"type": "boolean",
 			"referenceOnly": "true"