@atlaskit/link-datasource 2.8.0 → 2.9.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/link-datasource
 
+## 2.9.1
+
+### Patch Changes
+
+- [#124652](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/124652)
+  [`265b4500eb956`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/265b4500eb956) -
+  Extract ADF creation related code and move into InsertButton
+
+## 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/common/modal/datasource-modal/createDatasourceModal.js

@@ -0,0 +1,55 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createDatasourceModal = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _react2 = require("@emotion/react");
+var _analyticsNext = require("@atlaskit/analytics-next");
+var _datasourceExperienceId = require("../../../../contexts/datasource-experience-id");
+var _userInteractions = require("../../../../contexts/user-interactions");
+var _datasourceContext = require("../datasource-context");
+var _useViewModeContext = require("../mode-switcher/useViewModeContext");
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
+
+var DEFAULT_VIEW_MODE = 'table';
+var createDatasourceModal = exports.createDatasourceModal = function createDatasourceModal(_ref) {
+  var isValidParameters = _ref.isValidParameters,
+    dataProvider = _ref.dataProvider,
+    ModalContent = _ref.component;
+  return function (props) {
+    var datasourceId = props.datasourceId,
+      visibleColumnKeys = props.visibleColumnKeys,
+      columnCustomSizes = props.columnCustomSizes,
+      wrappedColumnKeys = props.wrappedColumnKeys,
+      parameters = props.parameters,
+      onInsert = props.onInsert,
+      viewMode = props.viewMode;
+    return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+      data: {
+        source: 'datasourceConfigModal',
+        component: 'datasourceConfigModal',
+        attributes: {
+          dataProvider: dataProvider
+        }
+      }
+    }, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (0, _react2.jsx)(_datasourceContext.DatasourceContextProvider, {
+      datasourceId: datasourceId,
+      initialVisibleColumnKeys: visibleColumnKeys,
+      initialColumnCustomSizes: columnCustomSizes,
+      initialWrappedColumnKeys: wrappedColumnKeys,
+      initialParameters: parameters,
+      isValidParameters: isValidParameters,
+      onInsert: onInsert
+    }, (0, _react2.jsx)(_useViewModeContext.DatasourceViewModeProvider, {
+      viewMode: viewMode !== null && viewMode !== void 0 ? viewMode : DEFAULT_VIEW_MODE
+    }, (0, _react2.jsx)(ModalContent, props))))));
+  };
+};

package/dist/cjs/ui/common/modal/datasources-table-in-modal-preview/index.js

