@atlaskit/editor-plugin-insert-block 8.3.2 → 8.4.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-insert-block
 
+## 8.4.0
+
+### Minor Changes
+
+- [`7b679117f4605`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7b679117f4605) -
+  [ux] Productionizes `confluence-whiteboards-quick-insert-eligible` and
+  `confluence-whiteboards-quick-insert-l10n-eligible` feature gates and
+  `confluence_whiteboards_quick_insert_localised` experiment. Ship "Diagram" variant.
+
+### Patch Changes
+
+- Updated dependencies
+
+## 8.3.3
+
+### Patch Changes
+
+- [`6431f5f6492ae`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/6431f5f6492ae) -
+  Remove unused platform_editor_toolbar_aifc_ga_blockers feature gate
+- Updated dependencies
+
 ## 8.3.2
 
 ### Patch Changes

package/dist/cjs/ui/ElementBrowser/InsertMenu.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.filterForPinWhiteboardsExperiment = exports.default = exports.DEFAULT_HEIGHT = void 0;
+exports.filterForPinWhiteboards = exports.default = exports.DEFAULT_HEIGHT = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
@@ -20,10 +20,7 @@ var _hooks = require("@atlaskit/editor-common/hooks");
 var _quickInsert = require("@atlaskit/editor-common/quick-insert");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorPluginConnectivity = require("@atlaskit/editor-plugin-connectivity");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
-var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
-var _expVal = require("@atlaskit/tmp-editor-statsig/expVal");
 var _excluded = ["children"];
 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; } /**
@@ -38,98 +35,29 @@ var DEFAULT_HEIGHT = exports.DEFAULT_HEIGHT = 560;
    method that can be used to get suggestions -> once all experiments are cleaned up,
    they should be unified through `pluginInjectionApi?.quickInsert?.actions.getSuggestions`
  */
