@atlaskit/link-datasource 7.0.2 → 7.0.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 7.0.3
+
+### Patch Changes
+
+- [`ffe3187520151`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ffe3187520151) -
+  Remove the redundant `linking_platform_site_picker_api_unit_compliant_cloud_id` and
+  `linking_platform_link_datasource_unit_compliant_cloud_id` feature gates. Both duplicated the
+  targeting of the existing `linking_platform_site_picker_api_unit_compliant` and
+  `linking_platform_link_datasource_unit_compliant` gates, which now solely drive the units
+  isolation rollout for the site picker and link datasource. No behaviour change.
+- Updated dependencies
+
 ## 7.0.2
 
 ### Patch Changes

package/dist/cjs/services/getAvailableSites.js

@@ -9,10 +9,10 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _mapAccessibleProductsToAvailableSites = require("@atlaskit/linking-common/map-accessible-products-to-available-sites");
 var _unitsRollout = require("@atlaskit/linking-common/units-rollout");
-var _isLinkDatasourceInUnitsRollout = require("./isLinkDatasourceInUnitsRollout");
+var _fg = require("@atlaskit/platform-feature-flags/fg");
 var getAccessibleProducts = exports.getAccessibleProducts = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(product) {
-    var requestConfig, endpoint, response, res, _t, _t2, _t3, _t4;
+    var requestConfig, isUnitCompliant, endpoint, response, res, _t, _t2, _t3;
     return _regenerator.default.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -28,49 +28,44 @@ var getAccessibleProducts = exports.getAccessibleProducts = /*#__PURE__*/functio
               productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
             })
           }; // Organisations with units isolation in effect must be served the unit compliant endpoint,
-          // which filters the products down to the unit the user belongs to.
+          // which filters the products down to the unit the user belongs to. The gate is passed as a
+          // callback so it is only evaluated - and only records exposure - once the units GA killswitch
+          // has already let the check through.
           _context.next = 1;
-          return (0, _unitsRollout.shouldUseUnitCompliantApi)(_isLinkDatasourceInUnitsRollout.isLinkDatasourceInUnitsRollout);
+          return (0, _unitsRollout.shouldUseUnitCompliantApi)(function () {
+            return (0, _fg.fg)('linking_platform_link_datasource_unit_compliant');
+          });
         case 1:
-          if (!_context.sent) {
-            _context.next = 2;
-            break;
-          }
-          _t = '/gateway/api/experimental/v2/accessible-products';
-          _context.next = 3;
-          break;
-        case 2:
-          _t = '/gateway/api/v2/accessible-products';
-        case 3:
-          endpoint = _t;
-          _context.next = 4;
+          isUnitCompliant = _context.sent;
+          endpoint = isUnitCompliant ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
+          _context.next = 2;
           return fetch(endpoint, requestConfig);
-        case 4:
+        case 2:
           response = _context.sent;
           if (!response.ok) {
-            _context.next = 6;
+            _context.next = 4;
             break;
           }
-          _context.next = 5;
+          _context.next = 3;
           return response.json();
-        case 5:
+        case 3:
           res = _context.sent;
           return _context.abrupt("return", (0, _mapAccessibleProductsToAvailableSites.mapAccessibleProductsToAvailableSites)(res.data));
-        case 6:
-          _t2 = Error;
-          _context.next = 7;
+        case 4:
+          _t = Error;
+          _context.next = 5;
           return response.text();
-        case 7:
-          _t3 = _context.sent;
-          if (_t3) {
-            _context.next = 8;
+        case 5:
+          _t2 = _context.sent;
+          if (_t2) {
+            _context.next = 6;
             break;
           }
-          _t3 = 'Something went wrong';
-        case 8:
-          _t4 = _t3;
-          throw new _t2(_t4);
-        case 9:
+          _t2 = 'Something went wrong';
+        case 6:
+          _t3 = _t2;
+          throw new _t(_t3);
+        case 7:
         case "end":
           return _context.stop();
       }

package/dist/es2019/services/getAvailableSites.js

@@ -1,6 +1,6 @@
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/map-accessible-products-to-available-sites';
 import { shouldUseUnitCompliantApi } from '@atlaskit/linking-common/units-rollout';
