@atlaskit/link-datasource 1.19.21 → 1.19.23

package/dist/es2019/ui/jira-issues-modal/basic-filters/utils/transformers.js

@@ -11,6 +11,15 @@ const getLozengeAppearance = colorName => {
     return appearanceMap[colorName];
   }
 };
+const checkAndConvertToAbsoluteUrl = (url, siteUrl) => {
+  if (!url) {
+    return '';
+  }
+  if (/^data:(.*)/.test(url) || /^http(.*)/.test(url) || !siteUrl) {
+    return url;
+  }
+  return `${siteUrl}${url}`;
+};
 function mapNodeToOption({
   displayName,
   jqlTerm,
@@ -18,7 +27,8 @@ function mapNodeToOption({
   issueTypes,
   project,
   statusCategory,
-  user
+  user,
+  siteUrl
 }) {
   try {
     const baseProps = {
@@ -47,7 +57,7 @@ function mapNodeToOption({
       return {
         ...baseProps,
         optionType: 'iconLabel',
-        icon: (_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_project$avatar = project.avatar) === null || _project$avatar === void 0 ? void 0 : _project$avatar.small, siteUrl)
       };
     }
     if (issueTypes) {
@@ -55,7 +65,7 @@ function mapNodeToOption({
       return {
         ...baseProps,
         optionType: 'iconLabel',
-        icon: (_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small
+        icon: checkAndConvertToAbsoluteUrl((_issueTypes$ = issueTypes[0]) === null || _issueTypes$ === void 0 ? void 0 : _issueTypes$.avatar.small, siteUrl)
       };
     }
     if (statusCategory) {
@@ -94,10 +104,14 @@ export function mapHydrateResponseData({
   return transformedHydrateResponseData;
 }
 export function mapFieldValuesToFilterOptions({
-  data
+  data,
+  siteUrl
 }) {
   var _data$jira2, _data$jira2$jqlBuilde, _data$jira2$jqlBuilde2, _data$jira2$jqlBuilde3;
-  return (data === null || data === void 0 ? void 0 : (_data$jira2 = data.jira) === null || _data$jira2 === void 0 ? void 0 : (_data$jira2$jqlBuilde = _data$jira2.jqlBuilder) === null || _data$jira2$jqlBuilde === void 0 ? void 0 : (_data$jira2$jqlBuilde2 = _data$jira2$jqlBuilde.fieldValues) === null || _data$jira2$jqlBuilde2 === void 0 ? void 0 : (_data$jira2$jqlBuilde3 = _data$jira2$jqlBuilde2.edges) === null || _data$jira2$jqlBuilde3 === void 0 ? void 0 : _data$jira2$jqlBuilde3.map(edge => edge.node ? mapNodeToOption(edge.node) : null).filter(isNonNullSelectOption)) || [];
+  return (data === null || data === void 0 ? void 0 : (_data$jira2 = data.jira) === null || _data$jira2 === void 0 ? void 0 : (_data$jira2$jqlBuilde = _data$jira2.jqlBuilder) === null || _data$jira2$jqlBuilde === void 0 ? void 0 : (_data$jira2$jqlBuilde2 = _data$jira2$jqlBuilde.fieldValues) === null || _data$jira2$jqlBuilde2 === void 0 ? void 0 : (_data$jira2$jqlBuilde3 = _data$jira2$jqlBuilde2.edges) === null || _data$jira2$jqlBuilde3 === void 0 ? void 0 : _data$jira2$jqlBuilde3.map(edge => edge.node ? mapNodeToOption({
+    ...edge.node,
+    siteUrl
+  }) : null).filter(isNonNullSelectOption)) || [];
 }
 export function mapFieldValuesToTotalCount({
   data

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

@@ -33,7 +33,8 @@ export const JiraSearchContainer = props => {
     onSearchMethodChange: onSearchMethodChangeCallback,
     initialSearchMethod,
     setSearchBarJql,
-    searchBarJql = DEFAULT_JQL_QUERY
+    searchBarJql = DEFAULT_JQL_QUERY,
+    site
   } = props;
   const {
     cloudId: currentCloudId
@@ -194,7 +195,7 @@ export const JiraSearchContainer = props => {
     searchTerm: basicSearchTerm
   }), showBasicFilters && jsx(BasicFilters, {
     jql: searchBarJql,
-    cloudId: cloudId || '',
+    site: site,
     onChange: handleBasicFilterSelectionChange,
     selections: filterSelections,
     isJQLHydrating: basicFilterHydrationStatus === 'loading'

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

@@ -518,7 +518,8 @@ export const PlainJiraIssuesConfigModal = props => {
     parameters: parameters,
     onSearch: onSearch,
     initialSearchMethod: initialSearchMethod,
-    onSearchMethodChange: setCurrentSearchMethod
+    onSearchMethodChange: setCurrentSearchMethod,
+    site: selectedJiraSite
   }), currentViewMode === 'count' ? renderCountModeContent() : renderIssuesModeContent()) : jsx(NoInstancesView, null)), jsx(ModalFooter, null, shouldShowIssueCount && jsx("div", {
     "data-testid": "jira-jql-datasource-modal-total-issues-count",
     css: issueCountStyles

package/dist/esm/analytics/constants.js

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

package/dist/esm/hooks/useValidateAqlText.js

@@ -1,77 +1,115 @@
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
-import { useCallback, useState } from 'react';
+import { useCallback, useRef, useState } from 'react';
 import { useDatasourceAnalyticsEvents } from '../analytics';
 import { validateAql } from '../services/cmdbService';
-export var useValidateAqlText = function useValidateAqlText(workspaceId) {
-  var _useState = useState(false),
+export var SEARCH_DEBOUNCE = 350;
+export var useValidateAqlText = function useValidateAqlText(workspaceId, initialValue) {
+  var timeout = useRef();
+  var lastValue = useRef('');
+  var lastResult = useRef(Promise.resolve(undefined));
+  var _useState = useState(initialValue.trim() === '' ? {
+      type: 'idle'
+    } : {
+      type: 'loading'
+    }),
     _useState2 = _slicedToArray(_useState, 2),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    isValidAqlText = _useState4[0],
-    setIsValidAqlText = _useState4[1];
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    error = _useState6[0],
-    setError = _useState6[1];
+    lastValidationResult = _useState2[0],
+    setLastValidationResult = _useState2[1];
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+
+  // We return undefined when valid and 'error' when invalid
   var validateAqlText = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(aql) {
-      var isValid, message, _validateAqlResponse$, validateAqlResponse;
+      var validateAqlResponse, _validateAqlResponse$, _validateAqlResponse$2;
       return _regeneratorRuntime.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 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/esm/ui/assets-modal/modal/index.js

@@ -1,8 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 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; }
 /** @jsx jsx */
@@ -277,36 +275,24 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     }).fire(EVENT_CHANNEL);
     onCancel();
   }, [analyticsPayload, onCancel]);
-  var handleOnSearch = useCallback( /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(searchAql, searchSchemaId) {
-      return _regeneratorRuntime.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(DatasourceAction.SCHEMA_UPDATED);
-              }
-              if (aql !== searchAql) {
-                userInteractionActions.current.add(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 = useCallback(function (searchAql, searchSchemaId) {
+    if (schemaId !== searchSchemaId || aql !== searchAql || status === 'rejected') {
+      searchCount.current++;
+      if (schemaId !== searchSchemaId) {
+        userInteractionActions.current.add(DatasourceAction.SCHEMA_UPDATED);
+      }
+      if (aql !== searchAql) {
+        userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
+      }
+      reset({
+        shouldResetColumns: true,
+        shouldForceRequest: true
+      });
+      setAql(searchAql);
+      setSchemaId(searchSchemaId);
+      setIsNewSearch(true);
+    }
+  }, [aql, reset, schemaId, status]);
   var renderErrorState = useCallback(function () {
     if (errorState) {
       switch (errorState) {
@@ -331,7 +317,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       return jsx(AssetsSearchContainer, {
         workspaceId: workspaceId,
         initialSearchData: {
-          aql: aql,
+          aql: initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.aql,
           objectSchema: existingObjectSchema,
           objectSchemas: objectSchemas
         },
@@ -340,7 +326,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 jsx(IntlMessagesProvider, {
     defaultMessages: i18nEN,
     loaderFn: fetchMessagesForLocale

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

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import { useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { N40 } from '@atlaskit/theme/colors';
 import { AccessRequired } from '../../../common/error-state/access-required';
@@ -84,19 +84,22 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
       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 jsx(LoadingView, null);
-  } else if (status === 'rejected') {
-    return jsx(RejectedView, null);
-  } else if (status === 'unauthorized') {
-    return jsx(UnauthorizedView, null);
-  } else if (status === 'empty') {
-    return jsx(EmptyView, null);
-  } else if (resolvedWithNoResults) {
-    return jsx(NoResultsView, null);
-  } else if (status === 'loading' && !columns.length) {
-    return jsx(LoadingView, null);
-  }
-  return issueLikeDataTableView;
+  var renderAssetsContentView = useCallback(function () {
+    if (isFetchingInitialData) {
+      // Placing this check first as it's a priority before all others
+      return jsx(LoadingView, null);
+    } else if (status === 'rejected') {
+      return jsx(RejectedView, null);
+    } else if (status === 'unauthorized') {
+      return jsx(UnauthorizedView, null);
+    } else if (status === 'empty') {
+      return jsx(EmptyView, null);
+    } else if (resolvedWithNoResults) {
+      return jsx(NoResultsView, null);
+    } else if (status === 'loading' && !columns.length) {
+      return jsx(LoadingView, null);
+    }
+    return issueLikeDataTableView;
+  }, [columns.length, isFetchingInitialData, issueLikeDataTableView, resolvedWithNoResults, status]);
+  return renderAssetsContentView();
 };

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

@@ -1,9 +1,6 @@
 import _extends from "@babel/runtime/helpers/extends";
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
-import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
-import { Fragment, useCallback, useRef, useState } from 'react';
+import { Fragment } from 'react';
 import { css, jsx } from '@emotion/react';
 import { useIntl } from 'react-intl-next';
 import { LoadingButton } from '@atlaskit/button';
@@ -20,10 +17,6 @@ import { useValidateAqlText } from '../../../../hooks/useValidateAqlText';
 import { aqlKey } from '../../../../types/assets/types';
 import { FieldContainer } from '../styled';
 import { searchInputMessages } from './messages';
-
-/* Meta isn't exported in @atlaskit/form
-Taken from packages/design-system/form/src/field.tsx */
-
 var buttonBaseStyles = css({
   display: 'flex',
   height: '100%',
@@ -37,15 +30,14 @@ var AQLSupportDocumentLink = 'https://support.atlassian.com/jira-service-managem
 var searchButtonStyles = css({
   marginRight: "var(--ds-space-075, 6px)"
 });
-export var 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 jsx(Spinner, {
       size: "medium",
       testId: "assets-datasource-modal--aql-validating"
     });
   }
-  if (value && error) {
+  if (lastValidationResult.type === 'invalid') {
     return jsx(CrossCircleIcon, {
       label: "label",
       primaryColor: "red",
@@ -53,7 +45,7 @@ var renderValidatorIcon = function renderValidatorIcon(value, error, meta) {
       testId: "assets-datasource-modal--aql-invalid"
     });
   }
-  if (value && meta.valid) {
+  if (lastValidationResult.type === 'valid') {
     return jsx(CheckCircleIcon, {
       label: "label",
       primaryColor: "green",
@@ -75,85 +67,22 @@ export var AqlSearchInput = function AqlSearchInput(_ref) {
     isSearching = _ref.isSearching;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
-  var timeout = useRef();
-  var lastValue = useRef(value);
-  var lastResult = useRef(Promise.resolve(undefined));
-  var _useState = useState(null),
-    _useState2 = _slicedToArray(_useState, 2),
-    message = _useState2[0],
-    setMessage = _useState2[1];
-  var _useValidateAqlText = useValidateAqlText(workspaceId),
-    validateAqlText = _useValidateAqlText.validateAqlText;
-
-  // Validation expects undefined when valid and a string as an error message when invalid
-  var handleValidation = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(newUnvalidatedQlQuery) {
-      var validation;
-      return _regeneratorRuntime.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 = useValidateAqlText(workspaceId, value),
+    debouncedValidation = _useValidateAqlText.debouncedValidation,
+    lastValidationResult = _useValidateAqlText.lastValidationResult;
   return jsx(FieldContainer, null, jsx(Field, {
     name: 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 jsx(Fragment, null, jsx(Textfield, _extends({}, fieldProps, {
       elemBeforeInput: jsx("span", {
         style: {
           paddingLeft: 6,
           width: 24
         }
-      }, renderValidatorIcon(fieldProps.value, error, meta)),
+      }, renderValidatorIcon(lastValidationResult)),
       elemAfterInput: jsx(Fragment, null, jsx(Tooltip, {
         content: formatMessage(searchInputMessages.helpTooltipText),
         position: "bottom"
@@ -177,10 +106,10 @@ export var 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(searchInputMessages.placeholder),
       testId: testId
-    })), fieldProps.value && error && message && jsx(ErrorMessage, null, message));
+    })), lastValidationResult.type === 'invalid' && lastValidationResult.error && jsx(ErrorMessage, null, lastValidationResult.error));
   }));
 };

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

@@ -19,7 +19,7 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
   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);