@atlaskit/link-datasource 1.19.22 → 1.19.23

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-datasource
 
+## 1.19.23
+
+### Patch Changes
+
+- [#57785](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/57785) [`846c9ef4fb27`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/846c9ef4fb27) - Update AQL validation hook for Assets Config Modal
+- Updated dependencies
+
 ## 1.19.22
 
 ### 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.22"
+  packageVersion: "1.19.23"
 };

package/dist/cjs/hooks/useValidateAqlText.js

@@ -4,81 +4,119 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useValidateAqlText = void 0;
+exports.useValidateAqlText = exports.SEARCH_DEBOUNCE = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
-var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlText(workspaceId) {
-  var _useState = (0, _react.useState)(false),
+var SEARCH_DEBOUNCE = exports.SEARCH_DEBOUNCE = 350;
+var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlText(workspaceId, initialValue) {
+  var timeout = (0, _react.useRef)();
+  var lastValue = (0, _react.useRef)('');
+  var lastResult = (0, _react.useRef)(Promise.resolve(undefined));
+  var _useState = (0, _react.useState)(initialValue.trim() === '' ? {
+      type: 'idle'
+    } : {
+      type: 'loading'
+    }),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    isValidAqlText = _useState4[0],
-    setIsValidAqlText = _useState4[1];
-  var _useState5 = (0, _react.useState)(),
-    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    error = _useState6[0],
-    setError = _useState6[1];
+    lastValidationResult = _useState2[0],
+    setLastValidationResult = _useState2[1];
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+
+  // We return undefined when valid and 'error' when invalid
   var validateAqlText = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(aql) {
-      var isValid, message, _validateAqlResponse$, validateAqlResponse;
+      var validateAqlResponse, _validateAqlResponse$, _validateAqlResponse$2;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            setLoading(true);
-            setError(undefined);
-            isValid = false;
-            message = null;
-            _context.prev = 4;
-            _context.next = 7;
+            if (!(aql !== null && aql !== void 0 && aql.trim())) {
+              _context.next = 18;
+              break;
+            }
+            _context.prev = 1;
+            _context.next = 4;
             return (0, _cmdbService.validateAql)(workspaceId, {
               qlQuery: aql
             }, fireEvent);
-          case 7:
+          case 4:
             validateAqlResponse = _context.sent;
-            setIsValidAqlText(validateAqlResponse.isValid);
-            isValid = validateAqlResponse.isValid;
-            message = ((_validateAqlResponse$ = validateAqlResponse.errors) === null || _validateAqlResponse$ === void 0 ? void 0 : _validateAqlResponse$.iql) || null;
-            _context.next = 16;
-            break;
-          case 13:
-            _context.prev = 13;
-            _context.t0 = _context["catch"](4);
-            if (_context.t0 instanceof Error) {
-              setError(_context.t0);
-            } else {
-              setError(new Error('Unexpected error occured'));
+            if (!validateAqlResponse.isValid) {
+              _context.next = 10;
+              break;
             }
-          case 16:
-            _context.prev = 16;
-            setLoading(false);
-            return _context.finish(16);
-          case 19:
-            return _context.abrupt("return", {
-              isValid: isValid,
-              message: message
+            setLastValidationResult({
+              type: 'valid',
+              validatedAql: aql
             });
+            return _context.abrupt("return", undefined);
+          case 10:
+            setLastValidationResult({
+              type: 'invalid',
+              error: (_validateAqlResponse$ = (_validateAqlResponse$2 = validateAqlResponse.errors) === null || _validateAqlResponse$2 === void 0 ? void 0 : _validateAqlResponse$2.iql) !== null && _validateAqlResponse$ !== void 0 ? _validateAqlResponse$ : ''
+            });
+            return _context.abrupt("return", 'error');
+          case 12:
+            _context.next = 18;
+            break;
+          case 14:
+            _context.prev = 14;
+            _context.t0 = _context["catch"](1);
+            setLastValidationResult({
+              type: 'invalid',
+              error: ''
+            });
+            return _context.abrupt("return", 'error');
+          case 18:
+            setLastValidationResult({
+              type: 'idle'
+            });
+            return _context.abrupt("return", undefined);
           case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[4, 13, 16, 19]]);
+      }, _callee, null, [[1, 14]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
     };
   }(), [workspaceId, fireEvent]);
+
+  /* Debounce async validation for input, validation is also called on every field change
+  in a form so we need to also memoize. The async validate function is expected to either:
+  Immediately return a promise (which is then collected into an array, every single time validation is run),
+  or immediately return either undefined or an error message */
+  var debouncedValidation = function debouncedValidation(value) {
+    return new Promise(function (resolve) {
+      if (timeout.current) {
+        timeout.current();
+      }
+      if (value !== lastValue.current) {
+        var timerId = setTimeout(function () {
+          setLastValidationResult({
+            type: 'loading'
+          });
+          lastValue.current = value;
+          lastResult.current = validateAqlText(value);
+          resolve(lastResult.current);
+        }, SEARCH_DEBOUNCE);
+        timeout.current = function () {
+          clearTimeout(timerId);
+          resolve('debouncing');
+        };
+      } else {
+        resolve(lastResult.current);
+      }
+    });
+  };
   return {
-    isValidAqlText: isValidAqlText,
+    debouncedValidation: debouncedValidation,
     validateAqlText: validateAqlText,
-    validateAqlTextLoading: loading,
-    validateAqlTextError: error
+    lastValidationResult: lastValidationResult
   };
 };

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

