@atlaskit/link-datasource 1.10.3 → 1.11.1

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/link-datasource
 
+## 1.11.1
+
+### Patch Changes
+
+- [#42377](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42377) [`c1c8a308bd5`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c1c8a308bd5) - Add support for basic filter in JQL generation
+
+## 1.11.0
+
+### Minor Changes
+
+- [#42245](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42245) [`7b328d1b1b2`](https://bitbucket.org/atlassian/atlassian-frontend/commits/7b328d1b1b2) - Added Datasource Analytics and UFO metrics to Assets Config Modal.
+  Added additional analyticsEvent param to onInsert of AssetsConfigModal.
+
 ## 1.10.3
 
 ### 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.10.3"
+  packageVersion: "1.11.1"
 };

package/dist/cjs/analytics/types.js

@@ -12,6 +12,7 @@ var DatasourceAction = exports.DatasourceAction = /*#__PURE__*/function (Datasou
   DatasourceAction["QUERY_UPDATED"] = "query updated";
   DatasourceAction["DISPLAY_VIEW_CHANGED"] = "display view changed";
   DatasourceAction["NEXT_PAGE_SCROLLED"] = "next page scrolled";
+  DatasourceAction["SCHEMA_UPDATED"] = "schema updated";
   return DatasourceAction;
 }({});
 var DatasourceDisplay = exports.DatasourceDisplay = /*#__PURE__*/function (DatasourceDisplay) {

package/dist/cjs/hooks/useObjectSchemas.js

@@ -21,11 +21,15 @@ var useObjectSchemas = exports.useObjectSchemas = function useObjectSchemas(work
     setObjectSchemas = _useState4[1];
   var _useState5 = (0, _react.useState)(),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    error = _useState6[0],
-    setError = _useState6[1];
+    totalObjectSchemas = _useState6[0],
+    setTotalObjectSchemas = _useState6[1];
+  var _useState7 = (0, _react.useState)(),
+    _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
+    error = _useState8[0],
+    setError = _useState8[1];
   var request = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(query) {
-      var fetchedObjectSchemas, fetchedObjectSchemasResponse;
+      var fetchedObjectSchemas, fetchTotalObjectSchemas, fetchedObjectSchemasResponse;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -37,28 +41,33 @@ var useObjectSchemas = exports.useObjectSchemas = function useObjectSchemas(work
           case 5:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
+            setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
             fetchedObjectSchemas = fetchedObjectSchemasResponse.values;
-            _context.next = 13;
+            fetchTotalObjectSchemas = fetchedObjectSchemasResponse.total;
+            _context.next = 15;
             break;
-          case 10:
-            _context.prev = 10;
+          case 12:
+            _context.prev = 12;
             _context.t0 = _context["catch"](2);
             if (_context.t0 instanceof Error) {
               setError(_context.t0);
             } else {
               setError(new Error('Unexpected error occured'));
             }
-          case 13:
-            _context.prev = 13;
+          case 15:
+            _context.prev = 15;
             setLoading(false);
-            return _context.finish(13);
-          case 16:
-            return _context.abrupt("return", fetchedObjectSchemas);
-          case 17:
+            return _context.finish(15);
+          case 18:
+            return _context.abrupt("return", {
+              objectSchemas: fetchedObjectSchemas,
+              totalObjectSchemas: fetchTotalObjectSchemas
+            });
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 10, 13, 16]]);
+      }, _callee, null, [[2, 12, 15, 18]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
@@ -68,6 +77,7 @@ var useObjectSchemas = exports.useObjectSchemas = function useObjectSchemas(work
     objectSchemasLoading: loading,
     objectSchemasError: error,
     objectSchemas: objectSchemas,
+    totalObjectSchemas: totalObjectSchemas,
     fetchObjectSchemas: request
   };
 };

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

@@ -7,18 +7,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AssetsConfigModal = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 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");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
+var _uuid = require("uuid");
 var _analyticsNext = require("@atlaskit/analytics-next");
 var _standardButton = _interopRequireDefault(require("@atlaskit/button/standard-button"));
 var _intlMessagesProvider = require("@atlaskit/intl-messages-provider");
 var _modalDialog = _interopRequireWildcard(require("@atlaskit/modal-dialog"));
 var _analytics = require("../../../analytics");
+var _constants = require("../../../analytics/constants");
+var _types = require("../../../analytics/types");
+var _ufoExperiences = require("../../../analytics/ufoExperiences");
+var _useColumnPickerRenderedFailedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience");
+var _useDataRenderedUfoExperience = require("../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience");
 var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messages-for-locale");
 var _useAssetsClient2 = require("../../../hooks/useAssetsClient");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
@@ -62,6 +68,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch = _useState8[1];
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+  var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
+    modalRenderInstanceId = _useRef.current;
 
   // If a workspaceError occurs this is a critical error
   var _useAssetsClient = (0, _useAssetsClient2.useAssetsClient)(initialParameters),
@@ -89,13 +97,69 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     loadDatasourceDetails = _useDatasourceTableSt.loadDatasourceDetails,
     hasNextPage = _useDatasourceTableSt.hasNextPage,
     columns = _useDatasourceTableSt.columns,
-    defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys;
+    defaultVisibleColumnKeys = _useDatasourceTableSt.defaultVisibleColumnKeys,
+    _useDatasourceTableSt2 = _useDatasourceTableSt.extensionKey,
+    extensionKey = _useDatasourceTableSt2 === void 0 ? null : _useDatasourceTableSt2,
+    destinationObjectTypes = _useDatasourceTableSt.destinationObjectTypes,
+    totalCount = _useDatasourceTableSt.totalCount;
+
+  /* ------------------------------ OBSERVABILITY ------------------------------ */
+  var searchCount = (0, _react.useRef)(0);
+  var userInteractionActions = (0, _react.useRef)(new Set());
+  var visibleColumnCount = (0, _react.useRef)((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
+  var isDataReady = (visibleColumnKeys || []).length > 0;
+  var analyticsPayload = (0, _react.useMemo)(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes
+    };
+  }, [destinationObjectTypes, extensionKey]);
+  (0, _react.useEffect)(function () {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
+  var fireTableViewedEvent = (0, _react.useCallback)(function () {
+    if (isDataReady) {
+      fireEvent('ui.table.viewed.datasourceConfigModal', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        searchMethod: _types.DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        displayedColumnCount: visibleColumnCount.current
+      }));
+    }
+  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  (0, _react.useEffect)(function () {
+    var isResolved = status === 'resolved';
+    if (!isResolved || !totalCount) {
+      return;
+    }
+    if (totalCount > 1) {
+      fireTableViewedEvent();
+    }
+  }, [fireTableViewedEvent, status, totalCount]);
+  (0, _react.useEffect)(function () {
+    var shouldStartUfoExperience = status === 'loading';
+    if (shouldStartUfoExperience) {
+      (0, _ufoExperiences.startUfoExperience)({
+        name: 'datasource-rendered'
+      }, modalRenderInstanceId);
+    }
+  }, [modalRenderInstanceId, status]);
+  (0, _useDataRenderedUfoExperience.useDataRenderedUfoExperience)({
+    status: status,
+    experienceId: modalRenderInstanceId,
+    itemCount: responseItems.length,
+    canBeLink: false,
+    extensionKey: extensionKey
+  });
+  (0, _useColumnPickerRenderedFailedUfoExperience.useColumnPickerRenderedFailedUfoExperience)(status, modalRenderInstanceId);
+  /* ------------------------------ END OBSERVABILITY ------------------------------ */
+
   var onVisibleColumnKeysChange = (0, _react.useCallback)(function (visibleColumnKeys) {
     setVisibleColumnKeys(visibleColumnKeys);
     setIsNewSearch(false);
   }, []);
   (0, _react.useEffect)(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   (0, _react.useEffect)(function () {
@@ -103,10 +167,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  (0, _react.useEffect)(function () {
-    fireEvent('screen.datasourceModalDialog.viewed', {});
-  }, [fireEvent]);
-  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || !!workspaceError || assetsClientLoading || !aql || !schemaId;
+  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
     var _data$key;
     var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
@@ -114,10 +175,25 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     // agreement with BE that we will use `key` for rendering smartlink
     return data === null || data === void 0 || (_data$key = data.key) === null || _data$key === void 0 || (_data$key = _data$key.data) === null || _data$key === void 0 ? void 0 : _data$key.url;
   }, [responseItems]);
-  var onInsertPressed = (0, _react.useCallback)(function () {
+  var onInsertPressed = (0, _react.useCallback)(function (e, analyticsEvent) {
+    var _insertButtonClickedE;
     if (!aql || !schemaId || !workspaceId) {
       return;
     }
+    var insertButtonClickedEvent = analyticsEvent.update({
+      actionSubjectId: 'insert',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        displayedColumnCount: visibleColumnCount.current,
+        display: _types.DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: _types.DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: Array.from(userInteractionActions.current)
+      }),
+      eventType: 'ui'
+    });
+    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(_analytics.EVENT_CHANNEL);
     var firstAssetUrl = retrieveUrlForSmartCardRender();
     if (responseItems.length === 1 && firstAssetUrl) {
       onInsert({
@@ -125,7 +201,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         attrs: {
           url: firstAssetUrl
         }
-      });
+      }, consumerEvent);
     } else {
       onInsert({
         type: 'blockCard',
@@ -149,15 +225,33 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
             }]
           }
         }
-      });
+      }, consumerEvent);
     }
