@atlaskit/link-datasource 1.0.15 → 1.0.17

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (108) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/cjs/analytics/utils.js +17 -0
  3. package/dist/cjs/common/types.js +5 -0
  4. package/dist/cjs/hooks/useDatasourceTableState.js +23 -7
  5. package/dist/cjs/i18n/cs.js +2 -2
  6. package/dist/cjs/i18n/da.js +2 -2
  7. package/dist/cjs/i18n/de.js +2 -2
  8. package/dist/cjs/i18n/en.js +1 -1
  9. package/dist/cjs/i18n/en_GB.js +1 -1
  10. package/dist/cjs/i18n/en_ZZ.js +1 -1
  11. package/dist/cjs/i18n/es.js +2 -2
  12. package/dist/cjs/i18n/fi.js +2 -2
  13. package/dist/cjs/i18n/fr.js +2 -2
  14. package/dist/cjs/i18n/hu.js +2 -2
  15. package/dist/cjs/i18n/it.js +2 -2
  16. package/dist/cjs/i18n/ja.js +2 -2
  17. package/dist/cjs/i18n/ko.js +2 -2
  18. package/dist/cjs/i18n/nb.js +2 -2
  19. package/dist/cjs/i18n/nl.js +2 -2
  20. package/dist/cjs/i18n/pl.js +2 -2
  21. package/dist/cjs/i18n/pt_BR.js +2 -2
  22. package/dist/cjs/i18n/ru.js +2 -2
  23. package/dist/cjs/i18n/sv.js +2 -2
  24. package/dist/cjs/i18n/th.js +2 -2
  25. package/dist/cjs/i18n/tr.js +2 -2
  26. package/dist/cjs/i18n/uk.js +2 -2
  27. package/dist/cjs/i18n/vi.js +2 -2
  28. package/dist/cjs/i18n/zh.js +2 -2
  29. package/dist/cjs/i18n/zh_TW.js +2 -2
  30. package/dist/cjs/ui/assets-modal/modal/index.js +2 -2
  31. package/dist/cjs/ui/datasource-table-view/datasourceTableView.js +1 -1
  32. package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +19 -16
  33. package/dist/cjs/ui/jira-issues-modal/modal/index.js +4 -2
  34. package/dist/es2019/analytics/utils.js +10 -0
  35. package/dist/es2019/common/types.js +1 -0
  36. package/dist/es2019/hooks/useDatasourceTableState.js +16 -2
  37. package/dist/es2019/i18n/cs.js +2 -2
  38. package/dist/es2019/i18n/da.js +2 -2
  39. package/dist/es2019/i18n/de.js +2 -2
  40. package/dist/es2019/i18n/en.js +1 -1
  41. package/dist/es2019/i18n/en_GB.js +1 -1
  42. package/dist/es2019/i18n/en_ZZ.js +1 -1
  43. package/dist/es2019/i18n/es.js +2 -2
  44. package/dist/es2019/i18n/fi.js +2 -2
  45. package/dist/es2019/i18n/fr.js +2 -2
  46. package/dist/es2019/i18n/hu.js +2 -2
  47. package/dist/es2019/i18n/it.js +2 -2
  48. package/dist/es2019/i18n/ja.js +2 -2
  49. package/dist/es2019/i18n/ko.js +2 -2
  50. package/dist/es2019/i18n/nb.js +2 -2
  51. package/dist/es2019/i18n/nl.js +2 -2
  52. package/dist/es2019/i18n/pl.js +2 -2
  53. package/dist/es2019/i18n/pt_BR.js +2 -2
  54. package/dist/es2019/i18n/ru.js +2 -2
  55. package/dist/es2019/i18n/sv.js +2 -2
  56. package/dist/es2019/i18n/th.js +2 -2
  57. package/dist/es2019/i18n/tr.js +2 -2
  58. package/dist/es2019/i18n/uk.js +2 -2
  59. package/dist/es2019/i18n/vi.js +2 -2
  60. package/dist/es2019/i18n/zh.js +2 -2
  61. package/dist/es2019/i18n/zh_TW.js +2 -2
  62. package/dist/es2019/ui/assets-modal/modal/index.js +2 -2
  63. package/dist/es2019/ui/datasource-table-view/datasourceTableView.js +1 -1
  64. package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +15 -13
  65. package/dist/es2019/ui/jira-issues-modal/modal/index.js +6 -4
  66. package/dist/esm/analytics/utils.js +10 -0
  67. package/dist/esm/common/types.js +1 -0
  68. package/dist/esm/hooks/useDatasourceTableState.js +23 -7
  69. package/dist/esm/i18n/cs.js +2 -2
  70. package/dist/esm/i18n/da.js +2 -2
  71. package/dist/esm/i18n/de.js +2 -2
  72. package/dist/esm/i18n/en.js +1 -1
  73. package/dist/esm/i18n/en_GB.js +1 -1
  74. package/dist/esm/i18n/en_ZZ.js +1 -1
  75. package/dist/esm/i18n/es.js +2 -2
  76. package/dist/esm/i18n/fi.js +2 -2
  77. package/dist/esm/i18n/fr.js +2 -2
  78. package/dist/esm/i18n/hu.js +2 -2
  79. package/dist/esm/i18n/it.js +2 -2
  80. package/dist/esm/i18n/ja.js +2 -2
  81. package/dist/esm/i18n/ko.js +2 -2
  82. package/dist/esm/i18n/nb.js +2 -2
  83. package/dist/esm/i18n/nl.js +2 -2
  84. package/dist/esm/i18n/pl.js +2 -2
  85. package/dist/esm/i18n/pt_BR.js +2 -2
  86. package/dist/esm/i18n/ru.js +2 -2
  87. package/dist/esm/i18n/sv.js +2 -2
  88. package/dist/esm/i18n/th.js +2 -2
  89. package/dist/esm/i18n/tr.js +2 -2
  90. package/dist/esm/i18n/uk.js +2 -2
  91. package/dist/esm/i18n/vi.js +2 -2
  92. package/dist/esm/i18n/zh.js +2 -2
  93. package/dist/esm/i18n/zh_TW.js +2 -2
  94. package/dist/esm/ui/assets-modal/modal/index.js +2 -2
  95. package/dist/esm/ui/datasource-table-view/datasourceTableView.js +1 -1
  96. package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +17 -15
  97. package/dist/esm/ui/jira-issues-modal/modal/index.js +6 -4
  98. package/dist/types/analytics/generated/analytics.types.d.ts +2 -2
  99. package/dist/types/analytics/utils.d.ts +2 -0
  100. package/dist/types/common/types.d.ts +1 -0
  101. package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts +3 -1
  102. package/dist/types/ui/jira-issues-modal/mode-switcher/index.d.ts +4 -4
  103. package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts +2 -2
  104. package/dist/types-ts4.5/analytics/utils.d.ts +2 -0
  105. package/dist/types-ts4.5/common/types.d.ts +1 -0
  106. package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts +3 -1
  107. package/dist/types-ts4.5/ui/jira-issues-modal/mode-switcher/index.d.ts +4 -4
  108. package/package.json +5 -5
