@atlaskit/link-datasource 2.5.5 → 2.5.6

package/dist/esm/ui/common/modal/datasource-context/DatasourceContextProvider.js

@@ -0,0 +1,26 @@
+import React, { useMemo } from 'react';
+import { useColumnResize } from '../../../issue-like-table/use-column-resize';
+import { useColumnWrapping } from '../../../issue-like-table/use-column-wrapping';
+import { DatasourceContext } from './DatasourceContext';
+export var DatasourceContextProvider = function DatasourceContextProvider(_ref) {
+  var children = _ref.children,
+    initialColumnCustomSizes = _ref.initialColumnCustomSizes,
+    initialWrappedColumnKeys = _ref.initialWrappedColumnKeys;
+  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
+  var contextValue = useMemo(function () {
+    return {
+      columnCustomSizes: columnCustomSizes,
+      onColumnResize: onColumnResize,
+      wrappedColumnKeys: wrappedColumnKeys,
+      onWrappedColumnChange: onWrappedColumnChange
+    };
+  }, [columnCustomSizes, onColumnResize, onWrappedColumnChange, wrappedColumnKeys]);
+  return /*#__PURE__*/React.createElement(DatasourceContext.Provider, {
+    value: contextValue
+  }, children);
+};

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

@@ -0,0 +1,447 @@
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+/** @jsx jsx */
+import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+
+// 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 Button from '@atlaskit/button/standard-button';
+import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { Box, xcss } from '@atlaskit/primitives';
+import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
+import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
+import { buildDatasourceAdf } from '../../../common/utils/adf';
+import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
+import { useUserInteractions } from '../../../contexts/user-interactions';
+import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
+import i18nEN from '../../../i18n/en';
+import { useAvailableSites } from '../../../services/useAvailableSites';
+import { AccessRequired } from '../../common/error-state/access-required';
+import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
+import { NoInstancesView } from '../../common/error-state/no-instances';
+import { NoResults } from '../../common/error-state/no-results';
+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 { DatasourceModal } from '../../common/modal/datasource-modal';
+import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
+import TableSearchCount from '../../common/modal/search-count';
+import { SiteSelector } from '../../common/modal/site-selector';
+import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
+import { useColumnResize } from '../../issue-like-table/use-column-resize';
+import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import { getColumnAction } from '../../issue-like-table/utils';
+import ConfluenceSearchContainer from '../confluence-search-container';
+import { ConfluenceSearchInitialStateSVG } from './confluence-search-initial-state-svg';
+import { confluenceSearchModalMessages } from './messages';
+var inputContainerStyles = xcss({
+  alignItems: 'baseline',
+  display: 'flex',
+  minHeight: '72px'
+});
+export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
+  var datasourceId = props.datasourceId,
+    initialColumnCustomSizes = props.columnCustomSizes,
+    initialWrappedColumnKeys = props.wrappedColumnKeys,
+    onCancel = props.onCancel,
+    onInsert = props.onInsert,
+    _props$viewMode = props.viewMode,
+    viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
+    initialParameters = props.parameters,
+    urlBeingEdited = props.url,
+    initialVisibleColumnKeys = props.visibleColumnKeys,
+    _props$disableDisplay = props.disableDisplayDropdown,
+    disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
+    overrideParameters = props.overrideParameters;
+  var _useState = useState(viewMode),
+    _useState2 = _slicedToArray(_useState, 2),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+    _useState4 = _slicedToArray(_useState3, 2),
+    cloudId = _useState4[0],
+    setCloudId = _useState4[1];
+  var _useAvailableSites = useAvailableSites('confluence', cloudId),
+    availableSites = _useAvailableSites.availableSites,
+    selectedConfluenceSite = _useAvailableSites.selectedSite;
+  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+    _useState6 = _slicedToArray(_useState5, 2),
+    searchString = _useState6[0],
+    setSearchString = _useState6[1];
+  var _useState7 = useState(initialVisibleColumnKeys),
+    _useState8 = _slicedToArray(_useState7, 2),
+    visibleColumnKeys = _useState8[0],
+    setVisibleColumnKeys = _useState8[1];
+  var _useState9 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
+    _useState10 = _slicedToArray(_useState9, 2),
+    contributorAccountIds = _useState10[0],
+    setContributorAccountIds = _useState10[1];
+  var _useState11 = 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
+    } : undefined),
+    _useState12 = _slicedToArray(_useState11, 2),
+    lastModified = _useState12[0],
+    setLastModified = _useState12[1];
+
+  // analytics related parameters
+  var searchCount = useRef(0);
+  var userInteractions = useUserInteractions();
+  var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
+  var parameters = useMemo(function () {
+    return _objectSpread(_objectSpread({}, initialParameters), {}, {
+      cloudId: cloudId || '',
+      searchString: searchString,
+      lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
+      lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
+      lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
+      contributorAccountIds: (contributorAccountIds === null || contributorAccountIds === void 0 ? void 0 : contributorAccountIds.length) > 0 ? contributorAccountIds : undefined
+    });
+  }, [initialParameters, cloudId, searchString, lastModified, contributorAccountIds]);
+  var isParametersSet = useMemo(function () {
+    return !!cloudId && Object.values(parameters !== null && parameters !== void 0 ? parameters : {}).filter(function (v) {
+      return v !== undefined;
+    }).length > 1;
+  }, [cloudId, parameters]);
+  var parametersToSend = useMemo(function () {
+    if (!isParametersSet) {
+      return undefined;
+    }
+    return _objectSpread(_objectSpread({}, parameters), overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
+  }, [parameters, overrideParameters, isParametersSet]);
+  var _useDatasourceTableSt = useDatasourceTableState({
+      datasourceId: datasourceId,
+      parameters: parametersToSend,
+      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 hasNoConfluenceSites = availableSites && availableSites.length === 0;
+  useEffect(function () {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
+      });
+    }
+  }, [fireEvent, availableSites]);
+
+  // TODO: further refactoring in EDM-9573
+  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
+  useEffect(function () {
+    if (selectedConfluenceSite && (!cloudId || cloudId !== selectedConfluenceSite.cloudId)) {
+      setCloudId(selectedConfluenceSite.cloudId);
+    }
+  }, [cloudId, selectedConfluenceSite]);
+
+  // TODO: further refactoring in EDM-9573
+  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829171
+  var onSiteSelection = useCallback(function (site) {
+    userInteractions.add(DatasourceAction.INSTANCE_UPDATED);
+    setSearchString(undefined);
+    setLastModified(undefined);
+    setContributorAccountIds([]);
+    setCloudId(site.cloudId);
+    reset({
+      shouldForceRequest: true
+    });
+  }, [reset, userInteractions]);
+  useEffect(function () {
+    var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
+    setVisibleColumnKeys(newVisibleColumnKeys);
+  }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
+  var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
+  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
+    columnCustomSizes = _useColumnResize.columnCustomSizes,
+    onColumnResize = _useColumnResize.onColumnResize;
+  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
+    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
+    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
+
+  // TODO: common functionality of all modals refactor in EDM-9573
+  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]);
+
+  // TODO: further refactoring in EDM-9573
+  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6798258
+  var confluenceSearchTable = useMemo(function () {
+    return jsx(ContentContainer, {
+      withTableBorder: true
+    }, jsx(IssueLikeDataTableView, {
+      testId: "confluence-search-datasource-table",
+      status: status,
+      columns: columns,
+      items: responseItems,
+      hasNextPage: hasNextPage,
+      visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
+      onNextPage: onNextPage,
+      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, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
+  var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
+  var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
+  var confluenceSearchUrl = useMemo(function () {
+    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+      return undefined;
+    }
+    var params = new URLSearchParams();
+    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search
+    params.append('text', searchString);
+    if (contributorAccountIds.length > 0) {
+      params.append('contributors', contributorAccountIds.join(','));
+    }
+    if (lastModified !== null && lastModified !== void 0 && lastModified.value) {
+      params.append('lastModified', lastModified.value);
+    }
+    if (lastModified !== null && lastModified !== void 0 && lastModified.from) {
+      params.append('from', lastModified === null || lastModified === void 0 ? void 0 : lastModified.from);
+    }
+    if (lastModified !== null && lastModified !== void 0 && lastModified.to) {
+      params.append('to', lastModified === null || lastModified === void 0 ? void 0 : lastModified.to);
+    }
+    return "".concat(selectedConfluenceSiteUrl, "/wiki/search?").concat(params.toString());
+  }, [contributorAccountIds, lastModified, searchString, selectedConfluenceSiteUrl]);
+  var analyticsPayload = useMemo(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: userInteractions.get()
+    };
+  }, [destinationObjectTypes, extensionKey, userInteractions]);
+  var isDataReady = (visibleColumnKeys || []).length > 0;
+  var fireInlineViewedEvent = useCallback(function () {
+    fireEvent('ui.link.viewed.count', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+      searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+      totalItemCount: totalCount || 0
+    }));
+  }, [analyticsPayload, fireEvent, totalCount]);
+  var fireTableViewedEvent = useCallback(function () {
+    if (isDataReady) {
+      fireEvent('ui.table.viewed.datasourceConfigModal', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        displayedColumnCount: visibleColumnCount.current
+      }));
+    }
+  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  useEffect(function () {
+    var isResolved = status === 'resolved';
+    var isTableViewMode = currentViewMode === 'table';
+    var isInlineViewMode = currentViewMode === 'inline';
+    if (!isResolved) {
+      return;
+    }
+    if (isTableViewMode) {
+      fireTableViewedEvent();
+    } else if (isInlineViewMode) {
+      fireInlineViewedEvent();
+    }
+  }, [currentViewMode, fireInlineViewedEvent, fireTableViewedEvent, status]);
+  var renderTableModalContent = useCallback(function () {
+    if (status === 'rejected') {
+      return jsx(ModalLoadingError, null);
+    } else if (status === 'unauthorized') {
+      return jsx(AccessRequired, {
+        url: selectedConfluenceSiteUrl || urlBeingEdited
+      });
+    } else if (resolvedWithNoResults || status === 'forbidden') {
+      return jsx(NoResults, null);
+    } else if (status === 'empty' || !columns.length) {
+      // persist the empty state when making the initial /data request which contains the columns
+      if (hasConfluenceSearchParams !== undefined) {
+        return jsx(EmptyState, {
+          testId: "confluence-search-datasource-modal--empty-state"
+        });
+      }
+      return jsx(ContentContainer, null, jsx(InitialStateView, {
+        icon: jsx(ConfluenceSearchInitialStateSVG, null),
+        title: confluenceSearchModalMessages.initialViewSearchTitle,
+        description: confluenceSearchModalMessages.initialViewSearchDescription
+      }));
+    }
+    return confluenceSearchTable;
+  }, [columns.length, selectedConfluenceSiteUrl, confluenceSearchTable, resolvedWithNoResults, status, urlBeingEdited, hasConfluenceSearchParams]);
+  var renderInlineLinkModalContent = useCallback(function () {
+    if (status === 'unauthorized') {
+      return jsx(AccessRequired, {
+        url: selectedConfluenceSiteUrl || urlBeingEdited
+      });
+    } else if (status === 'empty' || !selectedConfluenceSiteUrl) {
+      return jsx(SmartCardPlaceholder, {
+        placeholderText: confluenceSearchModalMessages.resultsCountSmartCardPlaceholderText
+      });
+    } else {
+      return confluenceSearchUrl && jsx(SmartLink, {
+        url: confluenceSearchUrl
+      });
+    }
+  }, [confluenceSearchUrl, selectedConfluenceSiteUrl, status, urlBeingEdited]);
+  var shouldShowResultsCount = !!totalCount && currentViewMode === 'table';
+  var onInsertPressed = useCallback(function (e, analyticsEvent) {
+    var _insertButtonClickedE;
+    if (!isParametersSet || !cloudId || !confluenceSearchUrl) {
+      return;
+    }
+    var insertButtonClickedEvent = analyticsEvent.update({
+      actionSubjectId: 'insert',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: currentViewMode === 'inline' ? DatasourceDisplay.DATASOURCE_INLINE : DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: userInteractions.get()
+      }),
+      eventType: 'ui'
+    });
+    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(EVENT_CHANNEL);
+    if (currentViewMode === 'inline') {
+      onInsert({
+        type: 'inlineCard',
+        attrs: {
+          url: confluenceSearchUrl
+        }
+      }, consumerEvent);
+    } else {
+      onInsert(buildDatasourceAdf({
+        id: datasourceId,
+        parameters: _objectSpread(_objectSpread({}, parametersToSend), {}, {
+          cloudId: cloudId
+        }),
+        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
+              } : {});
+            })
+          }
+        }]
+      }, confluenceSearchUrl), consumerEvent);
+    }
+  }, [isParametersSet, cloudId, analyticsPayload, totalCount, currentViewMode, onInsert, confluenceSearchUrl, datasourceId, parametersToSend, visibleColumnKeys, columnCustomSizes, wrappedColumnKeys, userInteractions]);
+  var handleViewModeChange = function handleViewModeChange(selectedMode) {
+    userInteractions.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
+    setCurrentViewMode(selectedMode);
+  };
+  var onSearch = useCallback(function (newSearchString, filters) {
+    searchCount.current++;
+    userInteractions.add(DatasourceAction.QUERY_UPDATED);
+    if (filters) {
+      var editedOrCreatedBy = filters.editedOrCreatedBy,
+        lastModifiedList = filters.lastModified;
+      if (lastModifiedList) {
+        var updatedDateRangeOption = lastModifiedList.find(function (range) {
+          return range.value;
+        });
+        if ((updatedDateRangeOption === null || updatedDateRangeOption === void 0 ? void 0 : updatedDateRangeOption.optionType) === 'dateRange') {
+          setLastModified({
+            value: updatedDateRangeOption.value,
+            from: updatedDateRangeOption.from,
+            to: updatedDateRangeOption.to
+          });
+        }
+      }
+      if (editedOrCreatedBy) {
+        var accountIds = editedOrCreatedBy.map(function (user) {
+          return user.value;
+        });
+        setContributorAccountIds(accountIds);
+      }
+    }
+    setSearchString(newSearchString);
+    reset({
+      shouldForceRequest: true
+    });
+  }, [reset, userInteractions]);
+  var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
+  var getCancelButtonAnalyticsPayload = useCallback(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes,
+      searchCount: searchCount.current,
+      actions: userInteractions.get()
+    };
+  }, [destinationObjectTypes, extensionKey, userInteractions]);
+  return jsx(IntlMessagesProvider, {
+    defaultMessages: i18nEN,
+    loaderFn: fetchMessagesForLocale
+  }, jsx(DatasourceModal, {
+    testId: "confluence-search-datasource-modal",
+    onClose: onCancel
+  }, jsx(ModalHeader, null, jsx(ModalTitle, null, jsx(SiteSelector, {
+    availableSites: availableSites,
+    onSiteSelection: onSiteSelection,
+    selectedSite: selectedConfluenceSite,
+    testId: "confluence-search-datasource-modal--site-selector",
+    label: siteSelectorLabel
+  })), !hasNoConfluenceSites && !disableDisplayDropdown && jsx(DisplayViewDropDown, {
+    onViewModeChange: handleViewModeChange,
+    viewMode: currentViewMode
+  })), jsx(ModalBody, null, !hasNoConfluenceSites ? jsx(Fragment, null, jsx(Box, {
+    xcss: inputContainerStyles
+  }, jsx(ConfluenceSearchContainer, {
+    isSearching: status === 'loading',
+    onSearch: onSearch,
+    parameters: parameters
+  })), currentViewMode === 'inline' ? renderInlineLinkModalContent() : renderTableModalContent()) : jsx(NoInstancesView, {
+    title: confluenceSearchModalMessages.noAccessToConfluenceSitesTitle,
+    description: confluenceSearchModalMessages.noAccessToConfluenceSitesDescription,
+    testId: 'no-confluence-instances-content'
+  })), jsx(ModalFooter, null, shouldShowResultsCount && confluenceSearchUrl && jsx(TableSearchCount, {
+    searchCount: totalCount,
+    url: confluenceSearchUrl,
+    prefixTextType: "result",
+    testId: "confluence-search-datasource-modal-total-results-count"
+  }), jsx(CancelButton, {
+    onCancel: onCancel,
+    getAnalyticsPayload: getCancelButtonAnalyticsPayload,
+    testId: "confluence-search-modal--cancel-button"
+  }), !hasNoConfluenceSites && jsx(Button, {
+    appearance: "primary",
+    onClick: onInsertPressed,
+    isDisabled: isInsertDisabled,
+    testId: "confluence-search-datasource-modal--insert-button"
+  }, jsx(FormattedMessage, confluenceSearchModalMessages.insertResultsButtonText)))));
+};

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

