@atlaskit/link-datasource 2.9.0 → 2.9.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @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

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

@@ -34,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");
@@ -50,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',
@@ -78,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],
@@ -113,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;
@@ -319,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, {
@@ -350,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)(_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,
-    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)))));
+};