@atlaskit/link-datasource 1.19.40 → 1.19.42

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.19.42
+
+### Patch Changes
+
+- [#67168](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67168) [`aa400684d082`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/aa400684d082) - [ux] Updating modal insert button to show 'Update table' when editing existing table
+- [#63918](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/63918) [`ab7df781854a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/ab7df781854a) - Updating mode switcher toggle with drop down for issue/count view
+
+## 1.19.41
+
+### Patch Changes
+
+- [#65779](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65779) [`a68623048896`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a68623048896) - Improve handling of column resizing and remove standard table css styles bleeding to datasource table when it is inside table
+
 ## 1.19.40
 
 ### Patch Changes

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

@@ -213,6 +213,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
   var isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
+  var isEditingExistingTable = !!(initialParameters !== null && initialParameters !== void 0 && initialParameters.aql && initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId && initialParameters !== null && initialParameters !== void 0 && initialParameters.workspaceId);
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
     var _data$key;
     var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
@@ -371,7 +372,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     onClick: onInsertPressed,
     isDisabled: isDisabled,
     testId: 'assets-datasource-modal--insert-button'
-  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.modalMessages.insertIssuesButtonText, {
+  }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, isEditingExistingTable ? _messages.modalMessages.updateObjectsButtonText : _messages.modalMessages.insertIssuesButtonText, {
     values: {
       objectsCount: responseItems.length
     }

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

@@ -11,6 +11,11 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Button text to close the modal with no changes being made',
     defaultMessage: 'Cancel'
   },
+  updateObjectsButtonText: {
+    id: 'linkDataSource.assets.configmodal.updateObjectsButtonText',
+    description: 'Button text to update the displayed content',
+    defaultMessage: 'Update table'
+  },
   insertIssuesButtonText: {
     id: 'linkDataSource.assets.configmodal.insertIssuesButtonText',
     description: 'Button text to insert the displayed content',

package/dist/cjs/ui/issue-like-table/draggable-table-heading.js

@@ -20,7 +20,7 @@ var _disableNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/
 var _offsetFromPointer = require("@atlaskit/pragmatic-drag-and-drop/util/offset-from-pointer");
 var _setCustomNativeDragPreview = require("@atlaskit/pragmatic-drag-and-drop/util/set-custom-native-drag-preview");
 var _styled = require("./styled");
-var _index = require("./index");
+var _utils = require("./utils");
 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; }
 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 */
 var verticallyAlignedStyles = (0, _react2.css)({
@@ -248,9 +248,6 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
 
         // Set the width of our header being resized
         var proposedWidth = initialWidth + relativeDistanceX;
-        if (initialWidth >= _index.COLUMN_MIN_WIDTH && proposedWidth < _index.COLUMN_MIN_WIDTH) {
-          proposedWidth = _index.COLUMN_MIN_WIDTH;
-        }
 
         // We update width css directly live
         mainHeaderCell.style.setProperty('width', "".concat(proposedWidth, "px"));
@@ -259,24 +256,24 @@ var DraggableTableHeading = exports.DraggableTableHeading = function DraggableTa
         _cancelUnhandled.cancelUnhandled.stop();
         setState(idleState);
         if (onWidthChange) {
-          // We use element's css value as a source of truth (compare to another Ref)
-          var currentWidthPx = mainHeaderCell.style.getPropertyValue('width');
-          onWidthChange(+currentWidthPx.slice(0, -2));
+          var cssWidth = +mainHeaderCell.style.getPropertyValue('width').slice(0, -2);
+          if (cssWidth < _utils.COLUMN_MIN_WIDTH) {
+            cssWidth = _utils.COLUMN_MIN_WIDTH;
+          }
+          onWidthChange(cssWidth);
         }
       }
     });
   }, [id, index, onWidthChange, state, tableId, width]);
   return (0, _react2.jsx)(_styled.TableHeading, {
     ref: mainHeaderCellRef,
-    className: "has-column-picker",
     "data-testid": "".concat(id, "-column-heading"),
     style: _objectSpread({
       cursor: 'grab'
-    }, onWidthChange ? {
+    }, (0, _utils.getWidthCss)({
+      shouldUseWidth: !!onWidthChange,
       width: width
-    } : {
-      maxWidth: width
-    })
+    }))
   }, onWidthChange ? (0, _react2.jsx)("div", {
     ref: columnResizeHandleRef,
     css: [resizerStyles, state.type === 'resizing' && resizingStyles],

package/dist/cjs/ui/issue-like-table/index.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.scrollableContainerShadowsCssComponents = exports.getOrderedColumns = exports.IssueLikeDataTableView = exports.EmptyState = exports.COLUMN_MIN_WIDTH = void 0;
+exports.scrollableContainerShadowsCssComponents = exports.getOrderedColumns = exports.IssueLikeDataTableView = exports.EmptyState = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
@@ -24,6 +24,7 @@ var _reorderWithEdge = require("@atlaskit/pragmatic-drag-and-drop-hitbox/util/re
 var _pragmaticDragAndDropReactBeautifulDndAutoscroll = require("@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll");
 var _element = require("@atlaskit/pragmatic-drag-and-drop/adapter/element");
 var _combine = require("@atlaskit/pragmatic-drag-and-drop/util/combine");
+var _primitives = require("@atlaskit/primitives");
 var _colors = require("@atlaskit/theme/colors");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _ufoExperiences = require("../../analytics/ufoExperiences");
@@ -35,7 +36,8 @@ var _emptyState = _interopRequireDefault(require("./empty-state"));
 var _renderType = require("./render-type");
 var _styled2 = require("./styled");
 var _useIsOnScreen = require("./useIsOnScreen");
-var _templateObject;
+var _utils = require("./utils");
+var _templateObject, _templateObject2;
 /** @jsx jsx */
 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; }
 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; }
@@ -51,21 +53,8 @@ var truncateTextStyles = (0, _react2.css)({
   textOverflow: 'ellipsis',
   whiteSpace: 'nowrap'
 });
-var ColumnPickerHeader = _styled.default.th(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: 56px;\n  z-index: 10;\n  position: sticky;\n  right: calc(-1 * ", ");\n  background-color: ", ";\n  border-bottom: 2px solid ", "; /* It is required to have solid (not half-transparent) color because of this gradient business below */\n\n  padding-right: ", ";\n\n  background: linear-gradient(\n    90deg,\n    rgba(255, 255, 255, 0) 0%,\n    ", " 10%\n  );\n  vertical-align: middle; /* Keeps dropdown button in the middle */\n  &:last-of-type {\n    padding-right: ", ";\n  }\n  text-align: right; /* In case when TH itself is bigger we want to keep picker at the right side */\n"])), tableSidePadding, "var(--ds-elevation-surface-current, #FFF)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-space-100, 4px)", "var(--ds-elevation-surface-current, #FFF)", tableSidePadding);
-var truncatedCellStyles = (0, _react2.css)({
-  overflow: 'hidden',
-  textOverflow: 'ellipsis',
-  whiteSpace: 'nowrap',
-  borderRight: "0.5px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
-  borderBottom: "0.5px solid ".concat("var(--ds-border, ".concat(_colors.N40, ")")),
-  '&:first-child': {
-    paddingLeft: "var(--ds-space-100, 8px)"
-  },
-  '&:last-child': {
-    borderRight: 0,
-    paddingRight: "var(--ds-space-100, 8px)"
-  }
-});
+var ColumnPickerHeader = _styled.default.th(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  ", " {\n    box-sizing: content-box;\n    border: 0;\n\n    width: 56px;\n    z-index: 10;\n    position: sticky;\n    right: calc(-1 * ", ");\n    background-color: ", ";\n    border-bottom: 2px solid ", "; /* It is required to have solid (not half-transparent) color because of this gradient business below */\n\n    padding-right: ", ";\n\n    background: linear-gradient(\n      90deg,\n      rgba(255, 255, 255, 0) 0%,\n      ", " 10%\n    );\n    vertical-align: middle; /* Keeps dropdown button in the middle */\n    text-align: right; /* In case when TH itself is bigger we want to keep picker at the right side */\n  }\n\n  ", " {\n    padding-right: ", ";\n  }\n"])), (0, _styled2.withTablePluginHeaderPrefix)(), tableSidePadding, "var(--ds-elevation-surface-current, #FFF)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-space-100, 4px)", "var(--ds-elevation-surface-current, #FFF)", (0, _styled2.withTablePluginHeaderPrefix)('&:last-of-type'), tableSidePadding);
+var TableCell = _styled.default.td(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", " {\n    /* First section here is to override things editor table plugin css defines */\n    padding: ", " ", ";\n    border: 0;\n    min-width: auto;\n    vertical-align: inherit;\n    box-sizing: border-box;\n\n    overflow: hidden;\n    text-overflow: ellipsis;\n    white-space: nowrap;\n    border-right: 0.5px solid ", ";\n    border-bottom: 0.5px solid ", ";\n  }\n\n  ", " {\n    padding-left: ", ";\n  }\n\n  ", " {\n    border-right: 0;\n    padding-right: ", ";\n  }\n"])), (0, _styled2.withTablePluginBodyPrefix)(), "var(--ds-space-050, 4px)", "var(--ds-space-100, 8px)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-border, ".concat(_colors.N40, ")"), (0, _styled2.withTablePluginBodyPrefix)('&:first-child'), "var(--ds-space-100, 8px)", (0, _styled2.withTablePluginBodyPrefix)('&:last-child'), "var(--ds-space-100, 8px)");
 var tableContainerStyles = (0, _react2.css)({
   borderRadius: 'inherit',
   borderBottomLeftRadius: 0,
@@ -195,16 +184,14 @@ var getOrderedColumns = exports.getOrderedColumns = function getOrderedColumns(c
   }).sort(sortColumns);
   return [].concat((0, _toConsumableArray2.default)(visibleColumns), (0, _toConsumableArray2.default)(alphabeticallySortedInvisibleColumns));
 };
-var BASE_WIDTH = 8;
-var DEFAULT_WIDTH = BASE_WIDTH * 22;
-var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = BASE_WIDTH * 3;
+var DEFAULT_WIDTH = _utils.COLUMN_BASE_WIDTH * 22;
 var keyBasedWidthMap = {
-  priority: BASE_WIDTH * 5,
-  status: BASE_WIDTH * 18,
-  summary: BASE_WIDTH * 45,
-  description: BASE_WIDTH * 31.25,
-  type: BASE_WIDTH * 5,
-  key: BASE_WIDTH * 13
+  priority: _utils.COLUMN_BASE_WIDTH * 5,
+  status: _utils.COLUMN_BASE_WIDTH * 18,
+  summary: _utils.COLUMN_BASE_WIDTH * 45,
+  description: _utils.COLUMN_BASE_WIDTH * 31,
+  type: _utils.COLUMN_BASE_WIDTH * 6,
+  key: _utils.COLUMN_BASE_WIDTH * 15
 };
 function getDefaultColumnWidth(key, type) {
   var keyBasedWidth = keyBasedWidthMap[key];
@@ -213,9 +200,9 @@ function getDefaultColumnWidth(key, type) {
   }
   switch (type) {
     case 'date':
-      return BASE_WIDTH * 14;
+      return _utils.COLUMN_BASE_WIDTH * 16;
     case 'icon':
-      return BASE_WIDTH * 5;
+      return _utils.COLUMN_BASE_WIDTH * 7;
     default:
       return DEFAULT_WIDTH;
   }
@@ -502,7 +489,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       }
     }, _callee, null, [[3, 9]]);
   })), [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
-  var shouldUseWidth = onColumnResize || columnCustomSizes;
+  var shouldUseWidth = !!(onColumnResize || columnCustomSizes);
+  var isEditable = onVisibleColumnKeysChange && hasData;
   return (0, _react2.jsx)("div", {
     /* There is required contentEditable={true} in editor-card-plugin
      * But this brakes how DND works. We set contentEditable={false} to allow DND to work
@@ -522,7 +510,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     } : {}
   }, (0, _react2.jsx)("thead", {
     "data-testid": testId && "".concat(testId, "--head"),
-    css: [noDefaultBorderStyles, tableHeadStyles]
+    css: [noDefaultBorderStyles, tableHeadStyles],
+    className: !!onVisibleColumnKeysChange ? 'has-column-picker' : ''
   }, (0, _react2.jsx)("tr", {
     ref: tableHeaderRowRef
   }, headerColumns.map(function (_ref13, cellIndex) {
@@ -537,7 +526,7 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       level: "h200",
       as: 'span'
     }, content));
-    if (onVisibleColumnKeysChange && hasData) {
+    if (isEditable) {
       var _containerRef$current3;
       var previewRows = tableRows.map(function (_ref14) {
         var cells = _ref14.cells;
@@ -566,14 +555,12 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     } else {
       return (0, _react2.jsx)(_styled2.TableHeading, {
         key: key,
-        className: !!onVisibleColumnKeysChange ? 'has-column-picker' : '',
         "data-testid": "".concat(key, "-column-heading"),
-        style: shouldUseWidth ? {
+        style: (0, _utils.getWidthCss)({
+          shouldUseWidth: shouldUseWidth,
           width: width
-        } : {
-          maxWidth: width
-        }
-      }, heading);
+        })
+      }, (0, _react2.jsx)(_primitives.Flex, null, heading));
     }
   }), onVisibleColumnKeysChange && (0, _react2.jsx)(ColumnPickerHeader, null, (0, _react2.jsx)(_columnPicker.ColumnPicker, {
     columns: hasFullSchema ? orderedColumns : [],
@@ -596,22 +583,21 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       var cellKey = _ref17.key,
         content = _ref17.content,
         width = _ref17.width;
-      var loadingRowStyle = shouldUseWidth ? {
+      var isLastCell = cellIndex === cells.length - 1;
+      var loadingRowStyle = (0, _utils.getWidthCss)({
+        shouldUseWidth: shouldUseWidth,
         width: width
-      } : {
-        maxWidth: width
-      };
+      });
       // extra padding is required around skeleton loader to avoid vertical jumps when data loads
       if (key !== null && key !== void 0 && key.includes('loading')) {
         loadingRowStyle = _objectSpread(_objectSpread({}, loadingRowStyle), {}, {
           paddingBlock: "var(--ds-space-100, 8px)"
         });
       }
-      return (0, _react2.jsx)("td", {
+      return (0, _react2.jsx)(TableCell, {
         key: cellKey,
         "data-testid": testId && "".concat(testId, "--cell-").concat(cellIndex),
-        colSpan: cellIndex + 1 === cells.length ? 2 : undefined,
-        css: truncatedCellStyles,
+        colSpan: isEditable && isLastCell ? 2 : undefined,
         style: loadingRowStyle
       }, content);
     }));

package/dist/cjs/ui/issue-like-table/styled.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TableHeading = exports.Table = exports.ScrollableContainerHeight = exports.FieldTextFontSize = void 0;
+exports.withTablePluginPrefix = exports.withTablePluginHeaderPrefix = exports.withTablePluginBodyPrefix = exports.TableHeading = exports.Table = exports.ScrollableContainerHeight = exports.FieldTextFontSize = void 0;
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _colors = require("@atlaskit/theme/colors");
@@ -14,4 +14,17 @@ var FieldTextFontSize = exports.FieldTextFontSize = '14px';
 var Table = exports.Table = _styled.default.table(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: 100%;\n"])));
 var lineHeight = "var(--ds-font-lineHeight-300, 24px)";
 var verticalPadding = "var(--ds-space-025, 2px)";
-var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  position: relative;\n  line-height: ", ";\n  padding: ", " ", ";\n  border-right: 0.5px solid ", ";\n  border-bottom: 2px solid ", ";\n  height: calc(", " * 2 + ", " * 2);\n  vertical-align: bottom;\n\n  &.has-column-picker:nth-last-of-type(2) {\n    border-right: 0;\n  }\n\n  &:first-child {\n    padding-left: ", ";\n  }\n\n  &:last-child {\n    border-right: 0;\n  }\n\n  & [data-testid='datasource-header-content--container'] {\n    width: 100%;\n    padding: ", " ", ";\n    display: -webkit-box;\n    -webkit-line-clamp: 2;\n    -webkit-box-orient: vertical;\n    white-space: normal;\n    overflow: hidden;\n    word-wrap: break-word;\n\n    &:hover {\n      background: ", ";\n      border-radius: 3px;\n    }\n  }\n"])), lineHeight, verticalPadding, "var(--ds-space-050, 4px)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-border, ".concat(_colors.N40, ")"), lineHeight, verticalPadding, "var(--ds-space-050, 4px)", verticalPadding, "var(--ds-space-050, 4px)", "var(--ds-background-input-hovered, #F7F8F9)");
+
+/**
+ * This is a hack used to override styles that are leaking to our table html element
+ * from editor table plugin.
+ * This css prefix can be used in front of our main css rule to make its weight bigger
+ * and force make browser use it first and editor plugin css second.
+ */
+var withTablePluginPrefix = exports.withTablePluginPrefix = function withTablePluginPrefix(tableSection) {
+  var mainRule = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '&';
+  return "\n  .pm-table-wrapper > table ".concat(tableSection, " ").concat(mainRule, ",\n  .ProseMirror .pm-table-wrapper > table ").concat(tableSection, " ").concat(mainRule, ",\n  ").concat(mainRule, "\n");
+};
+var withTablePluginHeaderPrefix = exports.withTablePluginHeaderPrefix = withTablePluginPrefix.bind(null, 'thead');
+var withTablePluginBodyPrefix = exports.withTablePluginBodyPrefix = withTablePluginPrefix.bind(null, 'tbody');
+var TableHeading = exports.TableHeading = _styled.default.th(_templateObject2 || (_templateObject2 = (0, _taggedTemplateLiteral2.default)(["\n  ", " {\n    border: 0;\n    position: relative;\n\n    /* This makes resizing work with out jumping due to padding + changes overall width for same default values. */\n    box-sizing: border-box;\n\n    line-height: ", ";\n    padding: ", " ", ";\n    border-right: 0.5px solid ", ";\n    border-bottom: 2px solid ", ";\n\n    /*\n      lineHeight * 2 -> Max height of two lined header\n      verticalPadding * 2 -> padding for this component itself\n      verticalPadding * 2 -> padding inside span (--container)\n      2px -> Bottom border\n      Last two terms are needed because of border-box box sizing.\n    */\n    height: calc(", " * 2 + ", " * 4 + 2px);\n    vertical-align: bottom;\n    background-color: ", ";\n  }\n\n  ", " {\n    border-right: 0;\n  }\n\n  ", " {\n    padding-left: ", ";\n  }\n\n  ", " {\n    border-right: 0;\n  }\n\n  & [data-testid='datasource-header-content--container'] {\n    width: 100%;\n    padding: ", " ", ";\n    display: -webkit-box;\n    -webkit-line-clamp: 2;\n    -webkit-box-orient: vertical;\n    white-space: normal;\n    overflow: hidden;\n    word-wrap: break-word;\n\n    &:hover {\n      background: ", ";\n      border-radius: 3px;\n    }\n  }\n"])), withTablePluginHeaderPrefix(), lineHeight, verticalPadding, "var(--ds-space-050, 4px)", "var(--ds-border, ".concat(_colors.N40, ")"), "var(--ds-border, ".concat(_colors.N40, ")"), lineHeight, verticalPadding, "var(--ds-elevation-surface-current, #FFF)", withTablePluginPrefix('', 'thead.has-column-picker &:nth-last-of-type(2)'), withTablePluginHeaderPrefix('&:first-child'), "var(--ds-space-050, 4px)", withTablePluginHeaderPrefix('&:last-child'), verticalPadding, "var(--ds-space-050, 4px)", "var(--ds-background-input-hovered, #F7F8F9)");

package/dist/cjs/ui/issue-like-table/utils.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getWidthCss = exports.COLUMN_MIN_WIDTH = exports.COLUMN_BASE_WIDTH = void 0;
+var COLUMN_BASE_WIDTH = exports.COLUMN_BASE_WIDTH = 8;
+var COLUMN_MIN_WIDTH = exports.COLUMN_MIN_WIDTH = COLUMN_BASE_WIDTH * 3;
+/**
+ * Generate width related portion of css for table cell.
+ *
+ * @param shouldUseWidth boolean argument defines if a given width is user defined / baked in value
+ * or rather default width that should be treated as a maximum width. When table inserted initially
+ * and no user custom width defined we set this value to `false`. As soon as user changes any of the
+ * column widths we treat all width as custom hardcoded widths.
+ * @param width
+ */
+var getWidthCss = exports.getWidthCss = function getWidthCss(_ref) {
+  var shouldUseWidth = _ref.shouldUseWidth,
+    width = _ref.width;
+  return shouldUseWidth ? {
+    width: width
+  } : {
+    maxWidth: width
+  };
+};

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

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/** @jsx jsx */
+
+var dropDownItemGroupStyles = (0, _primitives.xcss)({
+  width: '320px',
+  height: '140px',
+  paddingTop: "var(--ds-space-050, 4px)",
+  paddingBottom: "var(--ds-space-050, 4px)",
+  borderRadius: 'border.radius'
+});
+var InlineIcon = (0, _react.jsx)("svg", {
+  xmlns: "http://www.w3.org/2000/svg",
+  width: "24",
+  height: "24",
+  viewBox: "0 0 24 24",
+  fill: "none"
+}, (0, _react.jsx)("path", {
+  fillRule: "evenodd",
+  clipRule: "evenodd",
+  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 DisplayViewDropDown = exports.DisplayViewDropDown = function DisplayViewDropDown(_ref) {
+  var onViewModeChange = _ref.onViewModeChange,
+    viewMode = _ref.viewMode;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  var triggerText = viewMode === 'issue' ? formatMessage(_messages.modalMessages.tableViewModeLabel) : formatMessage(_messages.modalMessages.inlineLinkViewModeLabel);
+  return (0, _react.jsx)(_dropdownMenu.default, {
+    trigger: triggerText,
+    testId: "jira-jql-datasource-modal--view-drop-down"
+  }, (0, _react.jsx)(_primitives.Box, {
+    xcss: dropDownItemGroupStyles
+  }, (0, _react.jsx)(_dropdownMenu.DropdownItemGroup, null, (0, _react.jsx)(_dropdownMenu.DropdownItem, {
+    testId: "dropdown-item-table",
+    onClick: function onClick() {
+      return onViewModeChange('issue');
+    },
+    isSelected: viewMode === 'issue',
+    description: formatMessage(_messages.modalMessages.tableViewModeDescription),
+    elemBefore: (0, _react.jsx)(_table.default, {
+      label: "table icon"
+    })
+  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.tableViewModeLabel)), (0, _react.jsx)(_dropdownMenu.DropdownItem, {
+    testId: "dropdown-item-inline-link",
+    onClick: function onClick() {
+      return onViewModeChange('count');
+    },
+    isSelected: viewMode === 'count',
+    description: formatMessage(_messages.modalMessages.inlineLinkViewModeDescription),
+    elemBefore: InlineIcon
+  }, (0, _react.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.inlineLinkViewModeLabel)))));
+};

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

@@ -44,8 +44,8 @@ var _ui = require("../basic-filters/ui");
 var _isQueryTooComplex = require("../basic-filters/utils/isQueryTooComplex");
 var _initialStateView = require("../initial-state-view");
 var _jiraSearchContainer = require("../jira-search-container");
-var _modeSwitcher = require("../mode-switcher");
 var _siteSelector = require("../site-selector");
+var _displayViewDropDown = require("./display-view-dropdown/display-view-drop-down");
 var _messages = require("./messages");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -89,10 +89,10 @@ var smartLinkContainerStyles = (0, _react2.css)({
   paddingLeft: '1px'
 });
 var getDisplayValue = function getDisplayValue(currentViewMode, itemCount) {
-  if (currentViewMode === 'count') {
-    return _types.DatasourceDisplay.DATASOURCE_INLINE;
+  if (currentViewMode === 'issue') {
+    return _types.DatasourceDisplay.DATASOURCE_TABLE;
   }
-  return itemCount > 1 ? _types.DatasourceDisplay.DATASOURCE_TABLE : _types.DatasourceDisplay.INLINE;
+  return itemCount === 1 ? _types.DatasourceDisplay.INLINE : _types.DatasourceDisplay.DATASOURCE_INLINE;
 };
 
 /**
@@ -188,8 +188,6 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
     extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
     destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes;
-  var _useIntl = (0, _reactIntlNext.useIntl)(),
-    formatMessage = _useIntl.formatMessage;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
@@ -412,18 +410,11 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     var firstIssueUrl = retrieveUrlForSmartCardRender();
     if (currentViewMode === 'count') {
       macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
+      var url = responseItems.length === 1 ? firstIssueUrl : upToDateJqlUrl;
       onInsert({
         type: 'inlineCard',
         attrs: {
-          url: upToDateJqlUrl
-        }
-      }, consumerEvent);
-    } else if (responseItems.length === 1 && firstIssueUrl) {
-      macroInsertedEvent === null || macroInsertedEvent === void 0 || macroInsertedEvent.fire(_analytics.EVENT_CHANNEL);
-      onInsert({
-        type: 'inlineCard',
-        attrs: {
-          url: firstIssueUrl
+          url: url
         }
       }, consumerEvent);
     } else {
@@ -453,7 +444,7 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         }
       }, consumerEvent);
     }
-  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql]);
+  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, onInsert, datasourceId, cloudId, columnCustomSizes, searchBarJql, responseItems]);
   var handleViewModeChange = function handleViewModeChange(selectedMode) {
     userInteractionActions.current.add(_types.DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -503,14 +494,19 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         css: placeholderSmartLinkStyles
       }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.issuesCountSmartCardPlaceholderText)));
     } else {
-      var urlWithEncodedJql = "".concat(selectedJiraSiteUrl, "/issues/?jql=").concat(encodeURI(jql));
+      var url;
+      if (responseItems.length === 1 && retrieveUrlForSmartCardRender()) {
+        url = retrieveUrlForSmartCardRender();
+      } else {
+        url = "".concat(selectedJiraSiteUrl, "/issues/?jql=").concat(encodeURI(jql));
+      }
       return (0, _react2.jsx)("div", {
         css: smartLinkContainerStyles
       }, (0, _react2.jsx)(_link.default, {
-        url: urlWithEncodedJql
+        url: url
       }));
     }
-  }, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
+  }, [jql, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited, responseItems, retrieveUrlForSmartCardRender]);
   var renderIssuesModeContent = (0, _react.useCallback)(function () {
     var selectedJiraSiteUrl = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
     if (status === 'rejected' && jqlUrl) {
@@ -533,16 +529,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
         searchMethod: currentSearchMethod
       }));
     }
-    var firstIssueUrl = retrieveUrlForSmartCardRender();
-    if (responseItems.length === 1 && firstIssueUrl) {
-      return (0, _react2.jsx)("div", {
-        css: smartLinkContainerStyles
-      }, (0, _react2.jsx)(_link.default, {
-        url: firstIssueUrl
-      }));
-    }
     return issueLikeDataTableView;
-  }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, responseItems.length, retrieveUrlForSmartCardRender, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
+  }, [columns.length, currentSearchMethod, issueLikeDataTableView, jql, jqlUrl, resolvedWithNoResults, selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url, status, urlBeingEdited]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -558,17 +546,9 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
     onSiteSelection: onSiteSelection,
     selectedJiraSite: selectedJiraSite,
     testId: "jira-jql-datasource-modal--site-selector"
-  })) : (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesTitle))), !hasNoJiraSites && (0, _react2.jsx)(_modeSwitcher.ModeSwitcher, {
-    isCompact: true,
-    options: [{
-      label: formatMessage(_messages.modalMessages.issueViewModeLabel),
-      value: 'issue'
-    }, {
-      label: formatMessage(_messages.modalMessages.countViewModeLabel),
-      value: 'count'
-    }],
-    onOptionValueChange: handleViewModeChange,
-    selectedOptionValue: currentViewMode
+  })) : (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertIssuesTitle))), !hasNoJiraSites && (0, _react2.jsx)(_displayViewDropDown.DisplayViewDropDown, {
+    onViewModeChange: handleViewModeChange,
+    viewMode: currentViewMode
   })), (0, _react2.jsx)(_modalDialog.ModalBody, null, !hasNoJiraSites ? (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_jiraSearchContainer.JiraSearchContainer, {
     setSearchBarJql: setSearchBarJql,
     searchBarJql: searchBarJql,

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

@@ -26,15 +26,25 @@ var modalMessages = exports.modalMessages = (0, _reactIntlNext.defineMessages)({
     description: 'Title for the Jira Issues modal when a user has to select a site to inserting issues from',
     defaultMessage: 'Insert Jira issues from'
   },
-  issueViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.issueViewModeLabel',
-    description: 'Label for toggle to enable a view mode showing issues in a table list view',
-    defaultMessage: 'Issue view'
-  },
-  countViewModeLabel: {
-    id: 'linkDataSource.jira-issues.configmodal.countViewModeLabel',
-    description: 'Label for toggle to enable a view mode showing issues in as a total count',
-    defaultMessage: 'Count view'
+  tableViewModeLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.tableViewModeLabel',
+    description: 'Display Jira search results as a table',
+    defaultMessage: 'Table'
+  },
+  tableViewModeDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.tableViewModeDescription',
+    description: 'Description for table view mode',
+    defaultMessage: 'Display Jira search results as a table'
+  },
+  inlineLinkViewModeLabel: {
+    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeLabel',
+    description: 'Display the number of search results as an inline smart link',
+    defaultMessage: 'Inline link'
+  },
+  inlineLinkViewModeDescription: {
+    id: 'linkDataSource.jira-issues.configmodal.inlineLinkViewModeDescription',
+    description: 'Description for inline link view mode',
+    defaultMessage: 'Display the number of search results or as an inline smart link'
   },
   issuesCountSmartCardPlaceholderText: {
     id: 'linkDataSource.jira-issues.configmodal.placeholder.issues',

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

@@ -189,6 +189,7 @@ const PlainAssetsConfigModal = props => {
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
   const isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
+  const isEditingExistingTable = !!(initialParameters !== null && initialParameters !== void 0 && initialParameters.aql && initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId && initialParameters !== null && initialParameters !== void 0 && initialParameters.workspaceId);
   const retrieveUrlForSmartCardRender = useCallback(() => {
     var _data$key, _data$key$data;
     const [data] = responseItems;
@@ -346,7 +347,7 @@ const PlainAssetsConfigModal = props => {
     onClick: onInsertPressed,
     isDisabled: isDisabled,
     testId: 'assets-datasource-modal--insert-button'
-  }, jsx(FormattedMessage, _extends({}, modalMessages.insertIssuesButtonText, {
+  }, jsx(FormattedMessage, _extends({}, isEditingExistingTable ? modalMessages.updateObjectsButtonText : modalMessages.insertIssuesButtonText, {
     values: {
       objectsCount: responseItems.length
     }

package/dist/es2019/ui/assets-modal/modal/messages.js

@@ -5,6 +5,11 @@ export const modalMessages = defineMessages({
     description: 'Button text to close the modal with no changes being made',
     defaultMessage: 'Cancel'
   },
+  updateObjectsButtonText: {
+    id: 'linkDataSource.assets.configmodal.updateObjectsButtonText',
+    description: 'Button text to update the displayed content',
+    defaultMessage: 'Update table'
+  },
   insertIssuesButtonText: {
     id: 'linkDataSource.assets.configmodal.insertIssuesButtonText',
     description: 'Button text to insert the displayed content',