@atlaskit/link-datasource 2.8.0 → 2.9.1

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

@@ -14,25 +14,23 @@ 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 Button from '@atlaskit/button/standard-button';
+import { AnalyticsContext } from '@atlaskit/analytics-next';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';
-import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
-import { componentMetadata } from '../../../analytics/constants';
+import { useDatasourceAnalyticsEvents } from '../../../analytics';
+import { componentMetadata, EVENT_CHANNEL } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
 import { startUfoExperience } from '../../../analytics/ufoExperiences';
 import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
 import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
 import { mapSearchMethod } from '../../../analytics/utils';
-import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { DatasourceExperienceIdProvider, useDatasourceExperienceId } from '../../../contexts/datasource-experience-id';
 import { UserInteractionsProvider, useUserInteractions } from '../../../contexts/user-interactions';
-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';
@@ -43,22 +41,22 @@ import { initialStateViewMessages } from '../../common/initial-state-view/messag
 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 { useDatasourceContext } from '../../common/modal/datasource-context';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
-import { useColumnResize } from '../../common/modal/datasources-table-in-modal-preview/use-column-resize';
-import { useColumnWrapping } from '../../common/modal/datasources-table-in-modal-preview/use-column-wrapping';
+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, IssueLikeDataTableView } from '../../issue-like-table';
-import { getColumnAction } from '../../issue-like-table/utils';
+import { EmptyState } from '../../issue-like-table';
 import { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
 import { JiraInitialStateSVG } from './jira-issues-initial-state-svg';
 import { modalMessages } from './messages';
 import { PlainJiraIssuesConfigModalOld } from './ModalOld';
-var DEFAULT_VIEW_MODE = 'table';
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
@@ -66,81 +64,55 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
 };
 var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
+var isValidParameters = function isValidParameters(parameters) {
+  return typeof (parameters === null || parameters === void 0 ? void 0 : parameters.jql) === 'string' && parameters.jql.length > 0 && typeof (parameters === null || parameters === void 0 ? void 0 : parameters.cloudId) === 'string' && parameters.cloudId.length > 0;
+};
 var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
-  var datasourceId = props.datasourceId,
-    initialColumnCustomSizes = props.columnCustomSizes,
-    initialWrappedColumnKeys = props.wrappedColumnKeys,
-    onCancel = props.onCancel,
-    onInsert = props.onInsert,
-    initialParameters = props.parameters,
-    urlBeingEdited = props.url,
-    initialVisibleColumnKeys = props.visibleColumnKeys;
+  var onCancel = props.onCancel,
+    urlBeingEdited = props.url;
+  var _useDatasourceContext = useDatasourceContext(),
+    visibleColumnCount = _useDatasourceContext.visibleColumnCount,
+    visibleColumnKeys = _useDatasourceContext.visibleColumnKeys,
+    parameters = _useDatasourceContext.parameters,
+    setParameters = _useDatasourceContext.setParameters,
+    tableState = _useDatasourceContext.tableState;
+  var reset = tableState.reset,
+    status = tableState.status,
+    responseItems = tableState.responseItems,
+    columns = tableState.columns,
+    totalCount = tableState.totalCount,
+    _tableState$extension = tableState.extensionKey,
+    extensionKey = _tableState$extension === void 0 ? null : _tableState$extension,
+    destinationObjectTypes = tableState.destinationObjectTypes;
+  var _ref = parameters !== null && parameters !== void 0 ? parameters : {},
+    cloudId = _ref.cloudId,
+    jql = _ref.jql;
+  var _useState = useState(jql),
+    _useState2 = _slicedToArray(_useState, 1),
+    initialJql = _useState2[0];
   var _useViewModeContext = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useState = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
