@atlaskit/link-datasource 2.9.0 → 2.9.1

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

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
-import React from 'react';
+import React, { useCallback } from 'react';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { DatasourceAction } from '../../../../analytics/types';
+import { useUserInteractions } from '../../../../contexts/user-interactions';
 import { IssueLikeDataTableView } from '../../../issue-like-table';
 import { useDatasourceContext } from '../datasource-context';
 var Table = function Table(props) {
@@ -21,13 +23,19 @@ var Table = function Table(props) {
     loadDatasourceDetails = _useDatasourceContext2.loadDatasourceDetails,
     _useDatasourceContext3 = _useDatasourceContext2.extensionKey,
     extensionKey = _useDatasourceContext3 === void 0 ? null : _useDatasourceContext3;
+  var userInteractions = useUserInteractions();
+  var handleOnNextPage = useCallback(function () {
+    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    userInteractions.add(DatasourceAction.NEXT_PAGE_SCROLLED);
+    onNextPage(onNextPageProps);
+  }, [onNextPage, userInteractions]);
   return /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({}, props, {
     status: status,
     columns: columns,
     items: responseItems,
     hasNextPage: hasNextPage,
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-    onNextPage: onNextPage,
+    onNextPage: handleOnNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
     onVisibleColumnKeysChange: onVisibleColumnKeysChange,
     extensionKey: extensionKey,

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

@@ -21,6 +21,7 @@ export var InsertButton = function InsertButton(_ref) {
   var testId = _ref.testId,
     url = _ref.url,
     getAnalyticsPayload = _ref.getAnalyticsPayload,
+    overwriteParameters = _ref.overwriteParameters,
     children = _ref.children;
   var _useDatasourceContext = useDatasourceContext(),
     datasourceId = _useDatasourceContext.datasourceId,
@@ -45,13 +46,13 @@ export var 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' ? DatasourceDisplay.DATASOURCE_INLINE : DatasourceDisplay.DATASOURCE_TABLE,
         searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
         actions: userInteractions.get()
-      }),
+      }, getAnalyticsPayload()),
       eventType: 'ui'
     });
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
@@ -66,7 +67,7 @@ export var InsertButton = function InsertButton(_ref) {
     } else {
       onInsert(buildDatasourceAdf({
         id: datasourceId,
-        parameters: parameters,
+        parameters: overwriteParameters ? overwriteParameters(parameters) : parameters,
         views: [{
           type: 'table',
           properties: {
@@ -85,7 +86,7 @@ export var 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 jsx(Button, {
     appearance: "primary",
     onClick: onInsertPressed,

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

@@ -12,7 +12,7 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
-import { withAnalyticsContext } from '@atlaskit/analytics-next';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -34,12 +34,13 @@ import { InitialStateView } from '../../common/initial-state-view';
 import { CancelButton } from '../../common/modal/cancel-button';
 import { ContentContainer } from '../../common/modal/content-container';
 import { SmartCardPlaceholder, SmartLink } from '../../common/modal/count-view-smart-link';
-import { DatasourceContextProvider, useDatasourceContext } from '../../common/modal/datasource-context';
+import { useDatasourceContext } from '../../common/modal/datasource-context';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
+import { createDatasourceModal } from '../../common/modal/datasource-modal/createDatasourceModal';
 import DatasourcesTableInModalPreview from '../../common/modal/datasources-table-in-modal-preview';
 import { InsertButton } from '../../common/modal/insert-button';
 import { DatasourceViewModeDropDown } from '../../common/modal/mode-switcher';
-import { DatasourceViewModeProvider, useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
+import { useViewModeContext } from '../../common/modal/mode-switcher/useViewModeContext';
 import TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
 import { EmptyState } from '../../issue-like-table';
@@ -47,7 +48,6 @@ import ConfluenceSearchContainer from '../confluence-search-container';
 import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
 import { confluenceSearchModalMessages } from './messages';
 import { PlainConfluenceSearchConfigModal as PlainConfluenceSearchConfigModalOld } from './ModalOld';
-var DEFAULT_VIEW_MODE = 'table';
 var inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -75,32 +75,44 @@ var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(c
 };
 export var 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 = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useState = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+  var _useDatasourceContext2 = 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 = useState(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
     _useState2 = _slicedToArray(_useState, 2),
     cloudId = _useState2[0],
     setCloudId = _useState2[1];
   var _useAvailableSites = useAvailableSites('confluence', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+  var _useState3 = useState(parameters === null || parameters === void 0 ? void 0 : parameters.searchString),
     _useState4 = _slicedToArray(_useState3, 2),
     searchString = _useState4[0],
     setSearchString = _useState4[1];
-  var _useState5 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+  var _useState5 = useState((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []),
     _useState6 = _slicedToArray(_useState5, 2),
     contributorAccountIds = _useState6[0],
     setContributorAccountIds = _useState6[1];
-  var _useState7 = 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 = 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 = _slicedToArray(_useState7, 2),
     lastModified = _useState8[0],
@@ -110,19 +122,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
   useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
-  var _useDatasourceContext2 = 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 = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -316,7 +315,7 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   }, jsx(ConfluenceSearchContainer, {
     isSearching: status === 'loading',
     onSearch: onSearch,
-    parameters: isValidParameters(parameters) ? parameters : {
+    parameters: parameters && isValidParameters(parameters) ? parameters : {
       cloudId: ''
     }
   })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {
@@ -347,19 +346,16 @@ var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.con
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(function (props) {
-  var _props$viewMode;
-  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,
-    initialWrappedColumnKeys: props.wrappedColumnKeys,
-    initialParameters: props.parameters,
-    isValidParameters: isValidParameters,
-    onInsert: props.onInsert
-  }, jsx(DatasourceViewModeProvider, {
-    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))));
-});
+var ConnectedConfluenceSearchConfigModal = createDatasourceModal({
+  isValidParameters: isValidParameters,
+  dataProvider: 'confluence-search',
+  component: PlainConfluenceSearchConfigModal
+});
+export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
+  if (fg('platform-datasources-use-refactored-config-modal')) {
+    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, props));
+  }
+  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
+    data: contextData
+  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModalOld, props)))));
+};