@@ -6,9 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssetsConfigModal = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
@@ -286,36 +284,24 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     }).fire(_analytics.EVENT_CHANNEL);
     onCancel();
   }, [analyticsPayload, onCancel]);
-  var handleOnSearch = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(searchAql, searchSchemaId) {
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
-              searchCount.current++;
-              if (schemaId !== searchSchemaId) {
-                userInteractionActions.current.add(_types.DatasourceAction.SCHEMA_UPDATED);
-              }
-              if (aql !== searchAql) {
-                userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
-              }
-              reset({
-                shouldResetColumns: true
-              });
-              setAql(searchAql);
-              setSchemaId(searchSchemaId);
-              setIsNewSearch(true);
-            }
-          case 1:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x, _x2) {
-      return _ref.apply(this, arguments);
-    };
-  }(), [aql, reset, schemaId, status]);
+  var handleOnSearch = (0, _react.useCallback)(function (searchAql, searchSchemaId) {
+    if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
+      searchCount.current++;
+      if (schemaId !== searchSchemaId) {
+        userInteractionActions.current.add(_types.DatasourceAction.SCHEMA_UPDATED);
+      }
+      if (aql !== searchAql) {
+        userInteractionActions.current.add(_types.DatasourceAction.QUERY_UPDATED);
+      }
+      reset({
+        shouldResetColumns: true,
+        shouldForceRequest: true
+      });
+      setAql(searchAql);
+      setSchemaId(searchSchemaId);
+      setIsNewSearch(true);
+    }
+  }, [aql, reset, schemaId, status]);
   var renderErrorState = (0, _react.useCallback)(function () {
     if (errorState) {
       switch (errorState) {
@@ -340,7 +326,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       return (0, _react2.jsx)(_searchContainer.AssetsSearchContainer, {
         workspaceId: workspaceId,
         initialSearchData: {
-          aql: aql,
+          aql: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql,
           objectSchema: existingObjectSchema,
           objectSchemas: objectSchemas
         },
@@ -349,7 +335,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         isSearching: status === 'loading'
       });
     }
-  }, [errorState, workspaceId, assetsClientLoading, aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale

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

@@ -91,19 +91,22 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
       parentContainerRenderInstanceId: modalRenderInstanceId
     }));
   }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