-    _useState2 = _slicedToArray(_useState, 2),
-    cloudId = _useState2[0],
-    setCloudId = _useState2[1];
   var _useAvailableSites = useAvailableSites('jira', cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedJiraSite = _useAvailableSites.selectedSite;
-  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
+  var _useState3 = useState(jql),
     _useState4 = _slicedToArray(_useState3, 2),
-    jql = _useState4[0],
-    setJql = _useState4[1];
-  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
-    _useState6 = _slicedToArray(_useState5, 2),
-    searchBarJql = _useState6[0],
-    setSearchBarJql = _useState6[1];
-  var _useState7 = useState(initialVisibleColumnKeys),
-    _useState8 = _slicedToArray(_useState7, 2),
-    visibleColumnKeys = _useState8[0],
-    setVisibleColumnKeys = _useState8[1];
+    searchBarJql = _useState4[0],
+    setSearchBarJql = _useState4[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
   var initialSearchMethod =
   // eslint-disable-next-line @atlaskit/platform/no-preconditioning
-  fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
-  var _useState9 = useState(initialSearchMethod),
-    _useState10 = _slicedToArray(_useState9, 2),
-    currentSearchMethod = _useState10[0],
-    setCurrentSearchMethod = _useState10[1];
+  fg('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex(initialJql || '') ? 'basic' : 'jql';
+  var _useState5 = useState(initialSearchMethod),
+    _useState6 = _slicedToArray(_useState5, 2),
+    currentSearchMethod = _useState6[0],
+    setCurrentSearchMethod = _useState6[1];
   var searchMethodSearchedWith = useRef(null);
-  var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = useRef({});
   var isSearchedWithComplexQuery = useRef(false);
-  var parameters = useMemo(function () {
-    return !!cloudId ? {
-      cloudId: cloudId,
-      jql: jql || ''
-    } : undefined;
-  }, [cloudId, jql]);
-  var isParametersSet = !!(jql && cloudId);
-  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
-    columnCustomSizes = _useColumnResize.columnCustomSizes,
-    onColumnResize = _useColumnResize.onColumnResize;
-  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
-    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
-    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
-  var _useDatasourceTableSt = useDatasourceTableState({
-      datasourceId: datasourceId,
-      parameters: isParametersSet ? parameters : undefined,
-      fieldKeys: visibleColumnKeys
-    }),
-    reset = _useDatasourceTableSt.reset,
-    status = _useDatasourceTableSt.status,
-    onNextPage = _useDatasourceTableSt.onNextPage,
-    responseItems = _useDatasourceTableSt.responseItems,
-    hasNextPage = _useDatasourceTableSt.hasNextPage,
-    columns = _useDatasourceTableSt.columns,
-    defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
-    loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
-    totalCount = _useDatasourceTableSt.totalCount,
-    _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
-    extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
-    destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var experienceId = useDatasourceExperienceId();
@@ -152,7 +124,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   }, [destinationObjectTypes, extensionKey]);
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
-  var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
   var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
@@ -179,16 +150,21 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
   });
-  useEffect(function () {
-    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
+
+  /**
+   * If the selected Jira site changes, update the cloudId in the parameters
+   * This is mainly useful for setting the initial cloudId after the site selection loads
+   */
   useEffect(function () {
     if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
-      setCloudId(selectedJiraSite.cloudId);
+      setParameters(function () {
+        return {
+          jql: '',
+          cloudId: selectedJiraSite.cloudId
+        };
+      });
     }
-  }, [cloudId, selectedJiraSite]);
+  }, [cloudId, selectedJiraSite, setParameters]);
   var fireSingleItemViewedEvent = useCallback(function () {
     fireEvent('ui.link.viewed.singleItem', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
       searchMethod: mapSearchMethod(searchMethodSearchedWith.current)
@@ -208,7 +184,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
         displayedColumnCount: visibleColumnCount.current
       }));
     }
-  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  }, [isDataReady, fireEvent, analyticsPayload, totalCount, visibleColumnCount]);
   var fireIssueViewAnalytics = useCallback(function () {
     if (!totalCount) {
       return;
@@ -233,10 +209,10 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     }
   }, [currentViewMode, status, fireIssueViewAnalytics, fireCountViewedEvent]);
   useColumnPickerRenderedFailedUfoExperience(status, experienceId);
