@atlaskit/link-datasource 2.0.4 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @atlaskit/link-datasource
 
+## 2.1.1
+
+### Patch Changes
+
+-   [#97731](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97731)
+    [`3c244075bbb8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3c244075bbb8) -
+    Minor refactor to site picker for Jira and Confluence site picker. No expected functional
+    changes.
+-   Updated dependencies
+
+## 2.1.0
+
+### Minor Changes
+
+-   [#97537](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/97537)
+    [`ab7caf1bf7ee`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab7caf1bf7ee) -
+    Update AssetsConfigModalProps to be aligned with other modals. New fields made available
+    including:
+
+    -   `url`: The url that was used to insert a List of Links
+    -   `viewMode`: 2 viewModes `inline` and `table` for different display.
+    -   `wrappedColumnKeys`: toggle line-wrapping for each column.
+    -   `columnCustomSizes`: allow customized column sizes.
+
+    The new fields are not required for each modal to implement.
+
+### Patch Changes
+
+-   [#98158](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/98158)
+    [`2ec887a95a61`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2ec887a95a61) -
+    Minor internal refactor. No expected functional changes.
+
 ## 2.0.4
 
 ### Patch Changes

package/dist/cjs/services/useAvailableSites.js

@@ -0,0 +1,64 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useAvailableSites = void 0;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _getAvailableSites = require("./getAvailableSites");
+var useAvailableSites = exports.useAvailableSites = function useAvailableSites(product, cloudId) {
+  var _useState = (0, _react.useState)(undefined),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    availableSites = _useState2[0],
+    setAvailableSites = _useState2[1];
+  (0, _react.useEffect)(function () {
+    var fetchSiteDisplayNames = /*#__PURE__*/function () {
+      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var sites, sortedAvailableSites;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return (0, _getAvailableSites.getAvailableSites)(product);
+            case 2:
+              sites = _context.sent;
+              sortedAvailableSites = (0, _toConsumableArray2.default)(sites).sort(function (a, b) {
+                return a.displayName.localeCompare(b.displayName);
+              });
+              setAvailableSites(sortedAvailableSites);
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function fetchSiteDisplayNames() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+    void fetchSiteDisplayNames();
+  }, [product]);
+  var selectedSite = (0, _react.useMemo)(function () {
+    if (cloudId) {
+      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (site) {
+        return site.cloudId === cloudId;
+      });
+    }
+    var currentlyLoggedInSiteUrl;
+    if (typeof window.location !== 'undefined') {
+      currentlyLoggedInSiteUrl = window.location.origin;
+    }
+    return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (site) {
+      return site.url === currentlyLoggedInSiteUrl;
+    })) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
+  }, [availableSites, cloudId]);
+  return {
+    availableSites: availableSites,
+    selectedSite: selectedSite
+  };
+};

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

@@ -5,11 +5,8 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getColumnAction = exports.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+exports.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
@@ -31,7 +28,7 @@ var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
-var _getAvailableSites = require("../../../services/getAvailableSites");
+var _useAvailableSites2 = require("../../../services/useAvailableSites");
 var _accessRequired = require("../../common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
 var _noInstances = require("../../common/error-state/no-instances");
@@ -45,6 +42,7 @@ var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
 var _useColumnResize2 = require("../../issue-like-table/use-column-resize");
 var _useColumnWrapping2 = require("../../issue-like-table/use-column-wrapping");
+var _utils = require("../../issue-like-table/utils");
 var _confluenceSearchContainer = _interopRequireDefault(require("../confluence-search-container"));
 var _confluenceSearchInitialStateSvg = require("./confluence-search-initial-state-svg");
 var _messages = require("./messages");
@@ -61,19 +59,6 @@ var searchCountStyles = (0, _primitives.xcss)({
   flex: 1,
   fontWeight: 600
 });
-
-// TODO: common functionality of all modals refactor in EDM-9573
-var getColumnAction = exports.getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
-  var newColumnSize = newVisibleColumnKeys.length;
-  var oldColumnSize = oldVisibleColumnKeys.length;
-  if (newColumnSize > oldColumnSize) {
-    return _types.DatasourceAction.COLUMN_ADDED;
-  } else if (newColumnSize < oldColumnSize) {
-    return _types.DatasourceAction.COLUMN_REMOVED;
-  } else {
-    return _types.DatasourceAction.COLUMN_REORDERED;
-  }
-};
 var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
     modalRenderInstanceId = _useRef.current;
@@ -90,38 +75,37 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     _props$disableDisplay = props.disableDisplayDropdown,
     disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
     overrideParameters = props.overrideParameters;
-  var _useState = (0, _react.useState)(undefined),
+  var _useState = (0, _react.useState)(viewMode),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    availableSites = _useState2[0],
-    setAvailableSites = _useState2[1];
-  var _useState3 = (0, _react.useState)(viewMode),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var _useState3 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    currentViewMode = _useState4[0],
-    setCurrentViewMode = _useState4[1];
-  var _useState5 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+    cloudId = _useState4[0],
+    setCloudId = _useState4[1];
+  var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('confluence', cloudId),
+    availableSites = _useAvailableSites.availableSites,
+    selectedConfluenceSite = _useAvailableSites.selectedSite;
+  var _useState5 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    cloudId = _useState6[0],
-    setCloudId = _useState6[1];
-  var _useState7 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+    searchString = _useState6[0],
+    setSearchString = _useState6[1];
+  var _useState7 = (0, _react.useState)(initialVisibleColumnKeys),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    searchString = _useState8[0],
-    setSearchString = _useState8[1];
-  var _useState9 = (0, _react.useState)(initialVisibleColumnKeys),
+    visibleColumnKeys = _useState8[0],
+    setVisibleColumnKeys = _useState8[1];
+  var _useState9 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    visibleColumnKeys = _useState10[0],
-    setVisibleColumnKeys = _useState10[1];
-  var _useState11 = (0, _react.useState)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
-    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    contributorAccountIds = _useState12[0],
-    setContributorAccountIds = _useState12[1];
-  var _useState13 = (0, _react.useState)(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
+    contributorAccountIds = _useState10[0],
+    setContributorAccountIds = _useState10[1];
+  var _useState11 = (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
     } : undefined),
-    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    lastModified = _useState14[0],
-    setLastModified = _useState14[1];
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    lastModified = _useState12[0],
+    setLastModified = _useState12[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
@@ -168,21 +152,14 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
-  var selectedConfluenceSite = (0, _react.useMemo)(function () {
-    if (cloudId) {
-      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (confluenceSite) {
-        return confluenceSite.cloudId === cloudId;
+  (0, _react.useEffect)(function () {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
       });
-    } else {
-      var currentlyLoggedInSiteUrl;
-      if (typeof window.location !== 'undefined') {
-        currentlyLoggedInSiteUrl = window.location.origin;
-      }
-      return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (confluenceSite) {
-        return confluenceSite.url === currentlyLoggedInSiteUrl;
-      })) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
     }
-  }, [availableSites, cloudId]);
+  }, [fireEvent, availableSites]);
   (0, _react.useEffect)(function () {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
@@ -207,37 +184,6 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       shouldForceRequest: true
     });
   }, [reset]);
-  (0, _react.useEffect)(function () {
-    var fetchSiteDisplayNames = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var confluenceSites, sortedAvailableSites;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return (0, _getAvailableSites.getAvailableSites)('confluence');
-            case 2:
-              confluenceSites = _context.sent;
-              sortedAvailableSites = (0, _toConsumableArray2.default)(confluenceSites).sort(function (a, b) {
-                return a.displayName.localeCompare(b.displayName);
-              });
-              setAvailableSites(sortedAvailableSites);
-              fireEvent('ui.modal.ready.datasource', {
-                instancesCount: sortedAvailableSites.length,
-                schemasCount: null
-              });
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function fetchSiteDisplayNames() {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    void fetchSiteDisplayNames();
-  }, [fireEvent]);
   (0, _react.useEffect)(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;
@@ -254,7 +200,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   // TODO: common functionality of all modals refactor in EDM-9573
   var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
     var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    var columnAction = (0, _utils.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
     userInteractionActions.current.add(columnAction);
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);

package/dist/cjs/ui/issue-like-table/utils.js

@@ -3,7 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getWidthCss = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+exports.getWidthCss = exports.getColumnAction = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+var _types = require("../../analytics/types");
 var COLUMN_BASE_WIDTH = exports.COLUMN_BASE_WIDTH = 8;
 var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -23,4 +24,20 @@ var getWidthCss = exports.getWidthCss = function getWidthCss(_ref) {
   } : {
     maxWidth: width
   };
+};
+
+/**
+ * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
+ * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
+ */
+var getColumnAction = exports.getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
+  var newColumnSize = newVisibleColumnKeys.length;
+  var oldColumnSize = oldVisibleColumnKeys.length;
+  if (newColumnSize > oldColumnSize) {
+    return _types.DatasourceAction.COLUMN_ADDED;
+  } else if (newColumnSize < oldColumnSize) {
+    return _types.DatasourceAction.COLUMN_REMOVED;
+  } else {
+    return _types.DatasourceAction.COLUMN_REORDERED;
+  }
 };

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

@@ -5,12 +5,9 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getColumnAction = exports.PlainJiraIssuesConfigModal = exports.JiraIssuesConfigModal = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+exports.PlainJiraIssuesConfigModal = exports.JiraIssuesConfigModal = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -34,7 +31,7 @@ var _adf = require("../../../common/utils/adf");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
-var _getAvailableSites = require("../../../services/getAvailableSites");
+var _useAvailableSites2 = require("../../../services/useAvailableSites");
 var _accessRequired = require("../../common/error-state/access-required");
 var _messages = require("../../common/error-state/messages");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
@@ -50,6 +47,7 @@ var _siteSelector = require("../../common/modal/site-selector");
 var _issueLikeTable = require("../../issue-like-table");
 var _useColumnResize2 = require("../../issue-like-table/use-column-resize");
 var _useColumnWrapping2 = require("../../issue-like-table/use-column-wrapping");
+var _utils2 = require("../../issue-like-table/utils");
 var _ui = require("../basic-filters/ui");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _jiraSearchContainer = require("../jira-search-container");
@@ -70,22 +68,6 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
   return itemCount === 1 ? _types.DatasourceDisplay.INLINE : _types.DatasourceDisplay.DATASOURCE_INLINE;
 };
 var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
-
-/**
- * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
- * The assumption is that since only one action is changed at each time, we don't have to verify the actual contents of the lists.
- */
-var getColumnAction = exports.getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
-  var newColumnSize = newVisibleColumnKeys.length;
-  var oldColumnSize = oldVisibleColumnKeys.length;
-  if (newColumnSize > oldColumnSize) {
-    return _types.DatasourceAction.COLUMN_ADDED;
-  } else if (newColumnSize < oldColumnSize) {
-    return _types.DatasourceAction.COLUMN_REMOVED;
-  } else {
-    return _types.DatasourceAction.COLUMN_REORDERED;
-  }
-};
 var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialColumnCustomSizes = props.columnCustomSizes,
@@ -97,39 +79,38 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
-  var _useState = (0, _react.useState)(undefined),
+  var _useState = (0, _react.useState)(viewMode),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    availableSites = _useState2[0],
-    setAvailableSites = _useState2[1];
-  var _useState3 = (0, _react.useState)(viewMode),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var _useState3 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    currentViewMode = _useState4[0],
-    setCurrentViewMode = _useState4[1];
-  var _useState5 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+    cloudId = _useState4[0],
+    setCloudId = _useState4[1];
+  var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('jira', cloudId),
+    availableSites = _useAvailableSites.availableSites,
+    selectedJiraSite = _useAvailableSites.selectedSite;
+  var _useState5 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    cloudId = _useState6[0],
-    setCloudId = _useState6[1];
+    jql = _useState6[0],
+    setJql = _useState6[1];
   var _useState7 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    jql = _useState8[0],
-    setJql = _useState8[1];
-  var _useState9 = (0, _react.useState)(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
+    searchBarJql = _useState8[0],
+    setSearchBarJql = _useState8[1];
+  var _useState9 = (0, _react.useState)(initialVisibleColumnKeys),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    searchBarJql = _useState10[0],
-    setSearchBarJql = _useState10[1];
-  var _useState11 = (0, _react.useState)(initialVisibleColumnKeys),
-    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    visibleColumnKeys = _useState12[0],
-    setVisibleColumnKeys = _useState12[1];
+    visibleColumnKeys = _useState10[0],
+    setVisibleColumnKeys = _useState10[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractionActions = (0, _react.useRef)(new Set());
   var initialSearchMethod = (0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters') && !(0, _isQueryTooComplex.isQueryTooComplex)((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
-  var _useState13 = (0, _react.useState)(initialSearchMethod),
-    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    currentSearchMethod = _useState14[0],
-    setCurrentSearchMethod = _useState14[1];
+  var _useState11 = (0, _react.useState)(initialSearchMethod),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    currentSearchMethod = _useState12[0],
+    setCurrentSearchMethod = _useState12[1];
   var searchMethodSearchedWith = (0, _react.useRef)(null);
   var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = (0, _react.useRef)({});
@@ -168,21 +149,6 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
     modalRenderInstanceId = _useRef.current;
-  var selectedJiraSite = (0, _react.useMemo)(function () {
-    if (cloudId) {
-      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (jiraSite) {
-        return jiraSite.cloudId === cloudId;
-      });
-    } else {
-      var currentlyLoggedInSiteUrl;
-      if (typeof window.location !== 'undefined') {
-        currentlyLoggedInSiteUrl = window.location.origin;
-      }
-      return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (jiraSite) {
-        return jiraSite.url === currentlyLoggedInSiteUrl;
-      })) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
-    }
-  }, [availableSites, cloudId]);
   var analyticsPayload = (0, _react.useMemo)(function () {
     return {
       extensionKey: extensionKey,
@@ -195,6 +161,14 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
+  (0, _react.useEffect)(function () {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
+      });
+    }
+  }, [fireEvent, availableSites]);
   (0, _react.useEffect)(function () {
     var shouldStartUfoExperience = status === 'loading';
     if (shouldStartUfoExperience) {
@@ -218,37 +192,6 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
-  (0, _react.useEffect)(function () {
-    var fetchSiteDisplayNames = /*#__PURE__*/function () {
-      var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var jiraSites, sortedAvailableSites;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return (0, _getAvailableSites.getAvailableSites)('jira');
-            case 2:
-              jiraSites = _context.sent;
-              sortedAvailableSites = (0, _toConsumableArray2.default)(jiraSites).sort(function (a, b) {
-                return a.displayName.localeCompare(b.displayName);
-              });
-              setAvailableSites(sortedAvailableSites);
-              fireEvent('ui.modal.ready.datasource', {
-                instancesCount: sortedAvailableSites.length,
-                schemasCount: null
-              });
-            case 6:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function fetchSiteDisplayNames() {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    void fetchSiteDisplayNames();
-  }, [fireEvent]);
   (0, _react.useEffect)(function () {
     if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);
@@ -298,10 +241,10 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     }
   }, [currentViewMode, status, fireIssueViewAnalytics, fireCountViewedEvent]);
   (0, _useColumnPickerRenderedFailedUfoExperience.useColumnPickerRenderedFailedUfoExperience)(status, modalRenderInstanceId);
-  var onSearch = (0, _react.useCallback)(function (newParameters, _ref2) {
-    var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections,
-      isQueryComplex = _ref2.isQueryComplex;
+  var onSearch = (0, _react.useCallback)(function (newParameters, _ref) {
+    var searchMethod = _ref.searchMethod,
+      basicFilterSelections = _ref.basicFilterSelections,
+      isQueryComplex = _ref.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;
@@ -422,7 +365,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   }, [onNextPage]);
   var handleVisibleColumnKeysChange = (0, _react.useCallback)(function () {
     var newVisibleColumnKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
+    var columnAction = (0, _utils2.getColumnAction)(visibleColumnKeys || [], newVisibleColumnKeys);
     userInteractionActions.current.add(columnAction);
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);

package/dist/es2019/services/useAvailableSites.js

@@ -0,0 +1,27 @@
+import { useEffect, useMemo, useState } from 'react';
+import { getAvailableSites } from './getAvailableSites';
+export const useAvailableSites = (product, cloudId) => {
+  const [availableSites, setAvailableSites] = useState(undefined);
+  useEffect(() => {
+    const fetchSiteDisplayNames = async () => {
+      const sites = await getAvailableSites(product);
+      const sortedAvailableSites = [...sites].sort((a, b) => a.displayName.localeCompare(b.displayName));
+      setAvailableSites(sortedAvailableSites);
+    };
+    void fetchSiteDisplayNames();
+  }, [product]);
+  const selectedSite = useMemo(() => {
+    if (cloudId) {
+      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(site => site.cloudId === cloudId);
+    }
+    let currentlyLoggedInSiteUrl;
+    if (typeof window.location !== 'undefined') {
+      currentlyLoggedInSiteUrl = window.location.origin;
+    }
+    return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(site => site.url === currentlyLoggedInSiteUrl)) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
+  }, [availableSites, cloudId]);
+  return {
+    availableSites,
+    selectedSite
+  };
+};

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

@@ -19,7 +19,7 @@ import { buildDatasourceAdf } from '../../../common/utils/adf';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import i18nEN from '../../../i18n/en';
-import { getAvailableSites } from '../../../services/getAvailableSites';
+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';
@@ -33,6 +33,7 @@ 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';
@@ -45,19 +46,6 @@ const searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
-
-// TODO: common functionality of all modals refactor in EDM-9573
-export const getColumnAction = (oldVisibleColumnKeys, newVisibleColumnKeys) => {
-  const newColumnSize = newVisibleColumnKeys.length;
-  const oldColumnSize = oldVisibleColumnKeys.length;
-  if (newColumnSize > oldColumnSize) {
-    return DatasourceAction.COLUMN_ADDED;
-  } else if (newColumnSize < oldColumnSize) {
-    return DatasourceAction.COLUMN_REMOVED;
-  } else {
-    return DatasourceAction.COLUMN_REORDERED;
-  }
-};
 export const PlainConfluenceSearchConfigModal = props => {
   const {
     current: modalRenderInstanceId
@@ -75,9 +63,12 @@ export const PlainConfluenceSearchConfigModal = props => {
     disableDisplayDropdown = false,
     overrideParameters
   } = props;
-  const [availableSites, setAvailableSites] = useState(undefined);
   const [currentViewMode, setCurrentViewMode] = useState(viewMode);
   const [cloudId, setCloudId] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId);
+  const {
+    availableSites,
+    selectedSite: selectedConfluenceSite
+  } = useAvailableSites('confluence', cloudId);
   const [searchString, setSearchString] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString);
   const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
   const [contributorAccountIds, setContributorAccountIds] = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []);
@@ -131,17 +122,14 @@ export const PlainConfluenceSearchConfigModal = props => {
     fireEvent
   } = useDatasourceAnalyticsEvents();
   const hasNoConfluenceSites = availableSites && availableSites.length === 0;
-  const selectedConfluenceSite = useMemo(() => {
-    if (cloudId) {
-      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(confluenceSite => confluenceSite.cloudId === cloudId);
-    } else {
-      let currentlyLoggedInSiteUrl;
-      if (typeof window.location !== 'undefined') {
-        currentlyLoggedInSiteUrl = window.location.origin;
-      }
-      return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(confluenceSite => confluenceSite.url === currentlyLoggedInSiteUrl)) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
+  useEffect(() => {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
+      });
     }
-  }, [availableSites, cloudId]);
+  }, [fireEvent, availableSites]);
   useEffect(() => {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
@@ -166,18 +154,6 @@ export const PlainConfluenceSearchConfigModal = props => {
       shouldForceRequest: true
     });
   }, [reset]);
-  useEffect(() => {
-    const fetchSiteDisplayNames = async () => {
-      const confluenceSites = await getAvailableSites('confluence');
-      const sortedAvailableSites = [...confluenceSites].sort((a, b) => a.displayName.localeCompare(b.displayName));
-      setAvailableSites(sortedAvailableSites);
-      fireEvent('ui.modal.ready.datasource', {
-        instancesCount: sortedAvailableSites.length,
-        schemasCount: null
-      });
-    };
-    void fetchSiteDisplayNames();
-  }, [fireEvent]);
   useEffect(() => {
     const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;