@@ -0,0 +1,10 @@
1
+ export const mapSearchMethod = searchMethod => {
2
+ switch (searchMethod) {
3
+ case 'basic':
4
+ return 'datasource_basic_filter';
5
+ case 'jql':
6
+ return 'datasource_search_query';
7
+ default:
8
+ return 'unknown';
9
+ }
10
+ };
@@ -0,0 +1 @@
1
+ export {};
@@ -1,10 +1,14 @@
1
1
  import { useCallback, useEffect, useState } from 'react';
2
2
  import { useDatasourceClientExtension } from '@atlaskit/link-client-extension';
3
+ import { useDatasourceAnalyticsEvents } from '../analytics';
3
4
  export const useDatasourceTableState = ({
4
5
  datasourceId,
5
6
  parameters,
6
7
  fieldKeys = []
7
8
  }) => {
9
+ const {
10
+ fireEvent
11
+ } = useDatasourceAnalyticsEvents();
8
12
  const [defaultVisibleColumnKeys, setDefaultVisibleColumnKeys] = useState([]);
9
13
  const [lastRequestedFieldKeys, setLastRequestedFieldKeys] = useState([]);
10
14
  const [status, setStatus] = useState('empty');
@@ -122,10 +126,20 @@ export const useDatasourceTableState = ({
122
126
  if (isSchemaFromData && schema && items.length > 0) {
123
127
  applySchemaProperties(schema.properties);
124
128
  }
129
+ const isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
130
+ if (isUserLoadingNextPage) {
131
+ const currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
132
+ const newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
133
+ fireEvent('track.nextItem.loaded', {
134
+ extensionKey,
135
+ destinationObjectTypes,
136
+ loadedItemCount: currentLoadedItemCount + newlyLoadedItemCount
137
+ });
138
+ }
125
139
  } catch (e) {
126
140
  setStatus('rejected');
127
141
  }
128
- }, [parameters, fieldKeys, getDatasourceData, datasourceId, nextCursor, applySchemaProperties]);
142
+ }, [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent]);
129
143
  const reset = useCallback(options => {
130
144
  setStatus('empty');
131
145
  setResponseItems([]);
@@ -139,7 +153,7 @@ export const useDatasourceTableState = ({
139
153
  }
140
154
  }, []);
141
155
 
142
- // this takes care of requesting /data initally
156
+ // this takes care of requesting /data initially
143
157
  useEffect(() => {
144
158
  const isEmptyState = Object.keys(parameters || {}).length > 0 && lastRequestedFieldKeys.length === 0 && status === 'empty';
145
159
  if (isEmptyState) {
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Je nutné vybrat schéma',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Další informace o vyhledávání pomocí AQL',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Chcete-li vyhledávat, začněte psát nebo použijte dotaz AQL.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Vyhledat objekty nebo typy objektů',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Vyhledat objekty',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Zrušit',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Vložit objekty',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Vložit objekt} few {Vložit objekty} many {Vložit objekty} other {Vložit objekty}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Vložit objekty z:',
21
21
  'linkDataSource.column-picker.search': 'Vyhledat pole',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Chcete-li požádat o přístup, obraťte se na správce.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Skema er påkrævet',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Lær mere om søgning med AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begynd at indtaste, eller brug AQL for at søge.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søg efter objekter eller objekttyper',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søg efter objekter',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Annuller',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Indsæt objekter',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Indsæt objekt} other {Indsæt objekter}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Indsæt objekter fra',
21
21
  'linkDataSource.column-picker.search': 'Søg efter felter',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Kontakt din administrator for at anmode om adgang.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema erforderlich',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Weitere Informationen zur Suche mit AQL',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Um zu suchen, beginnen Sie mit der Eingabe, oder verwenden Sie AQL.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objekte oder Objekttypen suchen',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objekte suchen',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Abbrechen',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objekte einfügen',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Objekt einfügen} other {Objekte einfügen}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objekte einfügen aus',
21
21
  'linkDataSource.column-picker.search': 'Nach Feldern suchen',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Wenden Sie sich an Ihren Administrator, um Zugriff anzufordern.',
@@ -14,7 +14,7 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema is required',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Learn more about searching with AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Start typing or use AQL to search.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects or object types',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Cancel',
19
19
  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insert {objectsCount, plural, one {object} other {objects}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insert objects from',
@@ -14,7 +14,7 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema is required',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Learn more about searching with AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Start typing or use AQL to search.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects or object types',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Search for objects',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Cancel',
19
19
  'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insert {objectsCount, plural, one {object} other {objects}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insert objects from',
@@ -14,7 +14,7 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '⁣⁢Schema is required⁠‌⁡⁡؜⁠‍‍؜‍⁡‌⁣⁤',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '⁣⁢Learn more about searching with AQL.‍⁠‍⁡⁠؜؜⁡‌؜⁡؜⁣⁤',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '⁣⁢Start typing or use AQL to search.⁠⁠‌⁠⁡‌‍؜‌⁡‍⁠؜⁣⁤',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '⁣⁢Search for objects or object types؜‌‌‍⁡⁡⁠⁡⁠⁡‍⁣⁤',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '⁣⁢Search for objects‍‍‍⁡⁠⁠؜‍⁣⁤',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': '⁣⁢Cancel؜‌‌⁡‌؜⁠⁠⁣⁤',
19
19
  'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {⁣⁢Insert object؜‌؜‌؜؜⁡؜⁠‌⁣⁤} other {⁣⁢Insert objects؜‌؜‌؜؜⁡؜⁠‌⁣⁤}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': '⁣⁢Insert objects from‍؜‌⁠؜⁠؜⁡‌‍⁣⁤',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'El esquema es obligatorio',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Obtén más información sobre cómo realizar búsquedas con AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Empieza a escribir o utiliza AQL para buscar.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Busca objetos o tipos de objetos',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Buscar objetos',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Cancelar',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insertar objetos',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Insertar objeto} other {Insertar objetos}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insertar objetos de',
21
21
  'linkDataSource.column-picker.search': 'Buscar campos',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Para solicitar acceso, ponte en contacto con tu administrador.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Kaavio vaaditaan',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Lue lisää AQL-hausta.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Aloita haku kirjoittamalla tai käyttämällä AQL:ää.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Hae objekteja tai objektityyppejä',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Hae objekteja',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Peruuta',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Lisää kohteet',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Lisää kohde} other {Lisää kohteet}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Lisää objekteja kohteesta',
21
21
  'linkDataSource.column-picker.search': 'Hae kenttiä',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Pyydä pääsyä ottamalla yhteys ylläpitäjään.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Un schéma est requis',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'En savoir plus sur la recherche AQL',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Commencez à taper ou à utiliser AQL pour effectuer une recherche.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Rechercher des objets ou des types d'objet",
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Recherche d'objets",
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Annuler',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Insérer des objets',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Insérer un objet} other {Insérer des objets}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Insérer des objets à partir de',
21
21
  'linkDataSource.column-picker.search': 'Rechercher des champs',
22
22
  'linkDataSource.jira-issues.accessInstructions': "Pour demander l'accès, contactez votre administrateur.",
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'A séma megadása kötelező',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'További információ az AQL-lel történő keresésről',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'A kereséshez kezdj el gépelni vagy használj AQL-t.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objektumok vagy objektumtípusok keresése',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objektumok keresése',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Mégse',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objektumok beszúrása',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Objektum beszúrása} other {Objektumok beszúrása}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objektumok beszúrása innen:',
21
21
  'linkDataSource.column-picker.search': 'Mezők keresése',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Hozzáférés igényléséhez fordulj az adminisztrátorodhoz.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Lo schema è obbligatorio',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Scopri di più sulla ricerca con AQL',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Inizia a digitare o utilizza AQL per la ricerca.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Cerca oggetti o tipi di oggetto',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Cerca oggetti',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Annulla',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Inserisci oggetti',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Inserisci oggetto} other {Inserisci oggetti}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Inserisci oggetti da',