@@ -9,10 +9,10 @@ import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'rea
 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 Button from '@atlaskit/button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';
@@ -32,17 +32,19 @@ 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 { useDatasourceContext } from '../../common/modal/datasource-context/DatasourceContext';
+import { DatasourceContextProvider } from '../../common/modal/datasource-context/DatasourceContextProvider';
 import { DatasourceModal } from '../../common/modal/datasource-modal';
 import { DisplayViewDropDown } from '../../common/modal/display-view-dropdown/display-view-drop-down';
 import TableSearchCount from '../../common/modal/search-count';
 import { SiteSelector } from '../../common/modal/site-selector';
-import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
-import { useColumnResize } from '../../issue-like-table/use-column-resize';
-import { useColumnWrapping } from '../../issue-like-table/use-column-wrapping';
+import DatasourcesTableUsingContext from '../../datasources-table-in-modal-preview';
+import { EmptyState } from '../../issue-like-table';
 import { getColumnAction } from '../../issue-like-table/utils';
 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 inputContainerStyles = xcss({
   alignItems: 'baseline',
   display: 'flex',
@@ -50,8 +52,6 @@ var inputContainerStyles = xcss({
 });
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var datasourceId = props.datasourceId,
-    initialColumnCustomSizes = props.columnCustomSizes,
-    initialWrappedColumnKeys = props.wrappedColumnKeys,
     onCancel = props.onCancel,
     onInsert = props.onInsert,
     _props$viewMode = props.viewMode,
@@ -174,12 +174,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
-  var _useColumnResize = useColumnResize(initialColumnCustomSizes),
-    columnCustomSizes = _useColumnResize.columnCustomSizes,
-    onColumnResize = _useColumnResize.onColumnResize;
-  var _useColumnWrapping = useColumnWrapping(initialWrappedColumnKeys),
-    wrappedColumnKeys = _useColumnWrapping.wrappedColumnKeys,
-    onWrappedColumnChange = _useColumnWrapping.onWrappedColumnChange;
 
   // TODO: common functionality of all modals refactor in EDM-9573
   var handleVisibleColumnKeysChange = useCallback(function () {
@@ -189,13 +183,10 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [visibleColumnKeys, userInteractions]);
-
-  // TODO: further refactoring in EDM-9573
-  // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6798258
   var confluenceSearchTable = useMemo(function () {
     return jsx(ContentContainer, {
       withTableBorder: true
-    }, jsx(IssueLikeDataTableView, {
+    }, jsx(DatasourcesTableUsingContext, {
       testId: "confluence-search-datasource-table",
       status: status,
       columns: columns,
@@ -205,13 +196,9 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       onNextPage: onNextPage,
       onLoadDatasourceDetails: loadDatasourceDetails,
       onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
-      extensionKey: extensionKey,
-      columnCustomSizes: columnCustomSizes,
-      onColumnResize: onColumnResize,
-      wrappedColumnKeys: wrappedColumnKeys,
-      onWrappedColumnChange: getBooleanFF('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
+      extensionKey: extensionKey
     }));
-  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey, columnCustomSizes, onColumnResize, wrappedColumnKeys, onWrappedColumnChange]);
+  }, [status, columns, responseItems, hasNextPage, visibleColumnKeys, defaultVisibleColumnKeys, onNextPage, loadDatasourceDetails, handleVisibleColumnKeysChange, extensionKey]);
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
@@ -313,6 +300,9 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     }
   }, [confluenceSearchUrl, selectedConfluenceSiteUrl, status, urlBeingEdited]);
   var shouldShowResultsCount = !!totalCount && currentViewMode === 'table';
