@atlaskit/link-datasource 1.31.3 → 2.0.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 2.0.0
+
+### Major Changes
+
+-   [#93932](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/93932)
+    [`b42c3ca8a015`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b42c3ca8a015) -
+    Removed Jira specific view modes "issue" and "count" from config modal. They are replaced with
+    generic view mode "table" and "inline" respectively.
+
 ## 1.31.3
 
 ### Patch Changes

package/dist/cjs/ui/common/modal/display-view-dropdown/display-view-drop-down.js

@@ -1,6 +1,5 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
@@ -9,7 +8,6 @@ exports.DisplayViewDropDown = void 0;
 var _react = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _dropdownMenu = _interopRequireWildcard(require("@atlaskit/dropdown-menu"));
-var _table = _interopRequireDefault(require("@atlaskit/icon/glyph/table"));
 var _primitives = require("@atlaskit/primitives");
 var _messages = require("./messages");
 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); }
@@ -35,20 +33,25 @@ var InlineIcon = (0, _react.jsx)("svg", {
   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",
   fill: 'currentColor'
 }));
+var ListIcon = (0, _react.jsx)("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 15 15",
+  fill: "none"
+}, (0, _react.jsx)("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  d: "M0 2C0 0.89543 0.895431 0 2 0H13C14.1046 0 15 0.895431 15 2V13C15 14.1046 14.1046 15 13 15H2C0.89543 15 0 14.1046 0 13V2ZM5 6C5 5.44772 5.44772 5 6 5L12 5C12.5523 5 13 5.44772 13 6C13 6.55229 12.5523 7 12 7L6 7C5.44772 7 5 6.55228 5 6ZM6 8C5.44772 8 5 8.44771 5 9C5 9.55228 5.44772 10 6 10L12 10C12.5523 10 13 9.55229 13 9C13 8.44772 12.5523 8 12 8L6 8ZM5 12C5 11.4477 5.44772 11 6 11L12 11C12.5523 11 13 11.4477 13 12C13 12.5523 12.5523 13 12 13L6 13C5.44772 13 5 12.5523 5 12ZM3 7C3.55228 7 4 6.55228 4 6C4 5.44772 3.55228 5 3 5C2.44772 5 2 5.44772 2 6C2 6.55228 2.44772 7 3 7ZM5 3C5 2.44772 5.44772 2 6 2L12 2C12.5523 2 13 2.44772 13 3C13 3.55229 12.5523 4 12 4L6 4C5.44772 4 5 3.55228 5 3ZM3 4C3.55228 4 4 3.55228 4 3C4 2.44772 3.55228 2 3 2C2.44772 2 2 2.44772 2 3C2 3.55228 2.44772 4 3 4ZM4 9C4 9.55229 3.55228 10 3 10C2.44772 10 2 9.55229 2 9C2 8.44771 2.44772 8 3 8C3.55228 8 4 8.44771 4 9ZM3 13C3.55228 13 4 12.5523 4 12C4 11.4477 3.55228 11 3 11C2.44772 11 2 11.4477 2 12C2 12.5523 2.44772 13 3 13Z",
+  fill: 'currentColor'
+}));
 var DisplayViewDropDown = exports.DisplayViewDropDown = function DisplayViewDropDown(_ref) {
   var onViewModeChange = _ref.onViewModeChange,
     viewMode = _ref.viewMode;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  // TODO: further refactoring in EDM-9573
-  // temporary fix. transition 'count' to 'inline', 'issue' to 'table'
-  var isJira = viewMode === 'issue' || viewMode === 'count';
-  var isTable = viewMode === 'table' || viewMode === 'issue';
-  var triggerText = isTable ? formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? _messages.displayViewDropDownMessages.tableViewModeLabel : _messages.displayViewDropDownMessages.tableViewModeLabelDuplicate) : formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? _messages.displayViewDropDownMessages.inlineLinkViewModeLabel : _messages.displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate);
+  var isTable = viewMode === 'table';
+  var triggerText = isTable ? formatMessage(_messages.displayViewDropDownMessages.viewModeListLabel) : formatMessage(_messages.displayViewDropDownMessages.viewModeInlineLinkLabel);
   return (0, _react.jsx)(_dropdownMenu.default, {
     trigger: triggerText,
     testId: "datasource-modal--view-drop-down"
@@ -57,28 +60,18 @@ var DisplayViewDropDown = exports.DisplayViewDropDown = function DisplayViewDrop
   }, (0, _react.jsx)(_dropdownMenu.DropdownItemGroup, null, (0, _react.jsx)(_dropdownMenu.DropdownItem, {
     testId: "dropdown-item-table",
     onClick: function onClick() {
-      return onViewModeChange(isJira ? 'issue' : 'table');
+      return onViewModeChange('table');
     },
     isSelected: isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? _messages.displayViewDropDownMessages.tableViewModeDescription : _messages.displayViewDropDownMessages.tableViewModeDescriptionDuplicate),
-    elemBefore: (0, _react.jsx)(_table.default, {
-      label: "table icon"
-    })
-  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? _messages.displayViewDropDownMessages.tableViewModeLabel : _messages.displayViewDropDownMessages.tableViewModeLabelDuplicate)), (0, _react.jsx)(_dropdownMenu.DropdownItem, {
+    description: formatMessage(_messages.displayViewDropDownMessages.viewModeListDescription),
+    elemBefore: ListIcon
+  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.displayViewDropDownMessages.viewModeListLabel)), (0, _react.jsx)(_dropdownMenu.DropdownItem, {
     testId: "dropdown-item-inline-link",
     onClick: function onClick() {
-      return onViewModeChange(isJira ? 'count' : 'inline');
+      return onViewModeChange('inline');
     },
     isSelected: !isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? _messages.displayViewDropDownMessages.inlineLinkViewModeDescription : _messages.displayViewDropDownMessages.inlineLinkViewModeDescriptionDuplicate),
+    description: formatMessage(_messages.displayViewDropDownMessages.viewModeInlineLinkDescription),
     elemBefore: InlineIcon
-  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? _messages.displayViewDropDownMessages.inlineLinkViewModeLabel : _messages.displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate)))));
+  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.displayViewDropDownMessages.viewModeInlineLinkLabel)))));
 };