21
21
  'linkDataSource.column-picker.search': 'Cerca campi',
22
22
  'linkDataSource.jira-issues.accessInstructions': "Per richiedere l'accesso, contatta l'amministratore.",
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'スキーマは必須です',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL 検索の詳細をご確認ください。',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '語句を入力するか、AQL を使って検索できます。',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'オブジェクトまたはオブジェクト タイプの検索',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'オブジェクトを検索する',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'キャンセル',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'オブジェクトを挿入',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {オブジェクトを挿入}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'オブジェクトの挿入元',
21
21
  'linkDataSource.column-picker.search': 'フィールドを検索',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'アクセスをリクエストするには、管理者にお問い合わせください。',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '스키마가 필요합니다',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL을 사용한 검색에 대해 자세히 알아보세요.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '입력을 시작하거나 AQL을 사용하여 검색합니다.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '개체 또는 개체 유형 검색',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '개체 검색',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': '취소',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': '개체 삽입',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {개체 삽입}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': '다음의 개체 삽입',
21
21
  'linkDataSource.column-picker.search': '필드 검색',
22
22
  'linkDataSource.jira-issues.accessInstructions': '액세스를 요청하려면 관리자에게 문의하세요.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Oppsett kreves',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Finn ut mer om å søke med AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begynn å skrive eller bruk AQL for å søke.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søk etter objekter eller objekttyper',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Søk etter objekter',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Avbryt',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Sett inn objekter',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Sett inn objekt} other {Sett inn objekter}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Sett inn objekter fra',
