@atlaskit/link-datasource 1.24.4 → 1.24.6

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 (152) hide show
  1. package/CHANGELOG.md +13 -0
  2. package/dist/cjs/common/types.js +5 -1
  3. package/dist/cjs/services/{getAvailableJiraSites.js → getAvailableSites.js} +5 -5
  4. package/dist/cjs/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
  5. package/dist/cjs/ui/common/error-state/access-required.js +1 -2
  6. package/dist/cjs/ui/common/error-state/loading-error.js +2 -3
  7. package/dist/cjs/ui/common/error-state/messages.js +56 -0
  8. package/dist/cjs/ui/common/error-state/modal-loading-error.js +2 -3
  9. package/dist/cjs/ui/common/error-state/no-instances.js +10 -7
  10. package/dist/cjs/ui/common/error-state/no-results.js +2 -3
  11. package/dist/cjs/ui/common/initial-state-view/index.js +73 -0
  12. package/dist/cjs/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
  13. package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -6
  14. package/dist/cjs/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
  15. package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/index.js +20 -10
  16. package/dist/cjs/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
  17. package/dist/cjs/ui/confluence-search-modal/index.js +29 -0
  18. package/dist/cjs/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +152 -0
  19. package/dist/cjs/ui/confluence-search-modal/modal/index.js +153 -0
  20. package/dist/cjs/ui/confluence-search-modal/modal/messages.js +54 -0
  21. package/dist/cjs/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
  22. package/dist/cjs/ui/issue-like-table/drag-column-preview.js +1 -1
  23. package/dist/cjs/ui/issue-like-table/index.js +2 -2
  24. package/dist/cjs/ui/issue-like-table/styled.js +2 -2
  25. package/dist/cjs/ui/jira-issues-modal/index.js +1 -1
  26. package/dist/cjs/ui/jira-issues-modal/jira-search-container/index.js +8 -5
  27. package/dist/cjs/ui/jira-issues-modal/modal/index.js +41 -32
  28. package/dist/cjs/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +3 -3
  29. package/dist/cjs/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +2 -2
  30. package/dist/cjs/ui/jira-issues-modal/modal/messages.js +66 -0
  31. package/dist/es2019/common/types.js +1 -0
  32. package/dist/es2019/services/{getAvailableJiraSites.js → getAvailableSites.js} +2 -2
  33. package/dist/es2019/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
  34. package/dist/es2019/ui/common/error-state/access-required.js +1 -2
  35. package/dist/es2019/ui/common/error-state/loading-error.js +2 -3
  36. package/dist/es2019/ui/common/error-state/messages.js +56 -0
  37. package/dist/es2019/ui/common/error-state/modal-loading-error.js +2 -3
  38. package/dist/es2019/ui/common/error-state/no-instances.js +21 -14
  39. package/dist/es2019/ui/common/error-state/no-results.js +2 -3
  40. package/dist/es2019/ui/common/initial-state-view/index.js +66 -0
  41. package/dist/es2019/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
  42. package/dist/es2019/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -5
  43. package/dist/es2019/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
  44. package/dist/es2019/ui/{jira-issues-modal → common/modal}/site-selector/index.js +19 -9
  45. package/dist/es2019/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
  46. package/dist/es2019/ui/confluence-search-modal/index.js +13 -0
  47. package/dist/es2019/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +143 -0
  48. package/dist/es2019/ui/confluence-search-modal/modal/index.js +108 -0
  49. package/dist/es2019/ui/confluence-search-modal/modal/messages.js +48 -0
  50. package/dist/es2019/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
  51. package/dist/es2019/ui/issue-like-table/drag-column-preview.js +1 -1
  52. package/dist/es2019/ui/issue-like-table/index.js +2 -2
  53. package/dist/es2019/ui/issue-like-table/styled.js +2 -2
  54. package/dist/es2019/ui/jira-issues-modal/index.js +1 -1
  55. package/dist/es2019/ui/jira-issues-modal/jira-search-container/index.js +5 -2
  56. package/dist/es2019/ui/jira-issues-modal/modal/index.js +36 -27
  57. package/dist/es2019/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +2 -2
  58. package/dist/es2019/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +1 -1
  59. package/dist/es2019/ui/jira-issues-modal/modal/messages.js +66 -0
  60. package/dist/esm/common/types.js +1 -0
  61. package/dist/esm/services/{getAvailableJiraSites.js → getAvailableSites.js} +4 -4
  62. package/dist/esm/ui/assets-modal/modal/render-assets-content/initial-state-view/index.js +1 -3
  63. package/dist/esm/ui/common/error-state/access-required.js +1 -2
  64. package/dist/esm/ui/common/error-state/loading-error.js +2 -3
  65. package/dist/esm/ui/common/error-state/messages.js +56 -0
  66. package/dist/esm/ui/common/error-state/modal-loading-error.js +2 -3
  67. package/dist/esm/ui/common/error-state/no-instances.js +11 -8
  68. package/dist/esm/ui/common/error-state/no-results.js +2 -3
  69. package/dist/esm/ui/common/initial-state-view/index.js +65 -0
  70. package/dist/esm/ui/{jira-issues-modal → common}/initial-state-view/messages.js +9 -2
  71. package/dist/esm/ui/{jira-issues-modal → common/modal}/basic-search-input/index.js +8 -6
  72. package/dist/esm/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.js +5 -0
  73. package/dist/esm/ui/{jira-issues-modal → common/modal}/site-selector/index.js +19 -9
  74. package/dist/esm/ui/{jira-issues-modal → common/modal}/site-selector/messages.js +6 -0
  75. package/dist/esm/ui/confluence-search-modal/index.js +17 -0
  76. package/dist/esm/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.js +145 -0
  77. package/dist/esm/ui/confluence-search-modal/modal/index.js +142 -0
  78. package/dist/esm/ui/confluence-search-modal/modal/messages.js +48 -0
  79. package/dist/esm/ui/issue-like-table/column-picker/concatenated-menu-list.js +2 -3
  80. package/dist/esm/ui/issue-like-table/drag-column-preview.js +1 -1
  81. package/dist/esm/ui/issue-like-table/index.js +2 -2
  82. package/dist/esm/ui/issue-like-table/styled.js +2 -2
  83. package/dist/esm/ui/jira-issues-modal/index.js +1 -1
  84. package/dist/esm/ui/jira-issues-modal/jira-search-container/index.js +5 -2
  85. package/dist/esm/ui/jira-issues-modal/modal/index.js +36 -27
  86. package/dist/esm/ui/jira-issues-modal/modal/{display-view-dropdown/display-view-drop-down.js → jira-display-view-dropdown/jira-display-view-drop-down.js} +2 -2
  87. package/dist/esm/ui/jira-issues-modal/{initial-state-view/assets/initial-state-svg.js → modal/jira-issues-initial-state-svg.js} +1 -1
  88. package/dist/esm/ui/jira-issues-modal/modal/messages.js +66 -0
  89. package/dist/types/common/types.d.ts +30 -0
  90. package/dist/types/services/getAvailableSites.d.ts +2 -0
  91. package/dist/types/ui/common/error-state/messages.d.ts +45 -0
  92. package/dist/types/ui/common/error-state/no-instances.d.ts +8 -1
  93. package/dist/types/ui/common/initial-state-view/index.d.ts +16 -0
  94. package/dist/{types-ts4.5/ui/jira-issues-modal → types/ui/common}/initial-state-view/messages.d.ts +6 -1
  95. package/dist/types/ui/{jira-issues-modal → common/modal}/basic-search-input/index.d.ts +5 -2
  96. package/dist/types/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.d.ts +5 -0
  97. package/dist/types/ui/common/modal/site-selector/index.d.ts +11 -0
  98. package/dist/{types-ts4.5/ui/jira-issues-modal → types/ui/common/modal}/site-selector/messages.d.ts +5 -0
  99. package/dist/types/ui/confluence-search-modal/index.d.ts +5 -0
  100. package/dist/types/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.d.ts +2 -0
  101. package/dist/types/ui/confluence-search-modal/modal/index.d.ts +3 -0
  102. package/dist/types/ui/confluence-search-modal/modal/messages.d.ts +47 -0
  103. package/dist/types/ui/issue-like-table/styled.d.ts +1 -1
  104. package/dist/types/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts +1 -1
  105. package/dist/types/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts +1 -1
  106. package/dist/types/ui/jira-issues-modal/basic-filters/ui/index.d.ts +1 -1
  107. package/dist/types/ui/jira-issues-modal/index.d.ts +2 -2
  108. package/dist/types/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -2
  109. package/dist/types/ui/jira-issues-modal/modal/index.d.ts +6 -5
  110. package/dist/types/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +8 -0
  111. package/dist/types/ui/jira-issues-modal/modal/jira-issues-initial-state-svg.d.ts +2 -0
  112. package/dist/types/ui/jira-issues-modal/modal/messages.d.ts +60 -0
  113. package/dist/types/ui/jira-issues-modal/types.d.ts +1 -28
  114. package/dist/types-ts4.5/common/types.d.ts +30 -0
  115. package/dist/types-ts4.5/services/getAvailableSites.d.ts +2 -0
  116. package/dist/types-ts4.5/ui/common/error-state/messages.d.ts +45 -0
  117. package/dist/types-ts4.5/ui/common/error-state/no-instances.d.ts +8 -1
  118. package/dist/types-ts4.5/ui/common/initial-state-view/index.d.ts +16 -0
  119. package/dist/{types/ui/jira-issues-modal → types-ts4.5/ui/common}/initial-state-view/messages.d.ts +6 -1
  120. package/dist/types-ts4.5/ui/{jira-issues-modal → common/modal}/basic-search-input/index.d.ts +5 -2
  121. package/dist/types-ts4.5/ui/{jira-issues-modal → common/modal}/basic-search-input/messages.d.ts +5 -0
  122. package/dist/types-ts4.5/ui/common/modal/site-selector/index.d.ts +11 -0
  123. package/dist/{types/ui/jira-issues-modal → types-ts4.5/ui/common/modal}/site-selector/messages.d.ts +5 -0
  124. package/dist/types-ts4.5/ui/confluence-search-modal/index.d.ts +5 -0
  125. package/dist/types-ts4.5/ui/confluence-search-modal/modal/confluence-search-initial-state-svg.d.ts +2 -0
  126. package/dist/types-ts4.5/ui/confluence-search-modal/modal/index.d.ts +3 -0
  127. package/dist/types-ts4.5/ui/confluence-search-modal/modal/messages.d.ts +47 -0
  128. package/dist/types-ts4.5/ui/issue-like-table/styled.d.ts +1 -1
  129. package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.d.ts +1 -1
  130. package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.d.ts +1 -1
  131. package/dist/types-ts4.5/ui/jira-issues-modal/basic-filters/ui/index.d.ts +1 -1
  132. package/dist/types-ts4.5/ui/jira-issues-modal/index.d.ts +2 -2
  133. package/dist/types-ts4.5/ui/jira-issues-modal/jira-search-container/index.d.ts +2 -2
  134. package/dist/types-ts4.5/ui/jira-issues-modal/modal/index.d.ts +6 -5
  135. package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-display-view-dropdown/jira-display-view-drop-down.d.ts +8 -0
  136. package/dist/types-ts4.5/ui/jira-issues-modal/modal/jira-issues-initial-state-svg.d.ts +2 -0
  137. package/dist/types-ts4.5/ui/jira-issues-modal/modal/messages.d.ts +60 -0
  138. package/dist/types-ts4.5/ui/jira-issues-modal/types.d.ts +1 -28
  139. package/package.json +6 -3
  140. package/dist/cjs/ui/jira-issues-modal/initial-state-view/index.js +0 -83
  141. package/dist/es2019/ui/jira-issues-modal/initial-state-view/index.js +0 -77
  142. package/dist/esm/ui/jira-issues-modal/initial-state-view/index.js +0 -76
  143. package/dist/types/services/getAvailableJiraSites.d.ts +0 -2
  144. package/dist/types/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts +0 -2
  145. package/dist/types/ui/jira-issues-modal/initial-state-view/index.d.ts +0 -8
  146. package/dist/types/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts +0 -8
  147. package/dist/types/ui/jira-issues-modal/site-selector/index.d.ts +0 -9
  148. package/dist/types-ts4.5/services/getAvailableJiraSites.d.ts +0 -2
  149. package/dist/types-ts4.5/ui/jira-issues-modal/initial-state-view/assets/initial-state-svg.d.ts +0 -2
  150. package/dist/types-ts4.5/ui/jira-issues-modal/initial-state-view/index.d.ts +0 -8
  151. package/dist/types-ts4.5/ui/jira-issues-modal/modal/display-view-dropdown/display-view-drop-down.d.ts +0 -8
  152. package/dist/types-ts4.5/ui/jira-issues-modal/site-selector/index.d.ts +0 -9