-var filterForPinWhiteboardsExperiment = exports.filterForPinWhiteboardsExperiment = function filterForPinWhiteboardsExperiment(featuredItems, formatMessage) {
-  // Legacy path fallback -- prior comments as follows:
-  /**
-   * // Part of ATLAS-95399 to pin whiteboards to the top of the InsertMenu
-  	// Need to check if whiteboard options are available, and filter for the cohort
-  	// Takes the original featuredItems list and returns one with the right whiteboard option at the top
-   */
-  if ((0, _platformFeatureFlags.fg)('confluence-whiteboards-quick-insert-eligible')) {
-    var DIAGRAM_TITLE = 'Create diagram',
-      BLANK_TITLE = 'Create whiteboard';
-    var featuredWhiteboardsPresent = featuredItems.filter(function (item) {
-      return [DIAGRAM_TITLE, BLANK_TITLE].includes(item.title);
-    }).length === 2;
-    if (featuredWhiteboardsPresent) {
-      var pinWhiteboardActionToTop = function pinWhiteboardActionToTop(items, title) {
-        // find the requested item by title, give it the appropriate description, and bring it to the top of the list
-        var index = items.findIndex(function (item) {
-          return item.title === title;
-        });
-        var filteredList = items.filter(function (item) {
-          return ![DIAGRAM_TITLE, BLANK_TITLE].includes(item.title);
-        });
-        if (index === -1) {
-          return filteredList;
-        }
-        var featuredItem = _objectSpread({}, items[index]);
-        featuredItem.description = formatMessage(_quickInsert.messages.featuredWhiteboardDescription);
-        return [featuredItem].concat((0, _toConsumableArray2.default)(filteredList));
-      };
-      return pinWhiteboardActionToTop(featuredItems, DIAGRAM_TITLE);
-    } else {
-      if ((0, _platformFeatureFlags.fg)('confluence-whiteboards-quick-insert-l10n-eligible')) {
-        // Fire exposure for confluence_whiteboards_quick_insert_localised_aa
-        // https://switcheroo.atlassian.com/ui/gates/ccd80d32-28a1-4dcf-b3f9-dbdc02a046ff/key/confluence_whiteboards_quick_insert_localised_aa
-        (0, _expVal.expVal)('confluence_whiteboards_quick_insert_localised_aa', 'cohort', 'test_diagram');
-
-        /** BEGIN locale agnostic path */
-
-        /**
-         * EXTREMELY IMPORTANT: we must not drop diagram for those who already receive
-         * the 'insert diagram to the top' treatment.
-         *
-         * Our heuristic to check that this is only targeting users where they haven't
-         * gotten the experience, is if we _cannot_ find the blank board experience in
-         * the list, matching purely on title.
-         *
-         * e.g. `featuredWhiteboardsPresent` = false, given it matches on title.
-         *
-         * The side-effect of this, is that there's a small chance/edge case of users
-         * who toggle between locales, and receive different experiences.
-         *
-         * Hopefully we can make a call early on this experiment, and eliminate this
-         * code path.
-         */
-        var WHITEBOARD_KEY = 'whiteboard-extension:create-whiteboard';
-        var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-        var isBlank = function isBlank(item) {
-          return item.key === WHITEBOARD_KEY;
-        };
-        var isDiagram = function isDiagram(item) {
-          return item.key === DIAGRAM_KEY;
-        };
-        var hasBoth = featuredItems.some(isBlank) && featuredItems.some(isDiagram);
-        if (hasBoth) {
-          var pin = function pin(key) {
-            var idx = featuredItems.findIndex(function (item) {
-              return item.key === key;
-            });
-            var filtered = featuredItems.filter(function (item) {
-              return !isBlank(item) && !isDiagram(item);
-            });
-            if (idx === -1) {
-              return filtered;
-            }
-            var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
-              description: formatMessage(_quickInsert.messages.featuredWhiteboardDescription)
-            });
-            return [picked].concat((0, _toConsumableArray2.default)(filtered));
-          };
-          if ((0, _expValEquals.expValEquals)('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_blank')) {
-            return pin(WHITEBOARD_KEY);
-          }
-          if ((0, _expValEquals.expValEquals)('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_diagram')) {
-            return pin(DIAGRAM_KEY);
-          }
-          if ((0, _expValEquals.expValEquals)('confluence_whiteboards_quick_insert_localised', 'cohort', 'control')) {
-            return featuredItems;
-          }
-        }
+var filterForPinWhiteboards = exports.filterForPinWhiteboards = function filterForPinWhiteboards(featuredItems, formatMessage) {
+  var DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
+  var isDiagram = function isDiagram(item) {
+    return item.key === DIAGRAM_KEY;
+  };
+  var featuredWhiteboardsPresent = featuredItems.some(isDiagram);
+  if (featuredWhiteboardsPresent) {
+    var pin = function pin(key) {
+      var idx = featuredItems.findIndex(function (item) {
+        return item.key === key;
+      });
+      var filtered = featuredItems.filter(function (item) {
+        return !isDiagram(item);
+      });
+      if (idx === -1) {
+        return filtered;
       }
-      /** END locale agnostic path */
-    }
+      var picked = _objectSpread(_objectSpread({}, featuredItems[idx]), {}, {
+        description: formatMessage(_quickInsert.messages.featuredWhiteboardDescription)
+      });
+      return [picked].concat((0, _toConsumableArray2.default)(filtered));
+    };
+    return pin(DIAGRAM_KEY);
   }
   return featuredItems;
 };
@@ -243,7 +171,7 @@ var InsertMenu = function InsertMenu(_ref) {
       })) !== null && _pluginInjectionApi$q4 !== void 0 ? _pluginInjectionApi$q4 : [];
       var unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to filter on the concatenated list so whiteboards are at the top
-      result = filterForPinWhiteboardsExperiment(unfilteredResult, formatMessage);
+      result = filterForPinWhiteboards(unfilteredResult, formatMessage);
     }
     setItemCount(result.length);
     return result;

package/dist/cjs/ui/toolbar-components.js

@@ -279,166 +279,131 @@ var getToolbarComponents = exports.getToolbarComponents = function getToolbarCom
         });
       };
     };
-    if ((0, _platformFeatureFlags.fg)('platform_editor_toolbar_aifc_ga_blockers')) {
-      components.push({
+    components.push({
+      type: _toolbar.INSERT_GROUP.type,
+      key: "".concat(_toolbar.INSERT_GROUP.key, "-none"),
+      parents: [{
+        type: _toolbar.INSERT_BLOCK_SECTION.type,
+        key: _toolbar.INSERT_BLOCK_SECTION.key,
+        rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
+      }],
+      component: function component(_ref3) {
+        var children = _ref3.children;
+        return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+          below: "sm"
+        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+      }
+    });
+    components.push({
+      type: _toolbar.INSERT_BUTTON.type,
+      key: _toolbar.INSERT_BUTTON.key,
+      parents: [{
         type: _toolbar.INSERT_GROUP.type,
         key: "".concat(_toolbar.INSERT_GROUP.key, "-none"),
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }],
-        component: function component(_ref3) {
-          var children = _ref3.children;
-          return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-            below: "sm"
-          }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-        }
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: "".concat(_toolbar.INSERT_GROUP.key, "-none"),
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent(null)
-      });
-      components.push({
+        rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent(null)
+    });
+    components.push({
+      type: _toolbar.INSERT_GROUP.type,
+      key: "".concat(_toolbar.INSERT_GROUP.key, "-sm"),
+      parents: [{
+        type: _toolbar.INSERT_BLOCK_SECTION.type,
+        key: _toolbar.INSERT_BLOCK_SECTION.key,
+        rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
+      }],
+      component: function component(_ref4) {
+        var children = _ref4.children;
+        return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+          only: "sm"
+        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+      }
+    });
+    components.push({
+      type: _toolbar.INSERT_BUTTON.type,
+      key: _toolbar.INSERT_BUTTON.key,
+      parents: [{
         type: _toolbar.INSERT_GROUP.type,
         key: "".concat(_toolbar.INSERT_GROUP.key, "-sm"),
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }],
-        component: function component(_ref4) {
-          var children = _ref4.children;
-          return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-            only: "sm"
-          }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-        }
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: "".concat(_toolbar.INSERT_GROUP.key, "-sm"),
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('sm')
-      });
-      components.push({
+        rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('sm')
+    });
+    components.push({
+      type: _toolbar.INSERT_GROUP.type,
+      key: "".concat(_toolbar.INSERT_GROUP.key, "-md"),
+      parents: [{
+        type: _toolbar.INSERT_BLOCK_SECTION.type,
+        key: _toolbar.INSERT_BLOCK_SECTION.key,
+        rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
+      }],
+      component: function component(_ref5) {
+        var children = _ref5.children;
+        return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+          only: "md"
+        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+      }
+    });
+    components.push({
+      type: _toolbar.INSERT_BUTTON.type,
+      key: _toolbar.INSERT_BUTTON.key,
+      parents: [{
         type: _toolbar.INSERT_GROUP.type,
         key: "".concat(_toolbar.INSERT_GROUP.key, "-md"),
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }],
-        component: function component(_ref5) {
-          var children = _ref5.children;
-          return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-            only: "md"
-          }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-        }
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: "".concat(_toolbar.INSERT_GROUP.key, "-md"),
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('md')
-      });
-      components.push({
+        rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('md')
+    });
+    components.push({
+      type: _toolbar.INSERT_GROUP.type,
+      key: "".concat(_toolbar.INSERT_GROUP.key, "-lg"),
+      parents: [{
+        type: _toolbar.INSERT_BLOCK_SECTION.type,
+        key: _toolbar.INSERT_BLOCK_SECTION.key,
+        rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
+      }],
+      component: function component(_ref6) {
+        var children = _ref6.children;
+        return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+          only: "lg"
+        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+      }
+    });
+    components.push({
+      type: _toolbar.INSERT_BUTTON.type,
+      key: _toolbar.INSERT_BUTTON.key,
+      parents: [{
         type: _toolbar.INSERT_GROUP.type,
         key: "".concat(_toolbar.INSERT_GROUP.key, "-lg"),
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }],
-        component: function component(_ref6) {
-          var children = _ref6.children;
-          return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-            only: "lg"
-          }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-        }
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: "".concat(_toolbar.INSERT_GROUP.key, "-lg"),
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('lg')
-      });
-      components.push({
+        rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('lg')
+    });
+    components.push({
+      type: _toolbar.INSERT_GROUP.type,
+      key: "".concat(_toolbar.INSERT_GROUP.key, "-xl"),
+      parents: [{
+        type: _toolbar.INSERT_BLOCK_SECTION.type,
+        key: _toolbar.INSERT_BLOCK_SECTION.key,
+        rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
+      }],
+      component: function component(_ref7) {
+        var children = _ref7.children;
+        return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
+          only: "xl"
+        }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
+      }
+    });
+    components.push({
+      type: _toolbar.INSERT_BUTTON.type,
+      key: _toolbar.INSERT_BUTTON.key,
+      parents: [{
         type: _toolbar.INSERT_GROUP.type,
         key: "".concat(_toolbar.INSERT_GROUP.key, "-xl"),
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }],
-        component: function component(_ref7) {
-          var children = _ref7.children;
-          return /*#__PURE__*/_react.default.createElement(_editorToolbar.Show, {
-            only: "xl"
-          }, /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarButtonGroup, null, children));
-        }
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: "".concat(_toolbar.INSERT_GROUP.key, "-xl"),
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: createInsertButtonComponent('xl')
-      });
-    } else {
-      components.push({
-        type: _toolbar.INSERT_GROUP.type,
-        key: _toolbar.INSERT_GROUP.key,
-        parents: [{
-          type: _toolbar.INSERT_BLOCK_SECTION.type,
-          key: _toolbar.INSERT_BLOCK_SECTION.key,
-          rank: _toolbar.INSERT_BLOCK_SECTION_RANK[_toolbar.INSERT_GROUP.key]
-        }]
-      });
-      components.push({
-        type: _toolbar.INSERT_BUTTON.type,
-        key: _toolbar.INSERT_BUTTON.key,
-        parents: [{
-          type: _toolbar.INSERT_GROUP.type,
-          key: _toolbar.INSERT_GROUP.key,
-          rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
-        }],
-        component: function component() {
-          return /*#__PURE__*/_react.default.createElement(_InsertButton.InsertButton, {
-            api: api,
-            toolbarConfig: config,
-            showElementBrowserLink: options.showElementBrowserLink,
-            tableSelectorSupported: options.tableSelectorSupported,
-            onInsertBlockType: onInsertBlockType,
-            nativeStatusSupported: options.nativeStatusSupported,
-            horizontalRuleEnabled: options.horizontalRuleEnabled,
-            expandEnabled: options.allowExpand,
-            insertMenuItems: options.insertMenuItems,
-            numberOfButtons: 7 // TODO: ED-28759 - Default to 7 buttons - Remove this once we have a proper way to do toolbar responsiveness
-          });
-        }
-      });
-    }
+        rank: _toolbar.INSERT_GROUP_RANK[_toolbar.INSERT_BUTTON.key]
+      }],
+      component: createInsertButtonComponent('xl')
+    });
   }
   return components;
 };

package/dist/es2019/ui/ElementBrowser/InsertMenu.js

@@ -16,10 +16,7 @@ import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks'
 import { messages, IconCode, IconDate, IconDecision, IconDivider, IconExpand, IconPanel, IconQuote, IconStatus } from '@atlaskit/editor-common/quick-insert';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { isOfflineMode } from '@atlaskit/editor-plugin-connectivity';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { N0, N30A, N60A } from '@atlaskit/theme/colors';
-import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
-import { expVal } from '@atlaskit/tmp-editor-statsig/expVal';
 export const DEFAULT_HEIGHT = 560;
 
 /**
@@ -28,86 +25,24 @@ export const DEFAULT_HEIGHT = 560;
    method that can be used to get suggestions -> once all experiments are cleaned up,
    they should be unified through `pluginInjectionApi?.quickInsert?.actions.getSuggestions`
  */
-export const filterForPinWhiteboardsExperiment = (featuredItems, formatMessage) => {
-  // Legacy path fallback -- prior comments as follows:
-  /**
-   * // Part of ATLAS-95399 to pin whiteboards to the top of the InsertMenu
-  	// Need to check if whiteboard options are available, and filter for the cohort
-  	// Takes the original featuredItems list and returns one with the right whiteboard option at the top
-   */
-  if (fg('confluence-whiteboards-quick-insert-eligible')) {
-    const [DIAGRAM_TITLE, BLANK_TITLE] = ['Create diagram', 'Create whiteboard'];
-    const featuredWhiteboardsPresent = featuredItems.filter(item => [DIAGRAM_TITLE, BLANK_TITLE].includes(item.title)).length === 2;
-    if (featuredWhiteboardsPresent) {
-      const pinWhiteboardActionToTop = (items, title) => {
-        // find the requested item by title, give it the appropriate description, and bring it to the top of the list
-        const index = items.findIndex(item => item.title === title);
-        const filteredList = items.filter(item => ![DIAGRAM_TITLE, BLANK_TITLE].includes(item.title));
-        if (index === -1) {
-          return filteredList;
-        }
-        const featuredItem = {
-          ...items[index]
-        };
-        featuredItem.description = formatMessage(messages.featuredWhiteboardDescription);
-        return [featuredItem, ...filteredList];
-      };
-      return pinWhiteboardActionToTop(featuredItems, DIAGRAM_TITLE);
-    } else {
-      if (fg('confluence-whiteboards-quick-insert-l10n-eligible')) {
-        // Fire exposure for confluence_whiteboards_quick_insert_localised_aa
-        // https://switcheroo.atlassian.com/ui/gates/ccd80d32-28a1-4dcf-b3f9-dbdc02a046ff/key/confluence_whiteboards_quick_insert_localised_aa
-        expVal('confluence_whiteboards_quick_insert_localised_aa', 'cohort', 'test_diagram');
-
-        /** BEGIN locale agnostic path */
-
-        /**
-         * EXTREMELY IMPORTANT: we must not drop diagram for those who already receive
-         * the 'insert diagram to the top' treatment.
-         *
-         * Our heuristic to check that this is only targeting users where they haven't
-         * gotten the experience, is if we _cannot_ find the blank board experience in
-         * the list, matching purely on title.
-         *
-         * e.g. `featuredWhiteboardsPresent` = false, given it matches on title.
-         *
-         * The side-effect of this, is that there's a small chance/edge case of users
-         * who toggle between locales, and receive different experiences.
-         *
-         * Hopefully we can make a call early on this experiment, and eliminate this
-         * code path.
-         */
-        const WHITEBOARD_KEY = 'whiteboard-extension:create-whiteboard';
-        const DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
-        const isBlank = item => item.key === WHITEBOARD_KEY;
-        const isDiagram = item => item.key === DIAGRAM_KEY;
-        const hasBoth = featuredItems.some(isBlank) && featuredItems.some(isDiagram);
-        if (hasBoth) {
-          const pin = key => {
-            const idx = featuredItems.findIndex(item => item.key === key);
-            const filtered = featuredItems.filter(item => !isBlank(item) && !isDiagram(item));
-            if (idx === -1) {
-              return filtered;
-            }
-            const picked = {
-              ...featuredItems[idx],
-              description: formatMessage(messages.featuredWhiteboardDescription)
-            };
-            return [picked, ...filtered];
-          };
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_blank')) {
-            return pin(WHITEBOARD_KEY);
-          }
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'test_diagram')) {
-            return pin(DIAGRAM_KEY);
-          }
-          if (expValEquals('confluence_whiteboards_quick_insert_localised', 'cohort', 'control')) {
-            return featuredItems;
-          }
-        }
+export const filterForPinWhiteboards = (featuredItems, formatMessage) => {
+  const DIAGRAM_KEY = 'whiteboard-extension:create-diagram';
+  const isDiagram = item => item.key === DIAGRAM_KEY;
+  const featuredWhiteboardsPresent = featuredItems.some(isDiagram);
+  if (featuredWhiteboardsPresent) {
+    const pin = key => {
+      const idx = featuredItems.findIndex(item => item.key === key);
+      const filtered = featuredItems.filter(item => !isDiagram(item));
+      if (idx === -1) {
+        return filtered;
       }
-      /** END locale agnostic path */
-    }
+      const picked = {
+        ...featuredItems[idx],
+        description: formatMessage(messages.featuredWhiteboardDescription)
+      };
+      return [picked, ...filtered];
+    };
+    return pin(DIAGRAM_KEY);
   }
   return featuredItems;
 };
@@ -208,7 +143,7 @@ const InsertMenu = ({
       } : item)) !== null && _pluginInjectionApi$q5 !== void 0 ? _pluginInjectionApi$q5 : [];
       const unfilteredResult = quickInsertDropdownItems.concat(featuredQuickInsertSuggestions);
       // need to filter on the concatenated list so whiteboards are at the top
-      result = filterForPinWhiteboardsExperiment(unfilteredResult, formatMessage);
+      result = filterForPinWhiteboards(unfilteredResult, formatMessage);
     }
     setItemCount(result.length);
     return result;