@atlaskit/link-datasource 3.0.3 → 3.0.4

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @atlaskit/link-datasource
 
+## 3.0.4
+
+### Patch Changes
+
+- [#142151](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142151)
+  [`3f0c2aaf2773b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f0c2aaf2773b) -
+  Adds a bugfix for feature flag platform-datasources-use-refactored-config-modal for the confluence
+  search modal
+
 ## 3.0.3
 
 ### Patch Changes

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PlainConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -57,24 +57,9 @@ var inputContainerStyles = (0, _primitives.xcss)({
   minHeight: '72px'
 });
 var isValidParameters = function isValidParameters(parameters) {
-  var _parameters$contribut;
-  return !!(parameters && parameters.cloudId && (parameters.searchString !== undefined || (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length || parameters.lastModified || parameters.lastModifiedFrom || parameters.lastModifiedTo));
-};
-var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters) {
-  var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
-    setParameters = _useDatasourceContext.setParameters;
-  (0, _react.useEffect)(function () {
-    setParameters(function (parameters) {
-      return _objectSpread(_objectSpread({}, parameters), {}, {
-        cloudId: cloudId || '',
-        searchString: searchString,
-        lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
-        lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
-        lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
-        contributorAccountIds: contributorAccountIds.length > 0 ? contributorAccountIds : undefined
-      }, overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
-    });
-  }, [cloudId, searchString, lastModified, contributorAccountIds, setParameters, overrideParameters]);
+  return !!(parameters && parameters.cloudId && Object.values(parameters).filter(function (v) {
+    return v !== undefined;
+  }).length > 1);
 };
 var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var onCancel = props.onCancel,
@@ -82,47 +67,40 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
     overrideParameters = props.overrideParameters;
   var _useViewModeContext = (0, _useViewModeContext2.useViewModeContext)(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useDatasourceContext2 = (0, _datasourceContext.useDatasourceContext)(),
-    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
-    _useDatasourceContext3 = _useDatasourceContext2.tableState,
-    reset = _useDatasourceContext3.reset,
-    status = _useDatasourceContext3.status,
-    responseItems = _useDatasourceContext3.responseItems,
-    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
-    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
-    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
-    totalCount = _useDatasourceContext3.totalCount,
-    columns = _useDatasourceContext3.columns,
-    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
-    parameters = _useDatasourceContext2.parameters;
-  var _useState = (0, _react.useState)(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    cloudId = _useState2[0],
-    setCloudId = _useState2[1];
-  var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('confluence', cloudId),
+  var _useDatasourceContext = (0, _datasourceContext.useDatasourceContext)(),
+    visibleColumnKeys = _useDatasourceContext.visibleColumnKeys,
+    _useDatasourceContext2 = _useDatasourceContext.tableState,
+    reset = _useDatasourceContext2.reset,
+    status = _useDatasourceContext2.status,
+    responseItems = _useDatasourceContext2.responseItems,
+    _useDatasourceContext3 = _useDatasourceContext2.extensionKey,
+    extensionKey = _useDatasourceContext3 === void 0 ? null : _useDatasourceContext3,
+    destinationObjectTypes = _useDatasourceContext2.destinationObjectTypes,
+    totalCount = _useDatasourceContext2.totalCount,
+    columns = _useDatasourceContext2.columns,
+    visibleColumnCount = _useDatasourceContext.visibleColumnCount,
+    parameters = _useDatasourceContext.parameters,
+    setParameters = _useDatasourceContext.setParameters;
+  var _useAvailableSites = (0, _useAvailableSites2.useAvailableSites)('confluence', parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState3 = (0, _react.useState)(parameters === null || parameters === void 0 ? void 0 : parameters.searchString),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    searchString = _useState4[0],
-    setSearchString = _useState4[1];
-  var _useState5 = (0, _react.useState)((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    contributorAccountIds = _useState6[0],
-    setContributorAccountIds = _useState6[1];
-  var _useState7 = (0, _react.useState)(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
-      value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
-      from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
-      to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
-    } : undefined),
-    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    lastModified = _useState8[0],
-    setLastModified = _useState8[1];
 
   // analytics related parameters
   var searchCount = (0, _react.useRef)(0);
   var userInteractions = (0, _userInteractions.useUserInteractions)();
-  useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
+  var setParametersWithOverrides = (0, _react.useCallback)(function (setStateAction) {
+    if (typeof setStateAction !== 'function') {
+      setParameters(_objectSpread(_objectSpread({}, setStateAction), {}, {
+        cloudId: (setStateAction === null || setStateAction === void 0 ? void 0 : setStateAction.cloudId) || ''
+      }, overrideParameters));
+    } else {
+      setParameters(function (prev) {
+        return _objectSpread(_objectSpread(_objectSpread({}, prev), {}, {
+          cloudId: (prev === null || prev === void 0 ? void 0 : prev.cloudId) || ''
+        }, setStateAction(prev)), overrideParameters);
+      });
+    }
+  }, [setParameters, overrideParameters]);
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -138,48 +116,67 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
   (0, _react.useEffect)(function () {
-    if (selectedConfluenceSite && (!cloudId || cloudId !== selectedConfluenceSite.cloudId)) {
-      setCloudId(selectedConfluenceSite.cloudId);
+    if (selectedConfluenceSite && (!(parameters !== null && parameters !== void 0 && parameters.cloudId) || (parameters === null || parameters === void 0 ? void 0 : parameters.cloudId) !== selectedConfluenceSite.cloudId)) {
+      /**
+       * This code is primarily to set the cloudId in the parameters when the site selector loads a default value
+       * but there is no "onChange" emitted from the site picker
+       */
+      setParameters(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          cloudId: selectedConfluenceSite.cloudId
+        });
+      });
     }
-  }, [cloudId, selectedConfluenceSite]);
+  }, [parameters, setParameters, selectedConfluenceSite]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829171
   var onSiteSelection = (0, _react.useCallback)(function (site) {
     userInteractions.add(_types.DatasourceAction.INSTANCE_UPDATED);
-    setSearchString(undefined);
-    setLastModified(undefined);
-    setContributorAccountIds([]);
-    setCloudId(site.cloudId);
+
+    /**
+     * Clear the state of the form filters when the site is changed
+     */
+    setParameters(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        searchString: undefined,
+        lastModified: undefined,
+        lastModifiedFrom: undefined,
+        lastModifiedTo: undefined,
+        contributorAccountIds: undefined,
+        cloudId: site.cloudId
+      });
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, setParameters, userInteractions]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? _messages.confluenceSearchModalMessages.insertIssuesTitleManySites : _messages.confluenceSearchModalMessages.insertIssuesTitle;
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
-  var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
+  var hasConfluenceSearchParams = selectedConfluenceSite && (parameters === null || parameters === void 0 ? void 0 : parameters.searchString);
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   var confluenceSearchUrl = (0, _react.useMemo)(function () {
-    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+    var _parameters$contribut;
+    if (!selectedConfluenceSiteUrl || (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) === undefined) {
       return undefined;
     }
     var params = new URLSearchParams();
-    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search
-    params.append('text', searchString);
-    if (contributorAccountIds.length > 0) {
-      params.append('contributors', contributorAccountIds.join(','));
+    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search)
+    params.append('text', (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) || '');
+    if (parameters !== null && parameters !== void 0 && (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length) {
+      params.append('contributors', parameters.contributorAccountIds.join(','));
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.value) {
-      params.append('lastModified', lastModified.value);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModified) {
+      params.append('lastModified', parameters.lastModified);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.from) {
-      params.append('from', lastModified === null || lastModified === void 0 ? void 0 : lastModified.from);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedFrom) {
+      params.append('from', parameters.lastModifiedFrom);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.to) {
-      params.append('to', lastModified === null || lastModified === void 0 ? void 0 : lastModified.to);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedTo) {
+      params.append('to', parameters.lastModifiedTo);
     }
     return "".concat(selectedConfluenceSiteUrl, "/wiki/search?").concat(params.toString());
-  }, [contributorAccountIds, lastModified, searchString, selectedConfluenceSiteUrl]);
+  }, [parameters, selectedConfluenceSiteUrl]);
   var analyticsPayload = (0, _react.useMemo)(function () {
     return {
       extensionKey: extensionKey,
@@ -272,10 +269,12 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
           return range.value;
         });
         if ((updatedDateRangeOption === null || updatedDateRangeOption === void 0 ? void 0 : updatedDateRangeOption.optionType) === 'dateRange') {
-          setLastModified({
-            value: updatedDateRangeOption.value,
-            from: updatedDateRangeOption.from,
-            to: updatedDateRangeOption.to
+          setParametersWithOverrides(function (prev) {
+            return _objectSpread(_objectSpread({}, prev), {}, {
+              lastModified: updatedDateRangeOption.value,
+              lastModifiedFrom: updatedDateRangeOption.from,
+              lastModifiedTo: updatedDateRangeOption.to
+            });
           });
         }
       }
@@ -283,14 +282,22 @@ var PlainConfluenceSearchConfigModal = exports.PlainConfluenceSearchConfigModal
         var accountIds = editedOrCreatedBy.map(function (user) {
           return user.value;
         });
-        setContributorAccountIds(accountIds);
+        setParametersWithOverrides(function (prev) {
+          return _objectSpread(_objectSpread({}, prev), {}, {
+            contributorAccountIds: accountIds
+          });
+        });
       }
     }
-    setSearchString(newSearchString);
+    setParametersWithOverrides(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        searchString: newSearchString
+      });
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, userInteractions, setParametersWithOverrides]);
   var getButtonAnalyticsPayload = (0, _react.useCallback)(function () {
     return {
       extensionKey: extensionKey,
@@ -354,7 +361,14 @@ var ConnectedConfluenceSearchConfigModal = (0, _createDatasourceModal.createData
 });
 var ConfluenceSearchConfigModal = exports.ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
   if ((0, _platformFeatureFlags.fg)('platform-datasources-use-refactored-config-modal')) {
-    return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(ConnectedConfluenceSearchConfigModal, props));
+    return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(ConnectedConfluenceSearchConfigModal, (0, _extends2.default)({}, props, {
+      /**
+       * If the intial parameters are not valid, we will not initialise the modal state
+       * with `overrideParameters`. This is to allow the modal to be opened without
+       * any initial parameters and require the user to perform a search.
+       */
+      parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
+    })));
   }
   return (0, _react2.jsx)(_state.StoreContainer, null, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
     data: contextData

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -173,6 +173,7 @@ export const useDatasourceTableState = ({
           schema
         }
       } = await getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
+
       /**
        * Let the response finish and store in cache, but throw error if signal is aborted
        */

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

@@ -1,9 +1,10 @@
+import _extends from "@babel/runtime/helpers/extends";
 /* eslint-disable @atlaskit/platform/ensure-feature-flag-prefix */
 /**
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
@@ -49,29 +50,7 @@ const inputContainerStyles = xcss({
   display: 'flex',
   minHeight: '72px'
 });
-const isValidParameters = parameters => {
-  var _parameters$contribut;
-  return !!(parameters && parameters.cloudId && (parameters.searchString !== undefined || (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length || parameters.lastModified || parameters.lastModifiedFrom || parameters.lastModifiedTo));
-};
-const useUpdateParametersOnFormUpdate = (cloudId, searchString, lastModified, contributorAccountIds, overrideParameters) => {
-  const {
-    setParameters
-  } = useDatasourceContext();
-  useEffect(() => {
-    setParameters(parameters => {
-      return {
-        ...parameters,
-        cloudId: cloudId || '',
-        searchString,
-        lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
-        lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
-        lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
-        contributorAccountIds: contributorAccountIds.length > 0 ? contributorAccountIds : undefined,
-        ...(overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {})
-      };
-    });
-  }, [cloudId, searchString, lastModified, contributorAccountIds, setParameters, overrideParameters]);
-};
+const isValidParameters = parameters => !!(parameters && parameters.cloudId && Object.values(parameters).filter(v => v !== undefined).length > 1);
 export const PlainConfluenceSearchConfigModal = props => {
   const {
     onCancel,
@@ -93,25 +72,33 @@ export const PlainConfluenceSearchConfigModal = props => {
       columns
     },
     visibleColumnCount,
-    parameters
+    parameters,
+    setParameters
   } = useDatasourceContext();
-  const [cloudId, setCloudId] = useState(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId);
   const {
     availableSites,
     selectedSite: selectedConfluenceSite
-  } = useAvailableSites('confluence', cloudId);
-  const [searchString, setSearchString] = useState(parameters === null || parameters === void 0 ? void 0 : parameters.searchString);
-  const [contributorAccountIds, setContributorAccountIds] = useState((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []);
-  const [lastModified, setLastModified] = useState(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
-    value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
-    from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
-    to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
-  } : undefined);
+  } = useAvailableSites('confluence', parameters === null || parameters === void 0 ? void 0 : parameters.cloudId);
 
   // analytics related parameters
   const searchCount = useRef(0);
   const userInteractions = useUserInteractions();
-  useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
+  const setParametersWithOverrides = useCallback(setStateAction => {
+    if (typeof setStateAction !== 'function') {
+      setParameters({
+        ...setStateAction,
+        cloudId: (setStateAction === null || setStateAction === void 0 ? void 0 : setStateAction.cloudId) || '',
+        ...overrideParameters
+      });
+    } else {
+      setParameters(prev => ({
+        ...prev,
+        cloudId: (prev === null || prev === void 0 ? void 0 : prev.cloudId) || '',
+        ...setStateAction(prev),
+        ...overrideParameters
+      }));
+    }
+  }, [setParameters, overrideParameters]);
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
@@ -128,48 +115,65 @@ export const PlainConfluenceSearchConfigModal = props => {
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
   useEffect(() => {
-    if (selectedConfluenceSite && (!cloudId || cloudId !== selectedConfluenceSite.cloudId)) {
-      setCloudId(selectedConfluenceSite.cloudId);
+    if (selectedConfluenceSite && (!(parameters !== null && parameters !== void 0 && parameters.cloudId) || (parameters === null || parameters === void 0 ? void 0 : parameters.cloudId) !== selectedConfluenceSite.cloudId)) {
+      /**
+       * This code is primarily to set the cloudId in the parameters when the site selector loads a default value
+       * but there is no "onChange" emitted from the site picker
+       */
+      setParameters(prev => ({
+        ...prev,
+        cloudId: selectedConfluenceSite.cloudId
+      }));
     }
-  }, [cloudId, selectedConfluenceSite]);
+  }, [parameters, setParameters, selectedConfluenceSite]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829171
   const onSiteSelection = useCallback(site => {
     userInteractions.add(DatasourceAction.INSTANCE_UPDATED);
-    setSearchString(undefined);
-    setLastModified(undefined);
-    setContributorAccountIds([]);
-    setCloudId(site.cloudId);
+
+    /**
+     * Clear the state of the form filters when the site is changed
+     */
+    setParameters(prev => ({
+      ...prev,
+      searchString: undefined,
+      lastModified: undefined,
+      lastModifiedFrom: undefined,
+      lastModifiedTo: undefined,
+      contributorAccountIds: undefined,
+      cloudId: site.cloudId
+    }));
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, setParameters, userInteractions]);
   const siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
   const resolvedWithNoResults = status === 'resolved' && !responseItems.length;
-  const hasConfluenceSearchParams = selectedConfluenceSite && searchString;
+  const hasConfluenceSearchParams = selectedConfluenceSite && (parameters === null || parameters === void 0 ? void 0 : parameters.searchString);
   const selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   const confluenceSearchUrl = useMemo(() => {
-    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+    var _parameters$contribut;
+    if (!selectedConfluenceSiteUrl || (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) === undefined) {
       return undefined;
     }
     const params = new URLSearchParams();
-    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search
-    params.append('text', searchString);
-    if (contributorAccountIds.length > 0) {
-      params.append('contributors', contributorAccountIds.join(','));
+    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search)
+    params.append('text', (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) || '');
+    if (parameters !== null && parameters !== void 0 && (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length) {
+      params.append('contributors', parameters.contributorAccountIds.join(','));
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.value) {
-      params.append('lastModified', lastModified.value);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModified) {
+      params.append('lastModified', parameters.lastModified);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.from) {
-      params.append('from', lastModified === null || lastModified === void 0 ? void 0 : lastModified.from);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedFrom) {
+      params.append('from', parameters.lastModifiedFrom);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.to) {
-      params.append('to', lastModified === null || lastModified === void 0 ? void 0 : lastModified.to);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedTo) {
+      params.append('to', parameters.lastModifiedTo);
     }
     return `${selectedConfluenceSiteUrl}/wiki/search?${params.toString()}`;
-  }, [contributorAccountIds, lastModified, searchString, selectedConfluenceSiteUrl]);
+  }, [parameters, selectedConfluenceSiteUrl]);
   const analyticsPayload = useMemo(() => ({
     extensionKey,
     destinationObjectTypes,
@@ -262,23 +266,30 @@ export const PlainConfluenceSearchConfigModal = props => {
       if (lastModifiedList) {
         const updatedDateRangeOption = lastModifiedList.find(range => range.value);
         if ((updatedDateRangeOption === null || updatedDateRangeOption === void 0 ? void 0 : updatedDateRangeOption.optionType) === 'dateRange') {
-          setLastModified({
-            value: updatedDateRangeOption.value,
-            from: updatedDateRangeOption.from,
-            to: updatedDateRangeOption.to
-          });
+          setParametersWithOverrides(prev => ({
+            ...prev,
+            lastModified: updatedDateRangeOption.value,
+            lastModifiedFrom: updatedDateRangeOption.from,
+            lastModifiedTo: updatedDateRangeOption.to
+          }));
         }
       }
       if (editedOrCreatedBy) {
         const accountIds = editedOrCreatedBy.map(user => user.value);
-        setContributorAccountIds(accountIds);
+        setParametersWithOverrides(prev => ({
+          ...prev,
+          contributorAccountIds: accountIds
+        }));
       }
     }
-    setSearchString(newSearchString);
+    setParametersWithOverrides(prev => ({
+      ...prev,
+      searchString: newSearchString
+    }));
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, userInteractions, setParametersWithOverrides]);
   const getButtonAnalyticsPayload = useCallback(() => {
     return {
       extensionKey,
@@ -346,7 +357,17 @@ const ConnectedConfluenceSearchConfigModal = createDatasourceModal({
 });
 export const ConfluenceSearchConfigModal = props => {
   if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, props));
+    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
+      /**
+       * If the intial parameters are not valid, we will not initialise the modal state
+       * with `overrideParameters`. This is to allow the modal to be opened without
+       * any initial parameters and require the user to perform a search.
+       */
+      parameters: props.overrideParameters && isValidParameters(props.parameters) ? {
+        ...props.parameters,
+        ...props.overrideParameters
+      } : props.parameters
+    })));
   }
   return jsx(StoreContainer, null, jsx(AnalyticsContext, {
     data: contextData

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

@@ -1,4 +1,4 @@
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _extends from "@babel/runtime/helpers/extends";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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) { _defineProperty(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; }
@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsxRuntime classic
  * @jsx jsx
  */
-import { Fragment, useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Fragment, useCallback, useEffect, useMemo, useRef } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
@@ -54,24 +54,9 @@ var inputContainerStyles = xcss({
   minHeight: '72px'
 });
 var isValidParameters = function isValidParameters(parameters) {
-  var _parameters$contribut;
-  return !!(parameters && parameters.cloudId && (parameters.searchString !== undefined || (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length || parameters.lastModified || parameters.lastModifiedFrom || parameters.lastModifiedTo));
-};
-var useUpdateParametersOnFormUpdate = function useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters) {
-  var _useDatasourceContext = useDatasourceContext(),
-    setParameters = _useDatasourceContext.setParameters;
-  useEffect(function () {
-    setParameters(function (parameters) {
-      return _objectSpread(_objectSpread({}, parameters), {}, {
-        cloudId: cloudId || '',
-        searchString: searchString,
-        lastModified: lastModified === null || lastModified === void 0 ? void 0 : lastModified.value,
-        lastModifiedFrom: lastModified === null || lastModified === void 0 ? void 0 : lastModified.from,
-        lastModifiedTo: lastModified === null || lastModified === void 0 ? void 0 : lastModified.to,
-        contributorAccountIds: contributorAccountIds.length > 0 ? contributorAccountIds : undefined
-      }, overrideParameters !== null && overrideParameters !== void 0 ? overrideParameters : {});
-    });
-  }, [cloudId, searchString, lastModified, contributorAccountIds, setParameters, overrideParameters]);
+  return !!(parameters && parameters.cloudId && Object.values(parameters).filter(function (v) {
+    return v !== undefined;
+  }).length > 1);
 };
 export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConfigModal(props) {
   var onCancel = props.onCancel,
@@ -79,47 +64,40 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
     overrideParameters = props.overrideParameters;
   var _useViewModeContext = useViewModeContext(),
     currentViewMode = _useViewModeContext.currentViewMode;
-  var _useDatasourceContext2 = useDatasourceContext(),
-    visibleColumnKeys = _useDatasourceContext2.visibleColumnKeys,
-    _useDatasourceContext3 = _useDatasourceContext2.tableState,
-    reset = _useDatasourceContext3.reset,
-    status = _useDatasourceContext3.status,
-    responseItems = _useDatasourceContext3.responseItems,
-    _useDatasourceContext4 = _useDatasourceContext3.extensionKey,
-    extensionKey = _useDatasourceContext4 === void 0 ? null : _useDatasourceContext4,
-    destinationObjectTypes = _useDatasourceContext3.destinationObjectTypes,
-    totalCount = _useDatasourceContext3.totalCount,
-    columns = _useDatasourceContext3.columns,
-    visibleColumnCount = _useDatasourceContext2.visibleColumnCount,
-    parameters = _useDatasourceContext2.parameters;
-  var _useState = useState(parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
-    _useState2 = _slicedToArray(_useState, 2),
-    cloudId = _useState2[0],
-    setCloudId = _useState2[1];
-  var _useAvailableSites = useAvailableSites('confluence', cloudId),
+  var _useDatasourceContext = useDatasourceContext(),
+    visibleColumnKeys = _useDatasourceContext.visibleColumnKeys,
+    _useDatasourceContext2 = _useDatasourceContext.tableState,
+    reset = _useDatasourceContext2.reset,
+    status = _useDatasourceContext2.status,
+    responseItems = _useDatasourceContext2.responseItems,
+    _useDatasourceContext3 = _useDatasourceContext2.extensionKey,
+    extensionKey = _useDatasourceContext3 === void 0 ? null : _useDatasourceContext3,
+    destinationObjectTypes = _useDatasourceContext2.destinationObjectTypes,
+    totalCount = _useDatasourceContext2.totalCount,
+    columns = _useDatasourceContext2.columns,
+    visibleColumnCount = _useDatasourceContext.visibleColumnCount,
+    parameters = _useDatasourceContext.parameters,
+    setParameters = _useDatasourceContext.setParameters;
+  var _useAvailableSites = useAvailableSites('confluence', parameters === null || parameters === void 0 ? void 0 : parameters.cloudId),
     availableSites = _useAvailableSites.availableSites,
     selectedConfluenceSite = _useAvailableSites.selectedSite;
-  var _useState3 = useState(parameters === null || parameters === void 0 ? void 0 : parameters.searchString),
-    _useState4 = _slicedToArray(_useState3, 2),
-    searchString = _useState4[0],
-    setSearchString = _useState4[1];
-  var _useState5 = useState((parameters === null || parameters === void 0 ? void 0 : parameters.contributorAccountIds) || []),
-    _useState6 = _slicedToArray(_useState5, 2),
-    contributorAccountIds = _useState6[0],
-    setContributorAccountIds = _useState6[1];
-  var _useState7 = useState(parameters !== null && parameters !== void 0 && parameters.lastModified ? {
-      value: parameters === null || parameters === void 0 ? void 0 : parameters.lastModified,
-      from: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedFrom,
-      to: parameters === null || parameters === void 0 ? void 0 : parameters.lastModifiedTo
-    } : undefined),
-    _useState8 = _slicedToArray(_useState7, 2),
-    lastModified = _useState8[0],
-    setLastModified = _useState8[1];
 
   // analytics related parameters
   var searchCount = useRef(0);
   var userInteractions = useUserInteractions();
-  useUpdateParametersOnFormUpdate(cloudId, searchString, lastModified, contributorAccountIds, overrideParameters);
+  var setParametersWithOverrides = useCallback(function (setStateAction) {
+    if (typeof setStateAction !== 'function') {
+      setParameters(_objectSpread(_objectSpread({}, setStateAction), {}, {
+        cloudId: (setStateAction === null || setStateAction === void 0 ? void 0 : setStateAction.cloudId) || ''
+      }, overrideParameters));
+    } else {
+      setParameters(function (prev) {
+        return _objectSpread(_objectSpread(_objectSpread({}, prev), {}, {
+          cloudId: (prev === null || prev === void 0 ? void 0 : prev.cloudId) || ''
+        }, setStateAction(prev)), overrideParameters);
+      });
+    }
+  }, [setParameters, overrideParameters]);
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var hasNoConfluenceSites = availableSites && availableSites.length === 0;
@@ -135,48 +113,67 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6828283
   useEffect(function () {
-    if (selectedConfluenceSite && (!cloudId || cloudId !== selectedConfluenceSite.cloudId)) {
-      setCloudId(selectedConfluenceSite.cloudId);
+    if (selectedConfluenceSite && (!(parameters !== null && parameters !== void 0 && parameters.cloudId) || (parameters === null || parameters === void 0 ? void 0 : parameters.cloudId) !== selectedConfluenceSite.cloudId)) {
+      /**
+       * This code is primarily to set the cloudId in the parameters when the site selector loads a default value
+       * but there is no "onChange" emitted from the site picker
+       */
+      setParameters(function (prev) {
+        return _objectSpread(_objectSpread({}, prev), {}, {
+          cloudId: selectedConfluenceSite.cloudId
+        });
+      });
     }
-  }, [cloudId, selectedConfluenceSite]);
+  }, [parameters, setParameters, selectedConfluenceSite]);
 
   // TODO: further refactoring in EDM-9573
   // https://stash.atlassian.com/projects/ATLASSIAN/repos/atlassian-frontend-monorepo/pull-requests/82725/overview?commentId=6829171
   var onSiteSelection = useCallback(function (site) {
     userInteractions.add(DatasourceAction.INSTANCE_UPDATED);
-    setSearchString(undefined);
-    setLastModified(undefined);
-    setContributorAccountIds([]);
-    setCloudId(site.cloudId);
+
+    /**
+     * Clear the state of the form filters when the site is changed
+     */
+    setParameters(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        searchString: undefined,
+        lastModified: undefined,
+        lastModifiedFrom: undefined,
+        lastModifiedTo: undefined,
+        contributorAccountIds: undefined,
+        cloudId: site.cloudId
+      });
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, setParameters, userInteractions]);
   var siteSelectorLabel = availableSites && availableSites.length > 1 ? confluenceSearchModalMessages.insertIssuesTitleManySites : confluenceSearchModalMessages.insertIssuesTitle;
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
-  var hasConfluenceSearchParams = selectedConfluenceSite && searchString;
+  var hasConfluenceSearchParams = selectedConfluenceSite && (parameters === null || parameters === void 0 ? void 0 : parameters.searchString);
   var selectedConfluenceSiteUrl = selectedConfluenceSite === null || selectedConfluenceSite === void 0 ? void 0 : selectedConfluenceSite.url;
   var confluenceSearchUrl = useMemo(function () {
-    if (!selectedConfluenceSiteUrl || searchString === undefined) {
+    var _parameters$contribut;
+    if (!selectedConfluenceSiteUrl || (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) === undefined) {
       return undefined;
     }
     var params = new URLSearchParams();
-    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search
-    params.append('text', searchString);
-    if (contributorAccountIds.length > 0) {
-      params.append('contributors', contributorAccountIds.join(','));
+    // we are appending "text" without checking searchString as we need the url to have "text" when a user does an empty search)
+    params.append('text', (parameters === null || parameters === void 0 ? void 0 : parameters.searchString) || '');
+    if (parameters !== null && parameters !== void 0 && (_parameters$contribut = parameters.contributorAccountIds) !== null && _parameters$contribut !== void 0 && _parameters$contribut.length) {
+      params.append('contributors', parameters.contributorAccountIds.join(','));
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.value) {
-      params.append('lastModified', lastModified.value);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModified) {
+      params.append('lastModified', parameters.lastModified);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.from) {
-      params.append('from', lastModified === null || lastModified === void 0 ? void 0 : lastModified.from);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedFrom) {
+      params.append('from', parameters.lastModifiedFrom);
     }
-    if (lastModified !== null && lastModified !== void 0 && lastModified.to) {
-      params.append('to', lastModified === null || lastModified === void 0 ? void 0 : lastModified.to);
+    if (parameters !== null && parameters !== void 0 && parameters.lastModifiedTo) {
+      params.append('to', parameters.lastModifiedTo);
     }
     return "".concat(selectedConfluenceSiteUrl, "/wiki/search?").concat(params.toString());
-  }, [contributorAccountIds, lastModified, searchString, selectedConfluenceSiteUrl]);
+  }, [parameters, selectedConfluenceSiteUrl]);
   var analyticsPayload = useMemo(function () {
     return {
       extensionKey: extensionKey,
@@ -269,10 +266,12 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
           return range.value;
         });
         if ((updatedDateRangeOption === null || updatedDateRangeOption === void 0 ? void 0 : updatedDateRangeOption.optionType) === 'dateRange') {
-          setLastModified({
-            value: updatedDateRangeOption.value,
-            from: updatedDateRangeOption.from,
-            to: updatedDateRangeOption.to
+          setParametersWithOverrides(function (prev) {
+            return _objectSpread(_objectSpread({}, prev), {}, {
+              lastModified: updatedDateRangeOption.value,
+              lastModifiedFrom: updatedDateRangeOption.from,
+              lastModifiedTo: updatedDateRangeOption.to
+            });
           });
         }
       }
@@ -280,14 +279,22 @@ export var PlainConfluenceSearchConfigModal = function PlainConfluenceSearchConf
         var accountIds = editedOrCreatedBy.map(function (user) {
           return user.value;
         });
-        setContributorAccountIds(accountIds);
+        setParametersWithOverrides(function (prev) {
+          return _objectSpread(_objectSpread({}, prev), {}, {
+            contributorAccountIds: accountIds
+          });
+        });
       }
     }
-    setSearchString(newSearchString);
+    setParametersWithOverrides(function (prev) {
+      return _objectSpread(_objectSpread({}, prev), {}, {
+        searchString: newSearchString
+      });
+    });
     reset({
       shouldForceRequest: true
     });
-  }, [reset, userInteractions]);
+  }, [reset, userInteractions, setParametersWithOverrides]);
   var getButtonAnalyticsPayload = useCallback(function () {
     return {
       extensionKey: extensionKey,
@@ -351,7 +358,14 @@ var ConnectedConfluenceSearchConfigModal = createDatasourceModal({
 });
 export var ConfluenceSearchConfigModal = function ConfluenceSearchConfigModal(props) {
   if (fg('platform-datasources-use-refactored-config-modal')) {
-    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, props));
+    return jsx(StoreContainer, null, jsx(ConnectedConfluenceSearchConfigModal, _extends({}, props, {
+      /**
+       * If the intial parameters are not valid, we will not initialise the modal state
+       * with `overrideParameters`. This is to allow the modal to be opened without
+       * any initial parameters and require the user to perform a search.
+       */
+      parameters: props.overrideParameters && isValidParameters(props.parameters) ? _objectSpread(_objectSpread({}, props.parameters), props.overrideParameters) : props.parameters
+    })));
   }
   return jsx(StoreContainer, null, jsx(AnalyticsContext, {
     data: contextData

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/link-datasource",
-	"version": "3.0.3",
+	"version": "3.0.4",
 	"description": "UI Components to support linking platform dataset feature",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -54,7 +54,7 @@
 		"@atlaskit/inline-edit": "^13.7.0",
 		"@atlaskit/intl-messages-provider": "^1.0.0",
 		"@atlaskit/jql-ast": "^3.3.0",
-		"@atlaskit/jql-editor": "^4.7.0",
+		"@atlaskit/jql-editor": "^4.8.0",
 		"@atlaskit/jql-editor-autocomplete-rest": "^2.1.0",
 		"@atlaskit/layering": "^0.4.0",
 		"@atlaskit/link-client-extension": "^2.4.0",
@@ -62,10 +62,10 @@
 		"@atlaskit/linking-types": "^9.0.0",
 		"@atlaskit/logo": "^14.2.0",
 		"@atlaskit/lozenge": "^11.10.0",
-		"@atlaskit/modal-dialog": "^12.15.0",
+		"@atlaskit/modal-dialog": "^12.16.0",
 		"@atlaskit/outbound-auth-flow-client": "^3.4.5",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/popup": "^1.25.0",
+		"@atlaskit/popup": "^1.26.0",
 		"@atlaskit/pragmatic-drag-and-drop": "^1.3.0",
 		"@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.0.0",
 		"@atlaskit/pragmatic-drag-and-drop-react-beautiful-dnd-autoscroll": "^1.2.0",