package/dist/cjs/ui/common/modal/display-view-dropdown/messages.js

@@ -6,53 +6,24 @@ Object.defineProperty(exports, "__esModule", {
 exports.displayViewDropDownMessages = void 0;
 var _reactIntlNext = require("react-intl-next");
 var displayViewDropDownMessages = exports.displayViewDropDownMessages = (0, _reactIntlNext.defineMessages)({
-  // TODO EDM-9573
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeLabel',
-    description: 'Display search results as a table',
-    defaultMessage: 'Table'
+  viewModeListLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListLabel',
+    description: 'Display search results as a list',
+    defaultMessage: 'List'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display search results as a table'
+  viewModeListDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListDescription',
+    description: 'Description for list view mode',
+    defaultMessage: 'Display search results as a list'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeLabel',
+  viewModeInlineLinkLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkLabel',
     description: 'Display the number of search results as an inline smart link',
     defaultMessage: 'Inline link'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeDescription',
-    description: 'Description for inline view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
-    description: 'Display Jira search results as a table',
-    defaultMessage: 'Table'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display Jira search results as a table'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
-    description: 'Display the number of search results as an inline smart link',
-    defaultMessage: 'Inline link'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
+  viewModeInlineLinkDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkDescription',
     description: 'Description for inline link view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
+    defaultMessage: 'Display the number of search results as an inline Smart Link'
   }
 });

package/dist/cjs/ui/confluence-search-modal/modal/index.js

@@ -357,8 +357,8 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
   (0, _react.useEffect)(function () {
     var isResolved = status === 'resolved';
-    var isTableViewMode = currentViewMode === 'issue' || currentViewMode === 'table';
-    var isInlineViewMode = currentViewMode === 'count' || currentViewMode === 'inline';
+    var isTableViewMode = currentViewMode === 'table';
+    var isInlineViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }

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

@@ -62,7 +62,7 @@ var issueCountStyles = (0, _react2.css)({
   fontWeight: 600
 });
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
-  if (currentViewMode === 'issue') {
+  if (currentViewMode === 'table') {
     return _types.DatasourceDisplay.DATASOURCE_TABLE;
   }
   return itemCount === 1 ? _types.DatasourceDisplay.INLINE : _types.DatasourceDisplay.DATASOURCE_INLINE;
@@ -91,7 +91,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     onCancel = props.onCancel,
     onInsert = props.onInsert,
     _props$viewMode = props.viewMode,
-    viewMode = _props$viewMode === void 0 ? 'issue' : _props$viewMode,
+    viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
@@ -204,7 +204,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
   var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
-  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
+  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
   (0, _react.useEffect)(function () {
@@ -219,7 +219,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     status: status,
     experienceId: modalRenderInstanceId,
     itemCount: responseItems.length,
-    canBeLink: currentViewMode === 'count',
+    canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
   });
   (0, _react.useEffect)(function () {
@@ -298,8 +298,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
   }, [fireSingleItemViewedEvent, fireTableViewedEvent, totalCount]);
   (0, _react.useEffect)(function () {
     var isResolved = status === 'resolved';
-    var isIssueViewMode = currentViewMode === 'issue';
-    var isCountViewMode = currentViewMode === 'count';
+    var isIssueViewMode = currentViewMode === 'table';
+    var isCountViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }
@@ -388,7 +388,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(_analytics.EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
-    if (currentViewMode === 'count') {
+    if (currentViewMode === 'inline') {
       macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
       var url = responseItems.length === 1 ? firstIssueUrl : upToDateJqlUrl;
       onInsert({
@@ -554,7 +554,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     initialSearchMethod: initialSearchMethod,
     onSearchMethodChange: setCurrentSearchMethod,
     site: selectedJiraSite
-  }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
+  }), currentViewMode === 'inline' ? renderCountModeContent() : renderIssuesModeContent()) : (0, _react2.jsx)(_noInstances.NoInstancesView, {
     title: _messages.loadingErrorMessages.noAccessToJiraSitesTitle,
     description: _messages.loadingErrorMessages.noAccessToJiraSitesDescription,
     testId: "no-jira-instances-content"

package/dist/es2019/ui/common/modal/display-view-dropdown/display-view-drop-down.js

@@ -2,7 +2,6 @@
 import { jsx } from '@emotion/react';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
-import TableIcon from '@atlaskit/icon/glyph/table';
 import { Box, xcss } from '@atlaskit/primitives';
 import { displayViewDropDownMessages } from './messages';
 const dropDownItemGroupStyles = xcss({
@@ -24,6 +23,18 @@ const InlineIcon = jsx("svg", {
   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",
   fill: 'currentColor'
 }));
+const ListIcon = jsx("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 15 15",
+  fill: "none"
+}, jsx("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  d: "M0 2C0 0.89543 0.895431 0 2 0H13C14.1046 0 15 0.895431 15 2V13C15 14.1046 14.1046 15 13 15H2C0.89543 15 0 14.1046 0 13V2ZM5 6C5 5.44772 5.44772 5 6 5L12 5C12.5523 5 13 5.44772 13 6C13 6.55229 12.5523 7 12 7L6 7C5.44772 7 5 6.55228 5 6ZM6 8C5.44772 8 5 8.44771 5 9C5 9.55228 5.44772 10 6 10L12 10C12.5523 10 13 9.55229 13 9C13 8.44772 12.5523 8 12 8L6 8ZM5 12C5 11.4477 5.44772 11 6 11L12 11C12.5523 11 13 11.4477 13 12C13 12.5523 12.5523 13 12 13L6 13C5.44772 13 5 12.5523 5 12ZM3 7C3.55228 7 4 6.55228 4 6C4 5.44772 3.55228 5 3 5C2.44772 5 2 5.44772 2 6C2 6.55228 2.44772 7 3 7ZM5 3C5 2.44772 5.44772 2 6 2L12 2C12.5523 2 13 2.44772 13 3C13 3.55229 12.5523 4 12 4L6 4C5.44772 4 5 3.55228 5 3ZM3 4C3.55228 4 4 3.55228 4 3C4 2.44772 3.55228 2 3 2C2.44772 2 2 2.44772 2 3C2 3.55228 2.44772 4 3 4ZM4 9C4 9.55229 3.55228 10 3 10C2.44772 10 2 9.55229 2 9C2 8.44771 2.44772 8 3 8C3.55228 8 4 8.44771 4 9ZM3 13C3.55228 13 4 12.5523 4 12C4 11.4477 3.55228 11 3 11C2.44772 11 2 11.4477 2 12C2 12.5523 2.44772 13 3 13Z",
+  fill: 'currentColor'
+}));
 export const DisplayViewDropDown = ({
   onViewModeChange,
   viewMode
@@ -31,15 +42,8 @@ export const DisplayViewDropDown = ({
   const {
     formatMessage
   } = useIntl();
-  // TODO: further refactoring in EDM-9573
-  // temporary fix. transition 'count' to 'inline', 'issue' to 'table'
-  const isJira = viewMode === 'issue' || viewMode === 'count';
-  const isTable = viewMode === 'table' || viewMode === 'issue';
-  const triggerText = isTable ? formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate) : formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate);
+  const isTable = viewMode === 'table';
+  const triggerText = isTable ? formatMessage(displayViewDropDownMessages.viewModeListLabel) : formatMessage(displayViewDropDownMessages.viewModeInlineLinkLabel);
   return jsx(DropdownMenu, {
     trigger: triggerText,
     testId: "datasource-modal--view-drop-down"
@@ -47,25 +51,15 @@ export const DisplayViewDropDown = ({
     xcss: dropDownItemGroupStyles
   }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
     testId: "dropdown-item-table",
-    onClick: () => onViewModeChange(isJira ? 'issue' : 'table'),
+    onClick: () => onViewModeChange('table'),
     isSelected: isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? displayViewDropDownMessages.tableViewModeDescription : displayViewDropDownMessages.tableViewModeDescriptionDuplicate),
-    elemBefore: jsx(TableIcon, {
-      label: "table icon"
-    })
-  }, jsx(FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate)), jsx(DropdownItem, {
+    description: formatMessage(displayViewDropDownMessages.viewModeListDescription),
+    elemBefore: ListIcon
+  }, jsx(FormattedMessage, displayViewDropDownMessages.viewModeListLabel)), jsx(DropdownItem, {
     testId: "dropdown-item-inline-link",
-    onClick: () => onViewModeChange(isJira ? 'count' : 'inline'),
+    onClick: () => onViewModeChange('inline'),
     isSelected: !isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? displayViewDropDownMessages.inlineLinkViewModeDescription : displayViewDropDownMessages.inlineLinkViewModeDescriptionDuplicate),
+    description: formatMessage(displayViewDropDownMessages.viewModeInlineLinkDescription),
     elemBefore: InlineIcon
-  }, jsx(FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate)))));
+  }, jsx(FormattedMessage, displayViewDropDownMessages.viewModeInlineLinkLabel)))));
 };

