@atlaskit/link-datasource 1.0.15 → 1.0.16

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-datasource
 
+## 1.0.16
+
+### Patch Changes
+
+- [`7b3f96b38f9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7b3f96b38f9) - Added nextItem loaded analytics event
+- [`ecf7019c632`](https://bitbucket.org/atlassian/atlassian-frontend/commits/ecf7019c632) - Added analytics mapper to populate searchMethod analytic attribute, but it is not exposed to consumers yet.
+
 ## 1.0.15
 
 ### Patch Changes

package/dist/cjs/analytics/utils.js

@@ -0,0 +1,17 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapSearchMethod = void 0;
+var mapSearchMethod = function mapSearchMethod(searchMethod) {
+  switch (searchMethod) {
+    case 'basic':
+      return 'datasource_basic_filter';
+    case 'jql':
+      return 'datasource_search_query';
+    default:
+      return 'unknown';
+  }
+};
+exports.mapSearchMethod = mapSearchMethod;

package/dist/cjs/common/types.js

@@ -0,0 +1,5 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -11,11 +11,14 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _linkClientExtension = require("@atlaskit/link-client-extension");
+var _analytics = require("../analytics");
 var useDatasourceTableState = function useDatasourceTableState(_ref) {
   var datasourceId = _ref.datasourceId,
     parameters = _ref.parameters,
     _ref$fieldKeys = _ref.fieldKeys,
     fieldKeys = _ref$fieldKeys === void 0 ? [] : _ref$fieldKeys;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useState = (0, _react.useState)([]),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     defaultVisibleColumnKeys = _useState2[0],
@@ -151,6 +154,9 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
       nextPageCursor,
       _totalCount,
       schema,
+      isUserLoadingNextPage,
+      currentLoadedItemCount,
+      newlyLoadedItemCount,
       _args2 = arguments;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -212,18 +218,28 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (isSchemaFromData && schema && items.length > 0) {
             applySchemaProperties(schema.properties);
           }
-          _context2.next = 38;
+          isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
+          if (isUserLoadingNextPage) {
+            currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
+            newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
+            fireEvent('track.nextItem.loaded', {
+              extensionKey: _extensionKey2,
+              destinationObjectTypes: _destinationObjectTypes2,
+              loadedItemCount: currentLoadedItemCount + newlyLoadedItemCount
+            });
+          }
+          _context2.next = 40;
           break;
-        case 35:
-          _context2.prev = 35;
+        case 37:
+          _context2.prev = 37;
           _context2.t0 = _context2["catch"](8);
           setStatus('rejected');
-        case 38:
+        case 40:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[8, 35]]);
-  })), [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
+    }, _callee2, null, [[8, 37]]);
+  })), [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent]);
   var reset = (0, _react.useCallback)(function (options) {
     setStatus('empty');
     setResponseItems([]);
@@ -237,7 +253,7 @@ var useDatasourceTableState = function useDatasourceTableState(_ref) {
     }
   }, []);
 
-  // this takes care of requesting /data initally
+  // this takes care of requesting /data initially
   (0, _react.useEffect)(function () {
     var isEmptyState = Object.keys(parameters || {}).length > 0 && lastRequestedFieldKeys.length === 0 && status === 'empty';
     if (isEmptyState) {

package/dist/cjs/i18n/cs.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Je nutné vybrat schéma',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Další informace o vyhledávání pomocí AQL',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Chcete-li vyhledávat, začněte psát nebo použijte dotaz AQL.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Vyhledat objekty nebo typy objektů',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Vyhledat objekty',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Zrušit',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Vložit objekty',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Vložit objekt} few {Vložit objekty} many {Vložit objekty} other {Vložit objekty}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Vložit objekty z:',
   'linkDataSource.column-picker.search': 'Vyhledat pole',
   'linkDataSource.jira-issues.accessInstructions': 'Chcete-li požádat o přístup, obraťte se na správce.',

package/dist/cjs/i18n/da.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Skema er påkrævet',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Lær mere om søgning med AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begynd at indtaste, eller brug AQL for at søge.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søg efter objekter eller objekttyper',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søg efter objekter',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Annuller',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Indsæt objekter',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Indsæt objekt} other {Indsæt objekter}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Indsæt objekter fra',
   'linkDataSource.column-picker.search': 'Søg efter felter',
   'linkDataSource.jira-issues.accessInstructions': 'Kontakt din administrator for at anmode om adgang.',

package/dist/cjs/i18n/de.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema erforderlich',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Weitere Informationen zur Suche mit AQL',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Um zu suchen, beginnen Sie mit der Eingabe, oder verwenden Sie AQL.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objekte oder Objekttypen suchen',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objekte suchen',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Abbrechen',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objekte einfügen',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Objekt einfügen} other {Objekte einfügen}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objekte einfügen aus',
   'linkDataSource.column-picker.search': 'Nach Feldern suchen',
   'linkDataSource.jira-issues.accessInstructions': 'Wenden Sie sich an Ihren Administrator, um Zugriff anzufordern.',

package/dist/cjs/i18n/en.js

@@ -20,7 +20,7 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema is required',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Learn more about searching with AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Start typing or use AQL to search.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects or object types',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Cancel',
   'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insert {objectsCount, plural, one {object} other {objects}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insert objects from',

package/dist/cjs/i18n/en_GB.js

@@ -20,7 +20,7 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema is required',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Learn more about searching with AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Start typing or use AQL to search.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects or object types',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Cancel',
   'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insert {objectsCount, plural, one {object} other {objects}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insert objects from',

package/dist/cjs/i18n/en_ZZ.js

@@ -20,7 +20,7 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '⁣⁢Schema is required⁠‌⁡⁡؜⁠‍‍؜‍⁡‌⁣⁤',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '⁣⁢Learn more about searching with AQL.‍⁠‍⁡⁠؜؜⁡‌؜⁡؜⁣⁤',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '⁣⁢Start typing or use AQL to search.⁠⁠‌⁠⁡‌‍؜‌⁡‍⁠؜⁣⁤',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '⁣⁢Search for objects or object types؜‌‌‍⁡⁡⁠⁡⁠⁡‍⁣⁤',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '⁣⁢Search for objects‍‍‍⁡⁠⁠؜‍⁣⁤',
   'linkDataSource.assets.configmodal.cancelButtonText': '⁣⁢Cancel؜‌‌⁡‌؜⁠⁠⁣⁤',
   'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {⁣⁢Insert object؜‌؜‌؜؜⁡؜⁠‌⁣⁤} other {⁣⁢Insert objects؜‌؜‌؜؜⁡؜⁠‌⁣⁤}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': '⁣⁢Insert objects from‍؜‌⁠؜⁠؜⁡‌‍⁣⁤',

package/dist/cjs/i18n/es.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'El esquema es obligatorio',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Obtén más información sobre cómo realizar búsquedas con AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Empieza a escribir o utiliza AQL para buscar.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Busca objetos o tipos de objetos',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Buscar objetos',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Cancelar',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insertar objetos',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Insertar objeto} other {Insertar objetos}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insertar objetos de',
   'linkDataSource.column-picker.search': 'Buscar campos',
   'linkDataSource.jira-issues.accessInstructions': 'Para solicitar acceso, ponte en contacto con tu administrador.',

package/dist/cjs/i18n/fi.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Kaavio vaaditaan',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Lue lisää AQL-hausta.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Aloita haku kirjoittamalla tai käyttämällä AQL:ää.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Hae objekteja tai objektityyppejä',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Hae objekteja',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Peruuta',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Lisää kohteet',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Lisää kohde} other {Lisää kohteet}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Lisää objekteja kohteesta',
   'linkDataSource.column-picker.search': 'Hae kenttiä',
   'linkDataSource.jira-issues.accessInstructions': 'Pyydä pääsyä ottamalla yhteys ylläpitäjään.',

package/dist/cjs/i18n/fr.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Un schéma est requis',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'En savoir plus sur la recherche AQL',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Commencez à taper ou à utiliser AQL pour effectuer une recherche.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Rechercher des objets ou des types d'objet",
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Recherche d'objets",
   'linkDataSource.assets.configmodal.cancelButtonText': 'Annuler',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insérer des objets',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Insérer un objet} other {Insérer des objets}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insérer des objets à partir de',
   'linkDataSource.column-picker.search': 'Rechercher des champs',
   'linkDataSource.jira-issues.accessInstructions': "Pour demander l'accès, contactez votre administrateur.",

package/dist/cjs/i18n/hu.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'A séma megadása kötelező',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'További információ az AQL-lel történő keresésről',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'A kereséshez kezdj el gépelni vagy használj AQL-t.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objektumok vagy objektumtípusok keresése',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objektumok keresése',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Mégse',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objektumok beszúrása',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Objektum beszúrása} other {Objektumok beszúrása}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objektumok beszúrása innen:',
   'linkDataSource.column-picker.search': 'Mezők keresése',
   'linkDataSource.jira-issues.accessInstructions': 'Hozzáférés igényléséhez fordulj az adminisztrátorodhoz.',

package/dist/cjs/i18n/it.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Lo schema è obbligatorio',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Scopri di più sulla ricerca con AQL',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Inizia a digitare o utilizza AQL per la ricerca.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Cerca oggetti o tipi di oggetto',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Cerca oggetti',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Annulla',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Inserisci oggetti',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Inserisci oggetto} other {Inserisci oggetti}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Inserisci oggetti da',
   'linkDataSource.column-picker.search': 'Cerca campi',
   'linkDataSource.jira-issues.accessInstructions': "Per richiedere l'accesso, contatta l'amministratore.",

package/dist/cjs/i18n/ja.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'スキーマは必須です',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL 検索の詳細をご確認ください。',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '語句を入力するか、AQL を使って検索できます。',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'オブジェクトまたはオブジェクト タイプの検索',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'オブジェクトを検索する',
   'linkDataSource.assets.configmodal.cancelButtonText': 'キャンセル',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'オブジェクトを挿入',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {オブジェクトを挿入}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'オブジェクトの挿入元',
   'linkDataSource.column-picker.search': 'フィールドを検索',
   'linkDataSource.jira-issues.accessInstructions': 'アクセスをリクエストするには、管理者にお問い合わせください。',

package/dist/cjs/i18n/ko.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '스키마가 필요합니다',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL을 사용한 검색에 대해 자세히 알아보세요.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '입력을 시작하거나 AQL을 사용하여 검색합니다.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '개체 또는 개체 유형 검색',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '개체 검색',
   'linkDataSource.assets.configmodal.cancelButtonText': '취소',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': '개체 삽입',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {개체 삽입}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': '다음의 개체 삽입',
   'linkDataSource.column-picker.search': '필드 검색',
   'linkDataSource.jira-issues.accessInstructions': '액세스를 요청하려면 관리자에게 문의하세요.',

package/dist/cjs/i18n/nb.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Oppsett kreves',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Finn ut mer om å søke med AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begynn å skrive eller bruk AQL for å søke.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søk etter objekter eller objekttyper',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søk etter objekter',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Avbryt',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Sett inn objekter',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Sett inn objekt} other {Sett inn objekter}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Sett inn objekter fra',
   'linkDataSource.column-picker.search': 'Søk etter felt',
   'linkDataSource.jira-issues.accessInstructions': 'Kontakt administratoren for å be om tilgang.',

package/dist/cjs/i18n/nl.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Er is een schema nodig',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Meer informatie over zoeken met AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begin met typen of gebruik een AQL om te zoeken.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Zoeken naar objecten en objecttypen',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objecten zoeken',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Annuleren',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objecten invoegen',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Object invoegen} other {Objecten invoegen}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objecten invoegen van',
   'linkDataSource.column-picker.search': 'Zoek naar velden',
   'linkDataSource.jira-issues.accessInstructions': 'Neem contact op met je beheerder om toegang aan te vragen.',

package/dist/cjs/i18n/pl.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schemat jest wymagany',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Dowiedz się więcej o wyszukiwaniu przy użyciu zapytań AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Zacznij wpisywać lub użyj języka AQL, aby wyszukać.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Wyszukaj obiekty lub typy obiektów',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Wyszukaj obiekty',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Anuluj',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Wstaw obiekty',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Wstaw obiekt} few {Wstaw obiekty} many {Wstaw obiekty} other {Wstaw obiekty}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Wstawianie obiektów z',
   'linkDataSource.column-picker.search': 'Wyszukaj pola',
   'linkDataSource.jira-issues.accessInstructions': 'Aby poprosić o dostęp, skontaktuj się z administratorem.',

package/dist/cjs/i18n/pt_BR.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'O esquema é obrigatório',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Saiba mais sobre como pesquisar com AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Comece a digitar ou use o AQL para pesquisar.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Pesquisar objetos ou tipos de objetos',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Pesquisar objetos',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Cancelar',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Inserir objeto',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Inserir objeto} other {Inserir objetos}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Inserir objetos de',
   'linkDataSource.column-picker.search': 'Pesquisar campos',
   'linkDataSource.jira-issues.accessInstructions': 'Para solicitar acesso, entre em contato com o administrador.',

package/dist/cjs/i18n/ru.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Укажите схему',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Подробнее о поиске с помощью AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Начните вводить текст или используйте AQL для поиска.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Поиск по объектам или типам объектов',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Поиск объектов',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Отмена',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Вставить объекты',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Вставить объект} few {Вставить объекты} many {Вставить объекты} other {Вставить объекты}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Вставить объекты из',
   'linkDataSource.column-picker.search': 'Поиск полей',
   'linkDataSource.jira-issues.accessInstructions': 'Чтобы запросить доступ, обратитесь к администратору.',

package/dist/cjs/i18n/sv.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema krävs',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Läs mer om att söka med AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Börja skriva eller använd AQL för att söka.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Sök efter objekt eller objektstyper',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Sök efter objekt',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Avbryt',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Infoga objekt',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Infoga objekt} other {Infoga objekt}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Infoga objekt från',
   'linkDataSource.column-picker.search': 'Sök efter fält',
   'linkDataSource.jira-issues.accessInstructions': 'Kontakta din administratör för att begära åtkomst.',

package/dist/cjs/i18n/th.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'ต้องระบุรายละเอียดเรื่อง',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'เรียนรู้เพิ่มเติมเกี่ยวกับการค้นหาด้วย AQL',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'เริ่มพิมพ์หรือใช้ AQL เพื่อค้นหา',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'ค้นหาเรื่องหรือประเภทเรื่อง',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'ค้นหาวัตถุ',
   'linkDataSource.assets.configmodal.cancelButtonText': 'ยกเลิก',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'แทรกเรื่อง',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {แทรกเรื่อง}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'แทรกเรื่องจาก',
   'linkDataSource.column-picker.search': 'ค้นหาฟิลด์',
   'linkDataSource.jira-issues.accessInstructions': 'หากต้องการส่งคำขอการเข้าถึง โปรดติดต่อผู้ดูแลของคุณ',

package/dist/cjs/i18n/tr.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Şema gerekli',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL ile arama yapmak hakkında daha fazla bilgi edinin.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Aramak için yazmaya başlayın veya AQL kullanın.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Nesne veya nesne türleri arayın',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Nesne arayın',
   'linkDataSource.assets.configmodal.cancelButtonText': 'İptal',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Nesne ekle',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Nesne ekle} other {Nesne ekle}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Şuradan nesne ekleyin:',
   'linkDataSource.column-picker.search': 'Alan arayın',
   'linkDataSource.jira-issues.accessInstructions': 'Erişim talep etmek için yöneticinizle iletişime geçin.',

package/dist/cjs/i18n/uk.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Необхідно вибрати схему',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Докладніше про пошук засобами AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Почніть вводити запит або скористайтесь AQL для пошуку.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Пошук об’єктів або типів об'єктів",
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Пошук об’єктів',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Скасувати',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Вставити об’єкти',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Вставити об’єкт(-и)} few {Вставити об’єкти} many {Вставити об’єкти} other {Вставити об’єкти}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Вставка об’єктів з',
   'linkDataSource.column-picker.search': 'Пошук полів',
   'linkDataSource.jira-issues.accessInstructions': 'Щоб запитати доступ, зверніться до адміністратора.',

package/dist/cjs/i18n/vi.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Cần có sơ đồ',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Tìm hiểu thêm về việc tìm kiếm bằng AQL.',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Bắt đầu nhập hoặc sử dụng AQL để tìm kiếm.',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Tìm kiếm đối tượng hoặc loại đối tượng',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Tìm kiếm các đối tượng',
   'linkDataSource.assets.configmodal.cancelButtonText': 'Hủy',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Chèn đối tượng',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {Chèn đối tượng}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': 'Chèn đối tượng từ',
   'linkDataSource.column-picker.search': 'Tìm kiếm trường',
   'linkDataSource.jira-issues.accessInstructions': 'Hãy liên hệ với quản trị viên để yêu cầu quyền truy cập.',

package/dist/cjs/i18n/zh.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '必须选择架构',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '详细了解如何使用 AQL 进行搜索。',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '开始输入搜索内容或使用 AQL 进行搜索。',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜索对象或对象类型',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜索对象',
   'linkDataSource.assets.configmodal.cancelButtonText': '取消',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': '插入对象',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {插入对象}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': '插入以下来源的对象：',
   'linkDataSource.column-picker.search': '搜索字段',
   'linkDataSource.jira-issues.accessInstructions': '要申请访问权限，请联系您的管理员。',

package/dist/cjs/i18n/zh_TW.js

@@ -20,9 +20,9 @@ var _default = {
   'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '結構描述為必要項目',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '進一步了解如何使用 JQL 進行搜尋。',
   'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '開始輸入或使用 AQL 進行搜尋。',
-  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜尋物件或物件類型',
+  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜尋物件',
   'linkDataSource.assets.configmodal.cancelButtonText': '取消',
-  'linkDataSource.assets.configmodal.insertIssuesButtonText': '插入物件',
+  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {插入物件}}',
   'linkDataSource.assets.configmodal.insertObjectsTitle': '插入物件來源：',
   'linkDataSource.column-picker.search': '搜尋欄位',
   'linkDataSource.jira-issues.accessInstructions': '若要要求存取權，請連絡您的管理員。',

package/dist/cjs/ui/assets-modal/modal/index.js

@@ -231,7 +231,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.0.15",
+  packageVersion: "1.0.16",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

package/dist/cjs/ui/datasource-table-view/datasourceTableView.js

@@ -110,7 +110,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.0.15"
+  packageVersion: "1.0.16"
 };
 var DatasourceTableView = (0, _analyticsNext.withAnalyticsContext)(analyticsContextData)(DatasourceTableViewWithoutAnalytics);
 exports.DatasourceTableView = DatasourceTableView;

package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js

@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.JiraSearchContainer = void 0;
+exports.getInitialSearchMethod = exports.JiraSearchContainer = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
@@ -27,6 +27,11 @@ var inputContainerStyles = (0, _react2.css)({
   minHeight: '60px'
 });
 var DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
+var JiraSearchMethodSwitcher = _modeSwitcher.ModeSwitcher;
+var getInitialSearchMethod = function getInitialSearchMethod(initialJql) {
+  return initialJql ? 'jql' : 'basic';
+};
+exports.getInitialSearchMethod = getInitialSearchMethod;
 var JiraSearchContainer = function JiraSearchContainer(props) {
   var isSearching = props.isSearching,
     parameters = props.parameters,
@@ -36,16 +41,14 @@ var JiraSearchContainer = function JiraSearchContainer(props) {
     initialJql = _ref.jql;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var basicModeValue = 'basic';
-  var jqlModeValue = 'jql';
   var _useState = (0, _react.useState)(''),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
     basicSearchTerm = _useState2[0],
     setBasicSearchTerm = _useState2[1];
-  var _useState3 = (0, _react.useState)(initialJql ? jqlModeValue : basicModeValue),
+  var _useState3 = (0, _react.useState)(getInitialSearchMethod(initialJql)),
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    currentSearchMode = _useState4[0],
-    setCurrentSearchMode = _useState4[1];
+    currentSearchMethod = _useState4[0],
+    setCurrentSearchMethod = _useState4[1];
   var _useState5 = (0, _react.useState)(initialJql || DEFAULT_JQL_QUERY),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     jql = _useState6[0],
@@ -61,7 +64,7 @@ var JiraSearchContainer = function JiraSearchContainer(props) {
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var onSearchModeChange = function onSearchModeChange(searchMode) {
-    setCurrentSearchMode(searchMode);
+    setCurrentSearchMethod(searchMode);
   };
   var handleBasicSearchChange = function handleBasicSearchChange(e) {
     var rawSearch = e.currentTarget.value;
@@ -92,35 +95,35 @@ var JiraSearchContainer = function JiraSearchContainer(props) {
   var handleSearch = function handleSearch() {
     onSearch({
       jql: jql
-    });
-    if (currentSearchMode === basicModeValue) {
+    }, currentSearchMethod);
+    if (currentSearchMethod === 'basic') {
       fireEvent('ui.form.submitted.basicSearch', {});
-    } else if (currentSearchMode === jqlModeValue) {
+    } else if (currentSearchMethod === 'jql') {
       fireEvent('ui.jqlEditor.searched', {});
     }
   };
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles
-  }, currentSearchMode === basicModeValue && (0, _react2.jsx)(_basicSearchInput.BasicSearchInput, {
+  }, currentSearchMethod === 'basic' && (0, _react2.jsx)(_basicSearchInput.BasicSearchInput, {
     isSearching: isSearching,
     onChange: handleBasicSearchChange,
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
-  }), currentSearchMode === jqlModeValue && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
+  }), currentSearchMethod === 'jql' && (0, _react2.jsx)(_jqlEditor.JiraJQLEditor, {
     cloudId: cloudId || '',
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
     query: jql
-  }), (0, _react2.jsx)(_modeSwitcher.ModeSwitcher, {
+  }), (0, _react2.jsx)(JiraSearchMethodSwitcher, {
     onOptionValueChange: onSearchModeChange,
-    selectedOptionValue: currentSearchMode,
+    selectedOptionValue: currentSearchMethod,
     options: [{
       label: formatMessage(_messages.modeSwitcherMessages.basicTextSearchLabel),
-      value: basicModeValue
+      value: 'basic'
     }, {
       label: 'JQL',
-      value: jqlModeValue
+      value: 'jql'
     }]
   }));
 };

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

@@ -106,6 +106,7 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
     defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
     loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
     totalCount = _useDatasourceTableSt.totalCount;
+  var lastSearchMethodRef = (0, _react.useRef)((0, _jiraSearchContainer.getInitialSearchMethod)(parameters === null || parameters === void 0 ? void 0 : parameters.jql));
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
@@ -158,7 +159,8 @@ var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(props) {
       setCloudId(selectedJiraSite.cloudId);
     }
   }, [cloudId, selectedJiraSite]);
-  var onSearch = (0, _react.useCallback)(function (newParameters) {
+  var onSearch = (0, _react.useCallback)(function (newParameters, searchMethod) {
+    lastSearchMethodRef.current = searchMethod;
     setJql(newParameters.jql);
     reset({
       shouldForceRequest: true
@@ -348,7 +350,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.0.15",
+  packageVersion: "1.0.16",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {

package/dist/es2019/analytics/utils.js

@@ -0,0 +1,10 @@
+export const mapSearchMethod = searchMethod => {
+  switch (searchMethod) {
+    case 'basic':
+      return 'datasource_basic_filter';
+    case 'jql':
+      return 'datasource_search_query';
+    default:
+      return 'unknown';
+  }
+};

package/dist/es2019/common/types.js

@@ -0,0 +1 @@
+export {};