@atlaskit/link-datasource 1.10.2 → 1.11.0

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

@@ -1,19 +1,25 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
-import _regeneratorRuntime from "@babel/runtime/regenerator";
 /** @jsx jsx */
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage } from 'react-intl-next';
+import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import { IntlMessagesProvider } from '@atlaskit/intl-messages-provider';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
-import { useDatasourceAnalyticsEvents } from '../../../analytics';
+import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
+import { packageMetaData } from '../../../analytics/constants';
+import { DatasourceAction, DatasourceDisplay, DatasourceSearchMethod } from '../../../analytics/types';
+import { startUfoExperience } from '../../../analytics/ufoExperiences';
+import { useColumnPickerRenderedFailedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useColumnPickerRenderedFailedUfoExperience';
+import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/hooks/useDataRenderedUfoExperience';
 import { fetchMessagesForLocale } from '../../../common/utils/locale/fetch-messages-for-locale';
 import { useAssetsClient } from '../../../hooks/useAssetsClient';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
@@ -53,6 +59,8 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     setIsNewSearch = _useState8[1];
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+  var _useRef = useRef(uuidv4()),
+    modalRenderInstanceId = _useRef.current;
 
   // If a workspaceError occurs this is a critical error
   var _useAssetsClient = useAssetsClient(initialParameters),
@@ -80,13 +88,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 = useRef(0);
+  var userInteractionActions = useRef(new Set());
+  var visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
+  var isDataReady = (visibleColumnKeys || []).length > 0;
+  var analyticsPayload = useMemo(function () {
+    return {
+      extensionKey: extensionKey,
+      destinationObjectTypes: destinationObjectTypes
+    };
+  }, [destinationObjectTypes, extensionKey]);
+  useEffect(function () {
+    fireEvent('screen.datasourceModalDialog.viewed', {});
+  }, [fireEvent]);
+  var fireTableViewedEvent = useCallback(function () {
+    if (isDataReady) {
+      fireEvent('ui.table.viewed.datasourceConfigModal', _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        totalItemCount: totalCount || 0,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        displayedColumnCount: visibleColumnCount.current
+      }));
+    }
+  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  useEffect(function () {
+    var isResolved = status === 'resolved';
+    if (!isResolved || !totalCount) {
+      return;
+    }
+    if (totalCount > 1) {
+      fireTableViewedEvent();
+    }
+  }, [fireTableViewedEvent, status, totalCount]);
+  useEffect(function () {
+    var shouldStartUfoExperience = status === 'loading';
+    if (shouldStartUfoExperience) {
+      startUfoExperience({
+        name: 'datasource-rendered'
+      }, modalRenderInstanceId);
+    }
+  }, [modalRenderInstanceId, status]);
+  useDataRenderedUfoExperience({
+    status: status,
+    experienceId: modalRenderInstanceId,
+    itemCount: responseItems.length,
+    canBeLink: false,
+    extensionKey: extensionKey
+  });
+  useColumnPickerRenderedFailedUfoExperience(status, modalRenderInstanceId);
+  /* ------------------------------ END OBSERVABILITY ------------------------------ */
+
   var onVisibleColumnKeysChange = useCallback(function (visibleColumnKeys) {
     setVisibleColumnKeys(visibleColumnKeys);
     setIsNewSearch(false);
   }, []);
   useEffect(function () {
     var newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(function () {
@@ -94,10 +158,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  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 = useCallback(function () {
     var _data$key;
     var _responseItems = _slicedToArray(responseItems, 1),
@@ -105,10 +166,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 = useCallback(function () {
+  var onInsertPressed = 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: DatasourceDisplay.DATASOURCE_TABLE,
+        searchCount: searchCount.current,
+        searchMethod: DatasourceSearchMethod.DATASOURCE_SEARCH_QUERY,
+        actions: Array.from(userInteractionActions.current)
+      }),
+      eventType: 'ui'
+    });
+    var consumerEvent = (_insertButtonClickedE = insertButtonClickedEvent.clone()) !== null && _insertButtonClickedE !== void 0 ? _insertButtonClickedE : undefined;
+    insertButtonClickedEvent.fire(EVENT_CHANNEL);
     var firstAssetUrl = retrieveUrlForSmartCardRender();
     if (responseItems.length === 1 && firstAssetUrl) {
       onInsert({
@@ -116,7 +192,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         attrs: {
           url: firstAssetUrl
         }
-      });
+      }, consumerEvent);
     } else {
       onInsert({
         type: 'blockCard',
@@ -140,15 +216,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 = useCallback(function (e, analyticEvent) {
+    analyticEvent.update({
+      eventType: 'ui',
+      actionSubjectId: 'cancel',
+      attributes: _objectSpread(_objectSpread({}, analyticsPayload), {}, {
+        searchCount: searchCount.current,
+        actions: Array.from(userInteractionActions.current)
+      })
+    }).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) {
+              searchCount.current++;
+              if (schemaId !== searchSchemaId) {
+                userInteractionActions.current.add(DatasourceAction.SCHEMA_UPDATED);
+              }
+              if (aql !== searchAql) {
+                userInteractionActions.current.add(DatasourceAction.QUERY_UPDATED);
+              }
               reset({
                 shouldResetColumns: true
               });
@@ -210,10 +304,11 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     hasNextPage: hasNextPage,
     loadDatasourceDetails: loadDatasourceDetails,
     columns: columns,
-    defaultVisibleColumnKeys: defaultVisibleColumnKeys
+    defaultVisibleColumnKeys: defaultVisibleColumnKeys,
+    modalRenderInstanceId: modalRenderInstanceId
   }))), jsx(ModalFooter, null, jsx(Button, {
     appearance: "default",
-    onClick: onCancel,
+    onClick: onCancelClick,
     testId: 'asset-datasource-modal--cancel-button'
   }, jsx(FormattedMessage, modalMessages.cancelButtonText)), jsx(Button, {
     appearance: "primary",
@@ -229,11 +324,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
 var analyticsContextAttributes = {
   dataProvider: 'jsm-assets'
 };
-var analyticsContextData = {
-  packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.10.2",
+var analyticsContextData = _objectSpread(_objectSpread({}, packageMetaData), {}, {
   source: 'datasourceConfigModal'
-};
+});
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {
   attributes: _objectSpread({}, analyticsContextAttributes)
 });

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

@@ -12,7 +12,8 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
     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 = useMemo(function () {
     return /*#__PURE__*/React.createElement(IssueLikeDataTableView, {
@@ -24,9 +25,10 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
       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.createElement(ModalLoadingError, null);
   } else if (status === 'empty') {

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

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/extends";
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import Form from '@atlaskit/form';
+import { useDatasourceAnalyticsEvents } from '../../../analytics';
 import { AqlSearchInput } from './aql-search-input';
 import { AssetsObjectSchemaSelect } from './object-schema-select';
 import { FormContainer, FormRowContainer, SchemaSelectContainer } from './styled';
@@ -13,10 +14,13 @@ export var AssetsSearchContainer = function AssetsSearchContainer(props) {
     initialSearchData = props.initialSearchData,
     modalTitle = props.modalTitle,
     isSearching = props.isSearching;
+  var _useDatasourceAnalyti = 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/esm/ui/assets-modal/search-container/object-schema-select/index.js

@@ -1,6 +1,7 @@
 import _extends from "@babel/runtime/helpers/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 var _excluded = ["onChange", "onFocus"];
 import _regeneratorRuntime from "@babel/runtime/regenerator";
@@ -8,18 +9,25 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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 */
 
+import { useEffect, useState } from 'react';
 import { jsx } from '@emotion/react';
 import debounce from 'debounce-promise';
 import { useIntl } from 'react-intl-next';
 import { Field } from '@atlaskit/form';
 import { AsyncSelect } from '@atlaskit/select';
 import { layers } from '@atlaskit/theme/constants';
+import { useDatasourceAnalyticsEvents } from '../../../../analytics';
 import { useObjectSchemas } from '../../../../hooks/useObjectSchemas';
 import { objectSchemaKey } from '../../../../types/assets/types';
 import { FieldContainer } from '../styled';
 import { objectSchemaSelectMessages } from './messages';
 import { objectSchemaToSelectOption } from './utils';
 export var SEARCH_DEBOUNCE_MS = 350;
+var mapObjectSchemasToOptions = function mapObjectSchemasToOptions(objectSchemas) {
+  return objectSchemas ? objectSchemas.map(function (objectSchema) {
+    return objectSchemaToSelectOption(objectSchema);
+  }) : [];
+};
 
 /**
  * Rendering a `<Select>` in a `<Modal>` results in the select options getting cut off by the bottom of the modal and
@@ -40,34 +48,72 @@ export var AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref) {
     workspaceId = _ref.workspaceId,
     _ref$classNamePrefix = _ref.classNamePrefix,
     classNamePrefix = _ref$classNamePrefix === void 0 ? 'assets-datasource-modal--object-schema-select' : _ref$classNamePrefix;
+  var _useState = useState(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    defaultOptions = _useState2[0],
+    setDefaultOptions = _useState2[1];
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useIntl = useIntl(),
     formatMessage = _useIntl.formatMessage;
   var _useObjectSchemas = useObjectSchemas(workspaceId),
     fetchObjectSchemas = _useObjectSchemas.fetchObjectSchemas,
     objectSchemasLoading = _useObjectSchemas.objectSchemasLoading;
   var selectedObjectSchema = value ? objectSchemaToSelectOption(value) : undefined;
+  useEffect(function () {
+    var fetchInitialData = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+        var _yield$fetchObjectSch, objectSchemas, totalObjectSchemas;
+        return _regeneratorRuntime.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 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(inputValue) {
-      var objectSchemas, options;
-      return _regeneratorRuntime.wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(inputValue) {
+      var _yield$fetchObjectSch2, objectSchemas;
+      return _regeneratorRuntime.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 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 = debounce(loadOptions, SEARCH_DEBOUNCE_MS);
@@ -83,17 +129,16 @@ export var AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref) {
     validate: function validate(value) {
       return validateSchema(value);
     }
-  }, function (_ref3) {
-    var _ref3$fieldProps = _ref3.fieldProps,
-      _onChange = _ref3$fieldProps.onChange,
-      onFocus = _ref3$fieldProps.onFocus,
-      restFieldProps = _objectWithoutProperties(_ref3$fieldProps, _excluded);
+  }, function (_ref4) {
+    var _ref4$fieldProps = _ref4.fieldProps,
+      _onChange = _ref4$fieldProps.onChange,
+      onFocus = _ref4$fieldProps.onFocus,
+      restFieldProps = _objectWithoutProperties(_ref4$fieldProps, _excluded);
     return jsx(AsyncSelect, _extends({
       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(objectSchemaSelectMessages.placeholder),

package/dist/esm/ui/issue-like-table/render-type/link/index.js

@@ -39,8 +39,13 @@ var LinkRenderType = function LinkRenderType(_ref) {
     }, text || url));
   }, [linkStyle, url, text, testId]);
   var SmartCard = function SmartCard() {
+    var handleClick = function handleClick(e) {
+      e.preventDefault();
+      window.open(url, '_blank', 'noopener, noreferrer');
+    };
     return /*#__PURE__*/React.createElement(Card, {
       appearance: "inline",
+      onClick: handleClick,
       url: url,
       testId: testId,
       fallbackComponent: function fallbackComponent() {

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

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

package/dist/types/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::24da75a4acd4c592c9cfed50e9897853>>
+ * @codegen <<SignedSource::7e783b41141644b6a0df41de5ab456df>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -18,7 +18,8 @@ export type AnalyticsContextAttributesType = {
 };
 export type DatasourceModalDialogViewedAttributesType = {};
 export type ModalReadyDatasourceAttributesType = {
-    instancesCount: number;
+    instancesCount: number | null;
+    schemasCount: number | null;
 };
 export type JqlEditorSearchedAttributesType = {};
 export type FormSubmittedBasicSearchAttributesType = {};
@@ -81,6 +82,7 @@ export type LinkViewedCountAttributesType = {
     totalItemCount: number;
     extensionKey: string | null;
 };
+export type AqlEditorSearchedAttributesType = {};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -130,5 +132,8 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the datasource results are displayed as link( smart-link) in count mode. */
     'ui.link.viewed.count': LinkViewedCountAttributesType;
+    /**
+     * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
+    'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types/analytics/types.d.ts

@@ -5,7 +5,8 @@ export declare enum DatasourceAction {
     INSTANCE_UPDATED = "instance updated",
     QUERY_UPDATED = "query updated",
     DISPLAY_VIEW_CHANGED = "display view changed",
-    NEXT_PAGE_SCROLLED = "next page scrolled"
+    NEXT_PAGE_SCROLLED = "next page scrolled",
+    SCHEMA_UPDATED = "schema updated"
 }
 export declare enum DatasourceDisplay {
     DATASOURCE_TABLE = "datasource_table",

package/dist/types/hooks/useObjectSchemas.d.ts

@@ -1,8 +1,10 @@
 import { ObjectSchema } from '../types/assets/types';
+export type FetchObjectSchemasDetails = Pick<UseObjectSchemasState, 'objectSchemas' | 'totalObjectSchemas'>;
 export type UseObjectSchemasState = {
     objectSchemasLoading: boolean;
     objectSchemasError: Error | undefined;
     objectSchemas: ObjectSchema[] | undefined;
-    fetchObjectSchemas: (query: string) => Promise<ObjectSchema[] | undefined>;
+    totalObjectSchemas: number | undefined;
+    fetchObjectSchemas: (query: string) => Promise<FetchObjectSchemasDetails>;
 };
 export declare const useObjectSchemas: (workspaceId: string) => UseObjectSchemasState;

package/dist/types/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -13,5 +13,6 @@ export interface RenderAssetsContentProps {
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
+    modalRenderInstanceId: string;
 }
 export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => JSX.Element;

package/dist/types/ui/assets-modal/search-container/index.d.ts

@@ -2,7 +2,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import type { ObjectSchema } from '../../../types/assets/types';
-type InitialSearchData = {
+export type InitialSearchData = {
     objectSchema?: ObjectSchema;
     aql?: string;
 };
@@ -14,4 +14,3 @@ export interface SearchContainerProps {
     isSearching: boolean;
 }
 export declare const AssetsSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;
-export {};

package/dist/types/ui/assets-modal/types.d.ts

@@ -1,3 +1,4 @@
+import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { DatasourceAdf, DatasourceAdfView, InlineCardAdf } from '@atlaskit/linking-common/types';
 export interface AssetsDatasourceParameters {
     workspaceId: string;
@@ -19,5 +20,5 @@ export interface AssetsConfigModalProps {
     visibleColumnKeys?: string[];
     parameters?: AssetsDatasourceParameters;
     onCancel: () => void;
-    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf) => void;
+    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
 }

package/dist/types-ts4.5/analytics/generated/analytics.types.d.ts

@@ -3,7 +3,7 @@
  *
  * Generates Typescript types for analytics events from analytics.spec.yaml
  *
- * @codegen <<SignedSource::24da75a4acd4c592c9cfed50e9897853>>
+ * @codegen <<SignedSource::7e783b41141644b6a0df41de5ab456df>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -18,7 +18,8 @@ export type AnalyticsContextAttributesType = {
 };
 export type DatasourceModalDialogViewedAttributesType = {};
 export type ModalReadyDatasourceAttributesType = {
-    instancesCount: number;
+    instancesCount: number | null;
+    schemasCount: number | null;
 };
 export type JqlEditorSearchedAttributesType = {};
 export type FormSubmittedBasicSearchAttributesType = {};
@@ -81,6 +82,7 @@ export type LinkViewedCountAttributesType = {
     totalItemCount: number;
     extensionKey: string | null;
 };
+export type AqlEditorSearchedAttributesType = {};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -130,5 +132,8 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when the datasource results are displayed as link( smart-link) in count mode. */
     'ui.link.viewed.count': LinkViewedCountAttributesType;
+    /**
+     * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
+    'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types-ts4.5/analytics/types.d.ts

@@ -5,7 +5,8 @@ export declare enum DatasourceAction {
     INSTANCE_UPDATED = "instance updated",
     QUERY_UPDATED = "query updated",
     DISPLAY_VIEW_CHANGED = "display view changed",
-    NEXT_PAGE_SCROLLED = "next page scrolled"
+    NEXT_PAGE_SCROLLED = "next page scrolled",
+    SCHEMA_UPDATED = "schema updated"
 }
 export declare enum DatasourceDisplay {
     DATASOURCE_TABLE = "datasource_table",

package/dist/types-ts4.5/hooks/useObjectSchemas.d.ts

@@ -1,8 +1,10 @@
 import { ObjectSchema } from '../types/assets/types';
+export type FetchObjectSchemasDetails = Pick<UseObjectSchemasState, 'objectSchemas' | 'totalObjectSchemas'>;
 export type UseObjectSchemasState = {
     objectSchemasLoading: boolean;
     objectSchemasError: Error | undefined;
     objectSchemas: ObjectSchema[] | undefined;
-    fetchObjectSchemas: (query: string) => Promise<ObjectSchema[] | undefined>;
+    totalObjectSchemas: number | undefined;
+    fetchObjectSchemas: (query: string) => Promise<FetchObjectSchemasDetails>;
 };
 export declare const useObjectSchemas: (workspaceId: string) => UseObjectSchemasState;

package/dist/types-ts4.5/ui/assets-modal/modal/render-assets-content/index.d.ts

@@ -13,5 +13,6 @@ export interface RenderAssetsContentProps {
     columns: DatasourceResponseSchemaProperty[];
     defaultVisibleColumnKeys: string[];
     onVisibleColumnKeysChange: (visibleColumnKeys: string[]) => void;
+    modalRenderInstanceId: string;
 }
 export declare const RenderAssetsContent: (props: RenderAssetsContentProps) => JSX.Element;

package/dist/types-ts4.5/ui/assets-modal/search-container/index.d.ts

@@ -2,7 +2,7 @@
 /** @jsx jsx */
 import { jsx } from '@emotion/react';
 import type { ObjectSchema } from '../../../types/assets/types';
-type InitialSearchData = {
+export type InitialSearchData = {
     objectSchema?: ObjectSchema;
     aql?: string;
 };
@@ -14,4 +14,3 @@ export interface SearchContainerProps {
     isSearching: boolean;
 }
 export declare const AssetsSearchContainer: (props: SearchContainerProps) => jsx.JSX.Element;
-export {};

package/dist/types-ts4.5/ui/assets-modal/types.d.ts

@@ -1,3 +1,4 @@
+import type { UIAnalyticsEvent } from '@atlaskit/analytics-next';
 import { DatasourceAdf, DatasourceAdfView, InlineCardAdf } from '@atlaskit/linking-common/types';
 export interface AssetsDatasourceParameters {
     workspaceId: string;
@@ -19,5 +20,5 @@ export interface AssetsConfigModalProps {
     visibleColumnKeys?: string[];
     parameters?: AssetsDatasourceParameters;
     onCancel: () => void;
-    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf) => void;
+    onInsert: (adf: InlineCardAdf | AssetsDatasourceAdf, analyticsEvent?: UIAnalyticsEvent) => void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.10.2",
+  "version": "1.11.0",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -45,7 +45,7 @@
     "@atlaskit/jql-ast": "^3.0.0",
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
-    "@atlaskit/linking-common": "^4.12.0",
+    "@atlaskit/linking-common": "^4.13.0",
     "@atlaskit/linking-types": "^8.4.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.8.0",
@@ -56,7 +56,7 @@
     "@atlaskit/pragmatic-drag-and-drop-react-indicator": "^0.16.0",
     "@atlaskit/primitives": "^1.8.0",
     "@atlaskit/select": "^16.7.0",
-    "@atlaskit/smart-card": "^26.40.0",
+    "@atlaskit/smart-card": "^26.41.0",
     "@atlaskit/spinner": "^15.6.0",
     "@atlaskit/tag": "^11.6.0",
     "@atlaskit/textfield": "5.6.8",