21
21
  'linkDataSource.column-picker.search': 'Søk etter felt',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Kontakt administratoren for å be om tilgang.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Er is een schema nodig',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Meer informatie over zoeken met AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Begin met typen of gebruik een AQL om te zoeken.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Zoeken naar objecten en objecttypen',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Objecten zoeken',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Annuleren',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Objecten invoegen',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Object invoegen} other {Objecten invoegen}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Objecten invoegen van',
21
21
  'linkDataSource.column-picker.search': 'Zoek naar velden',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Neem contact op met je beheerder om toegang aan te vragen.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schemat jest wymagany',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Dowiedz się więcej o wyszukiwaniu przy użyciu zapytań AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Zacznij wpisywać lub użyj języka AQL, aby wyszukać.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Wyszukaj obiekty lub typy obiektów',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Wyszukaj obiekty',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Anuluj',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Wstaw obiekty',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Wstaw obiekt} few {Wstaw obiekty} many {Wstaw obiekty} other {Wstaw obiekty}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Wstawianie obiektów z',
21
21
  'linkDataSource.column-picker.search': 'Wyszukaj pola',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Aby poprosić o dostęp, skontaktuj się z administratorem.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'O esquema é obrigatório',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Saiba mais sobre como pesquisar com AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Comece a digitar ou use o AQL para pesquisar.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Pesquisar objetos ou tipos de objetos',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Pesquisar objetos',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Cancelar',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Inserir objeto',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Inserir objeto} other {Inserir objetos}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Inserir objetos de',