-  var onSearch = useCallback(function (newParameters, _ref) {
-    var searchMethod = _ref.searchMethod,
-      basicFilterSelections = _ref.basicFilterSelections,
-      isQueryComplex = _ref.isQueryComplex;
+  var onSearch = useCallback(function (newParameters, _ref2) {
+    var searchMethod = _ref2.searchMethod,
+      basicFilterSelections = _ref2.basicFilterSelections,
+      isQueryComplex = _ref2.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
@@ -244,19 +220,26 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     if (jql !== newParameters.jql) {
       userInteractions.add(DatasourceAction.QUERY_UPDATED);
     }
-    setJql(newParameters.jql);
+    setParameters(function (state) {
+      return state && newParameters.jql ? {
+        cloudId: state.cloudId,
+        jql: newParameters.jql
+      } : undefined;
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [jql, reset, userInteractions]);
+  }, [jql, reset, userInteractions, setParameters]);
   var onSiteSelection = useCallback(function (site) {
     userInteractions.add(DatasourceAction.INSTANCE_UPDATED);
-    setJql('');
-    setCloudId(site.cloudId);
+    setParameters({
+      jql: '',
+      cloudId: site.cloudId
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, userInteractions, setParameters]);
   var retrieveUrlForSmartCardRender = useCallback(function () {
     var _data$key;
     var _responseItems = _slicedToArray(responseItems, 1),
@@ -264,120 +247,6 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     // agreement with BE that we will use `key` for rendering smartlink
     return data === null || data === void 0 || (_data$key = data.key) === null || _data$key === void 0 || (_data$key = _data$key.data) === null || _data$key === void 0 ? void 0 : _data$key.url;
   }, [responseItems]);
-  var onInsertPressed = useCallback(function (e, analyticsEvent) {
-    var _insertButtonClickedE;
-    if (!isParametersSet || !jql || !selectedJiraSite) {
-      return;
-    }
-
-    // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
-    // even if the user didn't previously click search
-    var upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
-    var upToDateJqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURIComponent(upToDateJql));
-    var filterSelectionCount = availableBasicFilterTypes.reduce(function (current, filter) {
-      var _basicFilterSelection;
-      return _objectSpread(_objectSpread({}, current), {}, _defineProperty({}, "".concat(filter, "BasicFilterSelectionCount"), ((_basicFilterSelection = basicFilterSelectionsSearchedWith.current[filter]) === null || _basicFilterSelection === void 0 ? void 0 : _basicFilterSelection.length) || 0));
-    }, {});
-    var insertButtonClickedEvent = analyticsEvent.update({
-      actionSubjectId: 'insert',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        totalItemCount: totalCount || 0,
-        displayedColumnCount: visibleColumnCount.current,
-        display: getDisplayValue(currentViewMode, totalCount || 0),
-        searchCount: searchCount.current,
-        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
-        actions: userInteractions.get(),
-        isQueryComplex: isSearchedWithComplexQuery.current
-      }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {}),
-      eventType: 'ui'
-    });
-
-    // additional event for tracking in confluence against JIM
-    var macroInsertedEvent = analyticsEvent.clone();
-    macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
-      eventType: 'track',
-      action: 'inserted',
-      actionSubject: 'macro',
-      actionSubjectId: 'jlol',
-      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
-        totalItemCount: totalCount || 0,
-        displayedColumnCount: visibleColumnCount.current,
-        display: getDisplayValue(currentViewMode, totalCount || 0),
-        searchCount: searchCount.current,
-        searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
-        actions: userInteractions.get()
-      })
-    });
-    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
-    insertButtonClickedEvent.fire(EVENT_CHANNEL);
-    var firstIssueUrl = retrieveUrlForSmartCardRender();
-    if (currentViewMode === 'inline') {
-      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
-      var url = responseItems.length === 1 ? firstIssueUrl : upToDateJqlUrl;
-      onInsert({
-        type: 'inlineCard',
-        attrs: {
-          url: url
-        }
-      }, consumerEvent);
-    } else {
-      onInsert(buildDatasourceAdf({
-        id: datasourceId,
-        parameters: {
-          cloudId: cloudId,
-          jql: upToDateJql // TODO support non JQL type
-        },
-        views: [{
-          type: 'table',
-          properties: {
-            columns: (visibleColumnKeys || []).map(function (key) {
-              var width = columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key];
-              var isWrapped = wrappedColumnKeys === null || wrappedColumnKeys === void 0 ? void 0 : wrappedColumnKeys.includes(key);
-              return _objectSpread(_objectSpread({
-                key: key
-              }, width ? {
-                width: width
-              } : {}), isWrapped ? {
-                isWrapped: isWrapped
-              } : {});
-            })
-          }
-        }]
-      }, upToDateJqlUrl), consumerEvent);
-    }
-  }, [isParametersSet, jql, selectedJiraSite, searchBarJql, analyticsPayload, totalCount, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, cloudId, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys, userInteractions]);
-  var handleOnNextPage = useCallback(function () {
-    var onNextPageProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    userInteractions.add(DatasourceAction.NEXT_PAGE_SCROLLED);
-    onNextPage(onNextPageProps);
-  }, [onNextPage, userInteractions]);
-  var handleVisibleColumnKeysChange = useCallback(function () {
-    var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
-    userInteractions.add(columnAction);
-    visibleColumnCount.current = newVisibleColumnKeys.length;
-    setVisibleColumnKeys(newVisibleColumnKeys);
-  }, [visibleColumnKeys, userInteractions]);
-  var issueLikeDataTableView = useMemo(function () {
-    return jsx(ContentContainer, {
-      withTableBorder: true
-    }, jsx(IssueLikeDataTableView, {
-      testId: "jira-datasource-table",
-      status: status,
-      columns: columns,
-      items: responseItems,
-      hasNextPage: hasNextPage,
-      visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
-      onNextPage: handleOnNextPage,
-      onLoadDatasourceDetails: loadDatasourceDetails,
-      onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
-      extensionKey: extensionKey,
-      columnCustomSizes: columnCustomSizes,
-      onColumnResize: onColumnResize,
-      wrappedColumnKeys: wrappedColumnKeys,
-      onWrappedColumnChange: fg('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
-    }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, handleOnNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
   var renderCountModeContent = useCallback(function () {
     var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
     if (status === 'unauthorized') {
@@ -437,8 +306,12 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
         } : undefined
       }));
     }
-    return issueLikeDataTableView;
-  }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
+    return jsx(ContentContainer, {
+      withTableBorder: true
+    }, jsx(DatasourcesTableInModalPreview, {
+      testId: "jira-datasource-table"
+    }));
+  }, [columns.length, currentSearchMethod, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? modalMessages.insertIssuesTitleManySites : modalMessages.insertIssuesTitle;
   var getCancelButtonAnalyticsPayload = useCallback(function () {
     return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
@@ -446,6 +319,38 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       actions: userInteractions.get()
     });
   }, [analyticsPayload, userInteractions]);
