@atlaskit/editor-common 111.25.1 → 111.26.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @atlaskit/editor-common
 
+## 111.26.0
+
+### Minor Changes
+
+- [`06576a95fd8a9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/06576a95fd8a9) -
+  lower jira legacy macro search ranking
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 111.25.1
 
 ### Patch Changes

package/dist/cjs/monitoring/error.js

@@ -19,7 +19,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "111.25.0";
+var packageVersion = "111.25.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/quick-insert/utils.js

@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.find = find;
 exports.memoProcessQuickInsertItems = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _fuse = _interopRequireDefault(require("fuse.js"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var processQuickInsertItems = function processQuickInsertItems(items, intl) {
@@ -79,7 +81,29 @@ function find(query, items, prioritySortingFn) {
     }
   }
   var fuse = new _fuse.default(items, fuseOptions);
-  return fuse.search(query).map(function (result) {
+  var results = fuse.search(query);
+  if ((0, _platformFeatureFlags.fg)('jim-lower-ranking-in-jira-macro-search')) {
+    var _results$datasourceIn, _results$legacyIndex$;
+    // searching for jira work items macro first
+    var datasourceIndex = results.findIndex(function (r) {
+      var _r$item$keywords;
+      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+    });
+
+    //  then searching for the legacy jira macro
+    var legacyIndex = results.findIndex(function (r) {
+      return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
+    });
+
+    // the jira work items macro is found before the legacy jira macrothen swap the two
+    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
+      var _results$splice = results.splice(datasourceIndex, 1),
+        _results$splice2 = (0, _slicedToArray2.default)(_results$splice, 1),
+        datasource = _results$splice2[0];
+      results.splice(legacyIndex, 0, datasource);
+    }
+  }
+  return results.map(function (result) {
     return result.item;
   });
 }

package/dist/cjs/ui/DropList/index.js

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "111.25.0";
+var packageVersion = "111.25.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = (0, _react2.keyframes)({

package/dist/es2019/monitoring/error.js

@@ -4,7 +4,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "111.25.0";
+const packageVersion = "111.25.1";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/quick-insert/utils.js

@@ -1,5 +1,6 @@
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
+import { fg } from '@atlaskit/platform-feature-flags';
 const processQuickInsertItems = (items, intl) => {
   return items.reduce((acc, item) => {
     if (typeof item === 'function' &&
@@ -64,5 +65,23 @@ export function find(query, items, prioritySortingFn) {
     }
   }
   const fuse = new Fuse(items, fuseOptions);
-  return fuse.search(query).map(result => result.item);
+  const results = fuse.search(query);
+  if (fg('jim-lower-ranking-in-jira-macro-search')) {
+    var _results$datasourceIn, _results$legacyIndex$;
+    // searching for jira work items macro first
+    const datasourceIndex = results.findIndex(r => {
+      var _r$item$keywords;
+      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+    });
+
+    //  then searching for the legacy jira macro
+    const legacyIndex = results.findIndex(r => typeof r.item.key === 'string' && r.item.key.endsWith(':jira'));
+
+    // the jira work items macro is found before the legacy jira macrothen swap the two
+    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
+      const [datasource] = results.splice(datasourceIndex, 1);
+      results.splice(legacyIndex, 0, datasource);
+    }
+  }
+  return results.map(result => result.item);
 }

package/dist/es2019/ui/DropList/index.js

@@ -14,7 +14,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "111.25.0";
+const packageVersion = "111.25.1";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 const fadeIn = keyframes({

package/dist/esm/monitoring/error.js

@@ -10,7 +10,7 @@ import { isFedRamp } from './environment';
 import { normaliseSentryBreadcrumbs, SERIALIZABLE_ATTRIBUTES } from './normalise-sentry-breadcrumbs';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "111.25.0";
+var packageVersion = "111.25.1";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/quick-insert/utils.js

@@ -1,8 +1,10 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import Fuse from 'fuse.js';
 import memoizeOne from 'memoize-one';
+import { fg } from '@atlaskit/platform-feature-flags';
 var processQuickInsertItems = function processQuickInsertItems(items, intl) {
   return items.reduce(function (acc, item) {
     if (typeof item === 'function' &&
@@ -71,7 +73,29 @@ export function find(query, items, prioritySortingFn) {
     }
   }
   var fuse = new Fuse(items, fuseOptions);
-  return fuse.search(query).map(function (result) {
+  var results = fuse.search(query);
+  if (fg('jim-lower-ranking-in-jira-macro-search')) {
+    var _results$datasourceIn, _results$legacyIndex$;
+    // searching for jira work items macro first
+    var datasourceIndex = results.findIndex(function (r) {
+      var _r$item$keywords;
+      return r.item.id === 'datasource' && ((_r$item$keywords = r.item.keywords) === null || _r$item$keywords === void 0 ? void 0 : _r$item$keywords.includes('jira'));
+    });
+
+    //  then searching for the legacy jira macro
+    var legacyIndex = results.findIndex(function (r) {
+      return typeof r.item.key === 'string' && r.item.key.endsWith(':jira');
+    });
+
+    // the jira work items macro is found before the legacy jira macrothen swap the two
+    if (datasourceIndex > 0 && legacyIndex >= 0 && legacyIndex < datasourceIndex && Math.abs(((_results$datasourceIn = results[datasourceIndex].score) !== null && _results$datasourceIn !== void 0 ? _results$datasourceIn : 0) - ((_results$legacyIndex$ = results[legacyIndex].score) !== null && _results$legacyIndex$ !== void 0 ? _results$legacyIndex$ : 0)) < 0.2) {
+      var _results$splice = results.splice(datasourceIndex, 1),
+        _results$splice2 = _slicedToArray(_results$splice, 1),
+        datasource = _results$splice2[0];
+      results.splice(legacyIndex, 0, datasource);
+    }
+  }
+  return results.map(function (result) {
     return result.item;
   });
 }

package/dist/esm/ui/DropList/index.js

@@ -21,7 +21,7 @@ import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import { fg } from '@atlaskit/platform-feature-flags';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "111.25.0";
+var packageVersion = "111.25.1";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var fadeIn = keyframes({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "111.25.1",
+	"version": "111.26.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,7 +30,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.5.0",
-		"@atlaskit/adf-schema": "^52.1.0",
+		"@atlaskit/adf-schema": "^52.2.0",
 		"@atlaskit/adf-utils": "^19.27.0",
 		"@atlaskit/afm-i18n-platform-editor-editor-common": "2.18.0",
 		"@atlaskit/analytics-listeners": "^10.0.0",
@@ -82,7 +82,7 @@
 		"@atlaskit/task-decision": "^19.3.0",
 		"@atlaskit/textfield": "^8.2.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^32.12.0",
+		"@atlaskit/tmp-editor-statsig": "^33.0.0",
 		"@atlaskit/tokens": "^11.0.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/width-detector": "^5.0.0",