21
21
  'linkDataSource.column-picker.search': 'Pesquisar campos',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Para solicitar acesso, entre em contato com o administrador.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Укажите схему',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Подробнее о поиске с помощью AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Начните вводить текст или используйте AQL для поиска.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Поиск по объектам или типам объектов',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Поиск объектов',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Отмена',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Вставить объекты',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Вставить объект} few {Вставить объекты} many {Вставить объекты} other {Вставить объекты}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Вставить объекты из',
21
21
  'linkDataSource.column-picker.search': 'Поиск полей',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Чтобы запросить доступ, обратитесь к администратору.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Schema krävs',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Läs mer om att söka med AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Börja skriva eller använd AQL för att söka.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Sök efter objekt eller objektstyper',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Sök efter objekt',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Avbryt',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Infoga objekt',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Infoga objekt} other {Infoga objekt}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Infoga objekt från',
21
21
  'linkDataSource.column-picker.search': 'Sök efter fält',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Kontakta din administratör för att begära åtkomst.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'ต้องระบุรายละเอียดเรื่อง',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'เรียนรู้เพิ่มเติมเกี่ยวกับการค้นหาด้วย AQL',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'เริ่มพิมพ์หรือใช้ AQL เพื่อค้นหา',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'ค้นหาเรื่องหรือประเภทเรื่อง',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'ค้นหาวัตถุ',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'ยกเลิก',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'แทรกเรื่อง',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {แทรกเรื่อง}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'แทรกเรื่องจาก',