+  var filterSelectionCount = availableBasicFilterTypes.reduce(function (current, filter) {
+    var _basicFilterSelection;
+    return _objectSpread(_objectSpread({}, current), {}, _defineProperty({}, "".concat(filter, "BasicFilterSelectionCount"), ((_basicFilterSelection = basicFilterSelectionsSearchedWith.current[filter]) === null || _basicFilterSelection === void 0 ? void 0 : _basicFilterSelection.length) || 0));
+  }, {});
+  var getInsertButtonAnalyticsPayload = useCallback(function () {
+    return _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      display: getDisplayValue(currentViewMode, totalCount || 0),
+      isQueryComplex: isSearchedWithComplexQuery.current,
+      searchMethod: mapSearchMethod(searchMethodSearchedWith.current),
+      searchCount: searchCount.current,
+      actions: userInteractions.get()
+    }, searchMethodSearchedWith.current === 'basic' ? _objectSpread({}, filterSelectionCount) : {});
+  }, [analyticsPayload, currentViewMode, filterSelectionCount, totalCount, userInteractions]);
+  var urlToInsert = useMemo(function () {
+    var jql = parameters === null || parameters === void 0 ? void 0 : parameters.jql;
+    if (!jql || !(selectedJiraSite !== null && selectedJiraSite !== void 0 && selectedJiraSite.url)) {
+      return;
+    }
+    // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
+    // even if the user didn't previously click search
+    var upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
+    var upToDateJqlUrl = "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURIComponent(upToDateJql));
+    return currentViewMode === 'inline' && responseItems.length === 1 ? retrieveUrlForSmartCardRender() : upToDateJqlUrl;
+  }, [currentViewMode, parameters === null || parameters === void 0 ? void 0 : parameters.jql, responseItems, retrieveUrlForSmartCardRender, searchBarJql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url]);
+  var updateParametersBeforeInsert = function updateParametersBeforeInsert(parameters) {
+    return {
+      cloudId: parameters.cloudId,
+      // searchBarJql will not be null at this point, since this function is only called when user press insert button
+      //
+      jql: searchBarJql || ''
+    };
+  };
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale
@@ -480,11 +385,11 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     onCancel: onCancel,
     getAnalyticsPayload: getCancelButtonAnalyticsPayload,
     testId: "jira-datasource-modal--cancel-button"