-import { isLinkDatasourceInUnitsRollout } from './isLinkDatasourceInUnitsRollout';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 export const getAccessibleProducts = async product => {
   const requestConfig = {
     method: 'POST',
@@ -16,8 +16,11 @@ export const getAccessibleProducts = async product => {
   };
 
   // Organisations with units isolation in effect must be served the unit compliant endpoint,
-  // which filters the products down to the unit the user belongs to.
-  const endpoint = (await shouldUseUnitCompliantApi(isLinkDatasourceInUnitsRollout)) ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
+  // which filters the products down to the unit the user belongs to. The gate is passed as a
+  // callback so it is only evaluated - and only records exposure - once the units GA killswitch
+  // has already let the check through.
+  const isUnitCompliant = await shouldUseUnitCompliantApi(() => fg('linking_platform_link_datasource_unit_compliant'));
+  const endpoint = isUnitCompliant ? '/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/esm/services/getAvailableSites.js

@@ -2,10 +2,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/map-accessible-products-to-available-sites';
 import { shouldUseUnitCompliantApi } from '@atlaskit/linking-common/units-rollout';
-import { isLinkDatasourceInUnitsRollout } from './isLinkDatasourceInUnitsRollout';
+import { fg } from '@atlaskit/platform-feature-flags/fg';
 export var getAccessibleProducts = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(product) {
-    var requestConfig, endpoint, response, res, _t, _t2, _t3, _t4;
+    var requestConfig, isUnitCompliant, endpoint, response, res, _t, _t2, _t3;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -21,49 +21,44 @@ 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']
             })
           }; // Organisations with units isolation in effect must be served the unit compliant endpoint,
-          // which filters the products down to the unit the user belongs to.
+          // which filters the products down to the unit the user belongs to. The gate is passed as a
+          // callback so it is only evaluated - and only records exposure - once the units GA killswitch
+          // has already let the check through.
           _context.next = 1;
-          return shouldUseUnitCompliantApi(isLinkDatasourceInUnitsRollout);
+          return shouldUseUnitCompliantApi(function () {
+            return fg('linking_platform_link_datasource_unit_compliant');
+          });
         case 1:
-          if (!_context.sent) {
-            _context.next = 2;
-            break;
-          }
-          _t = '/gateway/api/experimental/v2/accessible-products';
-          _context.next = 3;
-          break;
-        case 2:
-          _t = '/gateway/api/v2/accessible-products';
-        case 3:
-          endpoint = _t;
-          _context.next = 4;
+          isUnitCompliant = _context.sent;
+          endpoint = isUnitCompliant ? '/gateway/api/experimental/v2/accessible-products' : '/gateway/api/v2/accessible-products';
+          _context.next = 2;
           return fetch(endpoint, requestConfig);
-        case 4:
+        case 2:
           response = _context.sent;
           if (!response.ok) {
-            _context.next = 6;
+            _context.next = 4;
             break;
           }
-          _context.next = 5;
+          _context.next = 3;
           return response.json();
-        case 5:
+        case 3:
           res = _context.sent;
           return _context.abrupt("return", mapAccessibleProductsToAvailableSites(res.data));
-        case 6:
-          _t2 = Error;
-          _context.next = 7;
+        case 4:
+          _t = Error;
+          _context.next = 5;
           return response.text();