@@ -34,30 +34,27 @@ var _adf = require("../../../common/utils/adf");
34
34
  var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
35
35
  var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
36
36
  var _en = _interopRequireDefault(require("../../../i18n/en"));
37
- var _getAvailableJiraSites = require("../../../services/getAvailableJiraSites");
37
+ var _getAvailableSites = require("../../../services/getAvailableSites");
38
38
  var _accessRequired = require("../../common/error-state/access-required");
39
+ var _messages = require("../../common/error-state/messages");
39
40
  var _modalLoadingError = require("../../common/error-state/modal-loading-error");
40
41
  var _noInstances = require("../../common/error-state/no-instances");
41
42
  var _noResults = require("../../common/error-state/no-results");
43
+ var _initialStateView = require("../../common/initial-state-view");
44
+ var _messages2 = require("../../common/initial-state-view/messages");
45
+ var _siteSelector = require("../../common/modal/site-selector");
42
46
  var _issueLikeTable = require("../../issue-like-table");
43
47
  var _link = _interopRequireDefault(require("../../issue-like-table/render-type/link"));
44
48
  var _ui = require("../basic-filters/ui");
45
49
  var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
46
- var _initialStateView = require("../initial-state-view");
47
50
  var _jiraSearchContainer = require("../jira-search-container");