-  }), !hasNoJiraSites && jsx(Button, {
-    appearance: "primary",
-    onClick: onInsertPressed,
-    isDisabled: isInsertDisabled,
-    testId: "jira-datasource-modal--insert-button"
+  }), !hasNoJiraSites && jsx(InsertButton, {
+    testId: "jira-datasource-modal--insert-button",
+    url: urlToInsert,
+    overwriteParameters: updateParametersBeforeInsert,
+    getAnalyticsPayload: getInsertButtonAnalyticsPayload
   }, jsx(FormattedMessage, modalMessages.insertIssuesButtonText))))));
 };
 var analyticsContextAttributes = {
@@ -496,9 +401,35 @@ var analyticsContextData = _objectSpread(_objectSpread({}, componentMetadata.con
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
-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, {
-    viewMode: (_props$viewMode = props.viewMode) !== null && _props$viewMode !== void 0 ? _props$viewMode : DEFAULT_VIEW_MODE
-  }, jsx(PlainJiraIssuesConfigModal, props)) : jsx(PlainJiraIssuesConfigModalOld, props)));
-});
+var ConnectedJiraIssueConfigModal = createDatasourceModal({
+  isValidParameters: isValidParameters,
+  dataProvider: 'jira-issues',
+  component: PlainJiraIssuesConfigModal
+});
+var JiraIssuesConfigModalWithExtraAnalyticsOnInsert = function JiraIssuesConfigModalWithExtraAnalyticsOnInsert(props) {
+  var onInsert = props.onInsert;
+  var onInsertWithMacroAnalytics = useCallback(function (adf, analyticsEvent) {
+    if (analyticsEvent && adf.type === 'inlineCard') {
+      var macroInsertedEvent = analyticsEvent.clone();
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.update({
+        eventType: 'track',
+        action: 'inserted',
+        actionSubject: 'macro',
+        actionSubjectId: 'jlol'
+      });
+      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
+    }
+    onInsert(adf, analyticsEvent);
+  }, [onInsert]);
+  return jsx(StoreContainer, null, jsx(ConnectedJiraIssueConfigModal, _extends({}, props, {
+    onInsert: onInsertWithMacroAnalytics
+  })));
+};
+export var JiraIssuesConfigModal = function JiraIssuesConfigModal(props) {
+  if (fg('platform-datasources-use-refactored-config-modal')) {
+    return jsx(JiraIssuesConfigModalWithExtraAnalyticsOnInsert, props);
+  }
+  return jsx(StoreContainer, null, jsx(AnalyticsContext, {
+    data: contextData
+  }, jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainJiraIssuesConfigModalOld, props)))));
+};

package/dist/types/common/types.d.ts

@@ -7,6 +7,7 @@ export interface Site {
     url: string;
 }
 export type DisplayViewModes = 'table' | 'inline';