21
21
  'linkDataSource.column-picker.search': 'ค้นหาฟิลด์',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'หากต้องการส่งคำขอการเข้าถึง โปรดติดต่อผู้ดูแลของคุณ',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Şema gerekli',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'AQL ile arama yapmak hakkında daha fazla bilgi edinin.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Aramak için yazmaya başlayın veya AQL kullanın.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Nesne veya nesne türleri arayın',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Nesne arayın',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'İptal',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Nesne ekle',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Nesne ekle} other {Nesne ekle}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Şuradan nesne ekleyin:',
21
21
  'linkDataSource.column-picker.search': 'Alan arayın',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Erişim talep etmek için yöneticinizle iletişime geçin.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Необхідно вибрати схему',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Докладніше про пошук засобами AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Почніть вводити запит або скористайтесь AQL для пошуку.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': "Пошук об’єктів або типів об'єктів",
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Пошук об’єктів',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Скасувати',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Вставити об’єкти',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, one {Вставити об’єкт(-и)} few {Вставити об’єкти} many {Вставити об’єкти} other {Вставити об’єкти}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Вставка об’єктів з',
21
21
  'linkDataSource.column-picker.search': 'Пошук полів',
22
22
  'linkDataSource.jira-issues.accessInstructions': 'Щоб запитати доступ, зверніться до адміністратора.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': 'Cần có sơ đồ',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': 'Tìm hiểu thêm về việc tìm kiếm bằng AQL.',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': 'Bắt đầu nhập hoặc sử dụng AQL để tìm kiếm.',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Tìm kiếm đối tượng hoặc loại đối tượng',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': 'Tìm kiếm các đối tượng',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': 'Hủy',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': 'Chèn đối tượng',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {Chèn đối tượng}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': 'Chèn đối tượng từ',
21
21
  'linkDataSource.column-picker.search': 'Tìm kiếm trường',
22
22
  '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.',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '必须选择架构',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '详细了解如何使用 AQL 进行搜索。',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '开始输入搜索内容或使用 AQL 进行搜索。',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜索对象或对象类型',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜索对象',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': '取消',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': '插入对象',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {插入对象}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': '插入以下来源的对象:',
21
21
  'linkDataSource.column-picker.search': '搜索字段',
22
22
  'linkDataSource.jira-issues.accessInstructions': '要申请访问权限,请联系您的管理员。',