48
- var _siteSelector = require("../site-selector");
49
- var _displayViewDropDown = require("./display-view-dropdown/display-view-drop-down");
50
- var _messages = require("./messages");
51
+ var _jiraDisplayViewDropDown = require("./jira-display-view-dropdown/jira-display-view-drop-down");
52
+ var _jiraIssuesInitialStateSvg = require("./jira-issues-initial-state-svg");
53
+ var _messages3 = require("./messages");
51
54
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
52
55
  function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
53
56
  function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
54
57
  function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /** @jsx jsx */
55
- var dropdownContainerStyles = (0, _react2.css)({
56
- display: 'flex',
57
- alignItems: 'center',
58
- gap: "var(--ds-space-100, 0.5rem)",
59
- minHeight: '40px' // to prevent vertical shifting when site selector pops in
60
- });
61
58
  var tableContainerStyles = (0, _react2.css)({
62
59
  borderTopLeftRadius: "var(--ds-border-radius-200, 8px)",
63
60
  borderTopRightRadius: "var(--ds-border-radius-200, 8px)",
@@ -94,6 +91,7 @@ var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
94
91
  }
95
92
  return itemCount === 1 ? _types.DatasourceDisplay.INLINE : _types.DatasourceDisplay.DATASOURCE_INLINE;
96
93
  };
94
+ var jqlSupportDocumentLink = 'https://support.atlassian.com/jira-service-management-cloud/docs/use-advanced-search-with-jira-query-language-jql/';
97
95
 