-  }, [aql, schemaId, workspaceId, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
+  }, [aql, schemaId, workspaceId, analyticsPayload, totalCount, retrieveUrlForSmartCardRender, responseItems.length, onInsert, datasourceId, visibleColumnKeys]);
+  var onCancelClick = (0, _react.useCallback)(function (e, analyticEvent) {
+    analyticEvent.update({
+      eventType: 'ui',
+      actionSubjectId: 'cancel',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        searchCount: searchCount.current,
+        actions: Array.from(userInteractionActions.current)
+      })
+    }).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) {
+              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
               });
@@ -219,10 +313,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     hasNextPage: hasNextPage,
     loadDatasourceDetails: loadDatasourceDetails,
     columns: columns,
-    defaultVisibleColumnKeys: defaultVisibleColumnKeys
+    defaultVisibleColumnKeys: defaultVisibleColumnKeys,
+    modalRenderInstanceId: modalRenderInstanceId
   }))), (0, _react2.jsx)(_modalDialog.ModalFooter, null, (0, _react2.jsx)(_standardButton.default, {
     appearance: "default",
-    onClick: onCancel,
+    onClick: onCancelClick,
     testId: 'asset-datasource-modal--cancel-button'
   }, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.cancelButtonText)), (0, _react2.jsx)(_standardButton.default, {
     appearance: "primary",
@@ -238,11 +333,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
 var analyticsContextAttributes = {
   dataProvider: 'jsm-assets'
 };
-var analyticsContextData = {
-  packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.10.3",
+var analyticsContextData = _objectSpread(_objectSpread({}, _constants.packageMetaData), {}, {
   source: 'datasourceConfigModal'
-};
+});
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });

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

