@atlaskit/link-datasource 1.2.0 → 1.2.2

package/dist/es2019/analytics/ufoExperiences/useDataRenderedUfoExperience.js

@@ -0,0 +1,46 @@
+import { useEffect } from 'react';
+import { addMetadataToExperience, failUfoExperience, succeedUfoExperience } from './index';
+/**
+ * Hook to mark DataRendered UFO experience as either Success or Failure
+ * 1. Success when
+ *    * its rendered as a link
+ *    * it returns empty results
+ *    * the request is unauthorized
+ * 2. Fail when
+ *    * request is rejected
+ *
+ * Note:
+ *    * When the request is resolved as a datasource table, it will be marked success in the table component, every other success case is marked by this hook
+ */
+export const useDataRenderedUfoExperience = ({
+  status,
+  experienceId,
+  itemCount,
+  canBeLink,
+  extensionKey
+}) => {
+  useEffect(() => {
+    const isEmptyResult = status === 'resolved' && itemCount === 0;
+    const isLink = status === 'resolved' && (itemCount === 1 || canBeLink); // this will take care of count-mode/single-item smart-link rendering
+    const isUnauthorized = status === 'unauthorized';
+    const shouldSucceedUfoExperience = isEmptyResult || isLink || isUnauthorized;
+    const shouldFailUfoExperience = status === 'rejected';
+    if (extensionKey) {
+      addMetadataToExperience({
+        name: 'datasource-rendered',
+        metadata: {
+          extensionKey
+        }
+      }, experienceId);
+    }
+    if (shouldFailUfoExperience) {
+      failUfoExperience({
+        name: 'datasource-rendered'
+      }, experienceId);
+    } else if (shouldSucceedUfoExperience) {
+      succeedUfoExperience({
+        name: 'datasource-rendered'
+      }, experienceId);
+    }
+  }, [canBeLink, experienceId, extensionKey, itemCount, status]);
+};

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -31,9 +31,7 @@ export const useDatasourceTableState = ({
     try {
       const {
         meta: {
-          access,
-          destinationObjectTypes,
-          extensionKey
+          access
         },
         data: {
           schema
@@ -45,8 +43,6 @@ export const useDatasourceTableState = ({
         setStatus('unauthorized');
         return;
       }
-      setExtensionKey(extensionKey);
-      setDestinationObjectTypes(destinationObjectTypes);
       const isColumnNotPresentInCurrentColumnsList = col => !columns.find(column => column.key === col.key);
       const allColumns = schema.properties;
       const newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
@@ -118,7 +114,6 @@ export const useDatasourceTableState = ({
         }
         return [...currentResponseItems, ...items];
       });
-      setStatus('resolved');
       setHasNextPage(Boolean(nextPageCursor));
       if (fieldKeys.length > 0) {
         setLastRequestedFieldKeys(fieldKeys);
@@ -136,6 +131,7 @@ export const useDatasourceTableState = ({
           loadedItemCount: currentLoadedItemCount + newlyLoadedItemCount
         });
       }
+      setStatus('resolved');
     } catch (e) {
       setStatus('rejected');
     }

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

@@ -205,7 +205,7 @@ const analyticsContextAttributes = {
 };
 const analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.2.0",
+  packageVersion: "1.2.2",
   source: 'datasourceConfigModal'
 };
 const contextData = {

package/dist/es2019/ui/datasource-table-view/datasourceTableView.js

@@ -1,9 +1,12 @@
 /** @jsx jsx */
 import { useCallback, useEffect, useRef } from 'react';
 import { jsx } from '@emotion/react';
+import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import { useDatasourceAnalyticsEvents } from '../../analytics';
 import { packageMetaData } from '../../analytics/constants';
+import { startUfoExperience } from '../../analytics/ufoExperiences';
+import { useDataRenderedUfoExperience } from '../../analytics/ufoExperiences/useDataRenderedUfoExperience';
 import { useDatasourceTableState } from '../../hooks/useDatasourceTableState';
 import { AccessRequired } from '../common/error-state/access-required';
 import { LoadingError } from '../common/error-state/loading-error';
@@ -37,6 +40,9 @@ const DatasourceTableViewWithoutAnalytics = ({
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
+  const {
+    current: tableRenderInstanceId
+  } = useRef(uuidv4());
 
   /*  Need this to make sure that the datasource in the editor gets updated new info if any edits are made in the modal
       But we don't want to call it on initial load. This screws up useDatasourceTableState's internal
@@ -54,6 +60,20 @@ const DatasourceTableViewWithoutAnalytics = ({
       onVisibleColumnKeysChange(defaultVisibleColumnKeys);
     }
   }, [visibleColumnKeys, defaultVisibleColumnKeys, onVisibleColumnKeysChange]);
+  useEffect(() => {
+    const shouldStartUfoExperience = datasourceId && parameters && visibleColumnKeys && status === 'loading';
+    if (shouldStartUfoExperience) {
+      startUfoExperience({
+        name: 'datasource-rendered'
+      }, tableRenderInstanceId);
+    }
+  }, [datasourceId, parameters, status, tableRenderInstanceId, visibleColumnKeys]);
+  useDataRenderedUfoExperience({
+    status,
+    experienceId: tableRenderInstanceId,
+    itemCount: responseItems.length,
+    extensionKey
+  });
   const forcedReset = useCallback(() => {
     fireEvent('ui.button.clicked.sync', {
       extensionKey,
@@ -91,7 +111,8 @@ const DatasourceTableViewWithoutAnalytics = ({
       columns: columns,
       visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
       onVisibleColumnKeysChange: onVisibleColumnKeysChange,
-      scrollableContainerHeight: 590
+      scrollableContainerHeight: 590,
+      parentContainerRenderInstanceId: tableRenderInstanceId
     }) : jsx(EmptyState, {
       testId: "datasource-table-view-skeleton",
       isCompact: true,

package/dist/es2019/ui/issue-like-table/index.js

@@ -12,6 +12,7 @@ import { monitorForElements } from '@atlaskit/pragmatic-drag-and-drop/adapter/el
 import { combine } from '@atlaskit/pragmatic-drag-and-drop/util/combine';
 import { N40 } from '@atlaskit/theme/colors';
 import Tooltip from '@atlaskit/tooltip';
+import { succeedUfoExperience } from '../../analytics/ufoExperiences';
 import { ColumnPicker } from './column-picker';
 import { DragColumnPreview } from './drag-column-preview';
 import { DraggableTableHeading } from './draggable-table-heading';
@@ -123,7 +124,8 @@ export const IssueLikeDataTableView = ({
   onVisibleColumnKeysChange,
   status,
   hasNextPage,
-  scrollableContainerHeight
+  scrollableContainerHeight,
+  parentContainerRenderInstanceId
 }) => {
   const tableId = useMemo(() => Symbol('unique-id'), []);
   const [lastRowElement, setLastRowElement] = useState(null);
@@ -134,6 +136,13 @@ export const IssueLikeDataTableView = ({
   useEffect(() => {
     setOrderedColumns(orderColumns([...columns], [...visibleColumnKeys]));
   }, [columns, visibleColumnKeys]);
+  useEffect(() => {
+    if (parentContainerRenderInstanceId && status === 'resolved') {
+      succeedUfoExperience({
+        name: 'datasource-rendered'
+      }, parentContainerRenderInstanceId);
+    }
+  }, [parentContainerRenderInstanceId, status]);
   const visibleSortedColumns = useMemo(() => visibleColumnKeys.map(visibleKey => orderedColumns.find(({
     key
   }) => visibleKey === key)).filter(Boolean), [orderedColumns, visibleColumnKeys]);

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

@@ -3,6 +3,7 @@ import _extends from "@babel/runtime/helpers/extends";
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { css, jsx } from '@emotion/react';
 import { FormattedMessage, FormattedNumber, useIntl } from 'react-intl-next';
+import { v4 as uuidv4 } from 'uuid';
 import { withAnalyticsContext } from '@atlaskit/analytics-next';
 import Button from '@atlaskit/button/standard-button';
 import Modal, { ModalBody, ModalFooter, ModalHeader, ModalTitle, ModalTransition } from '@atlaskit/modal-dialog';
@@ -10,6 +11,8 @@ import { B400, N0, N40, N800 } from '@atlaskit/theme/colors';
 import { EVENT_CHANNEL, useDatasourceAnalyticsEvents } from '../../../analytics';
 import { packageMetaData } from '../../../analytics/constants';
 import { DatasourceAction, DatasourceDisplay } from '../../../analytics/types';
+import { startUfoExperience } from '../../../analytics/ufoExperiences';
+import { useDataRenderedUfoExperience } from '../../../analytics/ufoExperiences/useDataRenderedUfoExperience';
 import { mapSearchMethod } from '../../../analytics/utils';
 import { useDatasourceTableState } from '../../../hooks/useDatasourceTableState';
 import { getAvailableJiraSites } from '../../../services/getAvailableJiraSites';
@@ -88,6 +91,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const searchCount = useRef(0);
   const userInteractionActions = useRef(new Set());
   const lastSearchMethodRef = useRef(null);
+  const visibleColumnCount = useRef((visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0);
   const parameters = useMemo(() => !!cloudId ? {
     cloudId,
     jql: jql || ''
@@ -116,6 +120,9 @@ export const PlainJiraIssuesConfigModal = props => {
   const {
     fireEvent
   } = useDatasourceAnalyticsEvents();
+  const {
+    current: modalRenderInstanceId
+  } = useRef(uuidv4());
   const selectedJiraSite = useMemo(() => {
     if (cloudId) {
       // if the cloud id we're editing isn't in available sites then user is likely unauthorized for that site
@@ -126,7 +133,7 @@ export const PlainJiraIssuesConfigModal = props => {
       return availableSites.find(jiraSite => jiraSite.url === currentlyLoggedInSiteUrl) || availableSites[0];
     }
   }, [availableSites, cloudId]);
-  const buttonClickedAnalyticsPayload = useMemo(() => {
+  const analyticsPayload = useMemo(() => {
     return {
       extensionKey: extensionKey,
       destinationObjectTypes: destinationObjectTypes
@@ -136,11 +143,28 @@ export const PlainJiraIssuesConfigModal = props => {
   const jqlUrl = selectedJiraSite && jql && `${selectedJiraSite.url}/issues/?jql=${encodeURI(jql)}`;
   const isInsertDisabled = !isParametersSet || status === 'rejected' || status === 'unauthorized' || status === 'loading' || resolvedWithNoResults;
   const shouldShowIssueCount = !!totalCount && totalCount !== 1 && currentViewMode === 'issue';
+  const isDataReady = (visibleColumnKeys || []).length > 0;
+  useEffect(() => {
+    const shouldStartUfoExperience = status === 'loading';
+    if (shouldStartUfoExperience) {
+      startUfoExperience({
+        name: 'datasource-rendered'
+      }, modalRenderInstanceId);
+    }
+  }, [modalRenderInstanceId, status]);
+  useDataRenderedUfoExperience({
+    status,
+    experienceId: modalRenderInstanceId,
+    itemCount: responseItems.length,
+    canBeLink: currentViewMode === 'count',
+    extensionKey
+  });
   useEffect(() => {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
   useEffect(() => {
     const newVisibleColumnKeys = !initialVisibleColumnKeys || (initialVisibleColumnKeys || []).length === 0 ? defaultVisibleColumnKeys : initialVisibleColumnKeys;
+    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [initialVisibleColumnKeys, defaultVisibleColumnKeys]);
   useEffect(() => {
@@ -160,31 +184,50 @@ export const PlainJiraIssuesConfigModal = props => {
   }, [cloudId, selectedJiraSite]);
   const fireSingleItemViewedEvent = useCallback(() => {
     fireEvent('ui.link.viewed.singleItem', {
-      destinationObjectTypes: destinationObjectTypes,
-      searchMethod: mapSearchMethod(lastSearchMethodRef.current),
-      extensionKey: extensionKey
+      ...analyticsPayload,
+      searchMethod: mapSearchMethod(lastSearchMethodRef.current)
     });
-  }, [extensionKey, fireEvent, destinationObjectTypes]);
+  }, [analyticsPayload, fireEvent]);
   const fireCountViewedEvent = useCallback(() => {
     fireEvent('ui.link.viewed.count', {
-      destinationObjectTypes: destinationObjectTypes,
+      ...analyticsPayload,
       searchMethod: mapSearchMethod(lastSearchMethodRef.current),
-      extensionKey: extensionKey,
       totalItemCount: totalCount || 0
     });
-  }, [extensionKey, fireEvent, totalCount, destinationObjectTypes]);
+  }, [analyticsPayload, fireEvent, totalCount]);
+  const fireTableViewedEvent = useCallback(() => {
+    if (isDataReady) {
+      fireEvent('ui.table.viewed.datasourceConfigModal', {
+        ...analyticsPayload,
+        totalItemCount: totalCount || 0,
+        searchMethod: mapSearchMethod(lastSearchMethodRef.current),
+        displayedColumnCount: visibleColumnCount.current
+      });
+    }
+  }, [analyticsPayload, fireEvent, totalCount, isDataReady]);
+  const fireIssueViewAnalytics = useCallback(() => {
+    if (!totalCount) {
+      return;
+    }
+    if (totalCount > 1) {
+      fireTableViewedEvent();
+    } else if (totalCount === 1) {
+      fireSingleItemViewedEvent();
+    }
+  }, [fireSingleItemViewedEvent, fireTableViewedEvent, totalCount]);
   useEffect(() => {
     const isResolved = status === 'resolved';
-    const isSingleItemViewed = currentViewMode === 'issue' && totalCount === 1;
-    const isCountViewed = currentViewMode === 'count';
-    if (isResolved) {
-      if (isSingleItemViewed) {
-        fireSingleItemViewedEvent();
-      } else if (isCountViewed && totalCount) {
-        fireCountViewedEvent();
-      }
+    const isIssueViewMode = currentViewMode === 'issue';
+    const isCountViewMode = currentViewMode === 'count';
+    if (!isResolved) {
+      return;
     }
-  }, [currentViewMode, totalCount, status, fireSingleItemViewedEvent, fireCountViewedEvent]);
+    if (isIssueViewMode) {
+      fireIssueViewAnalytics();
+    } else if (isCountViewMode) {
+      fireCountViewedEvent();
+    }
+  }, [currentViewMode, status, fireIssueViewAnalytics, fireCountViewedEvent]);
   const onSearch = useCallback((newParameters, searchMethod) => {
     searchCount.current++;
     lastSearchMethodRef.current = searchMethod;
@@ -201,13 +244,13 @@ export const PlainJiraIssuesConfigModal = props => {
       eventType: 'ui',
       actionSubjectId: 'cancel',
       attributes: {
-        ...buttonClickedAnalyticsPayload,
-        actions: Array.from(userInteractionActions.current),
-        searchCount: searchCount.current
+        ...analyticsPayload,
+        searchCount: searchCount.current,
+        actions: Array.from(userInteractionActions.current)
       }
     }).fire(EVENT_CHANNEL);
     onCancel();
-  }, [buttonClickedAnalyticsPayload, onCancel]);
+  }, [analyticsPayload, onCancel]);
   const onSiteSelection = useCallback(site => {
     userInteractionActions.current.add(DatasourceAction.INSTANCE_UPDATED);
     setCloudId(site.cloudId);
@@ -229,13 +272,13 @@ export const PlainJiraIssuesConfigModal = props => {
     const insertButtonClickedEvent = analyticsEvent.update({
       actionSubjectId: 'insert',
       attributes: {
-        ...buttonClickedAnalyticsPayload,
-        actions: Array.from(userInteractionActions.current),
+        ...analyticsPayload,
         totalItemCount: totalCount || 0,
-        displayedColumnCount: (visibleColumnKeys === null || visibleColumnKeys === void 0 ? void 0 : visibleColumnKeys.length) || 0,
+        displayedColumnCount: visibleColumnCount.current,
         display: getDisplayValue(currentViewMode, totalCount || 0),
         searchCount: searchCount.current,
-        searchMethod: mapSearchMethod(lastSearchMethodRef.current)
+        searchMethod: mapSearchMethod(lastSearchMethodRef.current),
+        actions: Array.from(userInteractionActions.current)
       },
       eventType: 'ui'
     });
@@ -280,7 +323,7 @@ export const PlainJiraIssuesConfigModal = props => {
         }
       }, consumerEvent);
     }
-  }, [isParametersSet, jql, selectedJiraSite, buttonClickedAnalyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, jqlUrl, datasourceId, cloudId]);
+  }, [isParametersSet, jql, selectedJiraSite, analyticsPayload, totalCount, visibleColumnKeys, currentViewMode, retrieveUrlForSmartCardRender, responseItems.length, onInsert, jqlUrl, datasourceId, cloudId]);
   const handleViewModeChange = selectedMode => {
     userInteractionActions.current.add(DatasourceAction.DISPLAY_VIEW_CHANGED);
     setCurrentViewMode(selectedMode);
@@ -292,6 +335,7 @@ export const PlainJiraIssuesConfigModal = props => {
   const handleVisibleColumnKeysChange = useCallback((newVisibleColumnKeys = []) => {
     const columnAction = getColumnAction(visibleColumnKeys || [], newVisibleColumnKeys);
     userInteractionActions.current.add(columnAction);
+    visibleColumnCount.current = newVisibleColumnKeys.length;
     setVisibleColumnKeys(newVisibleColumnKeys);
   }, [visibleColumnKeys]);
   const issueLikeDataTableView = useMemo(() => jsx("div", {
@@ -305,8 +349,9 @@ export const PlainJiraIssuesConfigModal = props => {
     visibleColumnKeys: visibleColumnKeys || defaultVisibleColumnKeys,
     onNextPage: handleOnNextPage,
     onLoadDatasourceDetails: loadDatasourceDetails,
-    onVisibleColumnKeysChange: handleVisibleColumnKeysChange
-  })), [columns, defaultVisibleColumnKeys, hasNextPage, handleVisibleColumnKeysChange, loadDatasourceDetails, handleOnNextPage, responseItems, status, visibleColumnKeys]);
+    onVisibleColumnKeysChange: handleVisibleColumnKeysChange,
+    parentContainerRenderInstanceId: modalRenderInstanceId
+  })), [columns, defaultVisibleColumnKeys, handleOnNextPage, handleVisibleColumnKeysChange, hasNextPage, loadDatasourceDetails, modalRenderInstanceId, responseItems, status, visibleColumnKeys]);
   const renderCountModeContent = useCallback(() => {
     const url = selectedJiraSite === null || selectedJiraSite === void 0 ? void 0 : selectedJiraSite.url;
     if (status === 'unauthorized') {

package/dist/esm/analytics/constants.js

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

package/dist/esm/analytics/ufoExperiences/index.js

@@ -0,0 +1,41 @@
+import { ConcurrentExperience, ExperiencePerformanceTypes, ExperienceTypes } from '@atlaskit/ufo';
+var datasourcePageSegmentLoadExperienceConfig = {
+  platform: {
+    component: 'datasource'
+  },
+  type: ExperienceTypes.Load,
+  performanceType: ExperiencePerformanceTypes.PageSegmentLoad
+};
+var ufoExperiences = {
+  'datasource-rendered': new ConcurrentExperience('datasource-rendered', datasourcePageSegmentLoadExperienceConfig)
+};
+export var startUfoExperience = function startUfoExperience(_ref, id) {
+  var name = _ref.name,
+    metadata = _ref.metadata;
+  var experienceInstance = ufoExperiences[name].getInstance(id);
+  experienceInstance.start();
+  if (metadata) {
+    experienceInstance.addMetadata(metadata);
+  }
+};
+export var succeedUfoExperience = function succeedUfoExperience(_ref2, id) {
+  var name = _ref2.name,
+    metadata = _ref2.metadata;
+  var experienceInstance = ufoExperiences[name].getInstance(id);
+  experienceInstance.success({
+    metadata: metadata
+  });
+};
+export var failUfoExperience = function failUfoExperience(_ref3, id) {
+  var name = _ref3.name,
+    metadata = _ref3.metadata;
+  var experienceInstance = ufoExperiences[name].getInstance(id);
+  experienceInstance.failure({
+    metadata: metadata
+  });
+};
+export var addMetadataToExperience = function addMetadataToExperience(_ref4, id) {
+  var name = _ref4.name,
+    metadata = _ref4.metadata;
+  ufoExperiences[name].getInstance(id).addMetadata(metadata);
+};

package/dist/esm/analytics/ufoExperiences/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/analytics/ufoExperiences/useDataRenderedUfoExperience.js

@@ -0,0 +1,45 @@
+import { useEffect } from 'react';
+import { addMetadataToExperience, failUfoExperience, succeedUfoExperience } from './index';
+/**
+ * Hook to mark DataRendered UFO experience as either Success or Failure
+ * 1. Success when
+ *    * its rendered as a link
+ *    * it returns empty results
+ *    * the request is unauthorized
+ * 2. Fail when
+ *    * request is rejected
+ *
+ * Note:
+ *    * When the request is resolved as a datasource table, it will be marked success in the table component, every other success case is marked by this hook
+ */
+export var useDataRenderedUfoExperience = function useDataRenderedUfoExperience(_ref) {
+  var status = _ref.status,
+    experienceId = _ref.experienceId,
+    itemCount = _ref.itemCount,
+    canBeLink = _ref.canBeLink,
+    extensionKey = _ref.extensionKey;
+  useEffect(function () {
+    var isEmptyResult = status === 'resolved' && itemCount === 0;
+    var isLink = status === 'resolved' && (itemCount === 1 || canBeLink); // this will take care of count-mode/single-item smart-link rendering
+    var isUnauthorized = status === 'unauthorized';
+    var shouldSucceedUfoExperience = isEmptyResult || isLink || isUnauthorized;
+    var shouldFailUfoExperience = status === 'rejected';
+    if (extensionKey) {
+      addMetadataToExperience({
+        name: 'datasource-rendered',
+        metadata: {
+          extensionKey: extensionKey
+        }
+      }, experienceId);
+    }
+    if (shouldFailUfoExperience) {
+      failUfoExperience({
+        name: 'datasource-rendered'
+      }, experienceId);
+    } else if (shouldSucceedUfoExperience) {
+      succeedUfoExperience({
+        name: 'datasource-rendered'
+      }, experienceId);
+    }
+  }, [canBeLink, experienceId, extensionKey, itemCount, status]);
+};

package/dist/esm/hooks/useDatasourceTableState.js

@@ -60,7 +60,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
   var loadDatasourceDetails = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var _yield$getDatasourceD, _yield$getDatasourceD2, access, _destinationObjectTypes, _extensionKey, schema, isColumnNotPresentInCurrentColumnsList, allColumns, newColumns;
+    var _yield$getDatasourceD, access, schema, isColumnNotPresentInCurrentColumnsList, allColumns, newColumns;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -77,20 +77,15 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           });
         case 5:
           _yield$getDatasourceD = _context.sent;
-          _yield$getDatasourceD2 = _yield$getDatasourceD.meta;
-          access = _yield$getDatasourceD2.access;
-          _destinationObjectTypes = _yield$getDatasourceD2.destinationObjectTypes;
-          _extensionKey = _yield$getDatasourceD2.extensionKey;
+          access = _yield$getDatasourceD.meta.access;
           schema = _yield$getDatasourceD.data.schema;
           if (!(access === 'forbidden' || access === 'unauthorized')) {
-            _context.next = 14;
+            _context.next = 11;
             break;
           }
           setStatus('unauthorized');
           return _context.abrupt("return");
-        case 14:
-          setExtensionKey(_extensionKey);
-          setDestinationObjectTypes(_destinationObjectTypes);
+        case 11:
           isColumnNotPresentInCurrentColumnsList = function isColumnNotPresentInCurrentColumnsList(col) {
             return !columns.find(function (column) {
               return column.key === col.key;
@@ -99,17 +94,17 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
-          _context.next = 25;
+          _context.next = 20;
           break;
-        case 22:
-          _context.prev = 22;
+        case 17:
+          _context.prev = 17;
           _context.t0 = _context["catch"](2);
           setStatus('rejected');
-        case 25:
+        case 20:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[2, 22]]);
+    }, _callee, null, [[2, 17]]);
   })), [columns, datasourceId, getDatasourceDetails, parameters]);
   var applySchemaProperties = useCallback(function (properties) {
     if (columns.length === 0) {
@@ -137,12 +132,12 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldForceRequest,
       sortedFieldKeys,
       datasourceDataRequest,
+      _yield$getDatasourceD2,
       _yield$getDatasourceD3,
-      _yield$getDatasourceD4,
       access,
-      _destinationObjectTypes2,
-      _extensionKey2,
-      _yield$getDatasourceD5,
+      _destinationObjectTypes,
+      _extensionKey,
+      _yield$getDatasourceD4,
       items,
       nextPageCursor,
       _totalCount,
@@ -176,16 +171,16 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           _context2.next = 11;
           return getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
         case 11:
-          _yield$getDatasourceD3 = _context2.sent;
-          _yield$getDatasourceD4 = _yield$getDatasourceD3.meta;
-          access = _yield$getDatasourceD4.access;
-          _destinationObjectTypes2 = _yield$getDatasourceD4.destinationObjectTypes;
-          _extensionKey2 = _yield$getDatasourceD4.extensionKey;
-          _yield$getDatasourceD5 = _yield$getDatasourceD3.data;
-          items = _yield$getDatasourceD5.items;
-          nextPageCursor = _yield$getDatasourceD5.nextPageCursor;
-          _totalCount = _yield$getDatasourceD5.totalCount;
-          schema = _yield$getDatasourceD5.schema;
+          _yield$getDatasourceD2 = _context2.sent;
+          _yield$getDatasourceD3 = _yield$getDatasourceD2.meta;
+          access = _yield$getDatasourceD3.access;
+          _destinationObjectTypes = _yield$getDatasourceD3.destinationObjectTypes;
+          _extensionKey = _yield$getDatasourceD3.extensionKey;
+          _yield$getDatasourceD4 = _yield$getDatasourceD2.data;
+          items = _yield$getDatasourceD4.items;
+          nextPageCursor = _yield$getDatasourceD4.nextPageCursor;
+          _totalCount = _yield$getDatasourceD4.totalCount;
+          schema = _yield$getDatasourceD4.schema;
           if (!(access === 'forbidden' || access === 'unauthorized')) {
             _context2.next = 24;
             break;
@@ -193,8 +188,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           setStatus('unauthorized');
           return _context2.abrupt("return");
         case 24:
-          setExtensionKey(_extensionKey2);
-          setDestinationObjectTypes(_destinationObjectTypes2);
+          setExtensionKey(_extensionKey);
+          setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
           setNextCursor(nextPageCursor);
           setResponseItems(function (currentResponseItems) {
@@ -203,7 +198,6 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             }
             return [].concat(_toConsumableArray(currentResponseItems), _toConsumableArray(items));
           });
-          setStatus('resolved');
           setHasNextPage(Boolean(nextPageCursor));
           if (fieldKeys.length > 0) {
             setLastRequestedFieldKeys(fieldKeys);
@@ -216,11 +210,12 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             currentLoadedItemCount = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) || 0;
             newlyLoadedItemCount = (items === null || items === void 0 ? void 0 : items.length) || 0;
             fireEvent('track.nextItem.loaded', {
-              extensionKey: _extensionKey2,
-              destinationObjectTypes: _destinationObjectTypes2,
+              extensionKey: _extensionKey,
+              destinationObjectTypes: _destinationObjectTypes,
               loadedItemCount: currentLoadedItemCount + newlyLoadedItemCount
             });
           }
+          setStatus('resolved');
           _context2.next = 40;
           break;
         case 37:

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

@@ -222,7 +222,7 @@ var analyticsContextAttributes = {
 };
 var analyticsContextData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.2.0",
+  packageVersion: "1.2.2",
   source: 'datasourceConfigModal'
 };
 var contextData = _objectSpread(_objectSpread({}, analyticsContextData), {}, {