@atlaskit/link-datasource 6.1.12 → 6.2.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 6.2.0
+
+### Minor Changes
+
+- [`fea8ee4d97d15`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fea8ee4d97d15) -
+  Assets macro in Confluence now resolves the primary Unit workspace on non-primary sites via an
+  in-package unit-aware resolver, behind the astral_units_workspace_host_resolver gate (default
+  off). Gate-off and single-site behaviour is unchanged.
+
 ## 6.1.12
 
 ### Patch Changes

package/dist/cjs/hooks/useAssetsClient.js

@@ -9,8 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
+var _getMeta2 = require("../services/getMeta");
 var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
   if (error instanceof Error) {
     errorSetter(error);
@@ -19,6 +21,7 @@ var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, er
   }
 };
 var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initialParameters) {
+  var _getMeta;
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     loading = _useState2[0],
@@ -54,6 +57,9 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
 
+  // cloudId resolved from <meta name="ajs-cloud-id"> rendered by the host page.
+  var cloudId = (_getMeta = (0, _getMeta2.getMeta)('ajs-cloud-id')) !== null && _getMeta !== void 0 ? _getMeta : '';
+
   /*
    * We wrap this in nested try/catch blocks because we want to handle
    * workspaceError/existingObjectSchemaError/objectSchemasError differently
@@ -61,67 +67,91 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
    */
   (0, _react.useEffect)(function () {
     (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _workspaceId, fetchedObjectSchema, fetchedObjectSchemasResponse, _t, _t2, _t3;
+      var _workspaceId, _yield$resolvePrimary, fetchedObjectSchema, fetchedObjectSchemasResponse, _t, _t2, _t3, _t4;
       return _regenerator.default.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
             setWorkspaceError(undefined);
             _context.prev = 1;
-            _context.next = 2;
+            if (!(cloudId && (0, _platformFeatureFlags.fg)('astral_units_workspace_host_resolver'))) {
+              _context.next = 7;
+              break;
+            }
+            _context.prev = 2;
+            _context.next = 3;
+            return (0, _cmdbService.resolvePrimaryWorkspace)(cloudId);
+          case 3:
+            _yield$resolvePrimary = _context.sent;
+            _workspaceId = _yield$resolvePrimary.workspaceId;
+            _context.next = 6;
+            break;
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](2);
+            _context.next = 5;
+            return (0, _cmdbService.getWorkspaceId)(fireEvent);
+          case 5:
+            _workspaceId = _context.sent;
+          case 6:
+            _context.next = 9;
+            break;
+          case 7:
+            _context.next = 8;
             return (0, _cmdbService.getWorkspaceId)(fireEvent);
-          case 2:
+          case 8:
             _workspaceId = _context.sent;
+          case 9:
             setWorkspaceId(_workspaceId);
             // Check schema from initial parameters still exists and fetch name/permissions for schema select
             if (!(initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId)) {
-              _context.next = 6;
+              _context.next = 13;
               break;
             }
-            _context.prev = 3;
-            _context.next = 4;
+            _context.prev = 10;
+            _context.next = 11;
             return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
-          case 4:
+          case 11:
             fetchedObjectSchema = _context.sent;
             setExistingObjectSchema(fetchedObjectSchema);
-            _context.next = 6;
+            _context.next = 13;
             break;
-          case 5:
-            _context.prev = 5;
-            _t = _context["catch"](3);
-            handleAssetsClientErrors(setExistingObjectSchemaError, _t);
-          case 6:
-            _context.prev = 6;
-            _context.next = 7;
+          case 12:
+            _context.prev = 12;
+            _t2 = _context["catch"](10);
+            handleAssetsClientErrors(setExistingObjectSchemaError, _t2);
+          case 13:
+            _context.prev = 13;
+            _context.next = 14;
             return (0, _cmdbService.fetchObjectSchemas)(_workspaceId, undefined, fireEvent);
-          case 7:
+          case 14:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
             setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
-            _context.next = 9;
+            _context.next = 16;
             break;
-          case 8:
-            _context.prev = 8;
-            _t2 = _context["catch"](6);
-            handleAssetsClientErrors(setObjectSchemasError, _t2);
-          case 9:
-            _context.next = 11;
+          case 15:
+            _context.prev = 15;
+            _t3 = _context["catch"](13);
+            handleAssetsClientErrors(setObjectSchemasError, _t3);
+          case 16:
+            _context.next = 18;
             break;
-          case 10:
-            _context.prev = 10;
-            _t3 = _context["catch"](1);
-            handleAssetsClientErrors(setWorkspaceError, _t3);
-          case 11:
-            _context.prev = 11;
+          case 17:
+            _context.prev = 17;
+            _t4 = _context["catch"](1);
+            handleAssetsClientErrors(setWorkspaceError, _t4);
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(11);
-          case 12:
+            return _context.finish(18);
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 11, 12], [3, 5], [6, 8]]);
+      }, _callee, null, [[1, 17, 18, 19], [2, 4], [10, 12], [13, 15]]);
     }))();