+export type OnInsertFunction<ADF> = (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
 export type ConfigModalProps<ADF, Parameters> = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
     datasourceId: string;
@@ -17,7 +18,7 @@ export type ConfigModalProps<ADF, Parameters> = {
     /** Callback function to be invoked when the modal is closed either via cancel button click, esc keydown, or modal blanket click */
     onCancel: () => void;
     /** Callback function to be invoked when the insert issues button is clicked */
-    onInsert: (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
+    onInsert: OnInsertFunction<ADF>;
     /**
      * The view mode that the modal will show on open:
      * - Table = Displays a list of links in table format

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/common/modal/datasource-context/index.d.ts

@@ -1,30 +1,27 @@
 import React, { type PropsWithChildren } from 'react';
-import { type UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common';
 import type { DatasourceParameters } from '@atlaskit/linking-types';
+import { type OnInsertFunction } from '../../../../common/types';
 import { type DatasourceTableState } from '../../../../hooks/useDatasourceTableState';
 import type { ColumnSizesMap } from '../../../issue-like-table/types';
 import { type ColumnResizeProps } from '../datasources-table-in-modal-preview/use-column-resize';
 import { type ColumnVisibilityProps } from '../datasources-table-in-modal-preview/use-column-visibility';
 import { type ColumnWrappingProps } from '../datasources-table-in-modal-preview/use-column-wrapping';
-type DatasourceContextStore = ColumnVisibilityProps & ColumnWrappingProps & ColumnResizeProps & {
-    datasourceId: string;
-    isValidParameters: (params: DatasourceParameters | undefined) => boolean;
+type DatasourceContextValue<Parameters extends DatasourceParameters = DatasourceParameters> = ColumnVisibilityProps & ColumnWrappingProps & ColumnResizeProps & Pick<DatasourceContextProviderProps<Parameters>, 'datasourceId' | 'onInsert' | 'isValidParameters'> & {
     tableState: DatasourceTableState;
     visibleColumnKeys?: string[];
-    parameters: DatasourceParameters | undefined;
-    setParameters: React.Dispatch<React.SetStateAction<DatasourceParameters | undefined>>;
-    onInsert: (adf: InlineCardAdf | DatasourceAdf<any>, analyticsEvent?: UIAnalyticsEvent) => void;
+    parameters: Parameters | undefined;
+    setParameters: React.Dispatch<React.SetStateAction<Parameters | undefined>>;
 };
-export type Props = PropsWithChildren<{
+type DatasourceContextProviderProps<Parameters extends DatasourceParameters> = PropsWithChildren<{
     datasourceId: string;
     isValidParameters: (params: DatasourceParameters | undefined) => boolean;
-    initialParameters: DatasourceParameters | undefined;
+    initialParameters: Parameters | undefined;
     initialVisibleColumnKeys?: string[] | undefined;
     initialWrappedColumnKeys?: string[] | undefined;
     initialColumnCustomSizes?: ColumnSizesMap | undefined;
-    onInsert: (adf: InlineCardAdf | DatasourceAdf<any>, analyticsEvent?: UIAnalyticsEvent) => void;
+    onInsert: OnInsertFunction<InlineCardAdf | DatasourceAdf<Parameters>>;
 }>;
-export declare const DatasourceContextProvider: ({ children, datasourceId, isValidParameters, initialParameters, initialVisibleColumnKeys, initialColumnCustomSizes, initialWrappedColumnKeys, onInsert, }: Props) => JSX.Element;
-export declare const useDatasourceContext: () => DatasourceContextStore;
+export declare const DatasourceContextProvider: <Parameters extends DatasourceParameters>({ children, datasourceId, isValidParameters, initialParameters, initialVisibleColumnKeys, initialColumnCustomSizes, initialWrappedColumnKeys, onInsert, }: DatasourceContextProviderProps<Parameters>) => JSX.Element;
+export declare const useDatasourceContext: <Parameters extends DatasourceParameters>() => DatasourceContextValue<Parameters>;
 export {};

package/dist/types/ui/common/modal/datasource-modal/createDatasourceModal.d.ts

@@ -0,0 +1,15 @@
+/**
+ * @jsxRuntime classic
+ * @jsx jsx
+ */
+import React from 'react';
+import { jsx } from '@emotion/react';
+import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common';
+import { type DatasourceParameters } from '@atlaskit/linking-types';
+import { type ConfigModalProps } from '../../../../common/types';
+export type ConnectedConfigModalProps<Parameters extends DatasourceParameters> = Omit<ConfigModalProps<DatasourceAdf<Parameters> | InlineCardAdf, Parameters>, 'onInsert' | 'parameters'>;
+export declare const createDatasourceModal: <Parameters extends DatasourceParameters>({ isValidParameters, dataProvider, component: ModalContent, }: {
+    isValidParameters: (params: DatasourceParameters | undefined) => boolean;
+    dataProvider: string;
+    component: React.ComponentType<ConnectedConfigModalProps<Parameters>>;
+}) => (props: ConfigModalProps<DatasourceAdf<Parameters> | InlineCardAdf, DatasourceParameters | Parameters>) => jsx.JSX.Element;

package/dist/types/ui/common/modal/insert-button/index.d.ts

@@ -4,9 +4,11 @@
  */
 import { type PropsWithChildren } from 'react';
 import { jsx } from '@emotion/react';
-export type InsertButtonProps = PropsWithChildren<{
+import { type DatasourceParameters } from '@atlaskit/linking-types';
+export type InsertButtonProps<Parameters extends DatasourceParameters> = PropsWithChildren<{
     testId: string;
     url: string | undefined;
     getAnalyticsPayload: () => Record<string, any>;
+    overwriteParameters?: (parameters: Parameters) => Parameters;
 }>;
-export declare const InsertButton: ({ testId, url, getAnalyticsPayload, children }: InsertButtonProps) => jsx.JSX.Element;
+export declare const InsertButton: <Parameters extends DatasourceParameters>({ testId, url, getAnalyticsPayload, overwriteParameters, children, }: InsertButtonProps<Parameters>) => jsx.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/ui/confluence-search-modal/modal/index.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { type ConfluenceSearchConfigModalProps } from '../types';
-export declare const PlainConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;
-export declare const ConfluenceSearchConfigModal: import("react").ForwardRefExoticComponent<ConfluenceSearchConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;
+import { type ConfluenceSearchConfigModalProps, type ConnectedConfluenceSearchConfigModalProps } from '../types';
+export declare const PlainConfluenceSearchConfigModal: (props: ConnectedConfluenceSearchConfigModalProps) => jsx.JSX.Element;
+export declare const ConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;