-  if (isFetchingInitialData) {
-    // Placing this check first as it's a priority before all others
-    return (0, _react2.jsx)(LoadingView, null);
-  } else if (status === 'rejected') {
-    return (0, _react2.jsx)(RejectedView, null);
-  } else if (status === 'unauthorized') {
-    return (0, _react2.jsx)(UnauthorizedView, null);
-  } else if (status === 'empty') {
-    return (0, _react2.jsx)(EmptyView, null);
-  } else if (resolvedWithNoResults) {
-    return (0, _react2.jsx)(NoResultsView, null);
-  } else if (status === 'loading' && !columns.length) {
-    return (0, _react2.jsx)(LoadingView, null);
-  }
-  return issueLikeDataTableView;
+  var renderAssetsContentView = (0, _react.useCallback)(function () {
+    if (isFetchingInitialData) {
+      // Placing this check first as it's a priority before all others
+      return (0, _react2.jsx)(LoadingView, null);
+    } else if (status === 'rejected') {
+      return (0, _react2.jsx)(RejectedView, null);
+    } else if (status === 'unauthorized') {
+      return (0, _react2.jsx)(UnauthorizedView, null);
+    } else if (status === 'empty') {
+      return (0, _react2.jsx)(EmptyView, null);
+    } else if (resolvedWithNoResults) {
+      return (0, _react2.jsx)(NoResultsView, null);
+    } else if (status === 'loading' && !columns.length) {
+      return (0, _react2.jsx)(LoadingView, null);
+    }
+    return issueLikeDataTableView;
+  }, [columns.length, isFetchingInitialData, issueLikeDataTableView, resolvedWithNoResults, status]);
+  return renderAssetsContentView();
 };

package/dist/cjs/ui/assets-modal/search-container/aql-search-input/index.js

@@ -4,11 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SEARCH_DEBOUNCE_MS = exports.AqlSearchInput = void 0;
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+exports.AqlSearchInput = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
@@ -28,9 +25,6 @@ var _styled = require("../styled");
 var _messages = require("./messages");
 /** @jsx jsx */
 