package/dist/es2019/ui/common/modal/display-view-dropdown/messages.js

@@ -1,52 +1,23 @@
 import { defineMessages } from 'react-intl-next';
 export const displayViewDropDownMessages = defineMessages({
-  // TODO EDM-9573
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeLabel',
-    description: 'Display search results as a table',
-    defaultMessage: 'Table'
+  viewModeListLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListLabel',
+    description: 'Display search results as a list',
+    defaultMessage: 'List'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display search results as a table'
+  viewModeListDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListDescription',
+    description: 'Description for list view mode',
+    defaultMessage: 'Display search results as a list'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeLabel',
+  viewModeInlineLinkLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkLabel',
     description: 'Display the number of search results as an inline smart link',
     defaultMessage: 'Inline link'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeDescription',
-    description: 'Description for inline view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
-    description: 'Display Jira search results as a table',
-    defaultMessage: 'Table'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display Jira search results as a table'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
-    description: 'Display the number of search results as an inline smart link',
-    defaultMessage: 'Inline link'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
+  viewModeInlineLinkDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkDescription',
     description: 'Description for inline link view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
+    defaultMessage: 'Display the number of search results as an inline Smart Link'
   }
 });

package/dist/es2019/ui/confluence-search-modal/modal/index.js

@@ -293,8 +293,8 @@ export const PlainConfluenceSearchConfigModal = props => {
   }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
   useEffect(() => {
     const isResolved = status === 'resolved';
-    const isTableViewMode = currentViewMode === 'issue' || currentViewMode === 'table';
-    const isInlineViewMode = currentViewMode === 'count' || currentViewMode === 'inline';
+    const isTableViewMode = currentViewMode === 'table';
+    const isInlineViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }

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

@@ -46,7 +46,7 @@ const issueCountStyles = css({
   fontWeight: 600
 });
 const getDisplayValue = (currentViewMode, itemCount) => {
-  if (currentViewMode === 'issue') {
+  if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
   }
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
@@ -75,7 +75,7 @@ export const PlainJiraIssuesConfigModal = props => {
     wrappedColumnKeys: initialWrappedColumnKeys,
     onCancel,
     onInsert,
-    viewMode = 'issue',
+    viewMode = 'table',
     parameters: initialParameters,
     url: urlBeingEdited,
     visibleColumnKeys: initialVisibleColumnKeys
@@ -159,7 +159,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   const jqlUrl = selectedJiraSite && jql && `${selectedJiraSite.url}/issues/?jql=${encodeURI(jql)}`;
   const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
-  const shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
+  const shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   const isDataReady = (visibleColumnKeys || []).length > 0;
   const hasNoJiraSites = availableSites && availableSites.length === 0;
   useEffect(() => {
@@ -174,7 +174,7 @@ export const PlainJiraIssuesConfigModal = props => {
     status,
     experienceId: modalRenderInstanceId,
     itemCount: responseItems.length,
-    canBeLink: currentViewMode === 'count',
+    canBeLink: currentViewMode === 'inline',
     extensionKey
   });
   useEffect(() => {
@@ -237,8 +237,8 @@ export const PlainJiraIssuesConfigModal = props => {
   }, [fireSingleItemViewedEvent, fireTableViewedEvent, totalCount]);
   useEffect(() => {
     const isResolved = status === 'resolved';
-    const isIssueViewMode = currentViewMode === 'issue';
-    const isCountViewMode = currentViewMode === 'count';
+    const isIssueViewMode = currentViewMode === 'table';
+    const isCountViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }
@@ -335,7 +335,7 @@ export const PlainJiraIssuesConfigModal = props => {
     const consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     const firstIssueUrl = retrieveUrlForSmartCardRender();
-    if (currentViewMode === 'count') {
+    if (currentViewMode === 'inline') {
       macroInsertedEvent === null || macroInsertedEvent === void 0 ? void 0 : macroInsertedEvent.fire(EVENT_CHANNEL);
       const url = responseItems.length === 1 ? firstIssueUrl : upToDateJqlUrl;
       onInsert({
@@ -498,7 +498,7 @@ export const PlainJiraIssuesConfigModal = props => {
     initialSearchMethod: initialSearchMethod,
     onSearchMethodChange: setCurrentSearchMethod,
     site: selectedJiraSite
-  }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, {
+  }), currentViewMode === 'inline' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, {
     title: loadingErrorMessages.noAccessToJiraSitesTitle,
     description: loadingErrorMessages.noAccessToJiraSitesDescription,
     testId: `no-jira-instances-content`

package/dist/esm/ui/common/modal/display-view-dropdown/display-view-drop-down.js

@@ -2,7 +2,6 @@
 import { jsx } from '@emotion/react';
 import { FormattedMessage, useIntl } from 'react-intl-next';
 import DropdownMenu, { DropdownItem, DropdownItemGroup } from '@atlaskit/dropdown-menu';
-import TableIcon from '@atlaskit/icon/glyph/table';
 import { Box, xcss } from '@atlaskit/primitives';
 import { displayViewDropDownMessages } from './messages';
 var dropDownItemGroupStyles = xcss({
@@ -24,20 +23,25 @@ var InlineIcon = jsx("svg", {
   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",
   fill: 'currentColor'
 }));
+var ListIcon = jsx("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 15 15",
+  fill: "none"
+}, jsx("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  d: "M0 2C0 0.89543 0.895431 0 2 0H13C14.1046 0 15 0.895431 15 2V13C15 14.1046 14.1046 15 13 15H2C0.89543 15 0 14.1046 0 13V2ZM5 6C5 5.44772 5.44772 5 6 5L12 5C12.5523 5 13 5.44772 13 6C13 6.55229 12.5523 7 12 7L6 7C5.44772 7 5 6.55228 5 6ZM6 8C5.44772 8 5 8.44771 5 9C5 9.55228 5.44772 10 6 10L12 10C12.5523 10 13 9.55229 13 9C13 8.44772 12.5523 8 12 8L6 8ZM5 12C5 11.4477 5.44772 11 6 11L12 11C12.5523 11 13 11.4477 13 12C13 12.5523 12.5523 13 12 13L6 13C5.44772 13 5 12.5523 5 12ZM3 7C3.55228 7 4 6.55228 4 6C4 5.44772 3.55228 5 3 5C2.44772 5 2 5.44772 2 6C2 6.55228 2.44772 7 3 7ZM5 3C5 2.44772 5.44772 2 6 2L12 2C12.5523 2 13 2.44772 13 3C13 3.55229 12.5523 4 12 4L6 4C5.44772 4 5 3.55228 5 3ZM3 4C3.55228 4 4 3.55228 4 3C4 2.44772 3.55228 2 3 2C2.44772 2 2 2.44772 2 3C2 3.55228 2.44772 4 3 4ZM4 9C4 9.55229 3.55228 10 3 10C2.44772 10 2 9.55229 2 9C2 8.44771 2.44772 8 3 8C3.55228 8 4 8.44771 4 9ZM3 13C3.55228 13 4 12.5523 4 12C4 11.4477 3.55228 11 3 11C2.44772 11 2 11.4477 2 12C2 12.5523 2.44772 13 3 13Z",
+  fill: 'currentColor'
+}));
 export var DisplayViewDropDown = function DisplayViewDropDown(_ref) {
   var onViewModeChange = _ref.onViewModeChange,
     viewMode = _ref.viewMode;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  // TODO: further refactoring in EDM-9573
-  // temporary fix. transition 'count' to 'inline', 'issue' to 'table'
-  var isJira = viewMode === 'issue' || viewMode === 'count';
-  var isTable = viewMode === 'table' || viewMode === 'issue';
-  var triggerText = isTable ? formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate) : formatMessage(
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate);
+  var isTable = viewMode === 'table';
+  var triggerText = isTable ? formatMessage(displayViewDropDownMessages.viewModeListLabel) : formatMessage(displayViewDropDownMessages.viewModeInlineLinkLabel);
   return jsx(DropdownMenu, {
     trigger: triggerText,
     testId: "datasource-modal--view-drop-down"
@@ -46,28 +50,18 @@ export var DisplayViewDropDown = function DisplayViewDropDown(_ref) {
   }, jsx(DropdownItemGroup, null, jsx(DropdownItem, {
     testId: "dropdown-item-table",
     onClick: function onClick() {
-      return onViewModeChange(isJira ? 'issue' : 'table');
+      return onViewModeChange('table');
     },
     isSelected: isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? displayViewDropDownMessages.tableViewModeDescription : displayViewDropDownMessages.tableViewModeDescriptionDuplicate),
-    elemBefore: jsx(TableIcon, {
-      label: "table icon"
-    })
-  }, jsx(FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? displayViewDropDownMessages.tableViewModeLabel : displayViewDropDownMessages.tableViewModeLabelDuplicate)), jsx(DropdownItem, {
+    description: formatMessage(displayViewDropDownMessages.viewModeListDescription),
+    elemBefore: ListIcon
+  }, jsx(FormattedMessage, displayViewDropDownMessages.viewModeListLabel)), jsx(DropdownItem, {
     testId: "dropdown-item-inline-link",
     onClick: function onClick() {
-      return onViewModeChange(isJira ? 'count' : 'inline');
+      return onViewModeChange('inline');
     },
     isSelected: !isTable,
-    description: formatMessage(
-    // TODO EDM-9573, remove once EDM-9431 is merged
-    isJira ? displayViewDropDownMessages.inlineLinkViewModeDescription : displayViewDropDownMessages.inlineLinkViewModeDescriptionDuplicate),
+    description: formatMessage(displayViewDropDownMessages.viewModeInlineLinkDescription),
     elemBefore: InlineIcon
-  }, jsx(FormattedMessage
-  // TODO EDM-9573, remove once EDM-9431 is merged
-  , isJira ? displayViewDropDownMessages.inlineLinkViewModeLabel : displayViewDropDownMessages.inlineLinkViewModeLabelDuplicate)))));
+  }, jsx(FormattedMessage, displayViewDropDownMessages.viewModeInlineLinkLabel)))));
 };

package/dist/esm/ui/common/modal/display-view-dropdown/messages.js

@@ -1,52 +1,23 @@
 import { defineMessages } from 'react-intl-next';
 export var displayViewDropDownMessages = defineMessages({
-  // TODO EDM-9573
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeLabel',
-    description: 'Display search results as a table',
-    defaultMessage: 'Table'
+  viewModeListLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListLabel',
+    description: 'Display search results as a list',
+    defaultMessage: 'List'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  tableViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display search results as a table'
+  viewModeListDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeListDescription',
+    description: 'Description for list view mode',
+    defaultMessage: 'Display search results as a list'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeLabelDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeLabel',
+  viewModeInlineLinkLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkLabel',
     description: 'Display the number of search results as an inline smart link',
     defaultMessage: 'Inline link'
   },
-  // remove duplicate from end of key once EDM-9431 is merged
-  inlineLinkViewModeDescriptionDuplicate: {
-    id: 'linkDataSource.configmodal.inlineLinkViewModeDescription',
-    description: 'Description for inline view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
-    description: 'Display Jira search results as a table',
-    defaultMessage: 'Table'
-  },
-  // delete once EDM-9431 is merged
-  tableViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
-    description: 'Description for table view mode',
-    defaultMessage: 'Display Jira search results as a table'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
-    description: 'Display the number of search results as an inline smart link',
-    defaultMessage: 'Inline link'
-  },
-  // delete once EDM-9431 is merged
-  inlineLinkViewModeDescription: {
-    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
+  viewModeInlineLinkDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.viewModeInlineLinkDescription',
     description: 'Description for inline link view mode',
-    defaultMessage: 'Display the number of search results or as an inline smart link'
+    defaultMessage: 'Display the number of search results as an inline Smart Link'
   }
 });

package/dist/esm/ui/confluence-search-modal/modal/index.js

@@ -348,8 +348,8 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
   useEffect(function () {
     var isResolved = status === 'resolved';
-    var isTableViewMode = currentViewMode === 'issue' || currentViewMode === 'table';
-    var isInlineViewMode = currentViewMode === 'count' || currentViewMode === 'inline';
+    var isTableViewMode = currentViewMode === 'table';
+    var isInlineViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }

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

@@ -53,7 +53,7 @@ var issueCountStyles = css({
   fontWeight: 600
 });
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
-  if (currentViewMode === 'issue') {
+  if (currentViewMode === 'table') {
     return DatasourceDisplay.DATASOURCE_TABLE;
   }
   return itemCount === 1 ? DatasourceDisplay.INLINE : DatasourceDisplay.DATASOURCE_INLINE;
@@ -82,7 +82,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     onCancel = props.onCancel,
     onInsert = props.onInsert,
     _props$viewMode = props.viewMode,
-    viewMode = _props$viewMode === void 0 ? 'issue' : _props$viewMode,
+    viewMode = _props$viewMode === void 0 ? 'table' : _props$viewMode,
     initialParameters = props.parameters,
     urlBeingEdited = props.url,
     initialVisibleColumnKeys = props.visibleColumnKeys;
@@ -195,7 +195,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var jqlUrl = selectedJiraSite && jql && "".concat(selectedJiraSite.url, "/issues/?jql=").concat(encodeURI(jql));
   var isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading';
-  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
+  var shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'table';
   var isDataReady = (visibleColumnKeys || []).length > 0;
   var hasNoJiraSites = availableSites && availableSites.length === 0;
   useEffect(function () {
@@ -210,7 +210,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     status: status,
     experienceId: modalRenderInstanceId,
     itemCount: responseItems.length,
-    canBeLink: currentViewMode === 'count',
+    canBeLink: currentViewMode === 'inline',
     extensionKey: extensionKey
   });
   useEffect(function () {
@@ -289,8 +289,8 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
   }, [fireSingleItemViewedEvent, fireTableViewedEvent, totalCount]);
   useEffect(function () {
     var isResolved = status === 'resolved';
-    var isIssueViewMode = currentViewMode === 'issue';
-    var isCountViewMode = currentViewMode === 'count';
+    var isIssueViewMode = currentViewMode === 'table';
+    var isCountViewMode = currentViewMode === 'inline';
     if (!isResolved) {
       return;
     }
@@ -379,7 +379,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
     insertButtonClickedEvent.fire(EVENT_CHANNEL);
     var firstIssueUrl = retrieveUrlForSmartCardRender();
-    if (currentViewMode === 'count') {
+    if (currentViewMode === 'inline') {
       macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(EVENT_CHANNEL);
       var url = responseItems.length === 1 ? firstIssueUrl : upToDateJqlUrl;
       onInsert({
@@ -545,7 +545,7 @@ export var PlainJiraIssuesConfigModal = function PlainJiraIssuesConfigModal(prop
     initialSearchMethod: initialSearchMethod,
     onSearchMethodChange: setCurrentSearchMethod,
     site: selectedJiraSite
-  }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, {
+  }), currentViewMode === 'inline' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, {
     title: loadingErrorMessages.noAccessToJiraSitesTitle,
     description: loadingErrorMessages.noAccessToJiraSitesDescription,
     testId: "no-jira-instances-content"

package/dist/types/common/types.d.ts

@@ -6,9 +6,7 @@ export interface Site {
     displayName: string;
     url: string;
 }
-export type IssueViewModes = 'issue' | 'count';
-export type ViewModes = 'table' | 'inline';
-export type DisplayViewModes = IssueViewModes | ViewModes;
+export type DisplayViewModes = 'table' | 'inline';
 export type ConfigModalProps<ADF, Parameters> = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
     datasourceId: string;
@@ -20,9 +18,10 @@ export type ConfigModalProps<ADF, Parameters> = {
     onCancel: () => void;
     /** Callback function to be invoked when the insert issues button is clicked */
     onInsert: (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
-    /** The view mode that the modal will show on open:
+    /**
+     * The view mode that the modal will show on open:
      * - Table = Displays a list of links in table format
      * - Inline = Presents a smart link that shows the count of query results. However, if there's only one result, it converts to an inline smart link of that issue.
-     * The view modes in 'DisplayViewModes' includes IssueViewModes which has not been changed from 'count' to 'inline' and 'issue' to 'table' */
+     */
     viewMode?: DisplayViewModes;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'wrappedColumnKeys' | 'columnCustomSizes'>>;

package/dist/types/ui/common/modal/display-view-dropdown/display-view-drop-down.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { DisplayViewModes } from '../../../../common/types';
+import { type DisplayViewModes } from '../../../../common/types';
 export type DisplayViewDropDownProps = {
     onViewModeChange: (value: DisplayViewModes) => void;
     viewMode: DisplayViewModes;

package/dist/types/ui/common/modal/display-view-dropdown/messages.d.ts

@@ -1,40 +1,20 @@
 export declare const displayViewDropDownMessages: {
-    tableViewModeLabelDuplicate: {
+    viewModeListLabel: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    tableViewModeDescriptionDuplicate: {
+    viewModeListDescription: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    inlineLinkViewModeLabelDuplicate: {
+    viewModeInlineLinkLabel: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    inlineLinkViewModeDescriptionDuplicate: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    tableViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    tableViewModeDescription: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeDescription: {
+    viewModeInlineLinkDescription: {
         id: string;
         description: string;
         defaultMessage: string;

package/dist/types/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { PopupComponentProps } from '@atlaskit/popup';
-export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
+export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "role" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;

package/dist/types-ts4.5/common/types.d.ts

@@ -6,9 +6,7 @@ export interface Site {
     displayName: string;
     url: string;
 }
-export type IssueViewModes = 'issue' | 'count';
-export type ViewModes = 'table' | 'inline';
-export type DisplayViewModes = IssueViewModes | ViewModes;
+export type DisplayViewModes = 'table' | 'inline';
 export type ConfigModalProps<ADF, Parameters> = {
     /** Unique identifier for which type of datasource is being rendered and for making its requests */
     datasourceId: string;
@@ -20,9 +18,10 @@ export type ConfigModalProps<ADF, Parameters> = {
     onCancel: () => void;
     /** Callback function to be invoked when the insert issues button is clicked */
     onInsert: (adf: ADF, analyticsEvent?: UIAnalyticsEvent) => void;
-    /** The view mode that the modal will show on open:
+    /**
+     * The view mode that the modal will show on open:
      * - Table = Displays a list of links in table format
      * - Inline = Presents a smart link that shows the count of query results. However, if there's only one result, it converts to an inline smart link of that issue.
-     * The view modes in 'DisplayViewModes' includes IssueViewModes which has not been changed from 'count' to 'inline' and 'issue' to 'table' */
+     */
     viewMode?: DisplayViewModes;
 } & Partial<Pick<IssueLikeDataTableViewProps, 'visibleColumnKeys' | 'wrappedColumnKeys' | 'columnCustomSizes'>>;

package/dist/types-ts4.5/ui/common/modal/display-view-dropdown/display-view-drop-down.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
-import { DisplayViewModes } from '../../../../common/types';
+import { type DisplayViewModes } from '../../../../common/types';
 export type DisplayViewDropDownProps = {
     onViewModeChange: (value: DisplayViewModes) => void;
     viewMode: DisplayViewModes;

package/dist/types-ts4.5/ui/common/modal/display-view-dropdown/messages.d.ts

@@ -1,40 +1,20 @@
 export declare const displayViewDropDownMessages: {
-    tableViewModeLabelDuplicate: {
+    viewModeListLabel: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    tableViewModeDescriptionDuplicate: {
+    viewModeListDescription: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    inlineLinkViewModeLabelDuplicate: {
+    viewModeInlineLinkLabel: {
         id: string;
         description: string;
         defaultMessage: string;
     };
-    inlineLinkViewModeDescriptionDuplicate: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    tableViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    tableViewModeDescription: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeLabel: {
-        id: string;
-        description: string;
-        defaultMessage: string;
-    };
-    inlineLinkViewModeDescription: {
+    viewModeInlineLinkDescription: {
         id: string;
         description: string;
         defaultMessage: string;

package/dist/types-ts4.5/ui/confluence-search-modal/basic-filters/filters/date-range-picker/PopupComponent.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 import type { PopupComponentProps } from '@atlaskit/popup';
-export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;
+export declare const PopupComponent: React.ForwardRefExoticComponent<Pick<PopupComponentProps, "style" | "data-testid" | "children" | "id" | "tabIndex" | "role" | "shouldRenderToParent" | "data-placement"> & React.RefAttributes<HTMLDivElement>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.31.3",
+  "version": "2.0.0",
   "description": "UI Components to support linking platform dataset feature",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -38,7 +38,7 @@
     "@atlaskit/avatar-group": "^9.5.0",
     "@atlaskit/badge": "^16.1.0",
     "@atlaskit/button": "^17.14.0",
-    "@atlaskit/datetime-picker": "^13.4.0",
+    "@atlaskit/datetime-picker": "^13.5.0",
     "@atlaskit/dropdown-menu": "^12.10.0",
     "@atlaskit/editor-prosemirror": "4.0.0",
     "@atlaskit/empty-state": "^7.8.0",
@@ -59,7 +59,7 @@
     "@atlaskit/modal-dialog": "^12.13.0",
     "@atlaskit/outbound-auth-flow-client": "^3.4.5",
     "@atlaskit/platform-feature-flags": "^0.2.4",
-    "@atlaskit/popup": "^1.16.0",
+    "@atlaskit/popup": "^1.17.0",
     "@atlaskit/pragmatic-drag-and-drop": "^1.1.0",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
     "@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.1.0",