-  }, [initialParameters, fireEvent]);
+  }, [initialParameters, fireEvent, cloudId]);
   return {
     workspaceId: workspaceId,
     workspaceError: workspaceError,

package/dist/cjs/services/cmdbService.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.validateAql = exports.getWorkspaceId = exports.fetchObjectSchemas = exports.fetchObjectSchema = void 0;
+exports.validateAql = exports.resolvePrimaryWorkspace = exports.getWorkspaceId = exports.fetchObjectSchemas = exports.fetchObjectSchema = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _linkingCommon = require("@atlaskit/linking-common");
@@ -53,26 +53,62 @@ var getWorkspaceId = exports.getWorkspaceId = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-var validateAql = exports.validateAql = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data, fireEvent) {
-    var url, response, error, _t2;
+
+// 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`.
+var resolvePrimaryWorkspace = exports.resolvePrimaryWorkspace = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(cloudId) {
+    var url, res;
     return _regenerator.default.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = '/assets/internal/workspace?productContext=confluence';
+          _context2.next = 1;
+          return (0, _linkingCommon.request)('get', url, undefined, {
+            'x-atlassian-cloud-id': cloudId
+          }, [200]);
+        case 1:
+          res = _context2.sent;
+          if (res !== null && res !== void 0 && res.linkedAssetsWorkspaceId) {
+            _context2.next = 2;
+            break;
+          }
+          throw new Error('Assets workspace resolver returned no workspaceId');
+        case 2:
+          return _context2.abrupt("return", {
+            workspaceId: res.linkedAssetsWorkspaceId
+          });
+        case 3:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function resolvePrimaryWorkspace(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+var validateAql = exports.validateAql = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, data, fireEvent) {
+    var url, response, error, _t2;
+    return _regenerator.default.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/aql/validate");
-          _context2.prev = 1;
-          _context2.next = 2;
+          _context3.prev = 1;
+          _context3.next = 2;
           return (0, _linkingCommon.request)('post', url, {
             qlQuery: data.qlQuery,
             context: 'SMART_LINKS'
           }, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context2.sent;
+          response = _context3.sent;
           fireEvent && fireEvent('operational.validateAql.success', {});
-          return _context2.abrupt("return", response);
+          return _context3.abrupt("return", response);
         case 3:
-          _context2.prev = 3;
-          _t2 = _context2["catch"](1);
+          _context3.prev = 3;
+          _t2 = _context3["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_t2);
           if (error instanceof _cmdbService.FetchError) {
             fireEvent && fireEvent('operational.validateAql.failed', {
@@ -85,31 +121,31 @@ var validateAql = exports.validateAql = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[1, 3]]);
+    }, _callee3, null, [[1, 3]]);
   }));
-  return function validateAql(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
+  return function validateAql(_x3, _x4, _x5) {
+    return _ref3.apply(this, arguments);
   };
 }();
 var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, schemaId, fireEvent) {
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, schemaId, fireEvent) {
     var url, response, error, _t3;
-    return _regenerator.default.wrap(function (_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regenerator.default.wrap(function (_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/").concat(schemaId);
-          _context3.prev = 1;
-          _context3.next = 2;
+          _context4.prev = 1;
+          _context4.next = 2;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context3.sent;
+          response = _context4.sent;
           fireEvent && fireEvent('operational.objectSchema.success', {});
-          return _context3.abrupt("return", response);
+          return _context4.abrupt("return", response);
         case 3:
-          _context3.prev = 3;
-          _t3 = _context3["catch"](1);
+          _context4.prev = 3;
+          _t3 = _context4["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_t3);
           if (error instanceof _cmdbService.FetchError) {
             fireEvent && fireEvent('operational.objectSchema.failed', {
@@ -122,35 +158,35 @@ var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3, null, [[1, 3]]);
+    }, _callee4, null, [[1, 3]]);
   }));
-  return function fetchObjectSchema(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
+  return function fetchObjectSchema(_x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
   };
 }();
 var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, query, fireEvent) {
+  var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(workspaceId, query, fireEvent) {
     var queryParams, url, response, error, _t4;
-    return _regenerator.default.wrap(function (_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regenerator.default.wrap(function (_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           queryParams = new URLSearchParams();
           queryParams.set('maxResults', '20');
           queryParams.set('includeCounts', 'false');
           query && queryParams.set('query', query);
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/list?").concat(queryParams);
-          _context4.prev = 1;
-          _context4.next = 2;
+          _context5.prev = 1;
+          _context5.next = 2;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context4.sent;
+          response = _context5.sent;
           fireEvent && fireEvent('operational.objectSchemas.success', {});
-          return _context4.abrupt("return", response);
+          return _context5.abrupt("return", response);
         case 3:
-          _context4.prev = 3;
-          _t4 = _context4["catch"](1);
+          _context5.prev = 3;
+          _t4 = _context5["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_t4);
           if (error instanceof _cmdbService.FetchError) {
             fireEvent && fireEvent('operational.objectSchemas.failed', {
@@ -163,11 +199,11 @@ var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4, null, [[1, 3]]);
+    }, _callee5, null, [[1, 3]]);
   }));
-  return function fetchObjectSchemas(_x8, _x9, _x0) {
-    return _ref4.apply(this, arguments);
+  return function fetchObjectSchemas(_x9, _x0, _x1) {
+    return _ref5.apply(this, arguments);
   };
 }();

package/dist/cjs/services/getMeta.js

@@ -0,0 +1,33 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getMeta = exports.__clearMetaCacheForTests = void 0;
+/**
+ * Read a `<meta name="...">` tag's content from the current document, with
+ * per-name caching. Browser-only: returns `undefined` under SSR or when absent.
+ */
+var cache = new Map();
+var getMeta = exports.getMeta = function getMeta(name) {
+  var _document$querySelect, _document$querySelect2;
+  if (typeof document === 'undefined') {
+    return undefined;
+  }
+  if (cache.has(name)) {
+    return cache.get(name);
+  }
+
+  // `name` is interpolated into a CSS attribute selector
+  var escapedName = typeof CSS !== 'undefined' && CSS.escape ? CSS.escape(name) : name;
+  var value = (_document$querySelect = (_document$querySelect2 = document.querySelector("meta[name=\"".concat(escapedName, "\"]"))) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.getAttribute('content')) !== null && _document$querySelect !== void 0 ? _document$querySelect : undefined;
+  cache.set(name, value);
+  return value;
+};
+
+/**
+ * Test-only: clear the cache so each test starts with a clean slate.
+ */
+var __clearMetaCacheForTests = exports.__clearMetaCacheForTests = function __clearMetaCacheForTests() {
+  cache.clear();
+};

package/dist/cjs/types/assets/types.js

@@ -4,6 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.objectSchemaKey = exports.aqlKey = void 0;
+/**
+ * Wire shape of the unit-aware `/assets/internal/workspace` resolver response.
+ * `linkedAssetsWorkspaceId` is the workspace of the Unit's primary Assets site.
+ */
+
 // These are to enforce the field "name" property and keep everything typed
 var objectSchemaKey = exports.objectSchemaKey = 'objectSchema';
 var aqlKey = exports.aqlKey = 'aql';

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -17,7 +17,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _reactIntl = require("react-intl");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
-var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
+var _main = _interopRequireDefault(require("@atlaskit/intl-messages-provider/main"));
 var _modalDialog = require("@atlaskit/modal-dialog");
 var _analytics = require("../../../analytics");
 var _constants = require("../../../analytics/constants");
@@ -335,7 +335,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       actions: userInteractions.get()
     });
   }, [analyticsPayload, userInteractions]);
-  return /*#__PURE__*/React.createElement(_intlMessagesProvider.IntlMessagesProvider, {
+  return /*#__PURE__*/React.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
   }, /*#__PURE__*/React.createElement(_modalDialog.ModalTransition, null, /*#__PURE__*/React.createElement(_datasourceModal.DatasourceModal, {

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

@@ -14,7 +14,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
-var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
+var _main = _interopRequireDefault(require("@atlaskit/intl-messages-provider/main"));
 var _link = _interopRequireDefault(require("@atlaskit/link"));
 var _modalDialog = require("@atlaskit/modal-dialog");
 var _compiled = require("@atlaskit/primitives/compiled");
@@ -334,7 +334,7 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
       actions: userInteractions.get()
     };
   }, [destinationObjectTypes, extensionKey, userInteractions]);
-  return /*#__PURE__*/_react.default.createElement(_intlMessagesProvider.IntlMessagesProvider, {
+  return /*#__PURE__*/_react.default.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
   }, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -15,7 +15,7 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _analyticsNext = require("@atlaskit/analytics-next");
-var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
+var _main = _interopRequireDefault(require("@atlaskit/intl-messages-provider/main"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _analytics = require("../../analytics");
 var _constants = require("../../analytics/constants");
@@ -209,7 +209,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       url: url
     });
   }
-  return /*#__PURE__*/React.createElement(_intlMessagesProvider.IntlMessagesProvider, {
+  return /*#__PURE__*/React.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
   }, /*#__PURE__*/React.createElement("div", {

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

@@ -15,7 +15,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _reactIntl = require("react-intl");
 var _featureGateJsClient = _interopRequireDefault(require("@atlaskit/feature-gate-js-client"));
-var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
+var _main = _interopRequireDefault(require("@atlaskit/intl-messages-provider/main"));
 var _link = _interopRequireDefault(require("@atlaskit/link"));
 var _modalDialog = require("@atlaskit/modal-dialog");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
@@ -382,7 +382,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
   var updateParametersJql = (0, _react.useCallback)(function (parameters) {
     parameters.jql = searchBarJql;
   }, [searchBarJql]);
-  return /*#__PURE__*/_react.default.createElement(_intlMessagesProvider.IntlMessagesProvider, {
+  return /*#__PURE__*/_react.default.createElement(_main.default, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
   }, /*#__PURE__*/_react.default.createElement(_modalDialog.ModalTransition, null, /*#__PURE__*/_react.default.createElement(_datasourceModal.DatasourceModal, {

package/dist/es2019/hooks/useAssetsClient.js

@@ -1,6 +1,8 @@
 import { useEffect, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
-import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
+import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId, resolvePrimaryWorkspace } from '../services/cmdbService';
+import { getMeta } from '../services/getMeta';
 const handleAssetsClientErrors = (errorSetter, error) => {
   if (error instanceof Error) {
     errorSetter(error);
@@ -9,6 +11,7 @@ const handleAssetsClientErrors = (errorSetter, error) => {
   }
 };
 export const useAssetsClient = initialParameters => {
+  var _getMeta;
   const [loading, setLoading] = useState(false);
   const [workspaceId, setWorkspaceId] = useState();
   const [workspaceError, setWorkspaceError] = useState();
@@ -21,6 +24,9 @@ export const useAssetsClient = initialParameters => {
     fireEvent
   } = useDatasourceAnalyticsEvents();
 
+  // cloudId resolved from <meta name="ajs-cloud-id"> rendered by the host page.
+  const cloudId = (_getMeta = getMeta('ajs-cloud-id')) !== null && _getMeta !== void 0 ? _getMeta : '';
+
   /*
    * We wrap this in nested try/catch blocks because we want to handle
    * workspaceError/existingObjectSchemaError/objectSchemasError differently
@@ -31,7 +37,20 @@ export const useAssetsClient = initialParameters => {
       setLoading(true);
       setWorkspaceError(undefined);
       try {
-        const workspaceId = await getWorkspaceId(fireEvent);
+        // When the gate is on and a cloudId is present, resolve the primary Unit
+        // workspace; on any failure fall back to the legacy current-site lookup.
+        let workspaceId;
+        if (cloudId && fg('astral_units_workspace_host_resolver')) {
+          try {
+            ({
+              workspaceId
+            } = await resolvePrimaryWorkspace(cloudId));
+          } catch (resolvePrimaryWorkspaceError) {
+            workspaceId = await getWorkspaceId(fireEvent);
+          }
+        } else {
+          workspaceId = await getWorkspaceId(fireEvent);
+        }
         setWorkspaceId(workspaceId);
         // Check schema from initial parameters still exists and fetch name/permissions for schema select
         if (initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId) {
@@ -55,7 +74,7 @@ export const useAssetsClient = initialParameters => {
         setLoading(false);
       }
     })();
-  }, [initialParameters, fireEvent]);
+  }, [initialParameters, fireEvent, cloudId]);
   return {
     workspaceId,
     workspaceError,

package/dist/es2019/services/cmdbService.js

@@ -24,6 +24,22 @@ export const getWorkspaceId = async fireEvent => {
     throw error;
   }
 };
+
+// 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`.
+export const resolvePrimaryWorkspace = async cloudId => {
+  const url = '/assets/internal/workspace?productContext=confluence';
+  const res = await request('get', url, undefined, {
+    'x-atlassian-cloud-id': cloudId
+  }, [200]);
+  if (!(res !== null && res !== void 0 && res.linkedAssetsWorkspaceId)) {
+    throw new Error('Assets workspace resolver returned no workspaceId');
+  }
+  return {
+    workspaceId: res.linkedAssetsWorkspaceId
+  };
+};
 export const validateAql = async (workspaceId, data, fireEvent) => {
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/aql/validate`;
   try {

package/dist/es2019/services/getMeta.js

@@ -0,0 +1,27 @@
+/**
+ * Read a `<meta name="...">` tag's content from the current document, with
+ * per-name caching. Browser-only: returns `undefined` under SSR or when absent.
+ */
+const cache = new Map();
+export const getMeta = name => {
+  var _document$querySelect, _document$querySelect2;
+  if (typeof document === 'undefined') {
+    return undefined;
+  }
+  if (cache.has(name)) {
+    return cache.get(name);
+  }
+
+  // `name` is interpolated into a CSS attribute selector
+  const escapedName = typeof CSS !== 'undefined' && CSS.escape ? CSS.escape(name) : name;
+  const value = (_document$querySelect = (_document$querySelect2 = document.querySelector(`meta[name="${escapedName}"]`)) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.getAttribute('content')) !== null && _document$querySelect !== void 0 ? _document$querySelect : undefined;
+  cache.set(name, value);
+  return value;
+};
+
+/**
+ * Test-only: clear the cache so each test starts with a clean slate.
+ */
+export const __clearMetaCacheForTests = () => {
+  cache.clear();
+};

package/dist/es2019/types/assets/types.js

@@ -1,3 +1,8 @@
+/**
+ * Wire shape of the unit-aware `/assets/internal/workspace` resolver response.
+ * `linkedAssetsWorkspaceId` is the workspace of the Unit's primary Assets site.
+ */
+
 // These are to enforce the field "name" property and keep everything typed
 export const objectSchemaKey = 'objectSchema';
 export const aqlKey = 'aql';

package/dist/es2019/ui/assets-modal/modal/index.js

@@ -7,7 +7,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';

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

@@ -5,7 +5,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import LinkComponent from '@atlaskit/link';
 import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { Box, Flex } from '@atlaskit/primitives/compiled';

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';

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

@@ -6,7 +6,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import LinkComponent from '@atlaskit/link';
 import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';

package/dist/esm/hooks/useAssetsClient.js

@@ -2,8 +2,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState } from 'react';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../analytics';
-import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
+import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId, resolvePrimaryWorkspace } from '../services/cmdbService';
+import { getMeta } from '../services/getMeta';
 var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
   if (error instanceof Error) {
     errorSetter(error);
@@ -12,6 +14,7 @@ var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, er
   }
 };
 export var useAssetsClient = function useAssetsClient(initialParameters) {
+  var _getMeta;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -47,6 +50,9 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
 
+  // cloudId resolved from <meta name="ajs-cloud-id"> rendered by the host page.
+  var cloudId = (_getMeta = getMeta('ajs-cloud-id')) !== null && _getMeta !== void 0 ? _getMeta : '';
+
   /*
    * We wrap this in nested try/catch blocks because we want to handle
    * workspaceError/existingObjectSchemaError/objectSchemasError differently
@@ -54,67 +60,91 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
    */
   useEffect(function () {
     _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _workspaceId, fetchedObjectSchema, fetchedObjectSchemasResponse, _t, _t2, _t3;
+      var _workspaceId, _yield$resolvePrimary, fetchedObjectSchema, fetchedObjectSchemasResponse, _t, _t2, _t3, _t4;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
             setWorkspaceError(undefined);
             _context.prev = 1;
-            _context.next = 2;
+            if (!(cloudId && fg('astral_units_workspace_host_resolver'))) {
+              _context.next = 7;
+              break;
+            }
+            _context.prev = 2;
+            _context.next = 3;
+            return resolvePrimaryWorkspace(cloudId);
+          case 3:
+            _yield$resolvePrimary = _context.sent;
+            _workspaceId = _yield$resolvePrimary.workspaceId;
+            _context.next = 6;
+            break;
+          case 4:
+            _context.prev = 4;
+            _t = _context["catch"](2);
+            _context.next = 5;
+            return getWorkspaceId(fireEvent);
+          case 5:
+            _workspaceId = _context.sent;
+          case 6:
+            _context.next = 9;
+            break;
+          case 7:
+            _context.next = 8;
             return getWorkspaceId(fireEvent);
-          case 2:
+          case 8:
             _workspaceId = _context.sent;
+          case 9:
             setWorkspaceId(_workspaceId);
             // Check schema from initial parameters still exists and fetch name/permissions for schema select
             if (!(initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId)) {
-              _context.next = 6;
+              _context.next = 13;
               break;
             }
-            _context.prev = 3;
-            _context.next = 4;
+            _context.prev = 10;
+            _context.next = 11;
             return fetchObjectSchema(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
-          case 4:
+          case 11:
             fetchedObjectSchema = _context.sent;
             setExistingObjectSchema(fetchedObjectSchema);
-            _context.next = 6;
+            _context.next = 13;
             break;
-          case 5:
-            _context.prev = 5;
-            _t = _context["catch"](3);
-            handleAssetsClientErrors(setExistingObjectSchemaError, _t);
-          case 6:
-            _context.prev = 6;
-            _context.next = 7;
+          case 12:
+            _context.prev = 12;
+            _t2 = _context["catch"](10);
+            handleAssetsClientErrors(setExistingObjectSchemaError, _t2);
+          case 13:
+            _context.prev = 13;
+            _context.next = 14;
             return fetchObjectSchemas(_workspaceId, undefined, fireEvent);
-          case 7:
+          case 14:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
             setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
-            _context.next = 9;
+            _context.next = 16;
             break;
-          case 8:
-            _context.prev = 8;
-            _t2 = _context["catch"](6);
-            handleAssetsClientErrors(setObjectSchemasError, _t2);
-          case 9:
-            _context.next = 11;
+          case 15:
+            _context.prev = 15;
+            _t3 = _context["catch"](13);
+            handleAssetsClientErrors(setObjectSchemasError, _t3);
+          case 16:
+            _context.next = 18;
             break;
-          case 10:
-            _context.prev = 10;
-            _t3 = _context["catch"](1);
-            handleAssetsClientErrors(setWorkspaceError, _t3);
-          case 11:
-            _context.prev = 11;
+          case 17:
+            _context.prev = 17;
+            _t4 = _context["catch"](1);
+            handleAssetsClientErrors(setWorkspaceError, _t4);
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(11);
-          case 12:
+            return _context.finish(18);
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 10, 11, 12], [3, 5], [6, 8]]);
+      }, _callee, null, [[1, 17, 18, 19], [2, 4], [10, 12], [13, 15]]);
     }))();
-  }, [initialParameters, fireEvent]);
+  }, [initialParameters, fireEvent, cloudId]);
   return {
     workspaceId: workspaceId,
     workspaceError: workspaceError,

package/dist/esm/services/cmdbService.js

@@ -46,26 +46,62 @@ export var getWorkspaceId = /*#__PURE__*/function () {
     return _ref.apply(this, arguments);
   };
 }();
-export var validateAql = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(workspaceId, data, fireEvent) {
-    var url, response, error, _t2;
+
+// 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`.
+export var resolvePrimaryWorkspace = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(cloudId) {
+    var url, res;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = '/assets/internal/workspace?productContext=confluence';
+          _context2.next = 1;
+          return request('get', url, undefined, {
+            'x-atlassian-cloud-id': cloudId
+          }, [200]);
+        case 1:
+          res = _context2.sent;
+          if (res !== null && res !== void 0 && res.linkedAssetsWorkspaceId) {
+            _context2.next = 2;
+            break;
+          }
+          throw new Error('Assets workspace resolver returned no workspaceId');
+        case 2:
+          return _context2.abrupt("return", {
+            workspaceId: res.linkedAssetsWorkspaceId
+          });
+        case 3:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function resolvePrimaryWorkspace(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+export var validateAql = /*#__PURE__*/function () {
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workspaceId, data, fireEvent) {
+    var url, response, error, _t2;
+    return _regeneratorRuntime.wrap(function (_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/aql/validate");
-          _context2.prev = 1;
-          _context2.next = 2;
+          _context3.prev = 1;
+          _context3.next = 2;
           return request('post', url, {
             qlQuery: data.qlQuery,
             context: 'SMART_LINKS'
           }, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context2.sent;
+          response = _context3.sent;
           fireEvent && fireEvent('operational.validateAql.success', {});
-          return _context2.abrupt("return", response);
+          return _context3.abrupt("return", response);
         case 3:
-          _context2.prev = 3;
-          _t2 = _context2["catch"](1);
+          _context3.prev = 3;
+          _t2 = _context3["catch"](1);
           error = mapFetchErrors(_t2);
           if (error instanceof FetchError) {
             fireEvent && fireEvent('operational.validateAql.failed', {
@@ -78,31 +114,31 @@ export var validateAql = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2, null, [[1, 3]]);
+    }, _callee3, null, [[1, 3]]);
   }));
-  return function validateAql(_x2, _x3, _x4) {
-    return _ref2.apply(this, arguments);
+  return function validateAql(_x3, _x4, _x5) {
+    return _ref3.apply(this, arguments);
   };
 }();
 export var fetchObjectSchema = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workspaceId, schemaId, fireEvent) {
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(workspaceId, schemaId, fireEvent) {
     var url, response, error, _t3;
-    return _regeneratorRuntime.wrap(function (_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regeneratorRuntime.wrap(function (_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
         case 0:
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/").concat(schemaId);
-          _context3.prev = 1;
-          _context3.next = 2;
+          _context4.prev = 1;
+          _context4.next = 2;
           return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context3.sent;
+          response = _context4.sent;
           fireEvent && fireEvent('operational.objectSchema.success', {});
-          return _context3.abrupt("return", response);
+          return _context4.abrupt("return", response);
         case 3:
-          _context3.prev = 3;
-          _t3 = _context3["catch"](1);
+          _context4.prev = 3;
+          _t3 = _context4["catch"](1);
           error = mapFetchErrors(_t3);
           if (error instanceof FetchError) {
             fireEvent && fireEvent('operational.objectSchema.failed', {
@@ -115,35 +151,35 @@ export var fetchObjectSchema = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context3.stop();
+          return _context4.stop();
       }
-    }, _callee3, null, [[1, 3]]);
+    }, _callee4, null, [[1, 3]]);
   }));
-  return function fetchObjectSchema(_x5, _x6, _x7) {
-    return _ref3.apply(this, arguments);
+  return function fetchObjectSchema(_x6, _x7, _x8) {
+    return _ref4.apply(this, arguments);
   };
 }();
 export var fetchObjectSchemas = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(workspaceId, query, fireEvent) {
+  var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(workspaceId, query, fireEvent) {
     var queryParams, url, response, error, _t4;
-    return _regeneratorRuntime.wrap(function (_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+    return _regeneratorRuntime.wrap(function (_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
           queryParams = new URLSearchParams();
           queryParams.set('maxResults', '20');
           queryParams.set('includeCounts', 'false');
           query && queryParams.set('query', query);
           url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/list?").concat(queryParams);
-          _context4.prev = 1;
-          _context4.next = 2;
+          _context5.prev = 1;
+          _context5.next = 2;
           return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 2:
-          response = _context4.sent;
+          response = _context5.sent;
           fireEvent && fireEvent('operational.objectSchemas.success', {});
-          return _context4.abrupt("return", response);
+          return _context5.abrupt("return", response);
         case 3:
-          _context4.prev = 3;
-          _t4 = _context4["catch"](1);
+          _context5.prev = 3;
+          _t4 = _context5["catch"](1);
           error = mapFetchErrors(_t4);
           if (error instanceof FetchError) {
             fireEvent && fireEvent('operational.objectSchemas.failed', {
@@ -156,11 +192,11 @@ export var fetchObjectSchemas = /*#__PURE__*/function () {
           throw error;
         case 4:
         case "end":
-          return _context4.stop();
+          return _context5.stop();
       }
-    }, _callee4, null, [[1, 3]]);
+    }, _callee5, null, [[1, 3]]);
   }));
-  return function fetchObjectSchemas(_x8, _x9, _x0) {
-    return _ref4.apply(this, arguments);
+  return function fetchObjectSchemas(_x9, _x0, _x1) {
+    return _ref5.apply(this, arguments);
   };
 }();

package/dist/esm/services/getMeta.js

@@ -0,0 +1,27 @@
+/**
+ * Read a `<meta name="...">` tag's content from the current document, with
+ * per-name caching. Browser-only: returns `undefined` under SSR or when absent.
+ */
+var cache = new Map();
+export var getMeta = function getMeta(name) {
+  var _document$querySelect, _document$querySelect2;
+  if (typeof document === 'undefined') {
+    return undefined;
+  }
+  if (cache.has(name)) {
+    return cache.get(name);
+  }
+
+  // `name` is interpolated into a CSS attribute selector
+  var escapedName = typeof CSS !== 'undefined' && CSS.escape ? CSS.escape(name) : name;
+  var value = (_document$querySelect = (_document$querySelect2 = document.querySelector("meta[name=\"".concat(escapedName, "\"]"))) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.getAttribute('content')) !== null && _document$querySelect !== void 0 ? _document$querySelect : undefined;
+  cache.set(name, value);
+  return value;
+};
+
+/**
+ * Test-only: clear the cache so each test starts with a clean slate.
+ */
+export var __clearMetaCacheForTests = function __clearMetaCacheForTests() {
+  cache.clear();
+};

package/dist/esm/types/assets/types.js

@@ -1,3 +1,8 @@
+/**
+ * Wire shape of the unit-aware `/assets/internal/workspace` resolver response.
+ * `linkedAssetsWorkspaceId` is the workspace of the Unit's primary Assets site.
+ */
+
 // These are to enforce the field "name" property and keep everything typed
 export var objectSchemaKey = 'objectSchema';
 export var aqlKey = 'aql';

package/dist/esm/ui/assets-modal/modal/index.js

@@ -11,7 +11,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { componentMetadata } from '../../../analytics/constants';

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

@@ -8,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import LinkComponent from '@atlaskit/link';
 import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle } from '@atlaskit/modal-dialog';
 import { Box, Flex } from '@atlaskit/primitives/compiled';

package/dist/esm/ui/datasource-table-view/datasourceTableView.js

@@ -7,7 +7,7 @@ import { ax, ix } from "@compiled/react/runtime";
 import { useCallback, useEffect, useRef, useState } from 'react';
 import isEqual from 'lodash/isEqual';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { componentMetadata } from '../../analytics/constants';

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

@@ -10,7 +10,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import React, { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { FormattedMessage, useIntl } from 'react-intl';
 import FeatureGates from '@atlaskit/feature-gate-js-client';
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import LinkComponent from '@atlaskit/link';
 import { CloseButton, ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
 import { fg } from '@atlaskit/platform-feature-flags';

package/dist/types/common/utils/locale/fetch-messages-for-locale.d.ts

@@ -1,2 +1,2 @@
-import { type I18NMessages } from '@atlaskit/intl-messages-provider';
+import type { I18NMessages } from '@atlaskit/intl-messages-provider/types';
 export declare const fetchMessagesForLocale: (locale: string) => Promise<I18NMessages | undefined>;

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

@@ -3,6 +3,9 @@ import type createEventPayload from '../analytics/generated/create-event-payload
 import { type AqlValidateResponse, type FetchObjectSchemasResponse, type ObjectSchema } from '../types/assets/types';
 type AnalyticsFireEvent = <K extends EventKey>(...params: Parameters<typeof createEventPayload<K>>) => void;
 export declare const getWorkspaceId: (fireEvent?: AnalyticsFireEvent) => Promise<string>;
+export declare const resolvePrimaryWorkspace: (cloudId: string) => Promise<{
+    workspaceId: string;
+}>;
 export declare const validateAql: (workspaceId: string, data: {
     qlQuery: string;
 }, fireEvent?: AnalyticsFireEvent) => Promise<AqlValidateResponse>;

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

@@ -0,0 +1,5 @@
+export declare const getMeta: (name: string) => string | undefined;
+/**
+ * Test-only: clear the cache so each test starts with a clean slate.
+ */
+export declare const __clearMetaCacheForTests: () => void;

package/dist/types/types/assets/types.d.ts

@@ -5,6 +5,15 @@ export type GetWorkspaceDetailsResponse = {
         }
     ];
 };
+/**
+ * Wire shape of the unit-aware `/assets/internal/workspace` resolver response.
+ * `linkedAssetsWorkspaceId` is the workspace of the Unit's primary Assets site.
+ */
+export type ResolvePrimaryWorkspaceResponse = {
+    linkedAssetsSiteCloudId?: string;
+    linkedAssetsWorkspaceId?: string;
+    siteWithJiraUrl?: string;
+};
 export type ObjectSchema = {
     id: string;
     name: string;

package/examples-helpers/buildAssetsIssuesTable.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import type { DatasourceTableView } from '@atlaskit/link-datasource';
 import { SmartCardProvider } from '@atlaskit/link-provider';
 import { type DatasourceParameters } from '@atlaskit/linking-types';

package/examples-helpers/buildConfluenceSearchTable.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useMemo } from 'react';
 
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { SmartCardProvider } from '@atlaskit/link-provider';
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
 import { type DatasourceParameters } from '@atlaskit/linking-types';

package/examples-helpers/buildIssueLikeTable.tsx

@@ -6,7 +6,7 @@ import { useEffect, useMemo } from 'react';
 
 import { jsx, styled } from '@compiled/react';
 
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { SmartCardProvider } from '@atlaskit/link-provider';
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
 import { Text } from '@atlaskit/primitives/compiled';

package/examples-helpers/buildIssueLikeTableLoadingError.tsx

@@ -4,7 +4,7 @@
  */
 import { jsx, styled } from '@compiled/react';
 
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { SmartCardProvider } from '@atlaskit/link-provider';
 import { token } from '@atlaskit/tokens';
 

package/examples-helpers/buildJiraIssuesTable.tsx

@@ -1,6 +1,6 @@
 import React, { useMemo } from 'react';
 
-import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
+import IntlMessagesProvider from '@atlaskit/intl-messages-provider/main';
 import { type ProviderProps, SmartCardProvider } from '@atlaskit/link-provider';
 import { mockDatasourceFetchRequests } from '@atlaskit/link-test-helpers/datasource';
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "6.1.12",
+	"version": "6.2.0",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -55,7 +55,7 @@
 		"@atlaskit/icon": "^37.1.0",
 		"@atlaskit/image": "^4.2.0",
 		"@atlaskit/inline-edit": "^16.2.0",
-		"@atlaskit/intl-messages-provider": "^4.1.0",
+		"@atlaskit/intl-messages-provider": "^4.2.0",
 		"@atlaskit/jql-ast": "^4.0.0",
 		"@atlaskit/jql-editor": "^7.4.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^4.2.0",
@@ -80,13 +80,13 @@
 		"@atlaskit/react-compiler-gating": "^0.2.0",
 		"@atlaskit/react-select": "^4.5.0",
 		"@atlaskit/select": "^22.5.0",
-		"@atlaskit/smart-card": "^45.11.0",
+		"@atlaskit/smart-card": "^45.12.0",
 		"@atlaskit/smart-user-picker": "^11.1.0",
 		"@atlaskit/spinner": "^20.1.0",
 		"@atlaskit/tag": "^15.4.0",
 		"@atlaskit/textfield": "^9.1.0",
 		"@atlaskit/theme": "^26.1.0",
-		"@atlaskit/tokens": "^16.2.0",
+		"@atlaskit/tokens": "^16.3.0",
 		"@atlaskit/tooltip": "^23.1.0",
 		"@atlaskit/ufo": "^1.0.0",
 		"@atlaskit/visually-hidden": "^4.2.0",
@@ -196,6 +196,9 @@
 		},
 		"navx-5290-sllv-modal-a11y-updates": {
 			"type": "boolean"
+		},
+		"astral_units_workspace_host_resolver": {
+			"type": "boolean"
 		}
 	},
 	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/9c893299-a527-4457-9b46-f3bc4c828766"