+  var _useDatasourceContext = useDatasourceContext(),
+    columnCustomSizes = _useDatasourceContext.columnCustomSizes,
+    wrappedColumnKeys = _useDatasourceContext.wrappedColumnKeys;
   var onInsertPressed = useCallback(function (e, analyticsEvent) {
     var _insertButtonClickedE;
     if (!isParametersSet || !cloudId || !confluenceSearchUrl) {
@@ -458,5 +448,10 @@ var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });
 export var ConfluenceSearchConfigModal = withAnalyticsContext(contextData)(function (props) {
-  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, jsx(PlainConfluenceSearchConfigModal, props)));
+  return jsx(DatasourceExperienceIdProvider, null, jsx(UserInteractionsProvider, null, fg('platform.linking-platform.datasources.use-refactored-config-modal') ? jsx(DatasourceContextProvider, {
+    initialColumnCustomSizes: props.columnCustomSizes,
+    initialWrappedColumnKeys: props.wrappedColumnKeys
+  }, jsx(PlainConfluenceSearchConfigModal, props)) :
+  // TODO on cleanup 'use-refactored-config-modal' ff, delete `ModalOld.tsx` as well
+  jsx(PlainConfluenceSearchConfigModalOld, props)));
 });

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

@@ -0,0 +1,19 @@
+import _extends from "@babel/runtime/helpers/extends";
+import React from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
+import { useDatasourceContext } from '../common/modal/datasource-context/DatasourceContext';
+import { IssueLikeDataTableView } from '../issue-like-table';
+var Table = function Table(props) {
+  var _useDatasourceContext = useDatasourceContext(),
+    columnCustomSizes = _useDatasourceContext.columnCustomSizes,
+    onColumnResize = _useDatasourceContext.onColumnResize,
+    wrappedColumnKeys = _useDatasourceContext.wrappedColumnKeys,
+    onWrappedColumnChange = _useDatasourceContext.onWrappedColumnChange;
+  return /*#__PURE__*/React.createElement(IssueLikeDataTableView, _extends({}, props, {
+    columnCustomSizes: columnCustomSizes,
+    onColumnResize: onColumnResize,
+    wrappedColumnKeys: wrappedColumnKeys,
+    onWrappedColumnChange: fg('platform.linking-platform.datasource-word_wrap') ? onWrappedColumnChange : undefined
+  }));
+};
+export default Table;

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