@@ -21,7 +21,8 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
     loadDatasourceDetails = props.loadDatasourceDetails,
     columns = props.columns,
     defaultVisibleColumnKeys = props.defaultVisibleColumnKeys,
-    onVisibleColumnKeysChange = props.onVisibleColumnKeysChange;
+    onVisibleColumnKeysChange = props.onVisibleColumnKeysChange,
+    modalRenderInstanceId = props.modalRenderInstanceId;
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var issueLikeDataTableView = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react.default.createElement(_issueLikeTable.IssueLikeDataTableView, {
@@ -33,9 +34,10 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onNextPage: onNextPage,
       onLoadDatasourceDetails: loadDatasourceDetails,
-      onVisibleColumnKeysChange: onVisibleColumnKeysChange
+      onVisibleColumnKeysChange: onVisibleColumnKeysChange,
+      parentContainerRenderInstanceId: modalRenderInstanceId
     });
-  }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys]);
+  }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
   if (status === 'rejected') {
     return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, null);
   } else if (status === 'empty') {

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

@@ -8,6 +8,7 @@ exports.AssetsSearchContainer = void 0;
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _react = require("@emotion/react");
 var _form = _interopRequireDefault(require("@atlaskit/form"));
+var _analytics = require("../../../analytics");
 var _aqlSearchInput = require("./aql-search-input");
 var _objectSchemaSelect = require("./object-schema-select");
 var _styled = require("./styled");
@@ -21,10 +22,13 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
     initialSearchData = props.initialSearchData,
     modalTitle = props.modalTitle,
     isSearching = props.isSearching;
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var onFormSubmit = function onFormSubmit(searchFormValues) {
     var aql = searchFormValues.aql,
       objectSchema = searchFormValues.objectSchema;
     if (objectSchema) {
+      fireEvent('ui.aqlEditor.searched', {});
       // Pass the validated aql and object schema back to modal
       onSearch(aql, objectSchema.value);
     }

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

@@ -9,13 +9,16 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("@emotion/react");
+var _react = require("react");
+var _react2 = require("@emotion/react");
 var _debouncePromise = _interopRequireDefault(require("debounce-promise"));
 var _reactIntlNext = require("react-intl-next");
 var _form = require("@atlaskit/form");
 var _select = require("@atlaskit/select");
 var _constants = require("@atlaskit/theme/constants");
+var _analytics = require("../../../../analytics");
 var _useObjectSchemas2 = require("../../../../hooks/useObjectSchemas");
 var _types = require("../../../../types/assets/types");
 var _styled = require("../styled");
@@ -25,6 +28,11 @@ var _excluded = ["onChange", "onFocus"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /** @jsx jsx */
 var SEARCH_DEBOUNCE_MS = exports.SEARCH_DEBOUNCE_MS = 350;
+var mapObjectSchemasToOptions = function mapObjectSchemasToOptions(objectSchemas) {
+  return objectSchemas ? objectSchemas.map(function (objectSchema) {
+    return (0, _utils.objectSchemaToSelectOption)(objectSchema);
+  }) : [];
+};
 
 /**
  * Rendering a `<Select>` in a `<Modal>` results in the select options getting cut off by the bottom of the modal and
@@ -45,34 +53,72 @@ var AssetsObjectSchemaSelect = exports.AssetsObjectSchemaSelect = function Asset
     workspaceId = _ref.workspaceId,
     _ref$classNamePrefix = _ref.classNamePrefix,
     classNamePrefix = _ref$classNamePrefix === void 0 ? 'assets-datasource-modal--object-schema-select' : _ref$classNamePrefix;
+  var _useState = (0, _react.useState)(null),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    defaultOptions = _useState2[0],
+    setDefaultOptions = _useState2[1];
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useObjectSchemas = (0, _useObjectSchemas2.useObjectSchemas)(workspaceId),
     fetchObjectSchemas = _useObjectSchemas.fetchObjectSchemas,
     objectSchemasLoading = _useObjectSchemas.objectSchemasLoading;
   var selectedObjectSchema = value ? (0, _utils.objectSchemaToSelectOption)(value) : undefined;
+  (0, _react.useEffect)(function () {
+    var fetchInitialData = /*#__PURE__*/function () {
+      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+        var _yield$fetchObjectSch, objectSchemas, totalObjectSchemas;
+        return _regenerator.default.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return fetchObjectSchemas('');
+            case 2:
+              _yield$fetchObjectSch = _context.sent;
+              objectSchemas = _yield$fetchObjectSch.objectSchemas;
+              totalObjectSchemas = _yield$fetchObjectSch.totalObjectSchemas;
+              // We only want to send modal ready event once after we've fetched the schema count
+              fireEvent('ui.modal.ready.datasource', {
+                schemasCount: totalObjectSchemas !== null && totalObjectSchemas !== void 0 ? totalObjectSchemas : 0,
+                instancesCount: null
+              });
+              setDefaultOptions(mapObjectSchemasToOptions(objectSchemas));
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function fetchInitialData() {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    if (defaultOptions === null) {
+      fetchInitialData();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   var loadOptions = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(inputValue) {
-      var objectSchemas, options;
-      return _regenerator.default.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(inputValue) {
+      var _yield$fetchObjectSch2, objectSchemas;
+      return _regenerator.default.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            _context.next = 2;
+            _context2.next = 2;
             return fetchObjectSchemas(inputValue);
           case 2:
-            objectSchemas = _context.sent;
-            options = objectSchemas ? objectSchemas.map(function (objectSchema) {
-              return (0, _utils.objectSchemaToSelectOption)(objectSchema);
-            }) : [];
-            return _context.abrupt("return", options);
+            _yield$fetchObjectSch2 = _context2.sent;
+            objectSchemas = _yield$fetchObjectSch2.objectSchemas;
+            return _context2.abrupt("return", mapObjectSchemasToOptions(objectSchemas));
           case 5:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function loadOptions(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var debouncedLoadOptions = (0, _debouncePromise.default)(loadOptions, SEARCH_DEBOUNCE_MS);
@@ -82,23 +128,22 @@ var AssetsObjectSchemaSelect = exports.AssetsObjectSchemaSelect = function Asset
     }
     return undefined;
   };
-  return (0, _react.jsx)(_styled.FieldContainer, null, (0, _react.jsx)(_form.Field, {
+  return (0, _react2.jsx)(_styled.FieldContainer, null, (0, _react2.jsx)(_form.Field, {
     name: _types.objectSchemaKey,
     defaultValue: selectedObjectSchema,
     validate: function validate(value) {
       return validateSchema(value);
     }
-  }, function (_ref3) {
-    var _ref3$fieldProps = _ref3.fieldProps,
-      _onChange = _ref3$fieldProps.onChange,
-      onFocus = _ref3$fieldProps.onFocus,
-      restFieldProps = (0, _objectWithoutProperties2.default)(_ref3$fieldProps, _excluded);
-    return (0, _react.jsx)(_select.AsyncSelect, (0, _extends2.default)({
+  }, function (_ref4) {
+    var _ref4$fieldProps = _ref4.fieldProps,
+      _onChange = _ref4$fieldProps.onChange,
+      onFocus = _ref4$fieldProps.onFocus,
+      restFieldProps = (0, _objectWithoutProperties2.default)(_ref4$fieldProps, _excluded);
+    return (0, _react2.jsx)(_select.AsyncSelect, (0, _extends2.default)({
       autoFocus: true,
       classNamePrefix: classNamePrefix,
       isLoading: objectSchemasLoading,
-      defaultOptions: true // setting to true causes the loadOptions to be called on mount
-      ,
+      defaultOptions: defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : [],
       isSearchable: true,
       loadOptions: debouncedLoadOptions,
       placeholder: formatMessage(_messages.objectSchemaSelectMessages.placeholder),

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

@@ -1,9 +1,11 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.buildJQL = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jqlAst = require("@atlaskit/jql-ast");
 var fuzzySearchRegExp = /^"(.+)"$/;
 var jiraIssueKeyRegExp = /[A-Z]+-\d+/;
@@ -21,7 +23,8 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
     _input$orderDirection = input.orderDirection,
     orderDirection = _input$orderDirection === void 0 ? _jqlAst.ORDER_BY_DIRECTION_DESC : _input$orderDirection,
     _input$orderKey = input.orderKey,
-    orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey;
+    orderKey = _input$orderKey === void 0 ? 'created' : _input$orderKey,
+    filterValues = input.filterValues;
   var trimmedRawSearch = rawSearch.trim();
   if (!query) {
     return '';
@@ -38,12 +41,29 @@ var buildJQL = exports.buildJQL = function buildJQL(input) {
     }
     var orClause = _jqlAst.creators.compoundClause(_jqlAst.creators.compoundOperator(_jqlAst.COMPOUND_OPERATOR_OR), orClauseFields);
     query.appendClause(orClause, _jqlAst.COMPOUND_OPERATOR_AND);
-  } else {
+  }
+  if (filterValues) {
+    Object.entries(filterValues).forEach(function (_ref) {
+      var _ref2 = (0, _slicedToArray2.default)(_ref, 2),
+        key = _ref2[0],
+        filterFieldValues = _ref2[1];
+      if (!key || filterFieldValues.length === 0) {
+        return;
+      }
+      var filterInClause = _jqlAst.creators.terminalClause(_jqlAst.creators.field(key), _jqlAst.creators.operator(_jqlAst.OPERATOR_IN), _jqlAst.creators.listOperand(filterFieldValues.map(function (filterFieldValue) {
+        return _jqlAst.creators.valueOperand(filterFieldValue.value);
+      })));
+      query.appendClause(filterInClause, _jqlAst.COMPOUND_OPERATOR_AND);
+    });
+  }
+  if (!trimmedRawSearch) {
     var created = constructTerminalClause('created', _jqlAst.OPERATOR_GT_EQUALS, '-30d');
     query.appendClause(created, _jqlAst.COMPOUND_OPERATOR_AND);
   }
   var orderField = _jqlAst.creators.orderByField(_jqlAst.creators.field(orderKey));
   query.prependOrderField(orderField);
   query.setOrderDirection(_jqlAst.creators.orderByDirection(orderDirection.toLowerCase() === 'asc' ? _jqlAst.ORDER_BY_DIRECTION_ASC : _jqlAst.ORDER_BY_DIRECTION_DESC));
-  return (0, _jqlAst.print)(jast);
+  return (0, _jqlAst.print)(jast, {
+    printWidth: null // this ensures jql string is not broken to new line
+  });
 };

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

@@ -225,7 +225,8 @@ var PlainJiraIssuesConfigModal = exports.PlainJiraIssuesConfigModal = function P
               });
               setAvailableSites(sortedAvailableSites);
               fireEvent('ui.modal.ready.datasource', {
-                instancesCount: sortedAvailableSites.length
+                instancesCount: sortedAvailableSites.length,
+                schemasCount: null
               });
             case 6:
             case "end":

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/analytics/types.js

@@ -6,6 +6,7 @@ export let DatasourceAction = /*#__PURE__*/function (DatasourceAction) {
   DatasourceAction["QUERY_UPDATED"] = "query updated";
   DatasourceAction["DISPLAY_VIEW_CHANGED"] = "display view changed";
   DatasourceAction["NEXT_PAGE_SCROLLED"] = "next page scrolled";
+  DatasourceAction["SCHEMA_UPDATED"] = "schema updated";
   return DatasourceAction;
 }({});
 export let DatasourceDisplay = /*#__PURE__*/function (DatasourceDisplay) {

package/dist/es2019/hooks/useObjectSchemas.js

@@ -3,15 +3,19 @@ import { fetchObjectSchemas } from '../services/cmdbService';
 export const useObjectSchemas = workspaceId => {
   const [loading, setLoading] = useState(false);
   const [objectSchemas, setObjectSchemas] = useState();
+  const [totalObjectSchemas, setTotalObjectSchemas] = useState();
   const [error, setError] = useState();
   const request = useCallback(async query => {
     setLoading(true);
     setError(undefined);
     let fetchedObjectSchemas;
+    let fetchTotalObjectSchemas;
     try {
       const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId, query);
       setObjectSchemas(fetchedObjectSchemasResponse.values);
+      setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
       fetchedObjectSchemas = fetchedObjectSchemasResponse.values;
+      fetchTotalObjectSchemas = fetchedObjectSchemasResponse.total;
     } catch (err) {
       if (err instanceof Error) {
         setError(err);
@@ -21,12 +25,16 @@ export const useObjectSchemas = workspaceId => {
     } finally {
       setLoading(false);
     }
-    return fetchedObjectSchemas;
+    return {
+      objectSchemas: fetchedObjectSchemas,
+      totalObjectSchemas: fetchTotalObjectSchemas
+    };
   }, [workspaceId]);
   return {
     objectSchemasLoading: loading,
     objectSchemasError: error,
     objectSchemas,
+    totalObjectSchemas,
     fetchObjectSchemas: request
   };
 };