-/* Meta isn't exported in @atlaskit/form
-Taken from packages/design-system/form/src/field.tsx */
-
 var buttonBaseStyles = (0, _react2.css)({
   display: 'flex',
   height: '100%',
@@ -44,15 +38,14 @@ var AQLSupportDocumentLink = 'https://support.atlassian.com/jira-service-managem
 var searchButtonStyles = (0, _react2.css)({
   marginRight: "var(--ds-space-075, 6px)"
 });
-var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;
-var renderValidatorIcon = function renderValidatorIcon(value, error, meta) {
-  if (value && meta !== null && meta !== void 0 && meta.validating) {
+var renderValidatorIcon = function renderValidatorIcon(lastValidationResult) {
+  if (lastValidationResult.type === 'loading') {
     return (0, _react2.jsx)(_spinner.default, {
       size: "medium",
       testId: "assets-datasource-modal--aql-validating"
     });
   }
-  if (value && error) {
+  if (lastValidationResult.type === 'invalid') {
     return (0, _react2.jsx)(_crossCircle.default, {
       label: "label",
       primaryColor: "red",
@@ -60,7 +53,7 @@ var renderValidatorIcon = function renderValidatorIcon(value, error, meta) {
       testId: "assets-datasource-modal--aql-invalid"
     });
   }
-  if (value && meta.valid) {
+  if (lastValidationResult.type === 'valid') {
     return (0, _react2.jsx)(_checkCircle.default, {
       label: "label",
       primaryColor: "green",
@@ -82,85 +75,22 @@ var AqlSearchInput = exports.AqlSearchInput = function AqlSearchInput(_ref) {
     isSearching = _ref.isSearching;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
-  var timeout = (0, _react.useRef)();
-  var lastValue = (0, _react.useRef)(value);
-  var lastResult = (0, _react.useRef)(Promise.resolve(undefined));
-  var _useState = (0, _react.useState)(null),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    message = _useState2[0],
-    setMessage = _useState2[1];
-  var _useValidateAqlText = (0, _useValidateAqlText2.useValidateAqlText)(workspaceId),
-    validateAqlText = _useValidateAqlText.validateAqlText;
-
-  // Validation expects undefined when valid and a string as an error message when invalid
-  var handleValidation = (0, _react.useCallback)( /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(newUnvalidatedQlQuery) {
-      var validation;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (newUnvalidatedQlQuery) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return", undefined);
-          case 2:
-            _context.next = 4;
-            return validateAqlText(newUnvalidatedQlQuery);
-          case 4:
-            validation = _context.sent;
-            setMessage(validation.message);
-            return _context.abrupt("return", validation.isValid ? undefined : 'invalid');
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), [validateAqlText]);
-
-  /* Debounce async validation for input, validation is also called on every field change
-  in a form so we need to also memoize. The async validate function is expected to either:
-  Immediately return a promise (which is then collected into an array, every single time validation is run),
-  or immediately return either undefined or an error message */
-  var debouncedMemoizedValidation = function debouncedMemoizedValidation(value) {
-    return new Promise(function (resolve) {
-      if (timeout.current) {
-        timeout.current();
-      }
-      if (value !== lastValue.current) {
-        var timerId = setTimeout(function () {
-          lastValue.current = value;
-          lastResult.current = handleValidation(value);
-          resolve(lastResult.current);
-        }, SEARCH_DEBOUNCE_MS);
-        timeout.current = function () {
-          clearTimeout(timerId);
-          resolve('debouncing');
-        };
-      } else {
-        resolve(lastResult.current);
-      }
-    });
-  };
+  var _useValidateAqlText = (0, _useValidateAqlText2.useValidateAqlText)(workspaceId, value),
+    debouncedValidation = _useValidateAqlText.debouncedValidation,
+    lastValidationResult = _useValidateAqlText.lastValidationResult;
   return (0, _react2.jsx)(_styled.FieldContainer, null, (0, _react2.jsx)(_form.Field, {
     name: _types.aqlKey,
     defaultValue: value,
-    validate: debouncedMemoizedValidation
-  }, function (_ref3) {
-    var fieldProps = _ref3.fieldProps,
-      meta = _ref3.meta,
-      error = _ref3.error;
+    validate: debouncedValidation
+  }, function (_ref2) {
+    var fieldProps = _ref2.fieldProps;
     return (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_textfield.default, (0, _extends2.default)({}, fieldProps, {
       elemBeforeInput: (0, _react2.jsx)("span", {
         style: {
           paddingLeft: 6,
           width: 24
         }
-      }, renderValidatorIcon(fieldProps.value, error, meta)),
+      }, renderValidatorIcon(lastValidationResult)),
       elemAfterInput: (0, _react2.jsx)(_react.Fragment, null, (0, _react2.jsx)(_tooltip.default, {
         content: formatMessage(_messages.searchInputMessages.helpTooltipText),
         position: "bottom"
@@ -184,10 +114,10 @@ var AqlSearchInput = exports.AqlSearchInput = function AqlSearchInput(_ref) {
         spacing: "none",
         testId: "assets-datasource-modal--aql-search-button",
         type: "submit",
-        isDisabled: fieldProps.value.trim() === '' || meta.validating || !meta.valid
+        isDisabled: lastValidationResult.type !== 'valid'
       })),
       placeholder: formatMessage(_messages.searchInputMessages.placeholder),
       testId: testId
-    })), fieldProps.value && error && message && (0, _react2.jsx)(_form.ErrorMessage, null, message));
+    })), lastValidationResult.type === 'invalid' && lastValidationResult.error && (0, _react2.jsx)(_form.ErrorMessage, null, lastValidationResult.error));
   }));
 };

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

@@ -27,7 +27,7 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
   var onFormSubmit = function onFormSubmit(searchFormValues) {
     var aql = searchFormValues.aql,
       objectSchema = searchFormValues.objectSchema;
-    if (objectSchema) {
+    if (aql && objectSchema) {
       fireEvent('ui.aqlEditor.searched', {});
       // Pass the validated aql and object schema back to modal
       onSearch(aql, objectSchema.value);

package/dist/es2019/analytics/constants.js

@@ -1,5 +1,5 @@
 export const EVENT_CHANNEL = 'media';
 export const packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.19.22"
+  packageVersion: "1.19.23"
 };

package/dist/es2019/hooks/useValidateAqlText.js

@@ -1,44 +1,83 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { validateAql } from '../services/cmdbService';
-export const useValidateAqlText = workspaceId => {
-  const [loading, setLoading] = useState(false);
-  const [isValidAqlText, setIsValidAqlText] = useState(false);
-  const [error, setError] = useState();
+export const SEARCH_DEBOUNCE = 350;
+export const useValidateAqlText = (workspaceId, initialValue) => {
+  const timeout = useRef();
+  const lastValue = useRef('');
+  const lastResult = useRef(Promise.resolve(undefined));
+  const [lastValidationResult, setLastValidationResult] = useState(initialValue.trim() === '' ? {
+    type: 'idle'
+  } : {
+    type: 'loading'
+  });
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
+
+  // We return undefined when valid and 'error' when invalid
   const validateAqlText = useCallback(async aql => {
-    setLoading(true);
-    setError(undefined);
-    let isValid = false;
-    let message = null;
-    try {
-      var _validateAqlResponse$;
-      const validateAqlResponse = await validateAql(workspaceId, {
-        qlQuery: aql
-      }, fireEvent);
-      setIsValidAqlText(validateAqlResponse.isValid);
-      isValid = validateAqlResponse.isValid;
-      message = ((_validateAqlResponse$ = validateAqlResponse.errors) === null || _validateAqlResponse$ === void 0 ? void 0 : _validateAqlResponse$.iql) || null;
-    } catch (err) {
-      if (err instanceof Error) {
-        setError(err);
-      } else {
-        setError(new Error('Unexpected error occured'));
+    if (aql !== null && aql !== void 0 && aql.trim()) {
+      try {
+        const validateAqlResponse = await validateAql(workspaceId, {
+          qlQuery: aql
+        }, fireEvent);
+        if (validateAqlResponse.isValid) {
+          setLastValidationResult({
+            type: 'valid',
+            validatedAql: aql
+          });
+          return undefined;
+        } else {
+          var _validateAqlResponse$, _validateAqlResponse$2;
+          setLastValidationResult({
+            type: 'invalid',
+            error: (_validateAqlResponse$ = (_validateAqlResponse$2 = validateAqlResponse.errors) === null || _validateAqlResponse$2 === void 0 ? void 0 : _validateAqlResponse$2.iql) !== null && _validateAqlResponse$ !== void 0 ? _validateAqlResponse$ : ''
+          });
+          return 'error';
+        }
+      } catch (err) {
+        setLastValidationResult({
+          type: 'invalid',
+          error: ''
+        });
+        return 'error';
       }
-    } finally {
-      setLoading(false);
     }
-    return {
-      isValid,
-      message
-    };
+    setLastValidationResult({
+      type: 'idle'
+    });
+    return undefined;
   }, [workspaceId, fireEvent]);
+
+  /* Debounce async validation for input, validation is also called on every field change
+  in a form so we need to also memoize. The async validate function is expected to either:
+  Immediately return a promise (which is then collected into an array, every single time validation is run),
+  or immediately return either undefined or an error message */
+  const debouncedValidation = value => new Promise(resolve => {
+    if (timeout.current) {
+      timeout.current();
+    }
+    if (value !== lastValue.current) {
+      const timerId = setTimeout(() => {
+        setLastValidationResult({
+          type: 'loading'
+        });
+        lastValue.current = value;
+        lastResult.current = validateAqlText(value);
+        resolve(lastResult.current);
+      }, SEARCH_DEBOUNCE);
+      timeout.current = () => {
+        clearTimeout(timerId);
+        resolve('debouncing');
+      };
+    } else {
+      resolve(lastResult.current);
+    }
+  });
   return {
-    isValidAqlText,
+    debouncedValidation,
     validateAqlText,
-    validateAqlTextLoading: loading,
-    validateAqlTextError: error
+    lastValidationResult
   };
 };

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

@@ -259,7 +259,7 @@ const PlainAssetsConfigModal = props => {
     }).fire(EVENT_CHANNEL);
     onCancel();
   }, [analyticsPayload, onCancel]);
-  const handleOnSearch = useCallback(async (searchAql, searchSchemaId) => {
+  const handleOnSearch = useCallback((searchAql, searchSchemaId) => {
     if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
       searchCount.current++;
       if (schemaId !== searchSchemaId) {
@@ -269,7 +269,8 @@ const PlainAssetsConfigModal = props => {
         userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
       }
       reset({
-        shouldResetColumns: true
+        shouldResetColumns: true,
+        shouldForceRequest: true
       });
       setAql(searchAql);
       setSchemaId(searchSchemaId);
@@ -300,7 +301,7 @@ const PlainAssetsConfigModal = props => {
       return jsx(AssetsSearchContainer, {
         workspaceId: workspaceId,
         initialSearchData: {
-          aql,
+          aql: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql,
           objectSchema: existingObjectSchema,
           objectSchemas
         },
@@ -309,7 +310,7 @@ const PlainAssetsConfigModal = props => {
         isSearching: status === 'loading'
       });
     }
-  }, [errorState, workspaceId, assetsClientLoading, aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
+  }, [errorState, workspaceId, assetsClientLoading, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
   return jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale