@atlaskit/editor-plugin-quick-insert 14.1.2 → 15.0.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaskit/editor-plugin-quick-insert
 
+## 15.0.0
+
+### Patch Changes
+
+- [`bb37742539a7d`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/bb37742539a7d) -
+  Rename Quick Insert category analytics from app counts to macro counts, add reusable extension app
+  identity, and track internal, ecosystem, and all macro/app counts for externally provided items
+  behind `platform_editor_slash_app_category_analytics`. GUID-only app identities are grouped as
+  `unknown`.
+
+  Breaking change: `CategoryInformation` and `QuickInsertInformationAttributes` from
+  `@atlaskit/editor-common/analytics/types/quick-insert-events` have changed shape. Update usages to
+  the new fields (`internalMacroCount`, `internalAppCount`, `internalAppMacroMax`,
+  `ecosystemMacroCount`, `ecosystemAppCount`, `ecosystemAppMacroMax`, `allMacroCount`,
+  `allAppCount`, and `allAppMacroMax`) and add the `allCategories` aggregate. Remove references to
+  the removed `appCount` and `appMacros` fields. `ExtensionApp.ownership` has been replaced by
+  `ExtensionApp.source` (`internal` or `ecosystem`); update app metadata producers accordingly.
+
+- Updated dependencies
+
 ## 14.1.2
 
 ### Patch Changes

package/compass.yml

@@ -1,7 +1,7 @@
 configVersion: 1
 id: ari:cloud:compass:a436116f-02ce-4520-8fbb-7301462a1674:component/c5751cc6-3513-4070-9deb-af31e86aed34/2f21d665-dd06-4dab-87b8-ba8867f6ce2e
 name: '@atlaskit/editor-plugin-quick-insert'
-ownerId: ari:cloud:identity::team/ce353f56-2a90-491b-b272-b90dca4fffa2 # Editor FE Platform
+ownerId: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb # Editor Developers
 labels:
   - platform-code
   - platform-afm
@@ -16,14 +16,14 @@ links:
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master
   - name: Slack Channel
     type: CHAT_CHANNEL
-    url: https://atlassian.enterprise.slack.com/archives/C03SD6QJWPP # #cc-editor-lego
+    url: https://atlassian.enterprise.slack.com/archives/CFG3PSQ9E # #help-editor
   - name: Editor Plugin Quick Insert
     type: REPOSITORY
     url: https://bitbucket.org/atlassian/atlassian-frontend-monorepo/src/master/platform/packages/editor/editor-plugin-quick-insert
 customFields:
   - name: Department
     type: text
-    value: Eng - Editor Frontend Platform
+    value: Editor Developers
   - name: Trusted Reviewer Teams
     type: text
     value: ari:cloud:identity::team/cf6a670b-5252-4c68-a769-9207de366beb

package/dist/cjs/app-category-analytics.js

@@ -13,151 +13,168 @@ function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 var QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS = exports.QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS = 10000;
+var GUID_ONLY_APP_KEY_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var isGuidOnlyAppKey = function isGuidOnlyAppKey(appKey) {
+  return GUID_ONLY_APP_KEY_REGEX.test(appKey);
+};
 var sectionCategoryKeys = (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, _keys.BLOCK_TEMPLATES_SECTION.key, 'blockTemplates'), _keys.DATA_AND_CHARTS_SECTION.key, 'dataAndCharts'), _keys.EMBED_SECTION.key, 'embed'), _keys.MEDIA_SECTION.key, 'media'), _keys.OTHER_SECTION.key, 'other'), _keys.ROVO_SECTION.key, 'rovo'), _keys.STRUCTURE_SECTION.key, 'structure'), _keys.TEXT_FORMATTING_SECTION.key, 'textFormatting');
 var legacyCategoryKeys = new Set(['admin', 'ai', 'block-templates', 'communication', 'confluence-content', 'data-and-charts', 'development', 'embed', 'external-content', 'formatting', 'media', 'navigation', 'other', 'reporting', 'skills', 'structure', 'text-formatting', 'visuals']);
 var isLegacyCategoryKey = function isLegacyCategoryKey(category) {
   return legacyCategoryKeys.has(category);
 };
-var calculateQuickInsertItemsAttributes = exports.calculateQuickInsertItemsAttributes = function calculateQuickInsertItemsAttributes(items) {
+var calculateQuickInsertItemsAttributes = exports.calculateQuickInsertItemsAttributes = function calculateQuickInsertItemsAttributes(_ref) {
+  var providedItems = _ref.providedItems;
+  var emptyCategoryInformation = function emptyCategoryInformation() {
+    return {
+      internalMacroCount: 0,
+      internalAppCount: 0,
+      internalAppMacroMax: 0,
+      ecosystemMacroCount: 0,
+      ecosystemAppCount: 0,
+      ecosystemAppMacroMax: 0,
+      allMacroCount: 0,
+      allAppCount: 0,
+      allAppMacroMax: 0
+    };
+  };
+  var emptyCategoryCounts = {
+    blockTemplates: emptyCategoryInformation(),
+    dataAndCharts: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    rovo: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    textFormatting: emptyCategoryInformation()
+  };
+  var emptyLegacyCategoryCounts = {
+    admin: emptyCategoryInformation(),
+    ai: emptyCategoryInformation(),
+    'block-templates': emptyCategoryInformation(),
+    communication: emptyCategoryInformation(),
+    'confluence-content': emptyCategoryInformation(),
+    'data-and-charts': emptyCategoryInformation(),
+    development: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    'external-content': emptyCategoryInformation(),
+    formatting: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    navigation: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    reporting: emptyCategoryInformation(),
+    skills: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    'text-formatting': emptyCategoryInformation(),
+    uncategorized: emptyCategoryInformation(),
+    visuals: emptyCategoryInformation()
+  };
   var attributes = {
-    category: {
-      blockTemplates: {
-        appCount: 0
-      },
-      dataAndCharts: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      rovo: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      textFormatting: {
-        appCount: 0
-      }
-    },
-    legacyCategory: {
-      admin: {
-        appCount: 0
-      },
-      ai: {
-        appCount: 0
-      },
-      'block-templates': {
-        appCount: 0
-      },
-      communication: {
-        appCount: 0
-      },
-      'confluence-content': {
-        appCount: 0
-      },
-      'data-and-charts': {
-        appCount: 0
-      },
-      development: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      'external-content': {
-        appCount: 0
-      },
-      formatting: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      navigation: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      reporting: {
-        appCount: 0
-      },
-      skills: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      'text-formatting': {
-        appCount: 0
-      },
-      uncategorized: {
-        appCount: 0
-      },
-      visuals: {
-        appCount: 0
-      }
+    category: emptyCategoryCounts,
+    legacyCategory: emptyLegacyCategoryCounts,
+    allCategories: emptyCategoryInformation()
+  };
+  var appMacroCounts = new WeakMap();
+  var getAppMacroCounts = function getAppMacroCounts(category) {
+    var existingCounts = appMacroCounts.get(category);
+    if (existingCounts) {
+      return existingCounts;
     }
+    var counts = {
+      all: new Map(),
+      internal: new Map(),
+      ecosystem: new Map()
+    };
+    appMacroCounts.set(category, counts);
+    return counts;
   };
-  var _iterator = _createForOfIteratorHelper(items),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _item$categories$map$, _item$categories;
-      var item = _step.value;
-      var normalizedCategories = new Set((_item$categories$map$ = (_item$categories = item.categories) === null || _item$categories === void 0 ? void 0 : _item$categories.map(function (category) {
-        return category.trim().toLowerCase();
-      }).filter(Boolean)) !== null && _item$categories$map$ !== void 0 ? _item$categories$map$ : []);
-      var hasUnknownCategory = normalizedCategories.size === 0;
-      var _iterator2 = _createForOfIteratorHelper(normalizedCategories),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var category = _step2.value;
-          if (isLegacyCategoryKey(category)) {
-            attributes.legacyCategory[category].appCount += 1;
-          } else {
-            hasUnknownCategory = true;
-          }
+  var countAppMacro = function countAppMacro(appKey, counts) {
+    var _counts$get;
+    var appMacroCount = ((_counts$get = counts.get(appKey)) !== null && _counts$get !== void 0 ? _counts$get : 0) + 1;
+    counts.set(appKey, appMacroCount);
+    return appMacroCount;
+  };
+  var countCategoryItem = function countCategoryItem(category, item) {
+    var _item$app;
+    category.allMacroCount += 1;
+    var _ref2 = (_item$app = item.app) !== null && _item$app !== void 0 ? _item$app : {},
+      _ref2$key = _ref2.key,
+      appKey = _ref2$key === void 0 ? 'unknown' : _ref2$key,
+      source = _ref2.source;
+    var appMacroKey = isGuidOnlyAppKey(appKey) ? 'unknown' : appKey;
+    var counts = getAppMacroCounts(category);
+    var allAppMacroCount = countAppMacro(appMacroKey, counts.all);
+    category.allAppCount = counts.all.size;
+    category.allAppMacroMax = Math.max(category.allAppMacroMax, allAppMacroCount);
+    if (source === 'internal') {
+      category.internalMacroCount += 1;
+      var internalAppMacroCount = countAppMacro(appMacroKey, counts.internal);
+      category.internalAppCount = counts.internal.size;
+      category.internalAppMacroMax = Math.max(category.internalAppMacroMax, internalAppMacroCount);
+    } else if (source === 'ecosystem') {
+      category.ecosystemMacroCount += 1;
+      var ecosystemAppMacroCount = countAppMacro(appMacroKey, counts.ecosystem);
+      category.ecosystemAppCount = counts.ecosystem.size;
+      category.ecosystemAppMacroMax = Math.max(category.ecosystemAppMacroMax, ecosystemAppMacroCount);
+    }
+  };
+  var countItem = function countItem(item) {
+    var _categories$map$filte;
+    countCategoryItem(attributes.allCategories, item);
+    var categories = item.categories;
+    var normalizedCategories = new Set((_categories$map$filte = categories === null || categories === void 0 ? void 0 : categories.map(function (category) {
+      return category.trim().toLowerCase();
+    }).filter(Boolean)) !== null && _categories$map$filte !== void 0 ? _categories$map$filte : []);
+    var hasUnknownCategory = normalizedCategories.size === 0;
+    var _iterator = _createForOfIteratorHelper(normalizedCategories),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var category = _step.value;
+        if (isLegacyCategoryKey(category)) {
+          countCategoryItem(attributes.legacyCategory[category], item);
+        } else {
+          hasUnknownCategory = true;
         }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
       }
-      if (hasUnknownCategory) {
-        attributes.legacyCategory.uncategorized.appCount += 1;
-      }
-      var _iterator3 = _createForOfIteratorHelper((0, _getMenuItemParents.getQuickInsertMenuItemParents)({
-          categories: item.categories,
-          rank: 0
-        })),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var key = _step3.value.key;
-          var categoryKey = sectionCategoryKeys[key];
-          if (categoryKey) {
-            attributes.category[categoryKey].appCount += 1;
-          }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (hasUnknownCategory) {
+      countCategoryItem(attributes.legacyCategory.uncategorized, item);
+    }
+    var _iterator2 = _createForOfIteratorHelper((0, _getMenuItemParents.getQuickInsertMenuItemParents)({
+        categories: categories,
+        rank: 0
+      })),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var key = _step2.value.key;
+        var categoryKey = sectionCategoryKeys[key];
+        if (!categoryKey) {
+          continue;
         }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+        countCategoryItem(attributes.category[categoryKey], item);
       }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  };
+  var _iterator3 = _createForOfIteratorHelper(providedItems),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var item = _step3.value;
+      countItem(item);
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator.f();
+    _iterator3.f();
   }
   return attributes;
 };
@@ -167,14 +184,14 @@ var createQuickInsertItemsAnalyticsScheduler = exports.createQuickInsertItemsAna
   var idleCallbackId;
   var destroyed = false;
   var scheduled = false;
-  var emit = function emit(items) {
+  var emit = function emit(options) {
     if (destroyed) {
       return;
     }
     dispatchAnalyticsEvent({
       action: _analytics.ACTION.QUICK_INSERT_INFORMATION,
       actionSubject: _analytics.ACTION_SUBJECT.QUICK_INSERT,
-      attributes: calculateQuickInsertItemsAttributes(items),
+      attributes: calculateQuickInsertItemsAttributes(options),
       eventType: _analytics.EVENT_TYPE.OPERATIONAL
     });
   };
@@ -191,7 +208,7 @@ var createQuickInsertItemsAnalyticsScheduler = exports.createQuickInsertItemsAna
         window.cancelIdleCallback(idleCallbackId);
       }
     },
-    schedule: function schedule(items) {
+    schedule: function schedule(options) {
       if (scheduled || destroyed) {
         return;
       }
@@ -202,11 +219,11 @@ var createQuickInsertItemsAnalyticsScheduler = exports.createQuickInsertItemsAna
         }
         if (typeof window.requestIdleCallback === 'function') {
           idleCallbackId = window.requestIdleCallback(function () {
-            return emit(items);
+            return emit(options);
           });
         } else if (typeof window.requestAnimationFrame === 'function') {
           animationFrameId = window.requestAnimationFrame(function () {
-            return emit(items);
+            return emit(options);
           });
         }
       }, QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS);

package/dist/cjs/quickInsertPlugin.js

@@ -410,7 +410,9 @@ function quickInsertPluginFactory(defaultItems, providerFactory, getIntl, dispat
                 })(editorView.state, editorView.dispatch);
                 if (!isDestroyed && !quickInsertItemsAnalyticsScheduler && (0, _isExperimentEnabled.isExperimentEnabled)('platform_editor_slash_app_category_analytics')) {
                   quickInsertItemsAnalyticsScheduler = (0, _appCategoryAnalytics.createQuickInsertItemsAnalyticsScheduler)(dispatchAnalyticsEvent);
-                  quickInsertItemsAnalyticsScheduler.schedule(providedItems);
+                  quickInsertItemsAnalyticsScheduler.schedule({
+                    providedItems: providedItems
+                  });
                 }
                 _context.next = 9;
                 break;

package/dist/es2019/app-category-analytics.js

@@ -2,6 +2,8 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { getQuickInsertMenuItemParents } from '@atlaskit/editor-common/quick-insert/get-menu-item-parents';
 import { BLOCK_TEMPLATES_SECTION, DATA_AND_CHARTS_SECTION, EMBED_SECTION, MEDIA_SECTION, OTHER_SECTION, ROVO_SECTION, STRUCTURE_SECTION, TEXT_FORMATTING_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 export const QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS = 10_000;
+const GUID_ONLY_APP_KEY_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/iu;
+const isGuidOnlyAppKey = appKey => GUID_ONLY_APP_KEY_REGEX.test(appKey);
 const sectionCategoryKeys = {
   [BLOCK_TEMPLATES_SECTION.key]: 'blockTemplates',
   [DATA_AND_CHARTS_SECTION.key]: 'dataAndCharts',
@@ -14,119 +16,131 @@ const sectionCategoryKeys = {
 };
 const legacyCategoryKeys = new Set(['admin', 'ai', 'block-templates', 'communication', 'confluence-content', 'data-and-charts', 'development', 'embed', 'external-content', 'formatting', 'media', 'navigation', 'other', 'reporting', 'skills', 'structure', 'text-formatting', 'visuals']);
 const isLegacyCategoryKey = category => legacyCategoryKeys.has(category);
-export const calculateQuickInsertItemsAttributes = items => {
+export const calculateQuickInsertItemsAttributes = ({
+  providedItems
+}) => {
+  const emptyCategoryInformation = () => ({
+    internalMacroCount: 0,
+    internalAppCount: 0,
+    internalAppMacroMax: 0,
+    ecosystemMacroCount: 0,
+    ecosystemAppCount: 0,
+    ecosystemAppMacroMax: 0,
+    allMacroCount: 0,
+    allAppCount: 0,
+    allAppMacroMax: 0
+  });
+  const emptyCategoryCounts = {
+    blockTemplates: emptyCategoryInformation(),
+    dataAndCharts: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    rovo: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    textFormatting: emptyCategoryInformation()
+  };
+  const emptyLegacyCategoryCounts = {
+    admin: emptyCategoryInformation(),
+    ai: emptyCategoryInformation(),
+    'block-templates': emptyCategoryInformation(),
+    communication: emptyCategoryInformation(),
+    'confluence-content': emptyCategoryInformation(),
+    'data-and-charts': emptyCategoryInformation(),
+    development: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    'external-content': emptyCategoryInformation(),
+    formatting: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    navigation: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    reporting: emptyCategoryInformation(),
+    skills: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    'text-formatting': emptyCategoryInformation(),
+    uncategorized: emptyCategoryInformation(),
+    visuals: emptyCategoryInformation()
+  };
   const attributes = {
-    category: {
-      blockTemplates: {
-        appCount: 0
-      },
-      dataAndCharts: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      rovo: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      textFormatting: {
-        appCount: 0
-      }
-    },
-    legacyCategory: {
-      admin: {
-        appCount: 0
-      },
-      ai: {
-        appCount: 0
-      },
-      'block-templates': {
-        appCount: 0
-      },
-      communication: {
-        appCount: 0
-      },
-      'confluence-content': {
-        appCount: 0
-      },
-      'data-and-charts': {
-        appCount: 0
-      },
-      development: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      'external-content': {
-        appCount: 0
-      },
-      formatting: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      navigation: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      reporting: {
-        appCount: 0
-      },
-      skills: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      'text-formatting': {
-        appCount: 0
-      },
-      uncategorized: {
-        appCount: 0
-      },
-      visuals: {
-        appCount: 0
-      }
+    category: emptyCategoryCounts,
+    legacyCategory: emptyLegacyCategoryCounts,
+    allCategories: emptyCategoryInformation()
+  };
+  const appMacroCounts = new WeakMap();
+  const getAppMacroCounts = category => {
+    const existingCounts = appMacroCounts.get(category);
+    if (existingCounts) {
+      return existingCounts;
     }
+    const counts = {
+      all: new Map(),
+      internal: new Map(),
+      ecosystem: new Map()
+    };
+    appMacroCounts.set(category, counts);
+    return counts;
+  };
+  const countAppMacro = (appKey, counts) => {
+    var _counts$get;
+    const appMacroCount = ((_counts$get = counts.get(appKey)) !== null && _counts$get !== void 0 ? _counts$get : 0) + 1;
+    counts.set(appKey, appMacroCount);
+    return appMacroCount;
   };
-  for (const item of items) {
-    var _item$categories$map$, _item$categories;
-    const normalizedCategories = new Set((_item$categories$map$ = (_item$categories = item.categories) === null || _item$categories === void 0 ? void 0 : _item$categories.map(category => category.trim().toLowerCase()).filter(Boolean)) !== null && _item$categories$map$ !== void 0 ? _item$categories$map$ : []);
+  const countCategoryItem = (category, item) => {
+    var _item$app;
+    category.allMacroCount += 1;
+    const {
+      key: appKey = 'unknown',
+      source
+    } = (_item$app = item.app) !== null && _item$app !== void 0 ? _item$app : {};
+    const appMacroKey = isGuidOnlyAppKey(appKey) ? 'unknown' : appKey;
+    const counts = getAppMacroCounts(category);
+    const allAppMacroCount = countAppMacro(appMacroKey, counts.all);
+    category.allAppCount = counts.all.size;
+    category.allAppMacroMax = Math.max(category.allAppMacroMax, allAppMacroCount);
+    if (source === 'internal') {
+      category.internalMacroCount += 1;
+      const internalAppMacroCount = countAppMacro(appMacroKey, counts.internal);
+      category.internalAppCount = counts.internal.size;
+      category.internalAppMacroMax = Math.max(category.internalAppMacroMax, internalAppMacroCount);
+    } else if (source === 'ecosystem') {
+      category.ecosystemMacroCount += 1;
+      const ecosystemAppMacroCount = countAppMacro(appMacroKey, counts.ecosystem);
+      category.ecosystemAppCount = counts.ecosystem.size;
+      category.ecosystemAppMacroMax = Math.max(category.ecosystemAppMacroMax, ecosystemAppMacroCount);
+    }
+  };
+  const countItem = item => {
+    var _categories$map$filte;
+    countCategoryItem(attributes.allCategories, item);
+    const categories = item.categories;
+    const normalizedCategories = new Set((_categories$map$filte = categories === null || categories === void 0 ? void 0 : categories.map(category => category.trim().toLowerCase()).filter(Boolean)) !== null && _categories$map$filte !== void 0 ? _categories$map$filte : []);
     let hasUnknownCategory = normalizedCategories.size === 0;
     for (const category of normalizedCategories) {
       if (isLegacyCategoryKey(category)) {
-        attributes.legacyCategory[category].appCount += 1;
+        countCategoryItem(attributes.legacyCategory[category], item);
       } else {
         hasUnknownCategory = true;
       }
     }
     if (hasUnknownCategory) {
-      attributes.legacyCategory.uncategorized.appCount += 1;
+      countCategoryItem(attributes.legacyCategory.uncategorized, item);
     }
     for (const {
       key
     } of getQuickInsertMenuItemParents({
-      categories: item.categories,
+      categories,
       rank: 0
     })) {
       const categoryKey = sectionCategoryKeys[key];
-      if (categoryKey) {
-        attributes.category[categoryKey].appCount += 1;
+      if (!categoryKey) {
+        continue;
       }
+      countCategoryItem(attributes.category[categoryKey], item);
     }
+  };
+  for (const item of providedItems) {
+    countItem(item);
   }
   return attributes;
 };
@@ -136,14 +150,14 @@ export const createQuickInsertItemsAnalyticsScheduler = dispatchAnalyticsEvent =
   let idleCallbackId;
   let destroyed = false;
   let scheduled = false;
-  const emit = items => {
+  const emit = options => {
     if (destroyed) {
       return;
     }
     dispatchAnalyticsEvent({
       action: ACTION.QUICK_INSERT_INFORMATION,
       actionSubject: ACTION_SUBJECT.QUICK_INSERT,
-      attributes: calculateQuickInsertItemsAttributes(items),
+      attributes: calculateQuickInsertItemsAttributes(options),
       eventType: EVENT_TYPE.OPERATIONAL
     });
   };
@@ -160,7 +174,7 @@ export const createQuickInsertItemsAnalyticsScheduler = dispatchAnalyticsEvent =
         window.cancelIdleCallback(idleCallbackId);
       }
     },
-    schedule: items => {
+    schedule: options => {
       if (scheduled || destroyed) {
         return;
       }
@@ -170,9 +184,9 @@ export const createQuickInsertItemsAnalyticsScheduler = dispatchAnalyticsEvent =
           return;
         }
         if (typeof window.requestIdleCallback === 'function') {
-          idleCallbackId = window.requestIdleCallback(() => emit(items));
+          idleCallbackId = window.requestIdleCallback(() => emit(options));
         } else if (typeof window.requestAnimationFrame === 'function') {
-          animationFrameId = window.requestAnimationFrame(() => emit(items));
+          animationFrameId = window.requestAnimationFrame(() => emit(options));
         }
       }, QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS);
     }

package/dist/es2019/quickInsertPlugin.js

@@ -350,7 +350,9 @@ function quickInsertPluginFactory(defaultItems, providerFactory, getIntl, dispat
             })(editorView.state, editorView.dispatch);
             if (!isDestroyed && !quickInsertItemsAnalyticsScheduler && isExperimentEnabled('platform_editor_slash_app_category_analytics')) {
               quickInsertItemsAnalyticsScheduler = createQuickInsertItemsAnalyticsScheduler(dispatchAnalyticsEvent);
-              quickInsertItemsAnalyticsScheduler.schedule(providedItems);
+              quickInsertItemsAnalyticsScheduler.schedule({
+                providedItems
+              });
             }
           } catch (e) {
             // eslint-disable-next-line no-console

package/dist/esm/app-category-analytics.js

@@ -6,151 +6,168 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { getQuickInsertMenuItemParents } from '@atlaskit/editor-common/quick-insert/get-menu-item-parents';
 import { BLOCK_TEMPLATES_SECTION, DATA_AND_CHARTS_SECTION, EMBED_SECTION, MEDIA_SECTION, OTHER_SECTION, ROVO_SECTION, STRUCTURE_SECTION, TEXT_FORMATTING_SECTION } from '@atlaskit/editor-common/quick-insert/keys';
 export var QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS = 10000;
+var GUID_ONLY_APP_KEY_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var isGuidOnlyAppKey = function isGuidOnlyAppKey(appKey) {
+  return GUID_ONLY_APP_KEY_REGEX.test(appKey);
+};
 var sectionCategoryKeys = _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, BLOCK_TEMPLATES_SECTION.key, 'blockTemplates'), DATA_AND_CHARTS_SECTION.key, 'dataAndCharts'), EMBED_SECTION.key, 'embed'), MEDIA_SECTION.key, 'media'), OTHER_SECTION.key, 'other'), ROVO_SECTION.key, 'rovo'), STRUCTURE_SECTION.key, 'structure'), TEXT_FORMATTING_SECTION.key, 'textFormatting');
 var legacyCategoryKeys = new Set(['admin', 'ai', 'block-templates', 'communication', 'confluence-content', 'data-and-charts', 'development', 'embed', 'external-content', 'formatting', 'media', 'navigation', 'other', 'reporting', 'skills', 'structure', 'text-formatting', 'visuals']);
 var isLegacyCategoryKey = function isLegacyCategoryKey(category) {
   return legacyCategoryKeys.has(category);
 };
-export var calculateQuickInsertItemsAttributes = function calculateQuickInsertItemsAttributes(items) {
+export var calculateQuickInsertItemsAttributes = function calculateQuickInsertItemsAttributes(_ref) {
+  var providedItems = _ref.providedItems;
+  var emptyCategoryInformation = function emptyCategoryInformation() {
+    return {
+      internalMacroCount: 0,
+      internalAppCount: 0,
+      internalAppMacroMax: 0,
+      ecosystemMacroCount: 0,
+      ecosystemAppCount: 0,
+      ecosystemAppMacroMax: 0,
+      allMacroCount: 0,
+      allAppCount: 0,
+      allAppMacroMax: 0
+    };
+  };
+  var emptyCategoryCounts = {
+    blockTemplates: emptyCategoryInformation(),
+    dataAndCharts: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    rovo: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    textFormatting: emptyCategoryInformation()
+  };
+  var emptyLegacyCategoryCounts = {
+    admin: emptyCategoryInformation(),
+    ai: emptyCategoryInformation(),
+    'block-templates': emptyCategoryInformation(),
+    communication: emptyCategoryInformation(),
+    'confluence-content': emptyCategoryInformation(),
+    'data-and-charts': emptyCategoryInformation(),
+    development: emptyCategoryInformation(),
+    embed: emptyCategoryInformation(),
+    'external-content': emptyCategoryInformation(),
+    formatting: emptyCategoryInformation(),
+    media: emptyCategoryInformation(),
+    navigation: emptyCategoryInformation(),
+    other: emptyCategoryInformation(),
+    reporting: emptyCategoryInformation(),
+    skills: emptyCategoryInformation(),
+    structure: emptyCategoryInformation(),
+    'text-formatting': emptyCategoryInformation(),
+    uncategorized: emptyCategoryInformation(),
+    visuals: emptyCategoryInformation()
+  };
   var attributes = {
-    category: {
-      blockTemplates: {
-        appCount: 0
-      },
-      dataAndCharts: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      rovo: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      textFormatting: {
-        appCount: 0
-      }
-    },
-    legacyCategory: {
-      admin: {
-        appCount: 0
-      },
-      ai: {
-        appCount: 0
-      },
-      'block-templates': {
-        appCount: 0
-      },
-      communication: {
-        appCount: 0
-      },
-      'confluence-content': {
-        appCount: 0
-      },
-      'data-and-charts': {
-        appCount: 0
-      },
-      development: {
-        appCount: 0
-      },
-      embed: {
-        appCount: 0
-      },
-      'external-content': {
-        appCount: 0
-      },
-      formatting: {
-        appCount: 0
-      },
-      media: {
-        appCount: 0
-      },
-      navigation: {
-        appCount: 0
-      },
-      other: {
-        appCount: 0
-      },
-      reporting: {
-        appCount: 0
-      },
-      skills: {
-        appCount: 0
-      },
-      structure: {
-        appCount: 0
-      },
-      'text-formatting': {
-        appCount: 0
-      },
-      uncategorized: {
-        appCount: 0
-      },
-      visuals: {
-        appCount: 0
-      }
+    category: emptyCategoryCounts,
+    legacyCategory: emptyLegacyCategoryCounts,
+    allCategories: emptyCategoryInformation()
+  };
+  var appMacroCounts = new WeakMap();
+  var getAppMacroCounts = function getAppMacroCounts(category) {
+    var existingCounts = appMacroCounts.get(category);
+    if (existingCounts) {
+      return existingCounts;
     }
+    var counts = {
+      all: new Map(),
+      internal: new Map(),
+      ecosystem: new Map()
+    };
+    appMacroCounts.set(category, counts);
+    return counts;
   };
-  var _iterator = _createForOfIteratorHelper(items),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _item$categories$map$, _item$categories;
-      var item = _step.value;
-      var normalizedCategories = new Set((_item$categories$map$ = (_item$categories = item.categories) === null || _item$categories === void 0 ? void 0 : _item$categories.map(function (category) {
-        return category.trim().toLowerCase();
-      }).filter(Boolean)) !== null && _item$categories$map$ !== void 0 ? _item$categories$map$ : []);
-      var hasUnknownCategory = normalizedCategories.size === 0;
-      var _iterator2 = _createForOfIteratorHelper(normalizedCategories),
-        _step2;
-      try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var category = _step2.value;
-          if (isLegacyCategoryKey(category)) {
-            attributes.legacyCategory[category].appCount += 1;
-          } else {
-            hasUnknownCategory = true;
-          }
+  var countAppMacro = function countAppMacro(appKey, counts) {
+    var _counts$get;
+    var appMacroCount = ((_counts$get = counts.get(appKey)) !== null && _counts$get !== void 0 ? _counts$get : 0) + 1;
+    counts.set(appKey, appMacroCount);
+    return appMacroCount;
+  };
+  var countCategoryItem = function countCategoryItem(category, item) {
+    var _item$app;
+    category.allMacroCount += 1;
+    var _ref2 = (_item$app = item.app) !== null && _item$app !== void 0 ? _item$app : {},
+      _ref2$key = _ref2.key,
+      appKey = _ref2$key === void 0 ? 'unknown' : _ref2$key,
+      source = _ref2.source;
+    var appMacroKey = isGuidOnlyAppKey(appKey) ? 'unknown' : appKey;
+    var counts = getAppMacroCounts(category);
+    var allAppMacroCount = countAppMacro(appMacroKey, counts.all);
+    category.allAppCount = counts.all.size;
+    category.allAppMacroMax = Math.max(category.allAppMacroMax, allAppMacroCount);
+    if (source === 'internal') {
+      category.internalMacroCount += 1;
+      var internalAppMacroCount = countAppMacro(appMacroKey, counts.internal);
+      category.internalAppCount = counts.internal.size;
+      category.internalAppMacroMax = Math.max(category.internalAppMacroMax, internalAppMacroCount);
+    } else if (source === 'ecosystem') {
+      category.ecosystemMacroCount += 1;
+      var ecosystemAppMacroCount = countAppMacro(appMacroKey, counts.ecosystem);
+      category.ecosystemAppCount = counts.ecosystem.size;
+      category.ecosystemAppMacroMax = Math.max(category.ecosystemAppMacroMax, ecosystemAppMacroCount);
+    }
+  };
+  var countItem = function countItem(item) {
+    var _categories$map$filte;
+    countCategoryItem(attributes.allCategories, item);
+    var categories = item.categories;
+    var normalizedCategories = new Set((_categories$map$filte = categories === null || categories === void 0 ? void 0 : categories.map(function (category) {
+      return category.trim().toLowerCase();
+    }).filter(Boolean)) !== null && _categories$map$filte !== void 0 ? _categories$map$filte : []);
+    var hasUnknownCategory = normalizedCategories.size === 0;
+    var _iterator = _createForOfIteratorHelper(normalizedCategories),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var category = _step.value;
+        if (isLegacyCategoryKey(category)) {
+          countCategoryItem(attributes.legacyCategory[category], item);
+        } else {
+          hasUnknownCategory = true;
         }
-      } catch (err) {
-        _iterator2.e(err);
-      } finally {
-        _iterator2.f();
       }
-      if (hasUnknownCategory) {
-        attributes.legacyCategory.uncategorized.appCount += 1;
-      }
-      var _iterator3 = _createForOfIteratorHelper(getQuickInsertMenuItemParents({
-          categories: item.categories,
-          rank: 0
-        })),
-        _step3;
-      try {
-        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-          var key = _step3.value.key;
-          var categoryKey = sectionCategoryKeys[key];
-          if (categoryKey) {
-            attributes.category[categoryKey].appCount += 1;
-          }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+    if (hasUnknownCategory) {
+      countCategoryItem(attributes.legacyCategory.uncategorized, item);
+    }
+    var _iterator2 = _createForOfIteratorHelper(getQuickInsertMenuItemParents({
+        categories: categories,
+        rank: 0
+      })),
+      _step2;
+    try {
+      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+        var key = _step2.value.key;
+        var categoryKey = sectionCategoryKeys[key];
+        if (!categoryKey) {
+          continue;
         }
-      } catch (err) {
-        _iterator3.e(err);
-      } finally {
-        _iterator3.f();
+        countCategoryItem(attributes.category[categoryKey], item);
       }
+    } catch (err) {
+      _iterator2.e(err);
+    } finally {
+      _iterator2.f();
+    }
+  };
+  var _iterator3 = _createForOfIteratorHelper(providedItems),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var item = _step3.value;
+      countItem(item);
     }
   } catch (err) {
-    _iterator.e(err);
+    _iterator3.e(err);
   } finally {
-    _iterator.f();
+    _iterator3.f();
   }
   return attributes;
 };
@@ -160,14 +177,14 @@ export var createQuickInsertItemsAnalyticsScheduler = function createQuickInsert
   var idleCallbackId;
   var destroyed = false;
   var scheduled = false;
-  var emit = function emit(items) {
+  var emit = function emit(options) {
     if (destroyed) {
       return;
     }
     dispatchAnalyticsEvent({
       action: ACTION.QUICK_INSERT_INFORMATION,
       actionSubject: ACTION_SUBJECT.QUICK_INSERT,
-      attributes: calculateQuickInsertItemsAttributes(items),
+      attributes: calculateQuickInsertItemsAttributes(options),
       eventType: EVENT_TYPE.OPERATIONAL
     });
   };
@@ -184,7 +201,7 @@ export var createQuickInsertItemsAnalyticsScheduler = function createQuickInsert
         window.cancelIdleCallback(idleCallbackId);
       }
     },
-    schedule: function schedule(items) {
+    schedule: function schedule(options) {
       if (scheduled || destroyed) {
         return;
       }
@@ -195,11 +212,11 @@ export var createQuickInsertItemsAnalyticsScheduler = function createQuickInsert
         }
         if (typeof window.requestIdleCallback === 'function') {
           idleCallbackId = window.requestIdleCallback(function () {
-            return emit(items);
+            return emit(options);
           });
         } else if (typeof window.requestAnimationFrame === 'function') {
           animationFrameId = window.requestAnimationFrame(function () {
-            return emit(items);
+            return emit(options);
           });
         }
       }, QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS);

package/dist/esm/quickInsertPlugin.js

@@ -403,7 +403,9 @@ function quickInsertPluginFactory(defaultItems, providerFactory, getIntl, dispat
                 })(editorView.state, editorView.dispatch);
                 if (!isDestroyed && !quickInsertItemsAnalyticsScheduler && isExperimentEnabled('platform_editor_slash_app_category_analytics')) {
                   quickInsertItemsAnalyticsScheduler = createQuickInsertItemsAnalyticsScheduler(dispatchAnalyticsEvent);
-                  quickInsertItemsAnalyticsScheduler.schedule(providedItems);
+                  quickInsertItemsAnalyticsScheduler.schedule({
+                    providedItems: providedItems
+                  });
                 }
                 _context.next = 9;
                 break;

package/dist/types/app-category-analytics.d.ts

@@ -2,8 +2,11 @@ import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
 import type { QuickInsertInformationAttributes } from '@atlaskit/editor-common/analytics/types/quick-insert-events';
 import type { QuickInsertItem } from '@atlaskit/editor-common/provider-factory';
 export declare const QUICK_INSERT_ITEMS_ANALYTICS_DELAY_MS = 10000;
-export declare const calculateQuickInsertItemsAttributes: (items: readonly QuickInsertItem[]) => QuickInsertInformationAttributes;
+export type QuickInsertItemsAnalyticsOptions = {
+    providedItems: readonly QuickInsertItem[];
+};
+export declare const calculateQuickInsertItemsAttributes: ({ providedItems, }: QuickInsertItemsAnalyticsOptions) => QuickInsertInformationAttributes;
 export declare const createQuickInsertItemsAnalyticsScheduler: (dispatchAnalyticsEvent: DispatchAnalyticsEvent) => {
     destroy: () => void;
-    schedule: (items: readonly QuickInsertItem[]) => void;
+    schedule: (options: QuickInsertItemsAnalyticsOptions) => void;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-quick-insert",
-	"version": "14.1.2",
+	"version": "15.0.0",
 	"description": "Quick insert plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -22,24 +22,24 @@
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
 		"@atlaskit/button": "^25.0.0",
-		"@atlaskit/editor-plugin-analytics": "^14.0.0",
-		"@atlaskit/editor-plugin-connectivity": "^14.0.0",
-		"@atlaskit/editor-plugin-metrics": "^15.0.0",
-		"@atlaskit/editor-plugin-type-ahead": "^15.1.0",
-		"@atlaskit/editor-plugin-ui-control-registry": "^8.1.0",
+		"@atlaskit/editor-plugin-analytics": "^15.0.0",
+		"@atlaskit/editor-plugin-connectivity": "^15.0.0",
+		"@atlaskit/editor-plugin-metrics": "^16.0.0",
+		"@atlaskit/editor-plugin-type-ahead": "^16.0.0",
+		"@atlaskit/editor-plugin-ui-control-registry": "^9.0.0",
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/editor-ui-control-model": "^2.6.0",
 		"@atlaskit/icon": "^37.3.0",
 		"@atlaskit/modal-dialog": "^16.3.0",
 		"@atlaskit/platform-feature-experiments": "^0.3.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
-		"@atlaskit/tmp-editor-statsig": "^147.0.0",
+		"@atlaskit/tmp-editor-statsig": "^147.1.0",
 		"@atlaskit/tokens": "^16.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^118.10.0",
+		"@atlaskit/editor-common": "^119.0.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-dom": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"

package/editor-plugin-quick-insert.docs.tsx

@@ -1,38 +0,0 @@
-/**
- * Testing structured MCP docs for review — ignore this file.
- * Contact #dst-structured-content in Slack with questions.
- */
-
-import path from 'path';
-
-import type { StructuredContentSource } from '@atlassian/structured-docs-types/types';
-
-import packageJson from './package.json';
-
-const packagePath = path.resolve(__dirname);
-
-const documentation: StructuredContentSource = {
-	utilities: [
-		{
-			kind: 'function',
-			name: 'quickInsertPlugin',
-			description: 'Quick insert plugin for @atlaskit/editor-core',
-			status: 'general-availability',
-			import: {
-				name: 'quickInsertPlugin',
-				package: '@atlaskit/editor-plugin-quick-insert',
-				type: 'named',
-				packagePath,
-				packageJson,
-			},
-			usageGuidelines: [],
-			accessibilityGuidelines: [],
-			keywords: ['editor', 'editor-plugin-quick-insert', 'atlaskit'],
-			categories: ['editor'],
-			signature: 'quickInsertPlugin: QuickInsertPlugin',
-			examples: [],
-		},
-	],
-};
-
-export default documentation;