@@ -14,9 +14,9 @@ export default {
14
14
  'linkDataSource.assets.configModal.objectSchemaSelect.schemaRequired': '結構描述為必要項目',
15
15
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.learnMoreLink': '進一步了解如何使用 JQL 進行搜尋。',
16
16
  'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchDescription': '開始輸入或使用 AQL 進行搜尋。',
17
- 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜尋物件或物件類型',
17
+ 'linkDataSource.assets.configModal.renderAssetsContent.initialStateView.searchTitle': '搜尋物件',
18
18
  'linkDataSource.assets.configmodal.cancelButtonText': '取消',
19
- 'linkDataSource.assets.configmodal.insertIssuesButtonText': '插入物件',
19
+ 'linkDataSource.assets.configmodal.insertIssuesButtonText': '{objectsCount, plural, other {插入物件}}',
20
20
  'linkDataSource.assets.configmodal.insertObjectsTitle': '插入物件來源:',
21
21
  'linkDataSource.column-picker.search': '搜尋欄位',
22
22
  'linkDataSource.jira-issues.accessInstructions': '若要要求存取權,請連絡您的管理員。',
@@ -193,7 +193,7 @@ const PlainAssetsConfigModal = props => {
193
193
  appearance: "primary",
194
194
  onClick: onInsertPressed,
195
195
  isDisabled: isDisabled,
196
- testId: 'asset-datasource-modal--insert-button'
196
+ testId: 'assets-datasource-modal--insert-button'
197
197
  }, jsx(FormattedMessage, _extends({}, modalMessages.insertIssuesButtonText, {
198
198
  values: {
199
199
  objectsCount: responseItems.length
@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
205
205
  };
206
206
  const analyticsContextData = {
207
207
  packageName: "@atlaskit/link-datasource",
208
- packageVersion: "1.0.15",
208
+ packageVersion: "1.0.17",
209
209
  source: 'datasourceConfigModal'
210
210
  };
211
211
  const contextData = {
@@ -104,6 +104,6 @@ const DatasourceTableViewWithoutAnalytics = ({
104
104
  };
105
105
  const analyticsContextData = {
106
106
  packageName: "@atlaskit/link-datasource",
107
- packageVersion: "1.0.15"
107
+ packageVersion: "1.0.17"
108
108
  };
109
109
  export const DatasourceTableView = withAnalyticsContext(analyticsContextData)(DatasourceTableViewWithoutAnalytics);
@@ -15,6 +15,10 @@ const inputContainerStyles = css({
15
15
  minHeight: '60px'
16
16
  });
17
17
  const DEFAULT_JQL_QUERY = 'created >= -30d order by created DESC';
18
+ const JiraSearchMethodSwitcher = ModeSwitcher;
19
+ export const getInitialSearchMethod = initialJql => {
20
+ return initialJql ? 'jql' : 'basic';
21
+ };
18
22
  export const JiraSearchContainer = props => {
19
23
  const {
20
24
  isSearching,
@@ -28,10 +32,8 @@ export const JiraSearchContainer = props => {
28
32
  const {
29
33
  formatMessage
30
34
  } = useIntl();
31
- const basicModeValue = 'basic';
32
- const jqlModeValue = 'jql';
33
35
  const [basicSearchTerm, setBasicSearchTerm] = useState('');
34
- const [currentSearchMode, setCurrentSearchMode] = useState(initialJql ? jqlModeValue : basicModeValue);
36
+ const [currentSearchMethod, setCurrentSearchMethod] = useState(getInitialSearchMethod(initialJql));
35
37
  const [jql, setJql] = useState(initialJql || DEFAULT_JQL_QUERY);
36
38
  const [orderKey, setOrderKey] = useState();
37
39
  const [orderDirection, setOrderDirection] = useState();
@@ -39,7 +41,7 @@ export const JiraSearchContainer = props => {
39
41
  fireEvent
40
42
  } = useDatasourceAnalyticsEvents();
41
43
  const onSearchModeChange = searchMode => {
42
- setCurrentSearchMode(searchMode);
44
+ setCurrentSearchMethod(searchMode);
43
45
  };
44
46
  const handleBasicSearchChange = e => {
45
47
  const rawSearch = e.currentTarget.value;
@@ -68,35 +70,35 @@ export const JiraSearchContainer = props => {
68
70
  const handleSearch = () => {
69
71
  onSearch({
70
72
  jql
71
- });
72
- if (currentSearchMode === basicModeValue) {
73
+ }, currentSearchMethod);
74
+ if (currentSearchMethod === 'basic') {
73
75
  fireEvent('ui.form.submitted.basicSearch', {});
74
- } else if (currentSearchMode === jqlModeValue) {
76
+ } else if (currentSearchMethod === 'jql') {
75
77
  fireEvent('ui.jqlEditor.searched', {});
76
78
  }
77
79
  };
78
80
  return jsx("div", {
79
81
  css: inputContainerStyles
80
- }, currentSearchMode === basicModeValue && jsx(BasicSearchInput, {
82
+ }, currentSearchMethod === 'basic' && jsx(BasicSearchInput, {
81
83
  isSearching: isSearching,
82
84
  onChange: handleBasicSearchChange,
83
85
  onSearch: handleSearch,
84
86
  searchTerm: basicSearchTerm
85
- }), currentSearchMode === jqlModeValue && jsx(JiraJQLEditor, {
87
+ }), currentSearchMethod === 'jql' && jsx(JiraJQLEditor, {
86
88
  cloudId: cloudId || '',
87
89
  isSearching: isSearching,
88
90
  onChange: onQueryChange,
89
91
  onSearch: handleSearch,
90
92
  query: jql
91
- }), jsx(ModeSwitcher, {
93
+ }), jsx(JiraSearchMethodSwitcher, {
92
94
  onOptionValueChange: onSearchModeChange,
93
- selectedOptionValue: currentSearchMode,
95
+ selectedOptionValue: currentSearchMethod,
94
96
  options: [{
95
97
  label: formatMessage(modeSwitcherMessages.basicTextSearchLabel),
96
- value: basicModeValue
98
+ value: 'basic'
97
99
  }, {
98
100
  label: 'JQL',
99
- value: jqlModeValue
101
+ value: 'jql'
100
102
  }]
101
103
  }));
102
104
  };
@@ -1,6 +1,6 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  /** @jsx jsx */
3
- import { useCallback, useEffect, useMemo, useState } from 'react';
3
+ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
4
4
  import { css, jsx } from '@emotion/react';
5
5
  import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
6
6
  import { withAnalyticsContext } from '@atlaskit/analytics-next';
@@ -15,7 +15,7 @@ import { ModalLoadingError } from '../../common/error-state/modal-loading-error'
15
15
  import { NoResults } from '../../common/error-state/no-results';
16
16
  import { EmptyState, IssueLikeDataTableView } from '../../issue-like-table';
17
17
  import LinkRenderType from '../../issue-like-table/render-type/link';
18
- import { JiraSearchContainer } from '../jira-search-container';
18
+ import { getInitialSearchMethod, JiraSearchContainer } from '../jira-search-container';
19
19
  import { ModeSwitcher } from '../mode-switcher';
20
20
  import { JiraSiteSelector } from '../site-selector';
21
21
  import { modalMessages } from './messages';
@@ -77,6 +77,7 @@ export const PlainJiraIssuesConfigModal = props => {
77
77
  parameters: isParametersSet ? parameters : undefined,
78
78
  fieldKeys: visibleColumnKeys
79
79
  });
80
+ const lastSearchMethodRef = useRef(getInitialSearchMethod(parameters === null || parameters === void 0 ? void 0 : parameters.jql));
80
81
  const {
81
82
  formatMessage
82
83
  } = useIntl();
@@ -110,7 +111,8 @@ export const PlainJiraIssuesConfigModal = props => {
110
111
  setCloudId(selectedJiraSite.cloudId);
111
112
  }
112
113
  }, [cloudId, selectedJiraSite]);
113
- const onSearch = useCallback(newParameters => {
114
+ const onSearch = useCallback((newParameters, searchMethod) => {
115
+ lastSearchMethodRef.current = searchMethod;
114
116
  setJql(newParameters.jql);
115
117
  reset({
116
118
  shouldForceRequest: true
@@ -294,7 +296,7 @@ const analyticsContextAttributes = {
294
296
  };
295
297
  const analyticsContextData = {
296
298
  packageName: "@atlaskit/link-datasource",
297
- packageVersion: "1.0.15",
299
+ packageVersion: "1.0.17",
298
300
  source: 'datasourceConfigModal'
299
301
  };
300
302
  const contextData = {
@@ -0,0 +1,10 @@
1
+ export var mapSearchMethod = function mapSearchMethod(searchMethod) {
2
+ switch (searchMethod) {
3
+ case 'basic':
4
+ return 'datasource_basic_filter';
5
+ case 'jql':
6
+ return 'datasource_search_query';
7
+ default:
8
+ return 'unknown';
9
+ }
10
+ };
@@ -0,0 +1 @@
1
+ export {};