@atlaskit/link-datasource 2.0.4 → 2.1.1

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

@@ -1,3 +1,4 @@
+import { DatasourceAction } from '../../analytics/types';
 export const COLUMN_BASE_WIDTH = 8;
 export const COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -16,4 +17,20 @@ export const getWidthCss = ({
   width
 } : {
   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.
+ */
+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;
+  }
 };

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

@@ -22,7 +22,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 { loadingErrorMessages } from '../../common/error-state/messages';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
@@ -38,6 +38,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 { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
@@ -54,22 +55,6 @@ const getDisplayValue = (currentViewMode, itemCount) => {
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
 };
 const 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.
- */
-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 PlainJiraIssuesConfigModal = props => {
   const {
     datasourceId,
@@ -82,9 +67,12 @@ export const PlainJiraIssuesConfigModal = props => {
     url: urlBeingEdited,
     visibleColumnKeys: initialVisibleColumnKeys
   } = 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: selectedJiraSite
+  } = useAvailableSites('jira', cloudId);
   const [jql, setJql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql);
   const [searchBarJql, setSearchBarJql] = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql);
   const [visibleColumnKeys, setVisibleColumnKeys] = useState(initialVisibleColumnKeys);
@@ -134,17 +122,6 @@ export const PlainJiraIssuesConfigModal = props => {
   const {
     current: modalRenderInstanceId
   } = useRef(uuidv4());
-  const selectedJiraSite = useMemo(() => {
-    if (cloudId) {
-      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(jiraSite => jiraSite.cloudId === cloudId);
-    } else {
-      let currentlyLoggedInSiteUrl;
-      if (typeof window.location !== 'undefined') {
-        currentlyLoggedInSiteUrl = window.location.origin;
-      }
-      return (availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(jiraSite => jiraSite.url === currentlyLoggedInSiteUrl)) || (availableSites === null || availableSites === void 0 ? void 0 : availableSites[0]);
-    }
-  }, [availableSites, cloudId]);
   const analyticsPayload = useMemo(() => ({
     extensionKey,
     destinationObjectTypes
@@ -155,6 +132,14 @@ export const PlainJiraIssuesConfigModal = props => {
   const shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   const isDataReady = (visibleColumnKeys || []).length > 0;
   const hasNoJiraSites = availableSites && availableSites.length === 0;
+  useEffect(() => {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
+      });
+    }
+  }, [fireEvent, availableSites]);
   useEffect(() => {
     const shouldStartUfoExperience = status === 'loading';
     if (shouldStartUfoExperience) {
@@ -178,18 +163,6 @@ export const PlainJiraIssuesConfigModal = props => {
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
-  useEffect(() => {
-    const fetchSiteDisplayNames = async () => {
-      const jiraSites = await getAvailableSites('jira');
-      const sortedAvailableSites = [...jiraSites].sort((a, b) => a.displayName.localeCompare(b.displayName));
-      setAvailableSites(sortedAvailableSites);
-      fireEvent('ui.modal.ready.datasource', {
-        instancesCount: sortedAvailableSites.length,
-        schemasCount: null
-      });
-    };
-    void fetchSiteDisplayNames();
-  }, [fireEvent]);
   useEffect(() => {
     if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);

package/dist/esm/services/useAvailableSites.js

@@ -0,0 +1,57 @@
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _regeneratorRuntime from "@babel/runtime/regenerator";
+import { useEffect, useMemo, useState } from 'react';
+import { getAvailableSites } from './getAvailableSites';
+export var useAvailableSites = function useAvailableSites(product, cloudId) {
+  var _useState = useState(undefined),
+    _useState2 = _slicedToArray(_useState, 2),
+    availableSites = _useState2[0],
+    setAvailableSites = _useState2[1];
+  useEffect(function () {
+    var fetchSiteDisplayNames = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var sites, sortedAvailableSites;
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return getAvailableSites(product);
+            case 2:
+              sites = _context.sent;
+              sortedAvailableSites = _toConsumableArray(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 = 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/esm/ui/confluence-search-modal/modal/index.js

@@ -1,9 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 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 */
@@ -26,7 +23,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';
@@ -40,6 +37,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';
@@ -52,19 +50,6 @@ var searchCountStyles = xcss({
   flex: 1,
   fontWeight: 600
 });
-
-// TODO: common functionality of all modals refactor in EDM-9573
-export var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
-  var newColumnSize = newVisibleColumnKeys.length;
-  var oldColumnSize = oldVisibleColumnKeys.length;
-  if (newColumnSize > oldColumnSize) {
-    return DatasourceAction.COLUMN_ADDED;
-  } else if (newColumnSize < oldColumnSize) {
-    return DatasourceAction.COLUMN_REMOVED;
-  } else {
-    return DatasourceAction.COLUMN_REORDERED;
-  }
-};
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var _useRef = useRef(uuidv4()),
     modalRenderInstanceId = _useRef.current;
@@ -81,38 +66,37 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     _props$disableDisplay = props.disableDisplayDropdown,
     disableDisplayDropdown = _props$disableDisplay === void 0 ? false : _props$disableDisplay,
     overrideParameters = props.overrideParameters;
-  var _useState = useState(undefined),
+  var _useState = useState(viewMode),
     _useState2 = _slicedToArray(_useState, 2),
-    availableSites = _useState2[0],
-    setAvailableSites = _useState2[1];
-  var _useState3 = useState(viewMode),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState4 = _slicedToArray(_useState3, 2),
-    currentViewMode = _useState4[0],
-    setCurrentViewMode = _useState4[1];
-  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+    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),
-    cloudId = _useState6[0],
-    setCloudId = _useState6[1];
-  var _useState7 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.searchString),
+    searchString = _useState6[0],
+    setSearchString = _useState6[1];
+  var _useState7 = useState(initialVisibleColumnKeys),
     _useState8 = _slicedToArray(_useState7, 2),
-    searchString = _useState8[0],
-    setSearchString = _useState8[1];
-  var _useState9 = useState(initialVisibleColumnKeys),
+    visibleColumnKeys = _useState8[0],
+    setVisibleColumnKeys = _useState8[1];
+  var _useState9 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
     _useState10 = _slicedToArray(_useState9, 2),
-    visibleColumnKeys = _useState10[0],
-    setVisibleColumnKeys = _useState10[1];
-  var _useState11 = useState((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.contributorAccountIds) || []),
-    _useState12 = _slicedToArray(_useState11, 2),
-    contributorAccountIds = _useState12[0],
-    setContributorAccountIds = _useState12[1];
-  var _useState13 = useState(initialParameters !== null && initialParameters !== void 0 && initialParameters.lastModified ? {
+    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),
-    _useState14 = _slicedToArray(_useState13, 2),
-    lastModified = _useState14[0],
-    setLastModified = _useState14[1];
+    _useState12 = _slicedToArray(_useState11, 2),
+    lastModified = _useState12[0],
+    setLastModified = _useState12[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
@@ -159,21 +143,14 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
-  var selectedConfluenceSite = useMemo(function () {
-    if (cloudId) {
-      return availableSites === null || availableSites === void 0 ? void 0 : availableSites.find(function (confluenceSite) {
-        return confluenceSite.cloudId === cloudId;
+  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]);
   useEffect(function () {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
@@ -198,37 +175,6 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
       shouldForceRequest: true
     });
   }, [reset]);
-  useEffect(function () {
-    var fetchSiteDisplayNames = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var confluenceSites, sortedAvailableSites;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return getAvailableSites('confluence');
-            case 2:
-              confluenceSites = _context.sent;
-              sortedAvailableSites = _toConsumableArray(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]);
   useEffect(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
     visibleColumnCount.current = newVisibleColumnKeys.length;

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

@@ -1,3 +1,4 @@
+import { DatasourceAction } from '../../analytics/types';
 export var COLUMN_BASE_WIDTH = 8;
 export var COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
 /**
@@ -17,4 +18,20 @@ export var 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.
+ */
+export var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
+  var newColumnSize = newVisibleColumnKeys.length;
+  var oldColumnSize = oldVisibleColumnKeys.length;
+  if (newColumnSize > oldColumnSize) {
+    return DatasourceAction.COLUMN_ADDED;
+  } else if (newColumnSize < oldColumnSize) {
+    return DatasourceAction.COLUMN_REMOVED;
+  } else {
+    return DatasourceAction.COLUMN_REORDERED;
+  }
 };

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

@@ -1,11 +1,8 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 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; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
 import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
@@ -29,7 +26,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 { loadingErrorMessages } from '../../common/error-state/messages';
 import { ModalLoadingError } from '../../common/error-state/modal-loading-error';
@@ -45,6 +42,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 { availableBasicFilterTypes } from '../basic-filters/ui';
 import { isQueryTooComplex } from '../basic-filters/utils/isQueryTooComplex';
 import { JiraSearchContainer } from '../jira-search-container';
@@ -61,22 +59,6 @@ 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/';
-
-/**
- * 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.
- */
-export var getColumnAction = function getColumnAction(oldVisibleColumnKeys, newVisibleColumnKeys) {
-  var newColumnSize = newVisibleColumnKeys.length;
-  var oldColumnSize = oldVisibleColumnKeys.length;
-  if (newColumnSize > oldColumnSize) {
-    return DatasourceAction.COLUMN_ADDED;
-  } else if (newColumnSize < oldColumnSize) {
-    return DatasourceAction.COLUMN_REMOVED;
-  } else {
-    return DatasourceAction.COLUMN_REORDERED;
-  }
-};
 export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var datasourceId = props.datasourceId,
     initialColumnCustomSizes = props.columnCustomSizes,
@@ -88,39 +70,38 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
-  var _useState = useState(undefined),
+  var _useState = useState(viewMode),
     _useState2 = _slicedToArray(_useState, 2),
-    availableSites = _useState2[0],
-    setAvailableSites = _useState2[1];
-  var _useState3 = useState(viewMode),
+    currentViewMode = _useState2[0],
+    setCurrentViewMode = _useState2[1];
+  var _useState3 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
     _useState4 = _slicedToArray(_useState3, 2),
-    currentViewMode = _useState4[0],
-    setCurrentViewMode = _useState4[1];
-  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.cloudId),
+    cloudId = _useState4[0],
+    setCloudId = _useState4[1];
+  var _useAvailableSites = useAvailableSites('jira', cloudId),
+    availableSites = _useAvailableSites.availableSites,
+    selectedJiraSite = _useAvailableSites.selectedSite;
+  var _useState5 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState6 = _slicedToArray(_useState5, 2),
-    cloudId = _useState6[0],
-    setCloudId = _useState6[1];
+    jql = _useState6[0],
+    setJql = _useState6[1];
   var _useState7 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
     _useState8 = _slicedToArray(_useState7, 2),
-    jql = _useState8[0],
-    setJql = _useState8[1];
-  var _useState9 = useState(initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql),
+    searchBarJql = _useState8[0],
+    setSearchBarJql = _useState8[1];
+  var _useState9 = useState(initialVisibleColumnKeys),
     _useState10 = _slicedToArray(_useState9, 2),
-    searchBarJql = _useState10[0],
-    setSearchBarJql = _useState10[1];
-  var _useState11 = useState(initialVisibleColumnKeys),
-    _useState12 = _slicedToArray(_useState11, 2),
-    visibleColumnKeys = _useState12[0],
-    setVisibleColumnKeys = _useState12[1];
+    visibleColumnKeys = _useState10[0],
+    setVisibleColumnKeys = _useState10[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractionActions = useRef(new Set());
   var initialSearchMethod = getBooleanFF('platform.linking-platform.datasource.show-jlol-basic-filters') && !isQueryTooComplex((initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.jql) || '') ? 'basic' : 'jql';
-  var _useState13 = useState(initialSearchMethod),
-    _useState14 = _slicedToArray(_useState13, 2),
-    currentSearchMethod = _useState14[0],
-    setCurrentSearchMethod = _useState14[1];
+  var _useState11 = useState(initialSearchMethod),
+    _useState12 = _slicedToArray(_useState11, 2),
+    currentSearchMethod = _useState12[0],
+    setCurrentSearchMethod = _useState12[1];
   var searchMethodSearchedWith = useRef(null);
   var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   var basicFilterSelectionsSearchedWith = useRef({});
@@ -159,21 +140,6 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useRef = useRef(uuidv4()),
     modalRenderInstanceId = _useRef.current;
-  var selectedJiraSite = 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 = useMemo(function () {
     return {
       extensionKey: extensionKey,
@@ -186,6 +152,14 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
+  useEffect(function () {
+    if (availableSites) {
+      fireEvent('ui.modal.ready.datasource', {
+        instancesCount: availableSites.length,
+        schemasCount: null
+      });
+    }
+  }, [fireEvent, availableSites]);
   useEffect(function () {
     var shouldStartUfoExperience = status === 'loading';
     if (shouldStartUfoExperience) {
@@ -209,37 +183,6 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
-  useEffect(function () {
-    var fetchSiteDisplayNames = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-        var jiraSites, sortedAvailableSites;
-        return _regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return getAvailableSites('jira');
-            case 2:
-              jiraSites = _context.sent;
-              sortedAvailableSites = _toConsumableArray(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]);
   useEffect(function () {
     if (selectedJiraSite && (!cloudId || cloudId !== selectedJiraSite.cloudId)) {
       setCloudId(selectedJiraSite.cloudId);
@@ -289,10 +232,10 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     }
   }, [currentViewMode, status, fireIssueViewAnalytics, fireCountViewedEvent]);
   useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
-  var onSearch = useCallback(function (newParameters, _ref2) {
-    var searchMethod = _ref2.searchMethod,
-      basicFilterSelections = _ref2.basicFilterSelections,
-      isQueryComplex = _ref2.isQueryComplex;
+  var onSearch = useCallback(function (newParameters, _ref) {
+    var searchMethod = _ref.searchMethod,
+      basicFilterSelections = _ref.basicFilterSelections,
+      isQueryComplex = _ref.isQueryComplex;
     searchCount.current++;
     searchMethodSearchedWith.current = searchMethod;
     basicFilterSelectionsSearchedWith.current = basicFilterSelections;

package/dist/types/services/useAvailableSites.d.ts

@@ -0,0 +1,5 @@
+import type { Site } from '../common/types';
+export declare const useAvailableSites: (product: 'confluence' | 'jira', cloudId?: string) => {
+    availableSites: Site[] | undefined;
+    selectedSite: Site | undefined;
+};

package/dist/types/ui/assets-modal/modal/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="react" />
-import { AssetsConfigModalProps } from '../types';
+import { type AssetsConfigModalProps } from '../types';
 export declare const AssetsConfigModal: import("react").ForwardRefExoticComponent<AssetsConfigModalProps & import("@atlaskit/analytics-next").WithContextProps & import("react").RefAttributes<any>>;

package/dist/types/ui/assets-modal/types.d.ts

@@ -1,15 +1,11 @@
-import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
-import { DatasourceAdf, InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import { type DatasourceParameters } from '@atlaskit/linking-types';
+import { type ConfigModalProps } from '../../common/types';
 export type AssetsDatasourceParameters = {
     workspaceId: string;
     aql: string;
     schemaId: string;
 };
 export type AssetsDatasourceAdf = DatasourceAdf<AssetsDatasourceParameters>;
-export interface AssetsConfigModalProps {
-    datasourceId: string;
-    visibleColumnKeys?: string[];
-    parameters?: AssetsDatasourceParameters;
-    onCancel: () => void;
-    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
+export interface AssetsConfigModalProps extends ConfigModalProps<InlineCardAdf | AssetsDatasourceAdf, DatasourceParameters | AssetsDatasourceParameters> {
 }

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

@@ -1,7 +1,5 @@
 /// <reference types="react" />
 import { jsx } from '@emotion/react';
-import { DatasourceAction } from '../../../analytics/types';
 import { type ConfluenceSearchConfigModalProps } from '../types';
-export declare const getColumnAction: (oldVisibleColumnKeys: string[], newVisibleColumnKeys: string[]) => DatasourceAction;
 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>>;

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

@@ -1,7 +1,8 @@
 import { type DatasourceAdf, type InlineCardAdf } from '@atlaskit/linking-common/types';
+import type { DatasourceParameters } from '@atlaskit/linking-types';
 import { type ConfigModalProps } from '../../common/types';
 import { type DateRangeType } from '../common/modal/popup-select/types';
-export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, ConfluenceSearchDatasourceParameters> {
+export interface ConfluenceSearchConfigModalProps extends ConfigModalProps<InlineCardAdf | ConfluenceSearchDatasourceAdf, DatasourceParameters | ConfluenceSearchDatasourceParameters> {
     disableDisplayDropdown?: boolean;
     overrideParameters?: Pick<ConfluenceSearchDatasourceParameters, 'entityTypes'>;
 }