-        case 7:
-          _t3 = _context.sent;
-          if (_t3) {
-            _context.next = 8;
+        case 5:
+          _t2 = _context.sent;
+          if (_t2) {
+            _context.next = 6;
             break;
           }
-          _t3 = 'Something went wrong';
-        case 8:
-          _t4 = _t3;
-          throw new _t2(_t4);
-        case 9:
+          _t2 = 'Something went wrong';
+        case 6:
+          _t3 = _t2;
+          throw new _t(_t3);
+        case 7:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "7.0.2",
+	"version": "7.0.3",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -43,8 +43,8 @@
 		"@atlaskit/analytics-cross-product": "^2.2.0",
 		"@atlaskit/analytics-next": "^12.5.0",
 		"@atlaskit/atlassian-context": "^2.0.0",
-		"@atlaskit/avatar": "^29.0.0",
-		"@atlaskit/avatar-group": "^14.3.0",
+		"@atlaskit/avatar": "^29.1.0",
+		"@atlaskit/avatar-group": "^14.4.0",
 		"@atlaskit/badge": "^22.0.0",
 		"@atlaskit/button": "^25.4.0",
 		"@atlaskit/css": "^1.1.0",
@@ -84,9 +84,9 @@
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^4.2.0",
 		"@atlaskit/primitives": "^22.5.0",
 		"@atlaskit/react-compiler-gating": "^0.2.0",
-		"@atlaskit/react-select": "^4.11.0",
+		"@atlaskit/react-select": "^4.12.0",
 		"@atlaskit/select": "^23.1.0",
-		"@atlaskit/smart-card": "^46.0.0",
+		"@atlaskit/smart-card": "^46.1.0",
 		"@atlaskit/smart-user-picker": "^12.0.0",
 		"@atlaskit/spinner": "^20.4.0",
 		"@atlaskit/tag": "^16.0.0",
@@ -171,9 +171,6 @@
 		"linking_platform_link_datasource_unit_compliant": {
 			"type": "boolean"
 		},
-		"linking_platform_link_datasource_unit_compliant_cloud_id": {
-			"type": "boolean"
-		},
 		"platform_lp_sllv_richtext_margin_reset": {
 			"type": "boolean"
 		},

package/dist/cjs/services/isLinkDatasourceInUnitsRollout.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.isLinkDatasourceInUnitsRollout = void 0;
-var _fg = require("@atlaskit/platform-feature-flags/fg");
-/**
- * Whether link datasource is in the units isolation rollout.
- *
- * Two gates drive the same rollout so it can be turned on for either an organisation or a single
- * site: `..._unit_compliant` targets org id, `..._unit_compliant_cloud_id` targets cloud id.
- * Either one being on opts link datasource in, and both are always evaluated so that exposure is
- * recorded for the two of them.
- *
- * Being in the rollout is not on its own enough to change behaviour - the organisation also has to
- * have launched units with boundary enforcement on. Pass this to `shouldUseUnitCompliantApi` from
- * `@atlaskit/linking-common/units-rollout`, which owns that decision, rather than calling it
- * directly.
- */
-var isLinkDatasourceInUnitsRollout = exports.isLinkDatasourceInUnitsRollout = function isLinkDatasourceInUnitsRollout() {
-  var isOrgInRollout = (0, _fg.fg)('linking_platform_link_datasource_unit_compliant');
-  var isSiteInRollout = (0, _fg.fg)('linking_platform_link_datasource_unit_compliant_cloud_id');
-  return isOrgInRollout || isSiteInRollout;
-};

package/dist/es2019/services/isLinkDatasourceInUnitsRollout.js

@@ -1,20 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-
-/**
- * Whether link datasource is in the units isolation rollout.
- *
- * Two gates drive the same rollout so it can be turned on for either an organisation or a single
- * site: `..._unit_compliant` targets org id, `..._unit_compliant_cloud_id` targets cloud id.
- * Either one being on opts link datasource in, and both are always evaluated so that exposure is
- * recorded for the two of them.
- *
- * Being in the rollout is not on its own enough to change behaviour - the organisation also has to
- * have launched units with boundary enforcement on. Pass this to `shouldUseUnitCompliantApi` from
- * `@atlaskit/linking-common/units-rollout`, which owns that decision, rather than calling it
- * directly.
- */
-export const isLinkDatasourceInUnitsRollout = () => {
-  const isOrgInRollout = fg('linking_platform_link_datasource_unit_compliant');
-  const isSiteInRollout = fg('linking_platform_link_datasource_unit_compliant_cloud_id');
-  return isOrgInRollout || isSiteInRollout;
-};

package/dist/esm/services/isLinkDatasourceInUnitsRollout.js

@@ -1,20 +0,0 @@
-import { fg } from '@atlaskit/platform-feature-flags/fg';
-
-/**
- * Whether link datasource is in the units isolation rollout.
- *
- * Two gates drive the same rollout so it can be turned on for either an organisation or a single
- * site: `..._unit_compliant` targets org id, `..._unit_compliant_cloud_id` targets cloud id.
- * Either one being on opts link datasource in, and both are always evaluated so that exposure is
- * recorded for the two of them.
- *
- * Being in the rollout is not on its own enough to change behaviour - the organisation also has to
- * have launched units with boundary enforcement on. Pass this to `shouldUseUnitCompliantApi` from
- * `@atlaskit/linking-common/units-rollout`, which owns that decision, rather than calling it
- * directly.
- */
-export var isLinkDatasourceInUnitsRollout = function isLinkDatasourceInUnitsRollout() {
-  var isOrgInRollout = fg('linking_platform_link_datasource_unit_compliant');
-  var isSiteInRollout = fg('linking_platform_link_datasource_unit_compliant_cloud_id');
-  return isOrgInRollout || isSiteInRollout;
-};

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

@@ -1,14 +0,0 @@
-/**
- * Whether link datasource is in the units isolation rollout.
- *
- * Two gates drive the same rollout so it can be turned on for either an organisation or a single
- * site: `..._unit_compliant` targets org id, `..._unit_compliant_cloud_id` targets cloud id.
- * Either one being on opts link datasource in, and both are always evaluated so that exposure is
- * recorded for the two of them.
- *
- * Being in the rollout is not on its own enough to change behaviour - the organisation also has to
- * have launched units with boundary enforcement on. Pass this to `shouldUseUnitCompliantApi` from
- * `@atlaskit/linking-common/units-rollout`, which owns that decision, rather than calling it
- * directly.
- */
-export declare const isLinkDatasourceInUnitsRollout: () => boolean;