@atlaskit/link-datasource 6.13.0 → 6.13.2

package/dist/cjs/ui/common/modal/popup-select/index.js

@@ -18,7 +18,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _reactIntl = require("react-intl");
 var _popupSelect = require("@atlaskit/select/popup-select");
 var _analytics = require("../../../../analytics");
-var _control = _interopRequireDefault(require("./control"));
+var _CustomControl = require("./CustomControl");
 var _customCheckboxOption = require("./custom-checkbox-option");
 var _dropdownIndicator = _interopRequireDefault(require("./dropdownIndicator"));
 var _footer = _interopRequireDefault(require("./footer"));
@@ -192,7 +192,7 @@ var FilterPopupSelect = exports.FilterPopupSelect = function FilterPopupSelect(_
     menuListProps: menuListProps,
     components: {
       Option: _customCheckboxOption.CustomCheckboxOption,
-      Control: _control.default,
+      Control: _CustomControl.CustomControl,
       MenuList: _menuList.default,
       DropdownIndicator: _dropdownIndicator.default,
       LoadingIndicator: undefined // disables the three ... indicator in the searchbox when picker is loading

package/dist/cjs/ui/issue-like-table/empty-state/index.js

@@ -13,14 +13,14 @@ var React = _react;
 var _runtime = require("@compiled/react/runtime");
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _linkingCommon = require("@atlaskit/linking-common");
+var _skeleton = require("@atlaskit/linking-common/skeleton");
 var _excluded = ["as", "style"];
 /* eslint-disable @atlaskit/design-system/use-tokens-typography */
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SkeletonComponent = function SkeletonComponent(_ref) {
   var width = _ref.width,
     itemName = _ref.itemName;
-  return /*#__PURE__*/React.createElement(_linkingCommon.Skeleton, {
+  return /*#__PURE__*/React.createElement(_skeleton.Skeleton, {
     borderRadius: "var(--ds-radius-small, 8px)",
     testId: "".concat(itemName, "-empty-state-skeleton"),
     height: 14,
@@ -143,7 +143,7 @@ var EmptyState = function EmptyState(_ref5) {
           width: width,
           padding: padding
         }
-      }, /*#__PURE__*/React.createElement(_linkingCommon.Skeleton, {
+      }, /*#__PURE__*/React.createElement(_skeleton.Skeleton, {
         appearance: "darkGray",
         borderRadius: "var(--ds-radius-full, 9999px)",
         testId: "empty-state-skeleton",

package/dist/cjs/ui/issue-like-table/issue-like-data-table-view.js

@@ -24,7 +24,7 @@ var _button = _interopRequireDefault(require("@atlaskit/button/default/button"))
 var _flagsProvider = require("@atlaskit/flag/flags-provider");
 var _sortAscending = _interopRequireDefault(require("@atlaskit/icon/core/sort-ascending"));
 var _sortDescending = _interopRequireDefault(require("@atlaskit/icon/core/sort-descending"));
-var _linkingCommon = require("@atlaskit/linking-common");
+var _skeleton = require("@atlaskit/linking-common/skeleton");
 var _fg = require("@atlaskit/platform-feature-flags/fg");
 var _extractClosestEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge/extract-closest-edge");
 var _reorderWithEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge");
@@ -361,7 +361,7 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
         return {
           content: /*#__PURE__*/React.createElement(_compiled.Box, {
             paddingInline: "space.100"
-          }, /*#__PURE__*/React.createElement(_linkingCommon.Skeleton, {
+          }, /*#__PURE__*/React.createElement(_skeleton.Skeleton, {
             borderRadius: "var(--ds-radius-large, 8px)",
             width: "100%",
             height: 14,

package/dist/es2019/analytics/xpc/useDatasourceCrossProductAttribution.js

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import { useCrossProductUrlWrapper } from '@atlaskit/analytics-cross-product/useCrossProductUrlWrapper';
-import { useSmartCardContext } from '@atlaskit/link-provider/context';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 import { functionWithFG } from '@atlaskit/platform-feature-flags-react/function-with-fg';
 const DATASOURCE_XPC_BRIDGE = 'linkDatasource';
 const XPC_QUERY_PARAM = 'xpis';

package/dist/es2019/hooks/useErrorLogger.js

@@ -1,6 +1,6 @@
 import { useCallback } from 'react';
 import { NetworkError } from '@atlaskit/linking-common';
-import { getTraceId } from '@atlaskit/linking-common/utils';
+import { getTraceId } from '@atlaskit/linking-common/utils/get-trace-id';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { logToSentry } from './logToSentry';
 const getNetworkFields = error => {

package/dist/es2019/hooks/useIsInPDFRender.js

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useSmartCardContext } from '@atlaskit/link-provider';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 export const useIsInPDFRender = () => {
   const smartCardContext = useSmartCardContext();
   return useMemo(() => {

package/dist/es2019/index.js

@@ -1,17 +1,17 @@
 /** @deprecated Use @atlaskit/link-datasource/confluence-search-modal */
-export { default as ConfluenceSearchConfigModal } from './ui/confluence-search-modal';
+export { ConfluenceSearchConfigModalWithWrappers as ConfluenceSearchConfigModal } from './ui/confluence-search-modal/ConfluenceSearchConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/jira-issues-modal */
-export { default as JiraIssuesConfigModal } from './ui/jira-issues-modal';
+export { JiraIssuesConfigModalWithWrappers as JiraIssuesConfigModal } from './ui/jira-issues-modal/JiraIssuesConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/assets-modal */
-export { default as AssetsConfigModal } from './ui/assets-modal';
+export { AssetsConfigModalWithWrappers as AssetsConfigModal } from './ui/assets-modal/AssetsConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/datasource-table-view */
-export { default as DatasourceTableView } from './ui/datasource-table-view';
+export { DatasourceTableViewWithWrappers as DatasourceTableView } from './ui/datasource-table-view/DatasourceTableViewWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/assets-modal (AssetsConfigModal) */
-export { default as JSMAssetsConfigModal } from './ui/assets-modal';
+export { AssetsConfigModalWithWrappers as JSMAssetsConfigModal } from './ui/assets-modal/AssetsConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/utils/schema */
 export { buildDatasourceAdf } from './common/utils/schema-utils';

package/dist/es2019/services/__clearUnitsRolloutSettingsCacheForTests.js

@@ -0,0 +1,8 @@
+import { cache } from './getUnitsRolloutSettings';
+
+/**
+ * Test-only: clear the cached units rollout settings so each test starts with a clean slate.
+ */
+export const __clearUnitsRolloutSettingsCacheForTests = () => {
+  cache.promise = undefined;
+};

package/dist/es2019/services/fetchObjectSchema.js

@@ -1,4 +1,4 @@
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/es2019/services/fetchObjectSchemas.js

@@ -1,4 +1,4 @@
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/es2019/services/getAvailableSites.js

@@ -1,5 +1,5 @@
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/hooks';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isUnitsIsolationEnabled } from './isUnitsIsolationEnabled';
 export const getAccessibleProducts = async product => {
   const requestConfig = {
     method: 'POST',
@@ -13,7 +13,7 @@ export const getAccessibleProducts = async product => {
       productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
     })
   };
-  const endpoint = fg('linking_platform_link_datasource_unit_compliant') ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
+  const endpoint = (await isUnitsIsolationEnabled()) ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
   const response = await fetch(endpoint, requestConfig);
   if (response.ok) {
     const res = await response.json();

package/dist/es2019/services/getUnitsRolloutSettings.js

@@ -0,0 +1,112 @@
+import { request } from '@atlaskit/linking-common';
+const AGG_URL = '/gateway/api/graphql';
+const TENANT_CONTEXT_OPERATION_NAME = 'link_datasource_tenantContext';
+const UNITS_ROLLOUT_SETTINGS_OPERATION_NAME = 'link_datasource_unitSettings';
+
+/**
+ * `Query.admin_unitSettings` is keyed by org id, which the browser does not know, so the org id
+ * is resolved from the host the product is currently served from.
+ */
+export const tenantContextQuery = `
+	query ${TENANT_CONTEXT_OPERATION_NAME}($hostNames: [String!]) {
+		tenantContexts(hostNames: $hostNames) {
+			orgId
+		}
+	}
+`;
+
+/**
+ * `admin_unitSettings` exposes both flags of the rollout and is callable with the session of the
+ * end user, so no opt-in directive or admin OAuth scope is needed from the browser.
+ */
+export const unitsRolloutSettingsQuery = `
+	query ${UNITS_ROLLOUT_SETTINGS_OPERATION_NAME}($orgId: ID!) {
+		admin_unitSettings(orgId: $orgId) {
+			boundaryEnforced
+			endUsersLaunched
+		}
+	}
+`;
+/**
+ * When the rollout settings cannot be resolved we keep the pre-isolation behaviour, which is
+ * what every org gets today while the unit settings are unset. The settings are only
+ * written when an org is activated - they are not backfilled - so `null` is expected for orgs
+ * that have not been activated yet and must be read as `false`.
+ */
+const DEFAULT_SETTINGS = {
+  boundaryEnforced: false,
+  endUsersLaunched: false
+};
+
+/**
+ * Holds the in-flight/resolved request so that the settings are only fetched once per page load.
+ */
+export const cache = {};
+
+/**
+ * AGG answers with a 200 and an `errors` array for query level failures, so those have to be
+ * turned into a rejection explicitly rather than being read as an empty response.
+ */
+const requestGraphQL = async (operationName, query, variables) => {
+  var _response$errors, _response$data;
+  const response = await request('post', AGG_URL, {
+    operationName,
+    query,
+    variables
+  });
+  if (response !== null && response !== void 0 && (_response$errors = response.errors) !== null && _response$errors !== void 0 && _response$errors.length) {
+    const messages = response.errors.map(error => error === null || error === void 0 ? void 0 : error.message).filter(Boolean).join(', ');
+    throw new Error(`${operationName} failed: ${messages || 'unknown error'}`);
+  }
+  return (_response$data = response === null || response === void 0 ? void 0 : response.data) !== null && _response$data !== void 0 ? _response$data : undefined;
+};
+const fetchOrgId = async () => {
+  var _window$location;
+  const hostName = typeof window !== 'undefined' ? (_window$location = window.location) === null || _window$location === void 0 ? void 0 : _window$location.hostname : undefined;
+  if (!hostName) {
+    return undefined;
+  }
+  const data = await requestGraphQL(TENANT_CONTEXT_OPERATION_NAME, tenantContextQuery, {
+    hostNames: [hostName]
+  });
+  for (const tenantContext of (_data$tenantContexts = data === null || data === void 0 ? void 0 : data.tenantContexts) !== null && _data$tenantContexts !== void 0 ? _data$tenantContexts : []) {
+    var _data$tenantContexts;
+    if (tenantContext !== null && tenantContext !== void 0 && tenantContext.orgId) {
+      return tenantContext.orgId;
+    }
+  }
+  return undefined;
+};
+const fetchUnitsRolloutSettings = async () => {
+  var _settings$boundaryEnf, _settings$endUsersLau;
+  const orgId = await fetchOrgId();
+  if (!orgId) {
+    return DEFAULT_SETTINGS;
+  }
+  const data = await requestGraphQL(UNITS_ROLLOUT_SETTINGS_OPERATION_NAME, unitsRolloutSettingsQuery, {
+    orgId
+  });
+  const settings = data === null || data === void 0 ? void 0 : data.admin_unitSettings;
+  return {
+    boundaryEnforced: (_settings$boundaryEnf = settings === null || settings === void 0 ? void 0 : settings.boundaryEnforced) !== null && _settings$boundaryEnf !== void 0 ? _settings$boundaryEnf : false,
+    endUsersLaunched: (_settings$endUsersLau = settings === null || settings === void 0 ? void 0 : settings.endUsersLaunched) !== null && _settings$endUsersLau !== void 0 ? _settings$endUsersLau : false
+  };
+};
+
+/**
+ * Reads the org's units rollout settings (`boundaryEnforced` and `endUsersLaunched`) from the
+ * TCS key exposed by AGG's `Query.admin_unitSettings`.
+ *
+ * The result is cached for the lifetime of the page because the settings only change when an
+ * admin activates or launches units, which requires a reload to be picked up anyway. A failed
+ * request is not cached so that a later call can retry.
+ */
+export const getUnitsRolloutSettings = () => {
+  if (!cache.promise) {
+    cache.promise = fetchUnitsRolloutSettings().catch(() => {
+      cache.promise = undefined;
+      return DEFAULT_SETTINGS;
+    });
+  }
+  return cache.promise;
+};

package/dist/es2019/services/getWorkspaceId.js

@@ -1,4 +1,4 @@
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/es2019/services/isUnitsIsolationEnabled.js

@@ -0,0 +1,34 @@
+import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { getUnitsRolloutSettings } from './getUnitsRolloutSettings';
+
+/**
+ * Whether unit isolation behaviour should be applied for the current org.
+ *
+ * An org is isolated when units GA is on, the org has been opted in to the rollout - either by
+ * org id or by cloud id - *and* the org has actually launched units with boundary enforcement
+ * turned on:
+ *
+ * `cc-units-ga on -> (orgId gate on || cloudId gate on) -> endUsersLaunched && boundaryEnforced -> isolate`
+ *
+ * `cc-units-ga` is the units GA master gate and acts as the killswitch: while it is off nothing
+ * else is evaluated and the current, non-isolated behaviour is kept. The AGG call is only made
+ * when one of the rollout gates passes, so orgs outside of the rollout do not pay for an extra
+ * request.
+ */
+export const isUnitsIsolationEnabled = async () => {
+  if (!fg('cc-units-ga')) {
+    return false;
+  }
+
+  // Both rollout gates are always evaluated so that exposure is recorded consistently.
+  const isOrgInRollout = fg('linking_platform_link_datasource_unit_compliant');
+  const isCloudInRollout = fg('linking_platform_link_datasource_unit_compliant_cloud_id');
+  if (!isOrgInRollout && !isCloudInRollout) {
+    return false;
+  }
+  const {
+    boundaryEnforced,
+    endUsersLaunched
+  } = await getUnitsRolloutSettings();
+  return boundaryEnforced && endUsersLaunched;
+};

package/dist/es2019/services/resolvePrimaryWorkspace.js

@@ -1,4 +1,4 @@
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 // Resolves the primary Unit workspace via the unit-aware resolver, keyed by the
 // current-site cloudId. Gated at the call-site behind
 // `astral_units_workspace_host_resolver`.

package/dist/es2019/services/useBasicFilterAGG.js

@@ -1,5 +1,5 @@
 import { useCallback, useMemo } from 'react';
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { fieldValuesQuery, hydrateJQLQuery, userHydration, userQuery } from './utils';
 const AGG_BASE_URL = '/gateway/api/graphql';
 export const useBasicFilterAGG = () => {

package/dist/es2019/services/validateAql.js

@@ -1,4 +1,4 @@
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/es2019/ui/assets-modal/search-container/aql-search-input/loading-state.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Skeleton } from '@atlaskit/linking-common';
+import { Skeleton } from '@atlaskit/linking-common/skeleton';
 export const AssetsAqlSearchInputSkeleton = () => /*#__PURE__*/React.createElement(Skeleton, {
   width: "100%",
   height: "40px",

package/dist/es2019/ui/assets-modal/search-container/object-schema-select/loading-state.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Skeleton } from '@atlaskit/linking-common';
+import { Skeleton } from '@atlaskit/linking-common/skeleton';
 export const AssetsObjectSchemaSelectSkeleton = () => /*#__PURE__*/React.createElement(Skeleton, {
   width: "100%",
   height: "40px",

package/dist/es2019/ui/common/modal/popup-select/index.js

@@ -4,7 +4,7 @@ import isEqual from 'lodash/isEqual';
 import { useIntl } from 'react-intl';
 import { PopupSelect } from '@atlaskit/select/popup-select';
 import { useDatasourceAnalyticsEvents } from '../../../../analytics';
-import CustomControl from './control';
+import { CustomControl } from './CustomControl';
 import { CustomCheckboxOption } from './custom-checkbox-option';
 import CustomDropdownIndicator from './dropdownIndicator';
 import PopupFooter from './footer';

package/dist/es2019/ui/issue-like-table/empty-state/index.js

@@ -6,7 +6,7 @@ import * as React from 'react';
 import { ax, ix } from "@compiled/react/runtime";
 /* eslint-disable @atlaskit/design-system/use-tokens-typography */
 
-import { Skeleton } from '@atlaskit/linking-common';
+import { Skeleton } from '@atlaskit/linking-common/skeleton';
 const SkeletonComponent = ({
   width,
   itemName

package/dist/es2019/ui/issue-like-table/issue-like-data-table-view.js

@@ -13,7 +13,7 @@ import Button from '@atlaskit/button/default/button';
 import { FlagsProvider } from '@atlaskit/flag/flags-provider';
 import SortAscendingIcon from '@atlaskit/icon/core/sort-ascending';
 import SortDescendingIcon from '@atlaskit/icon/core/sort-descending';
-import { Skeleton } from '@atlaskit/linking-common';
+import { Skeleton } from '@atlaskit/linking-common/skeleton';
 import { fg } from '@atlaskit/platform-feature-flags/fg';
 import { extractClosestEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/closest-edge/extract-closest-edge';
 import { reorderWithEdge } from '@atlaskit/pragmatic-drag-and-drop-hitbox/util/reorder-with-edge';

package/dist/esm/analytics/xpc/useDatasourceCrossProductAttribution.js

@@ -3,7 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { useCallback } from 'react';
 import { useCrossProductUrlWrapper } from '@atlaskit/analytics-cross-product/useCrossProductUrlWrapper';
-import { useSmartCardContext } from '@atlaskit/link-provider/context';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 import { functionWithFG } from '@atlaskit/platform-feature-flags-react/function-with-fg';
 var DATASOURCE_XPC_BRIDGE = 'linkDatasource';
 var XPC_QUERY_PARAM = 'xpis';

package/dist/esm/hooks/useErrorLogger.js

@@ -3,7 +3,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 { useCallback } from 'react';
 import { NetworkError } from '@atlaskit/linking-common';
-import { getTraceId } from '@atlaskit/linking-common/utils';
+import { getTraceId } from '@atlaskit/linking-common/utils/get-trace-id';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { logToSentry } from './logToSentry';
 var getNetworkFields = function getNetworkFields(error) {

package/dist/esm/hooks/useIsInPDFRender.js

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useSmartCardContext } from '@atlaskit/link-provider';
+import { useSmartCardContext } from '@atlaskit/link-provider/use-smart-card-context';
 export var useIsInPDFRender = function useIsInPDFRender() {
   var smartCardContext = useSmartCardContext();
   return useMemo(function () {

package/dist/esm/index.js

@@ -1,17 +1,17 @@
 /** @deprecated Use @atlaskit/link-datasource/confluence-search-modal */
-export { default as ConfluenceSearchConfigModal } from './ui/confluence-search-modal';
+export { ConfluenceSearchConfigModalWithWrappers as ConfluenceSearchConfigModal } from './ui/confluence-search-modal/ConfluenceSearchConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/jira-issues-modal */
-export { default as JiraIssuesConfigModal } from './ui/jira-issues-modal';
+export { JiraIssuesConfigModalWithWrappers as JiraIssuesConfigModal } from './ui/jira-issues-modal/JiraIssuesConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/assets-modal */
-export { default as AssetsConfigModal } from './ui/assets-modal';
+export { AssetsConfigModalWithWrappers as AssetsConfigModal } from './ui/assets-modal/AssetsConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/datasource-table-view */
-export { default as DatasourceTableView } from './ui/datasource-table-view';
+export { DatasourceTableViewWithWrappers as DatasourceTableView } from './ui/datasource-table-view/DatasourceTableViewWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/assets-modal (AssetsConfigModal) */
-export { default as JSMAssetsConfigModal } from './ui/assets-modal';
+export { AssetsConfigModalWithWrappers as JSMAssetsConfigModal } from './ui/assets-modal/AssetsConfigModalWithWrappers';
 
 /** @deprecated Use @atlaskit/link-datasource/utils/schema */
 export { buildDatasourceAdf } from './common/utils/schema-utils';

package/dist/esm/services/__clearUnitsRolloutSettingsCacheForTests.js

@@ -0,0 +1,8 @@
+import { cache } from './getUnitsRolloutSettings';
+
+/**
+ * Test-only: clear the cached units rollout settings so each test starts with a clean slate.
+ */
+export var __clearUnitsRolloutSettingsCacheForTests = function __clearUnitsRolloutSettingsCacheForTests() {
+  cache.promise = undefined;
+};

package/dist/esm/services/fetchObjectSchema.js

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/esm/services/fetchObjectSchemas.js

@@ -1,6 +1,6 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { request } from '@atlaskit/linking-common';
+import { request } from '@atlaskit/linking-common/api';
 import { FetchError } from './FetchError';
 import { PermissionError } from './PermissionError';
 import { getStatusCodeGroup } from './getStatusCodeGroup';

package/dist/esm/services/getAvailableSites.js

@@ -1,10 +1,10 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/hooks';
-import { fg } from '@atlaskit/platform-feature-flags/fg';
+import { isUnitsIsolationEnabled } from './isUnitsIsolationEnabled';
 export var getAccessibleProducts = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(product) {
-    var requestConfig, endpoint, response, res, _t, _t2, _t3;
+    var requestConfig, endpoint, response, res, _t, _t2, _t3, _t4;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -20,35 +20,48 @@ export var getAccessibleProducts = /*#__PURE__*/function () {
               productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
             })
           };
-          endpoint = fg('linking_platform_link_datasource_unit_compliant') ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
           _context.next = 1;
-          return fetch(endpoint, requestConfig);
+          return isUnitsIsolationEnabled();
         case 1:
-          response = _context.sent;
-          if (!response.ok) {
-            _context.next = 3;
+          if (!_context.sent) {
+            _context.next = 2;
             break;
           }
-          _context.next = 2;
-          return response.json();
+          _t = '/gateway/api/experimental/v2/accessible-products';
+          _context.next = 3;
+          break;
         case 2:
-          res = _context.sent;
-          return _context.abrupt("return", mapAccessibleProductsToAvailableSites(res.data));
+          _t = '/gateway/api/v2/accessible-products';
         case 3:
-          _t = Error;
+          endpoint = _t;
           _context.next = 4;
-          return response.text();
+          return fetch(endpoint, requestConfig);
         case 4:
-          _t2 = _context.sent;
-          if (_t2) {
-            _context.next = 5;
+          response = _context.sent;
+          if (!response.ok) {
+            _context.next = 6;
             break;
           }
-          _t2 = 'Something went wrong';
+          _context.next = 5;
+          return response.json();
         case 5:
-          _t3 = _t2;
-          throw new _t(_t3);
+          res = _context.sent;
+          return _context.abrupt("return", mapAccessibleProductsToAvailableSites(res.data));
         case 6:
+          _t2 = Error;
+          _context.next = 7;
+          return response.text();
+        case 7:
+          _t3 = _context.sent;
+          if (_t3) {
+            _context.next = 8;
+            break;
+          }
+          _t3 = 'Something went wrong';
+        case 8:
+          _t4 = _t3;
+          throw new _t2(_t4);
+        case 9:
         case "end":
           return _context.stop();
       }