98
96
  /**
99
97
  * This method should be called when one atomic action is performed on columns: adding new item, removing one item, changing items order.
@@ -264,7 +262,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
264
262
  while (1) switch (_context.prev = _context.next) {
265
263
  case 0:
266
264
  _context.next = 2;
267
- return (0, _getAvailableJiraSites.getAvailableJiraSites)();
265
+ return (0, _getAvailableSites.getAvailableSites)('jira');
268
266
  case 2:
269
267
  jiraSites = _context.sent;
270
268
  sortedAvailableSites = (0, _toConsumableArray2.default)(jiraSites).sort(function (a, b) {
@@ -387,7 +385,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
387
385
  // During insertion, we want the JQL of the datasource to be whatever is in the search bar,
388
386
  // even if the user didn't previously click search
389
387
  var upToDateJql = searchBarJql !== null && searchBarJql !== void 0 ? searchBarJql : jql;
390
- var upToDateJqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(upToDateJql));
388
+ var upToDateJqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-stricter-jql-encoding') ? encodeURIComponent(upToDateJql) : encodeURI(upToDateJql));
391
389
  var filterSelectionCount = _ui.availableBasicFilterTypes.reduce(function (current, filter) {
392
390
  var _basicFilterSelection;
393
391
  return _objectSpread(_objectSpread({}, current), {}, (0, _defineProperty2.default)({}, "".concat(filter, "BasicFilterSelectionCount"), ((_basicFilterSelection = basicFilterSelectionsSearchedWith.current[filter]) === null || _basicFilterSelection === void 0 ? void 0 : _basicFilterSelection.length) || 0));
@@ -480,7 +478,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
480
478
  return (0, _react2.jsx)("div", {
481
479
  css: [tableContainerStyles, contentContainerStyles]
482
480
  }, (0, _react2.jsx)(_issueLikeTable.IssueLikeDataTableView, {
483
- testId: "jira-jql-datasource-table",
481
+ testId: "jira-datasource-table",
484
482
  status: status,
485
483
  columns: columns,
486
484
  items: responseItems,
@@ -507,15 +505,15 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
507
505
  return (0, _react2.jsx)("div", {
508
506
  css: smartLinkContainerStyles
509
507
  }, (0, _react2.jsx)("span", {
510
- "data-testid": "jira-jql-datasource-modal--smart-card-placeholder",
508
+ "data-testid": "jira-datasource-modal--smart-card-placeholder",
511
509
  css: placeholderSmartLinkStyles
512
- }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.issuesCountSmartCardPlaceholderText)));
510
+ }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.issuesCountSmartCardPlaceholderText)));
513
511
  } else {
514
512
  var url;
515
513
  if (responseItems.length === 1 && retrieveUrlForSmartCardRender()) {
516
514
  url = retrieveUrlForSmartCardRender();
517
515
  } else {
518
- url = "".concat(selectedJiraSiteUrl, "/issues/?jql=").concat(encodeURI(jql));
516
+ url = "".concat(selectedJiraSiteUrl, "/issues/?jql=").concat((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.enable-stricter-jql-encoding') ? encodeURIComponent(jql) : encodeURI(jql));
519
517
  }
520
518
  return (0, _react2.jsx)("div", {
521
519
  css: smartLinkContainerStyles
@@ -541,29 +539,36 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
541
539
  return (0, _react2.jsx)("div", {
542
540
  css: [contentContainerStyles, !!jql && tableContainerStyles]
543
541
  }, !!jql ? (0, _react2.jsx)(_issueLikeTable.EmptyState, {
544
- testId: "jira-jql-datasource-modal--empty-state"
542
+ testId: "jira-datasource-modal--empty-state"
545
543
  }) : (0, _react2.jsx)(_initialStateView.InitialStateView, {
546
- searchMethod: currentSearchMethod
544
+ showBeta: !(0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters'),
545
+ icon: (0, _react2.jsx)(_jiraIssuesInitialStateSvg.JiraInitialStateSVG, null),
546
+ title: _messages3.modalMessages.searchJiraTitle,
547
+ description: currentSearchMethod === 'jql' ? _messages2.initialStateViewMessages.searchDescriptionForJQLSearch : _messages2.initialStateViewMessages.searchDescriptionForBasicSearch,
548
+ learnMoreLink: currentSearchMethod === 'jql' ? {
549
+ href: jqlSupportDocumentLink,
550
+ text: _messages2.initialStateViewMessages.learnMoreLink
551
+ } : undefined
547
552
  }));
548
553
  }
549
554
  return issueLikeDataTableView;
550
555
  }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
556
+ var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages3.modalMessages.insertIssuesTitleManySites : _messages3.modalMessages.insertIssuesTitle;
551
557
  return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
552
558
  defaultMessages: _en.default,
553
559
  loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
554
560
  }, (0, _react2.jsx)(_modalDialog.ModalTransition, null, (0, _react2.jsx)(_modalDialog.default, {
555
- testId: "jira-jql-datasource-modal",
561
+ testId: "jira-datasource-modal",
556
562
  onClose: onCancel,
557
563
  width: "calc(100% - 80px)",
558
564
  shouldScrollInViewport: true
559
- }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, (0, _react2.jsx)(_modalDialog.ModalTitle, null, (0, _react2.jsx)("div", {
560
- css: dropdownContainerStyles
561
- }, availableSites && availableSites.length > 1 ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesTitleManySites), (0, _react2.jsx)(_siteSelector.JiraSiteSelector, {
565
+ }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, (0, _react2.jsx)(_modalDialog.ModalTitle, null, (0, _react2.jsx)(_siteSelector.SiteSelector, {
562
566
  availableSites: availableSites,
563
567
  onSiteSelection: onSiteSelection,
564
- selectedJiraSite: selectedJiraSite,
565
- testId: "jira-jql-datasource-modal--site-selector"
566
- })) : (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesTitle))), !hasNoJiraSites && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
568
+ selectedSite: selectedJiraSite,
569
+ testId: "jira-datasource-modal--site-selector",
570
+ label: siteSelectorLabel
571
+ })), !hasNoJiraSites && (0, _react2.jsx)(_jiraDisplayViewDropDown.JiraDisplayViewDropDown, {
567
572
  onViewModeChange: handleViewModeChange,
568
573
  viewMode: currentViewMode
569
574
  })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoJiraSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_jiraSearchContainer.JiraSearchContainer, {
@@ -575,8 +580,12 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
575
580
  initialSearchMethod: initialSearchMethod,
576
581
  onSearchMethodChange: setCurrentSearchMethod,
577
582
  site: selectedJiraSite
578
- }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, null)), (0, _react2.jsx)(_modalDialog.ModalFooter, null, shouldShowIssueCount && (0, _react2.jsx)("div", {
579
- "data-testid": "jira-jql-datasource-modal-total-issues-count",
583
+ }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
584
+ title: _messages.loadingErrorMessages.noAccessToJiraSitesTitle,
585
+ description: _messages.loadingErrorMessages.noAccessToJiraSitesDescription,
586
+ testId: "no-jira-instances-content"
587
+ })), (0, _react2.jsx)(_modalDialog.ModalFooter, null, shouldShowIssueCount && (0, _react2.jsx)("div", {
588
+ "data-testid": "jira-datasource-modal-total-issues-count",
580
589
  css: issueCountStyles
581
590
  }, (0, _react2.jsx)(_linkUrl.default, {
582
591
  href: jqlUrl,
@@ -587,19 +596,19 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
587
596
  }
588
597
  }, (0, _react2.jsx)(_reactIntlNext.FormattedNumber, {
589
598
  value: totalCount
590
- }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.modalMessages.issueText, {
599
+ }), ' ', (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages3.modalMessages.issueText, {
591
600
  values: {
592
601
  totalCount: totalCount
593
602
  }
594
603
  })))), (0, _react2.jsx)(_standardButton.default, {
595
604
  appearance: "default",
596
605
  onClick: onCancelClick
597
- }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.cancelButtonText)), !hasNoJiraSites && (0, _react2.jsx)(_standardButton.default, {
606
+ }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.cancelButtonText)), !hasNoJiraSites && (0, _react2.jsx)(_standardButton.default, {
598
607
  appearance: "primary",
599
608
  onClick: onInsertPressed,
600
609
  isDisabled: isInsertDisabled,
601
- testId: "jira-jql-datasource-modal--insert-button"
602
- }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesButtonText))))));
610
+ testId: "jira-datasource-modal--insert-button"
611
+ }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages3.modalMessages.insertIssuesButtonText))))));
603
612
  };
604
613
  var analyticsContextAttributes = {
605
614
  dataProvider: 'jira-issues'
@@ -5,7 +5,7 @@ var _typeof = require("@babel/runtime/helpers/typeof");
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.DisplayViewDropDown = void 0;
8
+ exports.JiraDisplayViewDropDown = void 0;
9
9
  var _react = require("@emotion/react");
10
10
  var _reactIntlNext = require("react-intl-next");
11
11
  var _dropdownMenu = _interopRequireWildcard(require("@atlaskit/dropdown-menu"));
@@ -35,7 +35,7 @@ var InlineIcon = (0, _react.jsx)("svg", {
35
35
  d: "M4 9C2.89543 9 2 9.67155 2 10.5V13.5C2 14.3285 2.89543 15 4 15H20C21.1046 15 22 14.3285 22 13.5V10.5C22 9.67155 21.1046 9 20 9H4ZM4.22222 11.25C4.22222 10.5 4.22222 10.5 5 10.5H7C7.55556 10.5 7.55556 10.5 7.55556 11.25V13C7.55556 13.5 7.55556 13.5 7 13.5H5C4.22222 13.5 4.22222 13.5 4.22222 13V11.25ZM9 12C9 11.7929 9.2239 11.625 9.5 11.625H19.5C19.7761 11.625 20 11.7929 20 12C20 12.2071 19.7761 12.375 19.5 12.375H9.5C9.2239 12.375 9 12.2071 9 12Z",
36
36
  fill: 'currentColor'
37
37
  }));
38
- var DisplayViewDropDown = exports.DisplayViewDropDown = function DisplayViewDropDown(_ref) {
38
+ var JiraDisplayViewDropDown = exports.JiraDisplayViewDropDown = function JiraDisplayViewDropDown(_ref) {
39
39
  var onViewModeChange = _ref.onViewModeChange,
40
40
  viewMode = _ref.viewMode;
41
41
  var _useIntl = (0, _reactIntlNext.useIntl)(),
@@ -43,7 +43,7 @@ var DisplayViewDropDown = exports.DisplayViewDropDown = function DisplayViewDrop
43
43
  var triggerText = viewMode === 'issue' ? formatMessage(_messages.modalMessages.tableViewModeLabel) : formatMessage(_messages.modalMessages.inlineLinkViewModeLabel);
44
44
  return (0, _react.jsx)(_dropdownMenu.default, {
45
45
  trigger: triggerText,
46
- testId: "jira-jql-datasource-modal--view-drop-down"
46
+ testId: "jira-datasource-modal--view-drop-down"
47
47
  }, (0, _react.jsx)(_primitives.Box, {
48
48
  xcss: dropDownItemGroupStyles
49
49
  }, (0, _react.jsx)(_dropdownMenu.DropdownItemGroup, null, (0, _react.jsx)(_dropdownMenu.DropdownItem, {
@@ -4,9 +4,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
4
4
  Object.defineProperty(exports, "__esModule", {
5
5
  value: true
6
6
  });
7
- exports.InitialStateSVG = void 0;
7
+ exports.JiraInitialStateSVG = void 0;
8
8
  var _react = _interopRequireDefault(require("react"));
9
- var InitialStateSVG = exports.InitialStateSVG = function InitialStateSVG() {
9
+ var JiraInitialStateSVG = exports.JiraInitialStateSVG = function JiraInitialStateSVG() {
10
10
  return /*#__PURE__*/_react.default.createElement("svg", {
11
11
  width: "188",
12
12
  height: "112",
@@ -55,5 +55,71 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
55
55
  id: 'linkDataSource.jira-issues.configmodal.issue',
56
56
  description: 'Text that appears after issue count number.',
57
57
  defaultMessage: '{totalCount, plural, one {issue} other {issues}}'
58
+ },
59
+ searchJiraTitleDuplicate: {
60
+ id: 'linkDataSource.jira-issues.searchJiraTitle',
61
+ description: 'The initial modal search state title that gives the user some idea about how to get information',
62
+ defaultMessage: 'Search for Jira issues'
63
+ },
64
+ // delete and remove duplicate from title above once EDM-9407 is merged
65
+ searchJiraTitle: {
66
+ id: 'linkDataSource.modal-initial-state.searchTitle',
67
+ description: 'The initial modal search state title that gives the user some idea about how to get information',
68
+ defaultMessage: 'Search for Jira issues'
69
+ },
70
+ searchDescriptionForJiraBasicSearchDuplicate: {
71
+ id: 'linkDataSource.jira-issues.searchDescription-basic',
72
+ description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
73
+ defaultMessage: 'Search by keyword for issues to insert.'
74
+ },
75
+ // delete and remove duplicate from title above once EDM-9407 is merged
76
+ searchDescriptionForJiraBasicSearch: {
77
+ id: 'linkDataSource.modal-initial-state.searchDescription-basic',
78
+ description: 'The initial modal search state helper message displayed under the search title when basic search mode is selected',
79
+ defaultMessage: 'Search by keyword for issues to insert.'
80
+ },
81
+ searchDescriptionForJiraJQLSearchDuplicate: {
82
+ id: 'linkDataSource.jira-issues.searchDescription-jql',
83
+ description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
84
+ defaultMessage: 'Use JQL (Jira Query Language) to search for issues.'
85
+ },
86
+ // delete and remove duplicate from title above once EDM-9407 is merged
87
+ searchDescriptionForJiraJQLSearch: {
88
+ id: 'linkDataSource.modal-initial-state.searchDescription-jql',
89
+ description: 'The initial modal search state helper message displayed under the search title when JQL search mode is selected',
90
+ defaultMessage: 'Use JQL (Jira Query Language) to search for issues.'
91
+ },
92
+ learnMoreLinkDuplicate: {
93
+ id: 'linkDataSource.jira-issues.learnMoreLink',
94
+ description: 'The link that displays under the search description to help people know more about JQL',
95
+ defaultMessage: 'Learn how to search with JQL'
96
+ },
97
+ // delete and remove duplicate from title above once EDM-9407 is merged
98
+ learnMoreLink: {
99
+ id: 'linkDataSource.modal-initial-state.learnMoreLink',
100
+ description: 'The link that displays under the search description to help people know more about JQL',
101
+ defaultMessage: 'Learn how to search with JQL'
102
+ },
103
+ noAccessToJiraSitesTitleDuplicate: {
104
+ id: 'linkDataSource.no.jira.sites.access.title',
105
+ description: 'Title that shows in the modal when user has no access to any Jira sites',
106
+ defaultMessage: "You don't have access to any Jira sites"
107
+ },
108
+ // delete and remove duplicate from title above once EDM-9407 is merged
109
+ noAccessToJiraSitesTitle: {
110
+ id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
111
+ description: 'Title that shows in the modal when user has no access to any Jira sites',
112
+ defaultMessage: "You don't have access to any Jira sites"
113
+ },
114
+ noAccessToJiraSitesDescriptionDuplicate: {
115
+ id: 'linkDataSource.no.jira.sites.access.description',
116
+ description: 'Description that shows in the modal when user has no access to any Jira sites',
117
+ defaultMessage: 'To request access, contact your admin.'
118
+ },
119
+ // delete and remove duplicate from title above once EDM-9407 is merged
120
+ noAccessToJiraSitesDescription: {
121
+ id: 'linkDataSource.jira-issues.no.jira.sites.access.description',
122
+ description: 'Description that shows in the modal when user has no access to any Jira sites',
123
+ defaultMessage: 'To request access, contact your admin.'
58
124
  }
59
125
  });
