@atlaskit/link-datasource 4.30.5 → 4.30.7

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/link-datasource
 
+## 4.30.7
+
+### Patch Changes
+
+- [`7ae944d7f3cd6`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7ae944d7f3cd6) -
+  NAVX-2825 Fixing no-literal-string-in-jsx violations in linking platform
+- Updated dependencies
+
+## 4.30.6
+
+### Patch Changes
+
+- [`37aa215f58706`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/37aa215f58706) -
+  NAVX-1904 cleaning up navx-1819-link-create-confluence-site-migration
+- Updated dependencies
+
 ## 4.30.5
 
 ### Patch Changes

package/dist/cjs/services/getAvailableSites.js

@@ -4,11 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAvailableSites = exports.getAccessibleProducts = void 0;
+exports.getAccessibleProducts = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _hooks = require("@atlaskit/linking-common/hooks");
-var getAvailableSites = exports.getAvailableSites = /*#__PURE__*/function () {
+var getAccessibleProducts = exports.getAccessibleProducts = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(product) {
     var requestConfig, response, res;
     return _regenerator.default.wrap(function _callee$(_context) {
@@ -23,11 +23,11 @@ var getAvailableSites = exports.getAvailableSites = /*#__PURE__*/function () {
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-              products: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
+              productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
             })
           };
           _context.next = 3;
-          return fetch("/gateway/api/available-sites", requestConfig);
+          return fetch("/gateway/api/v2/accessible-products", requestConfig);
         case 3:
           response = _context.sent;
           if (!response.ok) {
@@ -38,7 +38,7 @@ var getAvailableSites = exports.getAvailableSites = /*#__PURE__*/function () {
           return response.json();
         case 7:
           res = _context.sent;
-          return _context.abrupt("return", res.sites);
+          return _context.abrupt("return", (0, _hooks.mapAccessibleProductsToAvailableSites)(res.data));
         case 9:
           _context.t0 = Error;
           _context.next = 12;
@@ -59,62 +59,7 @@ var getAvailableSites = exports.getAvailableSites = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getAvailableSites(_x) {
+  return function getAccessibleProducts(_x) {
     return _ref.apply(this, arguments);
   };
-}();
-var getAccessibleProducts = exports.getAccessibleProducts = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(product) {
-    var requestConfig, response, res;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          requestConfig = {
-            method: 'POST',
-            credentials: 'include',
-            headers: {
-              Accept: 'application/json',
-              'Cache-Control': 'no-cache',
-              'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-              productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
-            })
-          };
-          _context2.next = 3;
-          return fetch("/gateway/api/v2/accessible-products", requestConfig);
-        case 3:
-          response = _context2.sent;
-          if (!response.ok) {
-            _context2.next = 9;
-            break;
-          }
-          _context2.next = 7;
-          return response.json();
-        case 7:
-          res = _context2.sent;
-          return _context2.abrupt("return", (0, _hooks.mapAccessibleProductsToAvailableSites)(res.data));
-        case 9:
-          _context2.t0 = Error;
-          _context2.next = 12;
-          return response.text();
-        case 12:
-          _context2.t1 = _context2.sent;
-          if (_context2.t1) {
-            _context2.next = 15;
-            break;
-          }
-          _context2.t1 = 'Something went wrong';
-        case 15:
-          _context2.t2 = _context2.t1;
-          throw new _context2.t0(_context2.t2);
-        case 17:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getAccessibleProducts(_x2) {
-    return _ref2.apply(this, arguments);
-  };
 }();

package/dist/cjs/services/useAvailableSites.js

@@ -10,7 +10,6 @@ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers
 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 _getAvailableSites = require("./getAvailableSites");
 var useAvailableSites = exports.useAvailableSites = function useAvailableSites(product, cloudId) {
   var _useState = (0, _react.useState)(undefined),
@@ -25,7 +24,7 @@ var useAvailableSites = exports.useAvailableSites = function useAvailableSites(p
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return (0, _platformFeatureFlags.fg)('navx-1819-link-create-confluence-site-migration') ? (0, _getAvailableSites.getAccessibleProducts)(product) : (0, _getAvailableSites.getAvailableSites)(product);
+              return (0, _getAvailableSites.getAccessibleProducts)(product);
             case 2:
               sites = _context.sent;
               sortedAvailableSites = (0, _toConsumableArray2.default)(sites).sort(function (a, b) {

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

@@ -6,8 +6,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.JiraJQLEditor = void 0;
 var _react = _interopRequireWildcard(require("react"));
+var _reactIntlNext = require("react-intl-next");
 var _jqlEditor = require("@atlaskit/jql-editor");
 var _jqlEditorAutocompleteRest = require("@atlaskit/jql-editor-autocomplete-rest");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _makeGetJqlAutocompleteData = require("../../../services/makeGetJqlAutocompleteData");
 var _makeGetJqlSuggestionsData = require("../../../services/makeGetJqlSuggestionsData");
 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); }
@@ -41,9 +43,9 @@ var JiraJQLEditor = exports.JiraJQLEditor = function JiraJQLEditor(_ref) {
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
-    // eslint-disable-next-line @atlassian/i18n/no-literal-string-in-jsx
-    ,
-    "aria-label": "JQL Query Editor"
+    query: query,
+    "aria-label": (0, _platformFeatureFlags.fg)('navx-2825-eslint-translation-fix-linking-platform') ? /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, {
+      defaultMessage: "JQL Query Editor"
+    }) : "JQL Query Editor"
   });
 };

package/dist/es2019/services/getAvailableSites.js

@@ -1,24 +1,4 @@
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/hooks';
-export const getAvailableSites = async product => {
-  const requestConfig = {
-    method: 'POST',
-    credentials: 'include',
-    headers: {
-      Accept: 'application/json',
-      'Cache-Control': 'no-cache',
-      'Content-Type': 'application/json'
-    },
-    body: JSON.stringify({
-      products: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
-    })
-  };
-  const response = await fetch(`/gateway/api/available-sites`, requestConfig);
-  if (response.ok) {
-    const res = await response.json();
-    return res.sites;
-  }
-  throw new Error((await response.text()) || 'Something went wrong');
-};
 export const getAccessibleProducts = async product => {
   const requestConfig = {
     method: 'POST',

package/dist/es2019/services/useAvailableSites.js

@@ -1,11 +1,10 @@
 import { useEffect, useMemo, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { getAccessibleProducts, getAvailableSites } from './getAvailableSites';
+import { getAccessibleProducts } from './getAvailableSites';
 export const useAvailableSites = (product, cloudId) => {
   const [availableSites, setAvailableSites] = useState(undefined);
   useEffect(() => {
     const fetchSiteDisplayNames = async () => {
-      const sites = await (fg('navx-1819-link-create-confluence-site-migration') ? getAccessibleProducts(product) : getAvailableSites(product));
+      const sites = await getAccessibleProducts(product);
       const sortedAvailableSites = [...sites].sort((a, b) => a.displayName.localeCompare(b.displayName));
       setAvailableSites(sortedAvailableSites);
     };

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

@@ -1,6 +1,8 @@
 import React, { useEffect, useRef } from 'react';
+import { FormattedMessage } from 'react-intl-next';
 import { JQLEditor } from '@atlaskit/jql-editor';
 import { useAutocompleteProvider } from '@atlaskit/jql-editor-autocomplete-rest';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { makeGetJqlAutocompleteData } from '../../../services/makeGetJqlAutocompleteData';
 import { makeGetJqlSuggestionsData } from '../../../services/makeGetJqlSuggestionsData';
 export const JiraJQLEditor = ({
@@ -34,9 +36,9 @@ export const JiraJQLEditor = ({
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
-    // eslint-disable-next-line @atlassian/i18n/no-literal-string-in-jsx
-    ,
-    "aria-label": "JQL Query Editor"
+    query: query,
+    "aria-label": fg('navx-2825-eslint-translation-fix-linking-platform') ? /*#__PURE__*/React.createElement(FormattedMessage, {
+      defaultMessage: "JQL Query Editor"
+    }) : "JQL Query Editor"
   });
 };

package/dist/esm/services/getAvailableSites.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { mapAccessibleProductsToAvailableSites } from '@atlaskit/linking-common/hooks';
-export var getAvailableSites = /*#__PURE__*/function () {
+export var getAccessibleProducts = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(product) {
     var requestConfig, response, res;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -16,11 +16,11 @@ export var getAvailableSites = /*#__PURE__*/function () {
               'Content-Type': 'application/json'
             },
             body: JSON.stringify({
-              products: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
+              productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
             })
           };
           _context.next = 3;
-          return fetch("/gateway/api/available-sites", requestConfig);
+          return fetch("/gateway/api/v2/accessible-products", requestConfig);
         case 3:
           response = _context.sent;
           if (!response.ok) {
@@ -31,7 +31,7 @@ export var getAvailableSites = /*#__PURE__*/function () {
           return response.json();
         case 7:
           res = _context.sent;
-          return _context.abrupt("return", res.sites);
+          return _context.abrupt("return", mapAccessibleProductsToAvailableSites(res.data));
         case 9:
           _context.t0 = Error;
           _context.next = 12;
@@ -52,62 +52,7 @@ export var getAvailableSites = /*#__PURE__*/function () {
       }
     }, _callee);
   }));
-  return function getAvailableSites(_x) {
+  return function getAccessibleProducts(_x) {
     return _ref.apply(this, arguments);
   };
-}();
-export var getAccessibleProducts = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(product) {
-    var requestConfig, response, res;
-    return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          requestConfig = {
-            method: 'POST',
-            credentials: 'include',
-            headers: {
-              Accept: 'application/json',
-              'Cache-Control': 'no-cache',
-              'Content-Type': 'application/json'
-            },
-            body: JSON.stringify({
-              productIds: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
-            })
-          };
-          _context2.next = 3;
-          return fetch("/gateway/api/v2/accessible-products", requestConfig);
-        case 3:
-          response = _context2.sent;
-          if (!response.ok) {
-            _context2.next = 9;
-            break;
-          }
-          _context2.next = 7;
-          return response.json();
-        case 7:
-          res = _context2.sent;
-          return _context2.abrupt("return", mapAccessibleProductsToAvailableSites(res.data));
-        case 9:
-          _context2.t0 = Error;
-          _context2.next = 12;
-          return response.text();
-        case 12:
-          _context2.t1 = _context2.sent;
-          if (_context2.t1) {
-            _context2.next = 15;
-            break;
-          }
-          _context2.t1 = 'Something went wrong';
-        case 15:
-          _context2.t2 = _context2.t1;
-          throw new _context2.t0(_context2.t2);
-        case 17:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function getAccessibleProducts(_x2) {
-    return _ref2.apply(this, arguments);
-  };
 }();

package/dist/esm/services/useAvailableSites.js

@@ -3,8 +3,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useMemo, useState } from 'react';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { getAccessibleProducts, getAvailableSites } from './getAvailableSites';
+import { getAccessibleProducts } from './getAvailableSites';
 export var useAvailableSites = function useAvailableSites(product, cloudId) {
   var _useState = useState(undefined),
     _useState2 = _slicedToArray(_useState, 2),
@@ -18,7 +17,7 @@ export var useAvailableSites = function useAvailableSites(product, cloudId) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _context.next = 2;
-              return fg('navx-1819-link-create-confluence-site-migration') ? getAccessibleProducts(product) : getAvailableSites(product);
+              return getAccessibleProducts(product);
             case 2:
               sites = _context.sent;
               sortedAvailableSites = _toConsumableArray(sites).sort(function (a, b) {

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

@@ -1,6 +1,8 @@
 import React, { useEffect, useRef } from 'react';
+import { FormattedMessage } from 'react-intl-next';
 import { JQLEditor } from '@atlaskit/jql-editor';
 import { useAutocompleteProvider } from '@atlaskit/jql-editor-autocomplete-rest';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { makeGetJqlAutocompleteData } from '../../../services/makeGetJqlAutocompleteData';
 import { makeGetJqlSuggestionsData } from '../../../services/makeGetJqlSuggestionsData';
 export var JiraJQLEditor = function JiraJQLEditor(_ref) {
@@ -33,9 +35,9 @@ export var JiraJQLEditor = function JiraJQLEditor(_ref) {
     onUpdate: onChange,
     isSearching: isSearching,
     inputRef: inputRef,
-    query: query
-    // eslint-disable-next-line @atlassian/i18n/no-literal-string-in-jsx
-    ,
-    "aria-label": "JQL Query Editor"
+    query: query,
+    "aria-label": fg('navx-2825-eslint-translation-fix-linking-platform') ? /*#__PURE__*/React.createElement(FormattedMessage, {
+      defaultMessage: "JQL Query Editor"
+    }) : "JQL Query Editor"
   });
 };

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

@@ -1,3 +1,2 @@
 import type { Site } from '../common/types';
-export declare const getAvailableSites: (product: "jira" | "confluence") => Promise<Site[]>;
 export declare const getAccessibleProducts: (product: "jira" | "confluence") => Promise<Site[]>;

package/dist/types-ts4.5/services/getAvailableSites.d.ts

@@ -1,3 +1,2 @@
 import type { Site } from '../common/types';
-export declare const getAvailableSites: (product: "jira" | "confluence") => Promise<Site[]>;
 export declare const getAccessibleProducts: (product: "jira" | "confluence") => Promise<Site[]>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "4.30.5",
+	"version": "4.30.7",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -64,7 +64,7 @@
 		"@atlaskit/layering": "^3.4.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/link-client-extension": "^6.0.0",
-		"@atlaskit/linking-common": "^9.8.0",
+		"@atlaskit/linking-common": "^9.9.0",
 		"@atlaskit/linking-types": "^14.2.0",
 		"@atlaskit/logo": "^19.9.0",
 		"@atlaskit/lozenge": "^13.1.0",
@@ -76,16 +76,16 @@
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^2.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-drop-indicator": "^3.2.0",
-		"@atlaskit/primitives": "^16.3.0",
+		"@atlaskit/primitives": "^16.4.0",
 		"@atlaskit/react-select": "^3.9.0",
 		"@atlaskit/select": "^21.4.0",
-		"@atlaskit/smart-card": "^43.10.0",
+		"@atlaskit/smart-card": "^43.12.0",
 		"@atlaskit/smart-user-picker": "^8.4.0",
 		"@atlaskit/spinner": "^19.0.0",
 		"@atlaskit/tag": "^14.1.0",
 		"@atlaskit/textfield": "^8.1.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tokens": "^8.3.0",
+		"@atlaskit/tokens": "^8.4.0",
 		"@atlaskit/tooltip": "^20.10.0",
 		"@atlaskit/ufo": "^0.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -179,9 +179,6 @@
 		"navx-1334-datasource-deep-compare-params": {
 			"type": "boolean"
 		},
-		"navx-1819-link-create-confluence-site-migration": {
-			"type": "boolean"
-		},
 		"navx-1895-new-logo-design": {
 			"type": "boolean"
 		},
@@ -190,6 +187,9 @@
 		},
 		"jpd_confluence_date_fields_improvements": {
 			"type": "boolean"
+		},
+		"navx-2825-eslint-translation-fix-linking-platform": {
+			"type": "boolean"
 		}
 	},
 	"compassUnitTestMetricSourceId": "ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:metric-source/c5751cc6-3513-4070-9deb-af31e86aed34/9c893299-a527-4457-9b46-f3bc4c828766"