@@ -0,0 +1,11 @@
+import React from 'react';
+import { type ColumnSizesMap } from '../../../issue-like-table/types';
+type DatasourceContextStore = {
+    columnCustomSizes?: ColumnSizesMap;
+    onColumnResize: (key: string, width: number) => void;
+    wrappedColumnKeys?: string[];
+    onWrappedColumnChange: (key: string, isWrapped: boolean) => void;
+};
+export declare const DatasourceContext: React.Context<DatasourceContextStore | null>;
+export declare const useDatasourceContext: () => DatasourceContextStore;
+export {};

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

@@ -0,0 +1,10 @@
+import React from 'react';
+import { type ColumnSizesMap } from '../../../issue-like-table/types';
+type Props = {
+    initialColumnCustomSizes?: ColumnSizesMap | undefined;
+    initialWrappedColumnKeys?: string[] | undefined;
+};
+export declare const DatasourceContextProvider: ({ children, initialColumnCustomSizes, initialWrappedColumnKeys, }: Props & {
+    children: React.ReactNode;
+}) => JSX.Element;
+export {};

package/dist/types/ui/confluence-search-modal/modal/ModalOld.d.ts

@@ -0,0 +1,3 @@
+import { jsx } from '@emotion/react';
+import { type ConfluenceSearchConfigModalProps } from '../types';
+export declare const PlainConfluenceSearchConfigModal: (props: ConfluenceSearchConfigModalProps) => jsx.JSX.Element;

package/dist/types/ui/datasources-table-in-modal-preview/index.d.ts

@@ -0,0 +1,20 @@
+/// <reference types="react" />
+import type { DatasourceDataResponseItem, DatasourceResponseSchemaProperty, DatasourceTableStatusType } from '@atlaskit/linking-types';
+import type { NextPageType } from '../../hooks/useDatasourceTableState';
+import { type TableViewPropsRenderType } from '../issue-like-table/types';
+export interface DatasourcesTableProps {
+    testId?: string;
+    extensionKey?: string | null;
+    columns: DatasourceResponseSchemaProperty[];
+    visibleColumnKeys: string[];
+    hasNextPage: boolean;
+    status: DatasourceTableStatusType;
+    items: DatasourceDataResponseItem[];
+    onNextPage: NextPageType;
+    onLoadDatasourceDetails: () => void;
+    renderItem?: TableViewPropsRenderType;
+    onVisibleColumnKeysChange?: (visibleColumnKeys: string[]) => void;
+    scrollableContainerHeight?: number;
+}
+declare const Table: (props: DatasourcesTableProps) => JSX.Element;
+export default Table;