@@ -0,0 +1 @@
1
+ export {};
@@ -1,4 +1,4 @@
1
- export const getAvailableJiraSites = async () => {
1
+ export const getAvailableSites = async product => {
2
2
  const requestConfig = {
3
3
  method: 'POST',
4
4
  credentials: 'include',
@@ -8,7 +8,7 @@ export const getAvailableJiraSites = async () => {
8
8
  'Content-Type': 'application/json'
9
9
  },
10
10
  body: JSON.stringify({
11
- products: ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
11
+ products: product === 'confluence' ? ['confluence.ondemand'] : ['jira-software.ondemand', 'jira-core.ondemand', 'jira-incident-manager.ondemand', 'jira-product-discovery', 'jira-servicedesk.ondemand']
12
12
  })
13
13
  };
14
14
  const response = await fetch(`/gateway/api/available-sites`, requestConfig);
@@ -14,9 +14,7 @@ const svgAndTextsWrapperStyles = css({
14
14
  alignSelf: 'center'
15
15
  });
16
16
  const searchTitleStyles = css({
17
- fontWeight: "var(--ds-font-weight-semibold, 600)",
18
- fontSize: "var(--ds-font-size-200, 16px)",
19
- lineHeight: "var(--ds-font-lineHeight-300, 24px)",
17
+ font: "var(--ds-font-heading-small, normal 600 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
20
18
  paddingTop: "var(--ds-space-200, 16px)",
21
19
  paddingBottom: "var(--ds-space-100, 8px)"
22
20
  });
@@ -10,8 +10,7 @@ import { AccessRequiredSVG } from './access-required-svg';
10
10
  import { loadingErrorMessages } from './messages';
11
11
  const urlStyles = css({
12
12
  color: `var(--ds-text-subtlest, ${N400})`,
13
- fontSize: "var(--ds-font-size-100, 14px)",
14
- lineHeight: "var(--ds-font-lineHeight-200, 20px)"
13
+ font: "var(--ds-font-body, normal 400 14px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
15
14
  });
16
15
  const descriptionMessageStyles = css({
17
16
  display: 'flex',
@@ -18,8 +18,7 @@ const errorMessageContainerStyles = css({
18
18
  placeItems: 'center'
19
19
  });
20
20
  const errorMessageStyles = css({
21
- fontWeight: "var(--ds-font-weight-semibold, 600)",
22
- fontSize: "var(--ds-font-size-200, 16px)"
21
+ font: "var(--ds-font-heading-small, normal 600 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
23
22
  });
24
23
  const errorDescriptionStyles = css({
25
24
  margin: 0
@@ -37,7 +36,7 @@ export const LoadingError = ({
37
36
  }, [fireEvent]);
38
37
  return jsx("div", {
39
38
  css: errorContainerStyles,
40
- "data-testid": "jira-jql-datasource--loading-error"
39
+ "data-testid": "datasource--loading-error"
41
40
  }, jsx(LoadingErrorSVG, null), jsx("div", {
42
41
  css: errorMessageContainerStyles
43
42
  }, jsx("span", {
@@ -1,55 +1,111 @@
1
1
  import { defineMessages } from 'react-intl-next';
2
2
  export const loadingErrorMessages = defineMessages({
3
+ accessInstructionsDuplicate: {
4
+ id: 'linkDataSource.accessInstructions',
5
+ description: "Instructions to let the user know they must contact their site administrator in order to access this site's content",
6
+ defaultMessage: 'To request access, contact your site administrator.'
7
+ },
8
+ //delete and remove duplicate from title above
3
9
  accessInstructions: {
4
10
  id: 'linkDataSource.jira-issues.accessInstructions',
5
11
  description: "Instructions to let the user know they must contact their site administrator in order to access this site's content",
6
12
  defaultMessage: 'To request access, contact your site administrator.'
7
13
  },
14
+ accessRequiredDuplicate: {
15
+ id: 'linkDataSource.accessRequired',
16
+ description: 'Message letting user know that they do not have access to this content',
17
+ defaultMessage: "You don't have access to this content"
18
+ },
19
+ //delete and remove duplicate from title above
8
20
  accessRequired: {
9
21
  id: 'linkDataSource.jira-issues.accessRequired',
10
22
  description: 'Message letting user know that they do not have access to this content',
11
23
  defaultMessage: "You don't have access to this content"
12
24
  },
25
+ accessRequiredWithSiteDuplicate: {
26
+ id: 'linkDataSource.accessRequiredWithSite',
27
+ description: 'Message letting user know that they do not have access to the site that will be listed below this message',
28
+ defaultMessage: "You don't have access to the following site:"
29
+ },
30
+ //delete and remove duplicate from title above
13
31
  accessRequiredWithSite: {
14
32
  id: 'linkDataSource.jira-issues.accessRequiredWithSite',
15
33
  description: 'Message letting user know that they do not have access to the site that will be listed below this message',
16
34
  defaultMessage: "You don't have access to the following site:"
17
35
  },
36
+ checkConnectionDuplicate: {
37
+ id: 'linkDataSource.checkConnection',
38
+ description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
39
+ defaultMessage: 'Check your connection and refresh, or try again later.'
40
+ },
41
+ //delete and remove duplicate from title above
18
42
  checkConnection: {
19
43
  id: 'linkDataSource.jira-issues.checkConnection',
20
44
  description: 'Instructions to let the user know how to resolve the network error that occurred or to try again at a different time',
21
45
  defaultMessage: 'Check your connection and refresh, or try again later.'
22
46
  },
47
+ checkConnectionWithSourceDuplicate: {
48
+ id: 'linkDataSource.checkConnectionWithSource',
49
+ description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
50
+ defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
51
+ },
52
+ //delete and remove duplicate from title above
23
53
  checkConnectionWithSource: {
24
54
  id: 'linkDataSource.jira-issues.checkConnectionWithSource',
25
55
  description: 'Instructions to let the user know how to resolve the error that occured, or click the link provided to open the query in Jira',
26
56
  defaultMessage: 'Check your connection and refresh, or <a>open this query in Jira</a> to review.'
27
57
  },
58
+ noResultsFoundDuplicate: {
59
+ id: 'linkDataSource.noResultsFound',
60
+ description: 'Status message letting the user know their query did not have any results',
61
+ defaultMessage: 'No results found'
62
+ },
63
+ //delete and remove duplicate from title above
28
64
  noResultsFound: {
29
65
  id: 'linkDataSource.jira-issues.noResultsFound',
30
66
  description: 'Status message letting the user know their query did not have any results',
31
67
  defaultMessage: 'No results found'
32
68
  },
69
+ refreshDuplicate: {
70
+ id: 'linkDataSource.refresh',
71
+ description: 'Button text to allow the user to refresh the table to see results',
72
+ defaultMessage: 'Refresh'
73
+ },
74
+ //delete and remove duplicate from title above
33
75
  refresh: {
34
76
  id: 'linkDataSource.jira-issues.refresh',
35
77
  description: 'Button text to allow the user to refresh the table to see results',
36
78
  defaultMessage: 'Refresh'
37
79
  },
80
+ unableToLoadItemsDuplicate: {
81
+ id: 'linkDataSource.unableToLoadItems',
82
+ description: 'Error state message letting the user know we were unable the load the requested list of items',
83
+ defaultMessage: 'Unable to load items'
84
+ },
85
+ //delete and remove duplicate from title above
38
86
  unableToLoadItems: {
39
87
  id: 'linkDataSource.jira-issues.unableToLoadItems',
40
88
  description: 'Error state message letting the user know we were unable the load the requested list of items',
41
89
  defaultMessage: 'Unable to load items'
42
90
  },
91
+ unableToLoadResultsDuplicate: {
92
+ id: 'linkDataSource.unableToLoadResults',
93
+ description: 'Error state message letting the user know we were unable the load the requested list of results',
94
+ defaultMessage: 'Unable to load results'
95
+ },
96
+ //delete and remove duplicate from title above
43
97
  unableToLoadResults: {
44
98
  id: 'linkDataSource.jira-issues.unableToLoadResults',
45
99
  description: 'Error state message letting the user know we were unable the load the requested list of results',
46
100
  defaultMessage: 'Unable to load results'
47
101
  },
102
+ // delete once EDM-9407 is merged
48
103
  noAccessToJiraSitesTitle: {
49
104
  id: 'linkDataSource.jira-issues.no.jira.sites.access.title',
50
105
  description: 'Title that shows in the modal when user has no access to any Jira sites',
51
106
  defaultMessage: "You don't have access to any Jira sites"
52
107
  },
108
+ // delete once EDM-9407 is merged
53
109
  noAccessToJiraSitesDescription: {
54
110
  id: 'linkDataSource.jira-issues.no.jira.sites.access.description',
55
111
  description: 'Description that shows in the modal when user has no access to any Jira sites',
@@ -18,8 +18,7 @@ const errorMessageContainerStyles = css({
18
18
  placeItems: 'center'
19
19
  });
20
20
  const errorMessageStyles = css({
21
- fontWeight: "var(--ds-font-weight-semibold, 600)",
22
- fontSize: "var(--ds-font-size-200, 16px)"
21
+ font: "var(--ds-font-heading-small, normal 600 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
23
22
  });
24
23
  const errorDescriptionStyles = css({
25
24
  margin: 0
@@ -37,7 +36,7 @@ export const ModalLoadingError = ({
37
36
  }, [fireEvent]);
38
37
  return jsx("div", {
39
38
  css: errorContainerStyles,
40
- "data-testid": "jira-jql-datasource-modal--loading-error"
39
+ "data-testid": "datasource-modal--loading-error"
41
40
  }, jsx(LoadingErrorSVG, null), jsx("div", {
42
41
  css: errorMessageContainerStyles
43
42
  }, jsx("span", {
@@ -1,12 +1,10 @@
1
1
  /** @jsx jsx */
2
2
  import { css, jsx } from '@emotion/react';
3
- import { FormattedMessage } from 'react-intl-next';
3
+ import { useIntl } from 'react-intl-next';
4
4
  import { Flex, xcss } from '@atlaskit/primitives';
5
- import { loadingErrorMessages } from './messages';
6
5
  import { NoInstancesSvg } from './no-instances-svg';
7
6
  const titleStyles = css({
8
- fontWeight: "var(--ds-font-weight-semibold, 600)",
9
- fontSize: "var(--ds-font-size-200, 16px)",
7
+ font: "var(--ds-font-heading-small, normal 600 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
10
8
  marginTop: "var(--ds-space-200, 16px)"
11
9
  });
12
10
  const descriptionStyles = css({
@@ -15,13 +13,22 @@ const descriptionStyles = css({
15
13
  const containerStyles = xcss({
16
14
  marginTop: '60px'
17
15
  });
18
- export const NoInstancesView = () => jsx(Flex, {
19
- testId: "no-jira-instances-content",
20
- direction: "column",
21
- alignItems: "center",
22
- xcss: containerStyles
23
- }, jsx(NoInstancesSvg, null), jsx("span", {
24
- css: titleStyles
25
- }, jsx(FormattedMessage, loadingErrorMessages.noAccessToJiraSitesTitle)), jsx("span", {
26
- css: descriptionStyles
27
- }, jsx(FormattedMessage, loadingErrorMessages.noAccessToJiraSitesDescription)));
16
+ export const NoInstancesView = ({
17
+ title,
18
+ description,
19
+ testId
20
+ }) => {
21
+ const {
22
+ formatMessage
23
+ } = useIntl();
24
+ return jsx(Flex, {
25
+ testId: testId,
26
+ direction: "column",
27
+ alignItems: "center",
28
+ xcss: containerStyles
29
+ }, jsx(NoInstancesSvg, null), jsx("span", {
30
+ css: titleStyles
31
+ }, formatMessage(title)), jsx("span", {
32
+ css: descriptionStyles
33
+ }, formatMessage(description)));
34
+ };
@@ -17,8 +17,7 @@ const noResultsMessageContainerStyles = css({
17
17
  placeItems: 'center'
18
18
  });
19
19
  const noResultsMessageStyles = css({
20
- fontWeight: "var(--ds-font-weight-semibold, 600)",
21
- fontSize: "var(--ds-font-size-200, 16px)"
20
+ font: "var(--ds-font-heading-small, normal 600 16px/20px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)"
22
21
  });
23
22
  export const NoResults = ({
24
23
  onRefresh
@@ -31,7 +30,7 @@ export const NoResults = ({
31
30
  }, [fireEvent]);
32
31
  return jsx("div", {
33
32
  css: noResultsContainerStyles,
34
- "data-testid": "jira-jql-datasource-modal--no-results"
33
+ "data-testid": "datasource-modal--no-results"
35
34
  }, jsx("svg", {
36
35
  width: "131",
37
36
  height: "120",
@@ -0,0 +1,66 @@
1
+ /** @jsx jsx */
2
+ import { css, jsx } from '@emotion/react';
3
+ import { FormattedMessage, useIntl } from 'react-intl-next';
4
+ import Lozenge from '@atlaskit/lozenge';
5
+ import { N300 } from '@atlaskit/theme/colors';
6
+ import { initialStateViewMessages } from './messages';
7
+ const initialStateViewContainerStyles = css({
8
+ display: 'flex',
9
+ justifyContent: 'center',
10
+ height: '100%'
11
+ });
12
+ const svgAndTextsWrapperStyles = css({
13
+ textAlign: 'center',
14
+ alignSelf: 'center',
15
+ paddingTop: "var(--ds-space-600, 48px)",
16
+ paddingBottom: "var(--ds-space-600, 48px)"
17
+ });
18
+ const betaTagStyles = css({
19
+ display: 'flex'
20
+ });
21
+ const searchTitleStyles = css({
22
+ color: `var(--ds-text-subtlest, ${N300})`,
23
+ font: "var(--ds-font-heading-medium, normal 500 20px/24px ui-sans-serif, -apple-system, BlinkMacSystemFont, \"Segoe UI\", Ubuntu, system-ui, \"Helvetica Neue\", sans-serif)",
24
+ paddingTop: "var(--ds-space-200, 16px)",
25
+ paddingBottom: "var(--ds-space-100, 8px)",
26
+ display: 'flex',
27
+ justifyContent: 'center',
28
+ alignItems: 'center',
29
+ gap: "var(--ds-space-100, 8px)"
30
+ });
31
+ const mainTextStyles = css({
32
+ color: `var(--ds-text-subtlest, ${N300})`
33
+ });
34
+ const learnMoreLinkStyles = css({
35
+ paddingTop: "var(--ds-space-200, 16px)",
36
+ display: 'inline-block'
37
+ });
38
+ export const InitialStateView = ({
39
+ icon,
40
+ showBeta = false,
41
+ title,
42
+ description,
43
+ learnMoreLink
44
+ }) => {
45
+ const {
46
+ formatMessage
47
+ } = useIntl();
48
+ return jsx("div", {
49
+ css: initialStateViewContainerStyles,
50
+ "data-testid": "datasource-modal--initial-state-view"
51
+ }, jsx("div", {
52
+ css: svgAndTextsWrapperStyles
53
+ }, icon, jsx("div", {
54
+ css: searchTitleStyles
55
+ }, showBeta && jsx("div", {
56
+ css: betaTagStyles
57
+ }, jsx(Lozenge, {
58
+ appearance: "new"
59
+ }, jsx(FormattedMessage, initialStateViewMessages.beta))), formatMessage(title)), jsx("div", {
60
+ css: mainTextStyles
61
+ }, formatMessage(description)), learnMoreLink && jsx("a", {
62
+ href: learnMoreLink.href,
63
+ target: "_blank",
64
+ css: learnMoreLinkStyles
65
+ }, formatMessage(learnMoreLink.text))));
66
+ };