@@ -1,15 +1,20 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _types = require("../../../../analytics/types");
+var _userInteractions = require("../../../../contexts/user-interactions");
 var _issueLikeTable = require("../../../issue-like-table");
 var _datasourceContext = require("../datasource-context");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var Table = function Table(props) {
   var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
     columnCustomSizes = _useDatasourceContext.columnCustomSizes,
@@ -28,13 +33,19 @@ var Table = function Table(props) {
     loadDatasourceDetails = _useDatasourceContext2.loadDatasourceDetails,
     _useDatasourceContext3 = _useDatasourceContext2.extensionKey,
     extensionKey = _useDatasourceContext3 === void 0 ? null : _useDatasourceContext3;
+  var userInteractions = (0, _userInteractions.useUserInteractions)();
+  var handleOnNextPage = (0, _react.useCallback)(function () {
+    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    userInteractions.add(_types.DatasourceAction.NEXT_PAGE_SCROLLED);
+    onNextPage(onNextPageProps);
+  }, [onNextPage, userInteractions]);
   return /*#__PURE__*/_react.default.createElement(_issueLikeTable.IssueLikeDataTableView, (0, _extends2.default)({}, props, {
     status: status,
     columns: columns,
     items: responseItems,
     hasNextPage: hasNextPage,
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-    onNextPage: onNextPage,
+    onNextPage: handleOnNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     extensionKey: extensionKey,

package/dist/cjs/ui/common/modal/insert-button/index.js

@@ -24,6 +24,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
   var testId = _ref.testId,
     url = _ref.url,
     getAnalyticsPayload = _ref.getAnalyticsPayload,
+    overwriteParameters = _ref.overwriteParameters,
     children = _ref.children;
   var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
     datasourceId = _useDatasourceContext.datasourceId,
@@ -48,13 +49,13 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     }
     var insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
-      attributes: _objectSpread(_objectSpread({}, getAnalyticsPayload()), {}, {
+      attributes: _objectSpread({
         totalItemCount: totalCount || 0,
         displayedColumnCount: visibleColumnCount.current,
         display: currentViewMode === 'inline' ? _types.DatasourceDisplay.DATASOURCE_INLINE : _types.DatasourceDisplay.DATASOURCE_TABLE,
         searchMethod: _types.DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
         actions: userInteractions.get()
-      }),
+      }, getAnalyticsPayload()),
       eventType: 'ui'
     });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
@@ -69,7 +70,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
     } else {
       onInsert((0, _adf.buildDatasourceAdf)({
         id: datasourceId,
-        parameters: parameters,
+        parameters: overwriteParameters ? overwriteParameters(parameters) : parameters,
         views: [{
           type: 'table',
           properties: {
@@ -88,7 +89,7 @@ var InsertButton = exports.InsertButton = function InsertButton(_ref) {
         }]
       }, url), consumerEvent);
     }
-  }, [isValidParameters, parameters, url, getAnalyticsPayload, totalCount, visibleColumnCount, currentViewMode, userInteractions, onInsert, datasourceId, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys]);
+  }, [columnCustomSizes, currentViewMode, datasourceId, getAnalyticsPayload, isValidParameters, onInsert, overwriteParameters, parameters, totalCount, url, userInteractions, visibleColumnCount, visibleColumnKeys, wrappedColumnKeys]);
   return (0, _react2.jsx)(_standardButton.default, {
     appearance: "primary",
     onClick: onInsertPressed,

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");
@@ -33,6 +34,7 @@ var _contentContainer = require("../../common/modal/content-container");
 var _countViewSmartLink = require("../../common/modal/count-view-smart-link");
 var _datasourceContext = require("../../common/modal/datasource-context");
 var _datasourceModal = require("../../common/modal/datasource-modal");
+var _createDatasourceModal = require("../../common/modal/datasource-modal/createDatasourceModal");
 var _datasourcesTableInModalPreview = _interopRequireDefault(require("../../common/modal/datasources-table-in-modal-preview"));
 var _insertButton = require("../../common/modal/insert-button");
 var _modeSwitcher = require("../../common/modal/mode-switcher");
@@ -49,7 +51,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsxRuntime classic
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
-var DEFAULT_VIEW_MODE = 'table';
 var inputContainerStyles = (0, _primitives.xcss)({
   alignItems: 'baseline',
   display: 'flex',
@@ -77,32 +78,44 @@ var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(c
 };
 var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var onCancel = props.onCancel,
-    initialParameters = props.parameters,
     urlBeingEdited = props.url,
     _props$disableDisplay = props.disableDisplayDropdown,
     disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
     overrideParameters = props.overrideParameters;
   var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useState = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+  var _useDatasourceContext2 = (0, _datasourceContext.useDatasourceContext)(),
+    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
+    _useDatasourceContext3 = _useDatasourceContext2.tableState,
+    reset = _useDatasourceContext3.reset,
+    status = _useDatasourceContext3.status,
+    responseItems = _useDatasourceContext3.responseItems,
+    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
+    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
+    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
+    totalCount = _useDatasourceContext3.totalCount,
+    columns = _useDatasourceContext3.columns,
+    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
+    parameters = _useDatasourceContext2.parameters;
+  var _useState = (0, _react.useState)(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     cloudId = _useState2[0],
     setCloudId = _useState2[1];
   var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('confluence', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState3 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+  var _useState3 = (0, _react.useState)(parameters === null || parameters === void 0 ? void 0 : parameters.searchString),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     searchString = _useState4[0],
     setSearchString = _useState4[1];
-  var _useState5 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+  var _useState5 = (0, _react.useState)((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     contributorAccountIds = _useState6[0],
     setContributorAccountIds = _useState6[1];
-  var _useState7 = (0, _react.useState)(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
-      value: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModified,
-      from: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedFrom,
-      to: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.lastModifiedTo
+  var _useState7 = (0, _react.useState)(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
+      value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
+      from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
+      to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
     } : undefined),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     lastModified = _useState8[0],
@@ -112,19 +125,6 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
   useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
-  var _useDatasourceContext2 = (0, _datasourceContext.useDatasourceContext)(),
-    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
-    _useDatasourceContext3 = _useDatasourceContext2.tableState,
-    reset = _useDatasourceContext3.reset,
-    status = _useDatasourceContext3.status,
-    responseItems = _useDatasourceContext3.responseItems,
-    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
-    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
-    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
-    totalCount = _useDatasourceContext3.totalCount,
-    columns = _useDatasourceContext3.columns,
-    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
-    parameters = _useDatasourceContext2.parameters;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -318,7 +318,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   }, (0, _react2.jsx)(_confluenceSearchContainer.default, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: isValidParameters(parameters) ? parameters : {
+    parameters: parameters && isValidParameters(parameters) ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
@@ -349,19 +349,16 @@ var analyticsContextData = _objectSpread(_objectSpread({}, _constants.componentM
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-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, {
-    datasourceId: props.datasourceId,
-    initialVisibleColumnKeys: props.visibleColumnKeys,
-    initialColumnCustomSizes: props.columnCustomSizes,
-    initialWrappedColumnKeys: props.wrappedColumnKeys,
-    initialParameters: props.parameters,
-    isValidParameters: isValidParameters,
-    onInsert: props.onInsert
-  }, (0, _react2.jsx)(_useViewModeContext2.DatasourceViewModeProvider, {
-    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)));
-});
+var ConnectedConfluenceSearchConfigModal = (0, _createDatasourceModal.createDatasourceModal)({
+  isValidParameters: isValidParameters,
+  dataProvider: 'confluence-search',
+  component: PlainConfluenceSearchConfigModal
+});
+var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
+  if ((0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal')) {
+    return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(ConnectedConfluenceSearchConfigModal, props));
+  }
+  return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+    data: contextData
+  }, (0, _react2.jsx)(_datasourceExperienceId.DatasourceExperienceIdProvider, null, (0, _react2.jsx)(_userInteractions.UserInteractionsProvider, null, (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)));
 });