@atlaskit/link-datasource 1.19.16 → 1.19.18

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/link-datasource
 
+## 1.19.18
+
+### Patch Changes
+
+- [#57736](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57736) [`d8193e501bcc`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/d8193e501bcc) - [ux] Changes behavior of datasource modal to persist query changes on insert without needing to click search.
+
+## 1.19.17
+
+### Patch Changes
+
+- [#58033](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58033) [`e833dd7a4e2f`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e833dd7a4e2f) - [ux] Updated datasource tables to always have a background.
+
 ## 1.19.16
 
 ### Patch Changes

package/dist/cjs/analytics/constants.js

@@ -7,5 +7,5 @@ exports.packageMetaData = exports.EVENT_CHANNEL = void 0;
 var EVENT_CHANNEL = exports.EVENT_CHANNEL = 'media';
 var packageMetaData = exports.packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.16"
+  packageVersion: "1.19.18"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -98,13 +98,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           _yield$getDatasourceD = _context.sent;
           access = _yield$getDatasourceD.meta.access;
           schema = _yield$getDatasourceD.data.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context.next = 11;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
         case 11:
+          if (!(access === 'forbidden')) {
+            _context.next = 14;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 14:
           isColumnNotPresentInCurrentColumnsList = function isColumnNotPresentInCurrentColumnsList(col) {
             return !columns.find(function (column) {
               return column.key === col.key;
@@ -113,25 +120,32 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(newColumns)));
-          _context.next = 24;
+          _context.next = 30;
           break;
-        case 17:
-          _context.prev = 17;
+        case 20:
+          _context.prev = 20;
           _context.t0 = _context["catch"](2);
           captureError('loadDatasourceDetails', _context.t0);
-          if (!(_context.t0 instanceof Response && (_context.t0.status === 401 || _context.t0.status === 403))) {
-            _context.next = 23;
+          if (!(_context.t0 instanceof Response && _context.t0.status === 401)) {
+            _context.next = 26;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
-        case 23:
+        case 26:
+          if (!(_context.t0 instanceof Response && _context.t0.status === 403)) {
+            _context.next = 29;
+            break;
+          }
+          setStatus('forbidden');
+          return _context.abrupt("return");
+        case 29:
           setStatus('rejected');
-        case 24:
+        case 30:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 17]]);
+    }, _callee, null, [[2, 20]]);
   })), [captureError, columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = (0, _react.useCallback)(function (schema, fieldKeys) {
     var properties = schema.properties,
@@ -225,13 +239,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           nextPageCursor = _yield$getDatasourceD4.nextPageCursor;
           _totalCount = _yield$getDatasourceD4.totalCount;
           schema = _yield$getDatasourceD4.schema;
-          if (!(access === 'forbidden' || access === 'unauthorized')) {
+          if (!(access === 'unauthorized')) {
             _context2.next = 23;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
         case 23:
+          if (!(access === 'forbidden')) {
+            _context2.next = 26;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 26:
           setExtensionKey(_extensionKey);
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
@@ -260,25 +281,32 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 43;
+          _context2.next = 49;
           break;
-        case 36:
-          _context2.prev = 36;
+        case 39:
+          _context2.prev = 39;
           _context2.t0 = _context2["catch"](7);
           captureError('onNextPage', _context2.t0);
-          if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
-            _context2.next = 42;
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 401)) {
+            _context2.next = 45;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 42:
+        case 45:
+          if (!(_context2.t0 instanceof Response && _context2.t0.status === 403)) {
+            _context2.next = 48;
+            break;
+          }
+          setStatus('forbidden');
+          return _context2.abrupt("return");
+        case 48:
           setStatus('rejected');
-        case 43:
+        case 49:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[7, 36]]);
+    }, _callee2, null, [[7, 39]]);
   })), [captureError, parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
   var reset = (0, _react.useCallback)(function (options) {
     setStatus('empty');

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

@@ -30,7 +30,7 @@ var tableBordersStyles = (0, _react2.css)({
   borderTopLeftRadius: "var(--ds-border-radius-200, 8px)",
   borderTopRightRadius: "var(--ds-border-radius-200, 8px)",
   borderBottom: "2px solid ".concat("var(--ds-background-accent-gray-subtler, ".concat(_colors.N40, ")")),
-  background: _issueLikeTable.scrollableContainerShadowsCssComponents.background,
+  backgroundImage: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundImage,
   backgroundRepeat: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: _issueLikeTable.scrollableContainerShadowsCssComponents.backgroundAttachment

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

@@ -113,7 +113,7 @@ var DatasourceTableViewWithoutAnalytics = function DatasourceTableViewWithoutAna
       shouldForceRequest: true
     });
   }, [destinationObjectTypes, extensionKey, fireEvent, reset]);
-  if (status === 'resolved' && !responseItems.length) {
+  if (status === 'resolved' && !responseItems.length || status === 'forbidden') {
     return (0, _react2.jsx)(_noResults.NoResults, {
       onRefresh: reset
     });

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

@@ -23,6 +23,9 @@ var SkeletonComponent = function SkeletonComponent(_ref) {
 var tableBodyStyles = (0, _react.css)({
   borderBottom: 0
 });
+var tableStyles = (0, _react.css)({
+  background: "var(--ds-elevation-surface-current, #FFF)"
+});
 var padding = "var(--ds-space-100, 8px)".concat(" ", "var(--ds-space-100, 8px)");
 var cellStyles = (0, _react.css)({
   padding: padding,
@@ -112,6 +115,7 @@ var _default = exports.default = function _default(_ref4) {
       boxSizing: 'border-box'
     }
   }, (0, _react.jsx)("table", {
+    css: tableStyles,
     "data-testid": testId
   }, (0, _react.jsx)("thead", {
     style: {

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

@@ -78,65 +78,79 @@ var tableContainerStyles = (0, _react2.css)({
 var shadowColor = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.1))";
 var shadowColorLight = "var(--ds-shadow-overflow-perimeter, rgba(0, 0, 0, 0.05))";
 var leftWhiteOverrideGradient = {
-  background: "\n  linear-gradient(\n    90deg,\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n    rgba(255, 255, 255, 0)\n  ) left center"),
+  backgroundImage: "\n  linear-gradient(\n    90deg,\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n    rgba(255, 255, 255, 0)\n  )"),
+  backgroundPosition: 'left center',
   size: "40px 100%",
   attachment: "local"
 };
 var topWhiteOverrideGradient = {
-  background: "\n  linear-gradient(\n    0deg,\n    rgba(255, 255, 255, 0),\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%\n  ) top center"),
+  backgroundImage: "\n  linear-gradient(\n    0deg,\n    rgba(255, 255, 255, 0),\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%\n  )"),
+  backgroundPosition: 'top center',
   size: "100% 100px",
   attachment: "local"
 };
 var rightWhiteOverrideGradient = {
-  background: "\n  linear-gradient(\n    90deg,\n    rgba(255, 255, 255, 0),\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 70%\n  ) right center"),
+  backgroundImage: "\n  linear-gradient(\n    90deg,\n    rgba(255, 255, 255, 0),\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 70%\n  )"),
+  backgroundPosition: 'right center',
   size: "40px 100%",
   attachment: "local"
 };
 var bottomWhiteOverride = {
-  background: "\n  linear-gradient(\n    0deg,\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n    rgba(255, 255, 255, 0)\n  ) bottom center"),
+  backgroundImage: "\n  linear-gradient(\n    0deg,\n    ".concat("var(--ds-elevation-surface-current, #FFF)", " 30%,\n    rgba(255, 255, 255, 0)\n  )"),
+  backgroundPosition: 'bottom center',
   size: "100% 40px",
   attachment: "local"
 };
 var leftShadowGradient = {
-  background: "\n  linear-gradient(\n    90deg,\n    ".concat(shadowColor, ",\n    rgba(0, 0, 0, 0)\n  ) left center"),
+  backgroundImage: "\n  linear-gradient(\n    90deg,\n    ".concat(shadowColor, ",\n    rgba(0, 0, 0, 0)\n  )"),
+  backgroundPosition: 'left center',
   size: "14px 100%",
   attachment: "scroll"
 };
 var topShadowGradient = {
-  background: "\n  linear-gradient(\n    0deg,\n    rgba(0, 0, 0, 0),\n    ".concat(shadowColorLight, "\n  ) 0 52px"),
+  backgroundImage: "\n  linear-gradient(\n    0deg,\n    rgba(0, 0, 0, 0),\n    ".concat(shadowColorLight, "\n  )"),
+  backgroundPosition: '0 52px',
   size: "100% 14px",
   attachment: "scroll"
 };
 var rightShadowGradient = {
-  background: "\n  linear-gradient(\n    90deg,\n    rgba(0, 0, 0, 0),\n    ".concat(shadowColor, "\n  ) right center"),
+  backgroundImage: "\n  linear-gradient(\n    90deg,\n    rgba(0, 0, 0, 0),\n    ".concat(shadowColor, "\n  )"),
+  backgroundPosition: 'right center',
   size: "14px 100%",
   attachment: "scroll"
 };
 var bottomShadowGradient = {
-  background: "\n  linear-gradient(\n    0deg,\n    ".concat(shadowColorLight, ",\n    rgba(0, 0, 0, 0)\n  ) bottom center"),
+  backgroundImage: "\n  linear-gradient(\n    0deg,\n    ".concat(shadowColorLight, ",\n    rgba(0, 0, 0, 0)\n  )"),
+  backgroundPosition: 'bottom center',
   size: "100% 10px",
   attachment: "scroll"
 };
 var shadows = [leftWhiteOverrideGradient, leftShadowGradient, rightWhiteOverrideGradient, rightShadowGradient, topWhiteOverrideGradient, topShadowGradient, bottomWhiteOverride, bottomShadowGradient];
 var scrollableContainerShadowsCssComponents = exports.scrollableContainerShadowsCssComponents = {
-  background: shadows.map(function (_ref) {
-    var background = _ref.background;
-    return background;
+  backgroundImage: shadows.map(function (_ref) {
+    var backgroundImage = _ref.backgroundImage;
+    return backgroundImage;
+  }).join(','),
+  backgroundPosition: shadows.map(function (_ref2) {
+    var backgroundPosition = _ref2.backgroundPosition;
+    return backgroundPosition;
   }).join(','),
   backgroundRepeat: 'no-repeat',
-  backgroundSize: shadows.map(function (_ref2) {
-    var size = _ref2.size;
+  backgroundSize: shadows.map(function (_ref3) {
+    var size = _ref3.size;
     return size;
   }).join(','),
-  backgroundAttachment: shadows.map(function (_ref3) {
-    var attachment = _ref3.attachment;
+  backgroundAttachment: shadows.map(function (_ref4) {
+    var attachment = _ref4.attachment;
     return attachment;
   }).join(',')
 };
 var scrollableContainerStyles = (0, _react2.css)({
   overflow: 'auto',
   boxSizing: 'border-box',
-  background: scrollableContainerShadowsCssComponents.background,
+  backgroundColor: "var(--ds-elevation-surface-current, #FFF)",
+  backgroundImage: scrollableContainerShadowsCssComponents.backgroundImage,
+  backgroundPosition: scrollableContainerShadowsCssComponents.backgroundPosition,
   backgroundRepeat: scrollableContainerShadowsCssComponents.backgroundRepeat,
   backgroundSize: scrollableContainerShadowsCssComponents.backgroundSize,
   backgroundAttachment: scrollableContainerShadowsCssComponents.backgroundAttachment
@@ -196,23 +210,23 @@ function getDefaultColumnWidth(key, type) {
       return DEFAULT_WIDTH;
   }
 }
-var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLikeDataTableView(_ref4) {
-  var testId = _ref4.testId,
-    onNextPage = _ref4.onNextPage,
-    onLoadDatasourceDetails = _ref4.onLoadDatasourceDetails,
-    items = _ref4.items,
-    columns = _ref4.columns,
-    _ref4$renderItem = _ref4.renderItem,
-    renderItem = _ref4$renderItem === void 0 ? _renderType.fallbackRenderType : _ref4$renderItem,
-    visibleColumnKeys = _ref4.visibleColumnKeys,
-    onVisibleColumnKeysChange = _ref4.onVisibleColumnKeysChange,
-    columnCustomSizes = _ref4.columnCustomSizes,
-    onColumnResize = _ref4.onColumnResize,
-    status = _ref4.status,
-    hasNextPage = _ref4.hasNextPage,
-    scrollableContainerHeight = _ref4.scrollableContainerHeight,
-    parentContainerRenderInstanceId = _ref4.parentContainerRenderInstanceId,
-    extensionKey = _ref4.extensionKey;
+var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLikeDataTableView(_ref5) {
+  var testId = _ref5.testId,
+    onNextPage = _ref5.onNextPage,
+    onLoadDatasourceDetails = _ref5.onLoadDatasourceDetails,
+    items = _ref5.items,
+    columns = _ref5.columns,
+    _ref5$renderItem = _ref5.renderItem,
+    renderItem = _ref5$renderItem === void 0 ? _renderType.fallbackRenderType : _ref5$renderItem,
+    visibleColumnKeys = _ref5.visibleColumnKeys,
+    onVisibleColumnKeysChange = _ref5.onVisibleColumnKeysChange,
+    columnCustomSizes = _ref5.columnCustomSizes,
+    onColumnResize = _ref5.onColumnResize,
+    status = _ref5.status,
+    hasNextPage = _ref5.hasNextPage,
+    scrollableContainerHeight = _ref5.scrollableContainerHeight,
+    parentContainerRenderInstanceId = _ref5.parentContainerRenderInstanceId,
+    extensionKey = _ref5.extensionKey;
   var tableId = (0, _react.useMemo)(function () {
     return Symbol('unique-id');
   }, []);
@@ -247,8 +261,8 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
   }, [parentContainerRenderInstanceId, status]);
   var visibleSortedColumns = (0, _react.useMemo)(function () {
     return visibleColumnKeys.map(function (visibleKey) {
-      return orderedColumns.find(function (_ref5) {
-        var key = _ref5.key;
+      return orderedColumns.find(function (_ref6) {
+        var key = _ref6.key;
         return visibleKey === key;
       });
     }).filter(Boolean);
@@ -263,10 +277,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     return (columnCustomSizes === null || columnCustomSizes === void 0 ? void 0 : columnCustomSizes[key]) || getDefaultColumnWidth(key, type);
   }, [columnCustomSizes]);
   var headerColumns = (0, _react.useMemo)(function () {
-    return visibleSortedColumns.map(function (_ref6) {
-      var key = _ref6.key,
-        title = _ref6.title,
-        type = _ref6.type;
+    return visibleSortedColumns.map(function (_ref7) {
+      var key = _ref7.key,
+        title = _ref7.title,
+        type = _ref7.type;
       return {
         key: key,
         content: title,
@@ -308,9 +322,9 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
       return;
     }
     return (0, _combine.combine)((0, _element.monitorForElements)({
-      onDragStart: function onDragStart(_ref7) {
-        var location = _ref7.location,
-          source = _ref7.source;
+      onDragStart: function onDragStart(_ref8) {
+        var location = _ref8.location,
+          source = _ref8.source;
         initialAutoScrollerClientY.current = location.current.input.clientY;
         if (source.data.type === 'table-header') {
           var _containerRef$current;
@@ -326,9 +340,9 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
           });
         }
       },
-      onDrag: function onDrag(_ref8) {
-        var location = _ref8.location,
-          source = _ref8.source;
+      onDrag: function onDrag(_ref9) {
+        var location = _ref9.location,
+          source = _ref9.source;
         if (source.data.type === 'table-header') {
           var _containerRef$current2;
           _pragmaticDragAndDropReactBeautifulDndAutoscroll.autoScroller.updateInput({
@@ -338,9 +352,9 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
           });
         }
       },
-      onDrop: function onDrop(_ref9) {
-        var source = _ref9.source,
-          location = _ref9.location;
+      onDrop: function onDrop(_ref10) {
+        var source = _ref10.source,
+          location = _ref10.location;
         _pragmaticDragAndDropReactBeautifulDndAutoscroll.autoScroller.stop();
         if (location.current.dropTargets.length === 0) {
           return;
@@ -375,10 +389,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     return items.map(function (newRowData, rowIndex) {
       return {
         key: "".concat(identityColumnKey && newRowData[identityColumnKey] && newRowData[identityColumnKey].data || rowIndex),
-        cells: visibleSortedColumns.map(function (_ref10) {
+        cells: visibleSortedColumns.map(function (_ref11) {
           var _newRowData$key;
-          var key = _ref10.key,
-            type = _ref10.type;
+          var key = _ref11.key,
+            type = _ref11.type;
           var value = ((_newRowData$key = newRowData[key]) === null || _newRowData$key === void 0 ? void 0 : _newRowData$key.data) || newRowData[key];
           var values = Array.isArray(value) ? value : [value];
           var content = values.map(function (value) {
@@ -479,10 +493,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     css: [noDefaultBorderStyles, tableHeadStyles]
   }, (0, _react2.jsx)("tr", {
     ref: tableHeaderRowRef
-  }, headerColumns.map(function (_ref12, cellIndex) {
-    var key = _ref12.key,
-      content = _ref12.content,
-      width = _ref12.width;
+  }, headerColumns.map(function (_ref13, cellIndex) {
+    var key = _ref13.key,
+      content = _ref13.content,
+      width = _ref13.width;
     var heading = (0, _react2.jsx)(_tooltip.default, {
       content: content,
       tag: "span",
@@ -493,10 +507,10 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }, content));
     if (onVisibleColumnKeysChange && hasData) {
       var _containerRef$current3;
-      var previewRows = tableRows.map(function (_ref13) {
-        var cells = _ref13.cells;
-        var cell = cells.find(function (_ref14) {
-          var cellKey = _ref14.key;
+      var previewRows = tableRows.map(function (_ref14) {
+        var cells = _ref14.cells;
+        var cell = cells.find(function (_ref15) {
+          var cellKey = _ref15.key;
           return cellKey === key;
         });
         if (cell) {
@@ -538,18 +552,18 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
   })))), (0, _react2.jsx)("tbody", {
     css: noDefaultBorderStyles,
     "data-testid": testId && "".concat(testId, "--body")
-  }, rows.map(function (_ref15) {
-    var key = _ref15.key,
-      cells = _ref15.cells,
-      ref = _ref15.ref;
+  }, rows.map(function (_ref16) {
+    var key = _ref16.key,
+      cells = _ref16.cells,
+      ref = _ref16.ref;
     return (0, _react2.jsx)("tr", {
       key: key,
       "data-testid": testId && "".concat(testId, "--row-").concat(key),
       ref: ref
-    }, cells.map(function (_ref16, cellIndex) {
-      var cellKey = _ref16.key,
-        content = _ref16.content,
-        width = _ref16.width;
+    }, cells.map(function (_ref17, cellIndex) {
+      var cellKey = _ref17.key,
+        content = _ref17.content,
+        width = _ref17.width;
       var loadingRowStyle = shouldUseWidth ? {
         width: width
       } : {

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

@@ -45,10 +45,12 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     parameters = props.parameters,
     onSearch = props.onSearch,
     onSearchMethodChangeCallback = props.onSearchMethodChange,
-    initialSearchMethod = props.initialSearchMethod;
+    initialSearchMethod = props.initialSearchMethod,
+    setSearchBarJql = props.setSearchBarJql,
+    _props$searchBarJql = props.searchBarJql,
+    searchBarJql = _props$searchBarJql === void 0 ? DEFAULT_JQL_QUERY : _props$searchBarJql;
   var _ref = parameters || {},
-    currentCloudId = _ref.cloudId,
-    initialJql = _ref.jql;
+    currentCloudId = _ref.cloudId;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
@@ -61,37 +63,33 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     currentSearchMethod = _useState4[0],
     setCurrentSearchMethod = _useState4[1];
-  var _useState5 = (0, _react.useState)(initialJql || DEFAULT_JQL_QUERY),
+  var _useState5 = (0, _react.useState)(currentCloudId),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    jql = _useState6[0],
-    setJql = _useState6[1];
-  var _useState7 = (0, _react.useState)(currentCloudId),
+    cloudId = _useState6[0],
+    setCloudId = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    cloudId = _useState8[0],
-    setCloudId = _useState8[1];
-  var _useState9 = (0, _react.useState)(false),
+    isComplexQuery = _useState8[0],
+    setIsComplexQuery = _useState8[1];
+  var _useState9 = (0, _react.useState)(),
     _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
-    isComplexQuery = _useState10[0],
-    setIsComplexQuery = _useState10[1];
+    orderKey = _useState10[0],
+    setOrderKey = _useState10[1];
   var _useState11 = (0, _react.useState)(),
     _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
-    orderKey = _useState12[0],
-    setOrderKey = _useState12[1];
-  var _useState13 = (0, _react.useState)(),
+    orderDirection = _useState12[0],
+    setOrderDirection = _useState12[1];
+  var _useState13 = (0, _react.useState)({}),
     _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
-    orderDirection = _useState14[0],
-    setOrderDirection = _useState14[1];
-  var _useState15 = (0, _react.useState)({}),
-    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
-    filterSelections = _useState16[0],
-    setFilterSelections = _useState16[1];
+    filterSelections = _useState14[0],
+    setFilterSelections = _useState14[1];
   var showBasicFilters = (0, _react.useMemo)(function () {
     if ((0, _platformFeatureFlags.getBooleanFF)('platform.linking-platform.datasource.show-jlol-basic-filters')) {
       return true;
     }
     return false;
   }, []);
-  var _useHydrateJqlQuery = (0, _useHydrateJqlQuery2.useHydrateJqlQuery)(cloudId || '', jql),
+  var _useHydrateJqlQuery = (0, _useHydrateJqlQuery2.useHydrateJqlQuery)(cloudId || '', searchBarJql),
     hydratedOptions = _useHydrateJqlQuery.hydratedOptions,
     fetchHydratedJqlOptions = _useHydrateJqlQuery.fetchHydratedJqlOptions,
     basicFilterHydrationStatus = _useHydrateJqlQuery.status;
@@ -102,13 +100,13 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   var handleBasicSearchChange = (0, _react.useCallback)(function (e) {
     var rawSearch = e.currentTarget.value;
     setBasicSearchTerm(rawSearch);
-    setJql((0, _buildJQL.buildJQL)({
+    setSearchBarJql((0, _buildJQL.buildJQL)({
       rawSearch: rawSearch,
       filterValues: filterSelections,
       orderDirection: orderDirection,
       orderKey: orderKey
     }));
-  }, [filterSelections, orderDirection, orderKey]);
+  }, [setSearchBarJql, filterSelections, orderDirection, orderKey]);
   var onQueryChange = (0, _react.useCallback)(function (query) {
     var _query$split$map$filt, _fragments$at, _fragments$at2, _fragments$at3;
     // determine if order keys have been set so they can be saved and persisted when changes occur in basic search
@@ -124,12 +122,12 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
       setOrderKey(key);
       setOrderDirection(order);
     }
-    setJql(query);
-  }, []);
+    setSearchBarJql(query);
+  }, [setSearchBarJql]);
   var handleSearch = (0, _react.useCallback)(function () {
-    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     onSearch({
-      jql: jql
+      jql: searchBarJql
     }, {
       searchMethod: currentSearchMethod,
       basicFilterSelections: filterSelections,
@@ -146,7 +144,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         fetchHydratedJqlOptions();
       }
     }
-  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, jql, onSearch, showBasicFilters]);
+  }, [currentSearchMethod, fetchHydratedJqlOptions, filterSelections, fireEvent, searchBarJql, onSearch, showBasicFilters]);
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (filterValues) {
       var jqlWithFilterValues = (0, _buildJQL.buildJQL)({
         rawSearch: basicSearchTerm,
@@ -154,7 +152,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
         orderDirection: orderDirection,
         orderKey: orderKey
       });
-      setJql(jqlWithFilterValues);
+      setSearchBarJql(jqlWithFilterValues);
       var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jqlWithFilterValues);
       onSearch({
         jql: jqlWithFilterValues
@@ -172,9 +170,9 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     debouncedBasicFilterSelectionChange(updatedSelection);
   }, [debouncedBasicFilterSelectionChange, filterSelections]);
   (0, _react.useEffect)(function () {
-    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(jql);
+    var isCurrentQueryComplex = (0, _isQueryTooComplex.isQueryTooComplex)(searchBarJql);
     setIsComplexQuery(isCurrentQueryComplex);
-    if (showBasicFilters && !isCurrentQueryComplex && jql !== DEFAULT_JQL_QUERY) {
+    if (showBasicFilters && !isCurrentQueryComplex && searchBarJql !== DEFAULT_JQL_QUERY) {
       fetchHydratedJqlOptions();
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -192,14 +190,14 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
   (0, _react.useEffect)(function () {
     if (currentCloudId !== cloudId) {
       setBasicSearchTerm('');
-      setJql(DEFAULT_JQL_QUERY);
+      setSearchBarJql(DEFAULT_JQL_QUERY);
       setIsComplexQuery(false);
       setOrderKey(undefined);
       setOrderDirection(undefined);
       setFilterSelections({});
       setCloudId(currentCloudId);
     }
-  }, [currentCloudId, cloudId]);
+  }, [currentCloudId, cloudId, setSearchBarJql]);
   return (0, _react2.jsx)("div", {
     css: inputContainerStyles,
     "data-testid": "jira-search-container"
@@ -212,7 +210,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     onSearch: handleSearch,
     searchTerm: basicSearchTerm
   }), showBasicFilters && (0, _react2.jsx)(_basicFilters.BasicFilters, {
-    jql: jql,
+    jql: searchBarJql,
     cloudId: cloudId || '',
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
@@ -222,7 +220,7 @@ var JiraSearchContainer = exports.JiraSearchContainer = function JiraSearchConta
     isSearching: isSearching,
     onChange: onQueryChange,
     onSearch: handleSearch,
-    query: jql
+    query: searchBarJql
   }), (0, _react2.jsx)(_modeSwitcher.ModeSwitcher, {
     onOptionValueChange: onSearchMethodChange,
     selectedOptionValue: currentSearchMethod,