@atlaskit/link-datasource 1.17.0 → 1.17.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/link-datasource
 
+## 1.17.1
+
+### Patch Changes
+
+- [#43132](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43132) [`3e2792d125e`](https://bitbucket.org/atlassian/atlassian-frontend/commits/3e2792d125e) - added operational events for Assets Config Modal
+- Updated dependencies
+
 ## 1.17.0
 
 ### Minor 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.17.0"
+  packageVersion: "1.17.1"
 };

package/dist/cjs/hooks/useAssetsClient.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
 var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
   if (error instanceof Error) {
@@ -50,6 +51,8 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
     _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
     objectSchemasError = _useState16[0],
     setObjectSchemasError = _useState16[1];
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
 
   /*
    * We wrap this in nested try/catch blocks because we want to handle
@@ -66,7 +69,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
             setWorkspaceError(undefined);
             _context.prev = 2;
             _context.next = 5;
-            return (0, _cmdbService.getWorkspaceId)();
+            return (0, _cmdbService.getWorkspaceId)(fireEvent);
           case 5:
             _workspaceId = _context.sent;
             setWorkspaceId(_workspaceId);
@@ -77,7 +80,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
             }
             _context.prev = 8;
             _context.next = 11;
-            return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
+            return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
           case 11:
             fetchedObjectSchema = _context.sent;
             setExistingObjectSchema(fetchedObjectSchema);
@@ -90,7 +93,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
           case 18:
             _context.prev = 18;
             _context.next = 21;
-            return (0, _cmdbService.fetchObjectSchemas)(_workspaceId);
+            return (0, _cmdbService.fetchObjectSchemas)(_workspaceId, undefined, fireEvent);
           case 21:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
@@ -118,7 +121,7 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
         }
       }, _callee, null, [[2, 31, 34, 37], [8, 15], [18, 26]]);
     }))();
-  }, [initialParameters]);
+  }, [initialParameters, fireEvent]);
   return {
     workspaceId: workspaceId,
     workspaceError: workspaceError,

package/dist/cjs/hooks/useValidateAqlText.js

@@ -9,6 +9,7 @@ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"))
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
+var _analytics = require("../analytics");
 var _cmdbService = require("../services/cmdbService");
 var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlText(workspaceId) {
   var _useState = (0, _react.useState)(false),
@@ -23,6 +24,8 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
     error = _useState6[0],
     setError = _useState6[1];
+  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var validateAqlText = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(aql) {
       var isValid, message, _validateAqlResponse$, validateAqlResponse;
@@ -37,7 +40,7 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
             _context.next = 7;
             return (0, _cmdbService.validateAql)(workspaceId, {
               qlQuery: aql
-            });
+            }, fireEvent);
           case 7:
             validateAqlResponse = _context.sent;
             setIsValidAqlText(validateAqlResponse.isValid);
@@ -71,7 +74,7 @@ var useValidateAqlText = exports.useValidateAqlText = function useValidateAqlTex
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [workspaceId]);
+  }(), [workspaceId, fireEvent]);
   return {
     isValidAqlText: isValidAqlText,
     validateAqlText: validateAqlText,

package/dist/cjs/services/cmdbService.js

@@ -10,7 +10,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _linkingCommon = require("@atlaskit/linking-common");
 var _cmdbService = require("./cmdbService.utils");
 var getWorkspaceId = exports.getWorkspaceId = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(fireEvent) {
     var url, _workspaceDetailsResp, workspaceDetailsResponse, error;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -27,32 +27,35 @@ var getWorkspaceId = exports.getWorkspaceId = /*#__PURE__*/function () {
           }
           throw new _cmdbService.PermissionError('No workspace results found');
         case 7:
+          fireEvent && fireEvent('operational.getWorkspaceId.success', {});
           return _context.abrupt("return", workspaceDetailsResponse.results[0].id);
-        case 10:
-          _context.prev = 10;
+        case 11:
+          _context.prev = 11;
           _context.t0 = _context["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for workspace here before remapping to PermissionError
-            // Only 429 and 5xx errors will be treated as FetchErrors otherwise PermissionError
+            fireEvent && fireEvent('operational.getWorkspaceId.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
+            // Only 429 and5xx errors will be treated as FetchErrors otherwise PermissionError
             if ((0, _cmdbService.getStatusCodeGroup)(error) !== '5xx' && error.statusCode !== 429) {
               error = new _cmdbService.PermissionError('Failed to fetch workspace');
             }
           }
           throw error;
-        case 15:
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 10]]);
+    }, _callee, null, [[1, 11]]);
   }));
-  return function getWorkspaceId() {
+  return function getWorkspaceId(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 var validateAql = exports.validateAql = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data) {
-    var url, error;
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data, fireEvent) {
+    var url, response, error;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -64,31 +67,35 @@ var validateAql = exports.validateAql = /*#__PURE__*/function () {
             context: 'SMART_LINKS'
           }, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context2.abrupt("return", _context2.sent);
-        case 7:
-          _context2.prev = 7;
+          response = _context2.sent;
+          fireEvent && fireEvent('operational.validateAql.success', {});
+          return _context2.abrupt("return", response);
+        case 9:
+          _context2.prev = 9;
           _context2.t0 = _context2["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context2.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for aql here before remapping to PermissionError
+            fireEvent && fireEvent('operational.validateAql.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 7]]);
+    }, _callee2, null, [[1, 9]]);
   }));
-  return function validateAql(_x, _x2) {
+  return function validateAql(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
 var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
-  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, schemaId) {
-    var url, error;
+  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(workspaceId, schemaId, fireEvent) {
+    var url, response, error;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -97,31 +104,35 @@ var fetchObjectSchema = exports.fetchObjectSchema = /*#__PURE__*/function () {
           _context3.next = 4;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context3.abrupt("return", _context3.sent);
-        case 7:
-          _context3.prev = 7;
+          response = _context3.sent;
+          fireEvent && fireEvent('operational.objectSchema.success', {});
+          return _context3.abrupt("return", response);
+        case 9:
+          _context3.prev = 9;
           _context3.t0 = _context3["catch"](1);
           error = (0, _cmdbService.mapFetchErrors)(_context3.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for object schema here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchema.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[1, 7]]);
+    }, _callee3, null, [[1, 9]]);
   }));
-  return function fetchObjectSchema(_x3, _x4) {
+  return function fetchObjectSchema(_x5, _x6, _x7) {
     return _ref3.apply(this, arguments);
   };
 }();
 var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
-  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, query) {
-    var queryParams, url, error;
+  var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(workspaceId, query, fireEvent) {
+    var queryParams, url, response, error;
     return _regenerator.default.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -134,25 +145,29 @@ var fetchObjectSchemas = exports.fetchObjectSchemas = /*#__PURE__*/function () {
           _context4.next = 8;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 8:
-          return _context4.abrupt("return", _context4.sent);
-        case 11:
-          _context4.prev = 11;
+          response = _context4.sent;
+          fireEvent && fireEvent('operational.objectSchemas.success', {});
+          return _context4.abrupt("return", response);
+        case 13:
+          _context4.prev = 13;
           _context4.t0 = _context4["catch"](5);
           error = (0, _cmdbService.mapFetchErrors)(_context4.t0);
           if (error instanceof _cmdbService.FetchError) {
-            // TODO Fire error operational event for object schemas here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchemas.failed', {
+              statusCodeGroup: (0, _cmdbService.getStatusCodeGroup)(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new _cmdbService.PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 16:
+        case 18:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[5, 11]]);
+    }, _callee4, null, [[5, 13]]);
   }));
-  return function fetchObjectSchemas(_x5, _x6) {
+  return function fetchObjectSchemas(_x8, _x9, _x10) {
     return _ref4.apply(this, arguments);
   };
 }();

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/hooks/useAssetsClient.js

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
 const handleAssetsClientErrors = (errorSetter, error) => {
   if (error instanceof Error) {
@@ -16,6 +17,9 @@ export const useAssetsClient = initialParameters => {
   const [objectSchemas, setObjectSchemas] = useState();
   const [totalObjectSchemas, setTotalObjectSchemas] = useState();
   const [objectSchemasError, setObjectSchemasError] = useState();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
 
   /*
    * We wrap this in nested try/catch blocks because we want to handle
@@ -27,19 +31,19 @@ export const useAssetsClient = initialParameters => {
       setLoading(true);
       setWorkspaceError(undefined);
       try {
-        const workspaceId = await getWorkspaceId();
+        const workspaceId = await getWorkspaceId(fireEvent);
         setWorkspaceId(workspaceId);
         // Check schema from initial parameters still exists and fetch name/permissions for schema select
         if (initialParameters !== null && initialParameters !== void 0 && initialParameters.schemaId) {
           try {
-            const fetchedObjectSchema = await fetchObjectSchema(workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
+            const fetchedObjectSchema = await fetchObjectSchema(workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
             setExistingObjectSchema(fetchedObjectSchema);
           } catch (fetchObjectSchemaError) {
             handleAssetsClientErrors(setExistingObjectSchemaError, fetchObjectSchemaError);
           }
         }
         try {
-          const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId);
+          const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId, undefined, fireEvent);
           setObjectSchemas(fetchedObjectSchemasResponse.values);
           setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
         } catch (fetchObjectSchemasError) {
@@ -51,7 +55,7 @@ export const useAssetsClient = initialParameters => {
         setLoading(false);
       }
     })();
-  }, [initialParameters]);
+  }, [initialParameters, fireEvent]);
   return {
     workspaceId,
     workspaceError,

package/dist/es2019/hooks/useValidateAqlText.js

@@ -1,9 +1,13 @@
 import { useCallback, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { validateAql } from '../services/cmdbService';
 export const useValidateAqlText = workspaceId => {
   const [loading, setLoading] = useState(false);
   const [isValidAqlText, setIsValidAqlText] = useState(false);
   const [error, setError] = useState();
+  const {
+    fireEvent
+  } = useDatasourceAnalyticsEvents();
   const validateAqlText = useCallback(async aql => {
     setLoading(true);
     setError(undefined);
@@ -13,7 +17,7 @@ export const useValidateAqlText = workspaceId => {
       var _validateAqlResponse$;
       const validateAqlResponse = await validateAql(workspaceId, {
         qlQuery: aql
-      });
+      }, fireEvent);
       setIsValidAqlText(validateAqlResponse.isValid);
       isValid = validateAqlResponse.isValid;
       message = ((_validateAqlResponse$ = validateAqlResponse.errors) === null || _validateAqlResponse$ === void 0 ? void 0 : _validateAqlResponse$.iql) || null;
@@ -30,7 +34,7 @@ export const useValidateAqlText = workspaceId => {
       isValid,
       message
     };
-  }, [workspaceId]);
+  }, [workspaceId, fireEvent]);
   return {
     isValidAqlText,
     validateAqlText,

package/dist/es2019/services/cmdbService.js

@@ -1,6 +1,6 @@
 import { request } from '@atlaskit/linking-common';
 import { FetchError, getStatusCodeGroup, mapFetchErrors, PermissionError } from './cmdbService.utils';
-export const getWorkspaceId = async () => {
+export const getWorkspaceId = async fireEvent => {
   const url = '/rest/servicedesk/cmdb/latest/workspace';
   try {
     var _workspaceDetailsResp;
@@ -8,12 +8,15 @@ export const getWorkspaceId = async () => {
     if (!((_workspaceDetailsResp = workspaceDetailsResponse.results) !== null && _workspaceDetailsResp !== void 0 && _workspaceDetailsResp.length)) {
       throw new PermissionError('No workspace results found');
     }
+    fireEvent && fireEvent('operational.getWorkspaceId.success', {});
     return workspaceDetailsResponse.results[0].id;
   } catch (err) {
     let error = mapFetchErrors(err);
     if (error instanceof FetchError) {
-      // TODO Fire error operational event for workspace here before remapping to PermissionError
-      // Only 429 and 5xx errors will be treated as FetchErrors otherwise PermissionError
+      fireEvent && fireEvent('operational.getWorkspaceId.failed', {
+        statusCodeGroup: getStatusCodeGroup(error)
+      });
+      // Only 429 and5xx errors will be treated as FetchErrors otherwise PermissionError
       if (getStatusCodeGroup(error) !== '5xx' && error.statusCode !== 429) {
         error = new PermissionError('Failed to fetch workspace');
       }
@@ -21,17 +24,21 @@ export const getWorkspaceId = async () => {
     throw error;
   }
 };
-export const validateAql = async (workspaceId, data) => {
+export const validateAql = async (workspaceId, data, fireEvent) => {
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/aql/validate`;
   try {
-    return await request('post', url, {
+    const response = await request('post', url, {
       qlQuery: data.qlQuery,
       context: 'SMART_LINKS'
     }, undefined, [200, 201, 202, 203, 204]);
+    fireEvent && fireEvent('operational.validateAql.success', {});
+    return response;
   } catch (err) {
     let error = mapFetchErrors(err);
     if (error instanceof FetchError) {
-      // TODO Fire error operational event for aql here before remapping to PermissionError
+      fireEvent && fireEvent('operational.validateAql.failed', {
+        statusCodeGroup: getStatusCodeGroup(error)
+      });
       if (error.statusCode === 401 || error.statusCode === 403) {
         error = new PermissionError('Failed to fetch object schemas');
       }
@@ -39,14 +46,18 @@ export const validateAql = async (workspaceId, data) => {
     throw error;
   }
 };
-export const fetchObjectSchema = async (workspaceId, schemaId) => {
+export const fetchObjectSchema = async (workspaceId, schemaId, fireEvent) => {
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/objectschema/${schemaId}`;
   try {
-    return await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+    const response = await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+    fireEvent && fireEvent('operational.objectSchema.success', {});
+    return response;
   } catch (err) {
     let error = mapFetchErrors(err);
     if (error instanceof FetchError) {
-      // TODO Fire error operational event for object schema here before remapping to PermissionError
+      fireEvent && fireEvent('operational.objectSchema.failed', {
+        statusCodeGroup: getStatusCodeGroup(error)
+      });
       if (error.statusCode === 401 || error.statusCode === 403) {
         error = new PermissionError('Failed to fetch object schemas');
       }
@@ -54,18 +65,22 @@ export const fetchObjectSchema = async (workspaceId, schemaId) => {
     throw error;
   }
 };
-export const fetchObjectSchemas = async (workspaceId, query) => {
+export const fetchObjectSchemas = async (workspaceId, query, fireEvent) => {
   const queryParams = new URLSearchParams();
   queryParams.set('maxResults', '20');
   queryParams.set('includeCounts', 'false');
   query && queryParams.set('query', query);
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/objectschema/list?${queryParams}`;
   try {
-    return await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+    const response = await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+    fireEvent && fireEvent('operational.objectSchemas.success', {});
+    return response;
   } catch (err) {
     let error = mapFetchErrors(err);
     if (error instanceof FetchError) {
-      // TODO Fire error operational event for object schemas here before remapping to PermissionError
+      fireEvent && fireEvent('operational.objectSchemas.failed', {
+        statusCodeGroup: getStatusCodeGroup(error)
+      });
       if (error.statusCode === 401 || error.statusCode === 403) {
         error = new PermissionError('Failed to fetch object schemas');
       }

package/dist/esm/analytics/constants.js

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

package/dist/esm/hooks/useAssetsClient.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useEffect, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
 var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
   if (error instanceof Error) {
@@ -43,6 +44,8 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
     _useState16 = _slicedToArray(_useState15, 2),
     objectSchemasError = _useState16[0],
     setObjectSchemasError = _useState16[1];
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
 
   /*
    * We wrap this in nested try/catch blocks because we want to handle
@@ -59,7 +62,7 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
             setWorkspaceError(undefined);
             _context.prev = 2;
             _context.next = 5;
-            return getWorkspaceId();
+            return getWorkspaceId(fireEvent);
           case 5:
             _workspaceId = _context.sent;
             setWorkspaceId(_workspaceId);
@@ -70,7 +73,7 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
             }
             _context.prev = 8;
             _context.next = 11;
-            return fetchObjectSchema(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
+            return fetchObjectSchema(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId, fireEvent);
           case 11:
             fetchedObjectSchema = _context.sent;
             setExistingObjectSchema(fetchedObjectSchema);
@@ -83,7 +86,7 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
           case 18:
             _context.prev = 18;
             _context.next = 21;
-            return fetchObjectSchemas(_workspaceId);
+            return fetchObjectSchemas(_workspaceId, undefined, fireEvent);
           case 21:
             fetchedObjectSchemasResponse = _context.sent;
             setObjectSchemas(fetchedObjectSchemasResponse.values);
@@ -111,7 +114,7 @@ export var useAssetsClient = function useAssetsClient(initialParameters) {
         }
       }, _callee, null, [[2, 31, 34, 37], [8, 15], [18, 26]]);
     }))();
-  }, [initialParameters]);
+  }, [initialParameters, fireEvent]);
   return {
     workspaceId: workspaceId,
     workspaceError: workspaceError,

package/dist/esm/hooks/useValidateAqlText.js

@@ -2,6 +2,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { useCallback, useState } from 'react';
+import { useDatasourceAnalyticsEvents } from '../analytics';
 import { validateAql } from '../services/cmdbService';
 export var useValidateAqlText = function useValidateAqlText(workspaceId) {
   var _useState = useState(false),
@@ -16,6 +17,8 @@ export var useValidateAqlText = function useValidateAqlText(workspaceId) {
     _useState6 = _slicedToArray(_useState5, 2),
     error = _useState6[0],
     setError = _useState6[1];
+  var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
+    fireEvent = _useDatasourceAnalyti.fireEvent;
   var validateAqlText = useCallback( /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(aql) {
       var isValid, message, _validateAqlResponse$, validateAqlResponse;
@@ -30,7 +33,7 @@ export var useValidateAqlText = function useValidateAqlText(workspaceId) {
             _context.next = 7;
             return validateAql(workspaceId, {
               qlQuery: aql
-            });
+            }, fireEvent);
           case 7:
             validateAqlResponse = _context.sent;
             setIsValidAqlText(validateAqlResponse.isValid);
@@ -64,7 +67,7 @@ export var useValidateAqlText = function useValidateAqlText(workspaceId) {
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  }(), [workspaceId]);
+  }(), [workspaceId, fireEvent]);
   return {
     isValidAqlText: isValidAqlText,
     validateAqlText: validateAqlText,

package/dist/esm/services/cmdbService.js

@@ -3,7 +3,7 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { request } from '@atlaskit/linking-common';
 import { FetchError, getStatusCodeGroup, mapFetchErrors, PermissionError } from './cmdbService.utils';
 export var getWorkspaceId = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(fireEvent) {
     var url, _workspaceDetailsResp, workspaceDetailsResponse, error;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -20,32 +20,35 @@ export var getWorkspaceId = /*#__PURE__*/function () {
           }
           throw new PermissionError('No workspace results found');
         case 7:
+          fireEvent && fireEvent('operational.getWorkspaceId.success', {});
           return _context.abrupt("return", workspaceDetailsResponse.results[0].id);
-        case 10:
-          _context.prev = 10;
+        case 11:
+          _context.prev = 11;
           _context.t0 = _context["catch"](1);
           error = mapFetchErrors(_context.t0);
           if (error instanceof FetchError) {
-            // TODO Fire error operational event for workspace here before remapping to PermissionError
-            // Only 429 and 5xx errors will be treated as FetchErrors otherwise PermissionError
+            fireEvent && fireEvent('operational.getWorkspaceId.failed', {
+              statusCodeGroup: getStatusCodeGroup(error)
+            });
+            // Only 429 and5xx errors will be treated as FetchErrors otherwise PermissionError
             if (getStatusCodeGroup(error) !== '5xx' && error.statusCode !== 429) {
               error = new PermissionError('Failed to fetch workspace');
             }
           }
           throw error;
-        case 15:
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[1, 10]]);
+    }, _callee, null, [[1, 11]]);
   }));
-  return function getWorkspaceId() {
+  return function getWorkspaceId(_x) {
     return _ref.apply(this, arguments);
   };
 }();
 export var validateAql = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(workspaceId, data) {
-    var url, error;
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(workspaceId, data, fireEvent) {
+    var url, response, error;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -57,31 +60,35 @@ export var validateAql = /*#__PURE__*/function () {
             context: 'SMART_LINKS'
           }, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context2.abrupt("return", _context2.sent);
-        case 7:
-          _context2.prev = 7;
+          response = _context2.sent;
+          fireEvent && fireEvent('operational.validateAql.success', {});
+          return _context2.abrupt("return", response);
+        case 9:
+          _context2.prev = 9;
           _context2.t0 = _context2["catch"](1);
           error = mapFetchErrors(_context2.t0);
           if (error instanceof FetchError) {
-            // TODO Fire error operational event for aql here before remapping to PermissionError
+            fireEvent && fireEvent('operational.validateAql.failed', {
+              statusCodeGroup: getStatusCodeGroup(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 7]]);
+    }, _callee2, null, [[1, 9]]);
   }));
-  return function validateAql(_x, _x2) {
+  return function validateAql(_x2, _x3, _x4) {
     return _ref2.apply(this, arguments);
   };
 }();
 export var fetchObjectSchema = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workspaceId, schemaId) {
-    var url, error;
+  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(workspaceId, schemaId, fireEvent) {
+    var url, response, error;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
@@ -90,31 +97,35 @@ export var fetchObjectSchema = /*#__PURE__*/function () {
           _context3.next = 4;
           return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 4:
-          return _context3.abrupt("return", _context3.sent);
-        case 7:
-          _context3.prev = 7;
+          response = _context3.sent;
+          fireEvent && fireEvent('operational.objectSchema.success', {});
+          return _context3.abrupt("return", response);
+        case 9:
+          _context3.prev = 9;
           _context3.t0 = _context3["catch"](1);
           error = mapFetchErrors(_context3.t0);
           if (error instanceof FetchError) {
-            // TODO Fire error operational event for object schema here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchema.failed', {
+              statusCodeGroup: getStatusCodeGroup(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 12:
+        case 14:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[1, 7]]);
+    }, _callee3, null, [[1, 9]]);
   }));
-  return function fetchObjectSchema(_x3, _x4) {
+  return function fetchObjectSchema(_x5, _x6, _x7) {
     return _ref3.apply(this, arguments);
   };
 }();
 export var fetchObjectSchemas = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(workspaceId, query) {
-    var queryParams, url, error;
+  var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(workspaceId, query, fireEvent) {
+    var queryParams, url, response, error;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -127,25 +138,29 @@ export var fetchObjectSchemas = /*#__PURE__*/function () {
           _context4.next = 8;
           return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
         case 8:
-          return _context4.abrupt("return", _context4.sent);
-        case 11:
-          _context4.prev = 11;
+          response = _context4.sent;
+          fireEvent && fireEvent('operational.objectSchemas.success', {});
+          return _context4.abrupt("return", response);
+        case 13:
+          _context4.prev = 13;
           _context4.t0 = _context4["catch"](5);
           error = mapFetchErrors(_context4.t0);
           if (error instanceof FetchError) {
-            // TODO Fire error operational event for object schemas here before remapping to PermissionError
+            fireEvent && fireEvent('operational.objectSchemas.failed', {
+              statusCodeGroup: getStatusCodeGroup(error)
+            });
             if (error.statusCode === 401 || error.statusCode === 403) {
               error = new PermissionError('Failed to fetch object schemas');
             }
           }
           throw error;
-        case 16:
+        case 18:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[5, 11]]);
+    }, _callee4, null, [[5, 13]]);
   }));
-  return function fetchObjectSchemas(_x5, _x6) {
+  return function fetchObjectSchemas(_x8, _x9, _x10) {
     return _ref4.apply(this, arguments);
   };
 }();

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::ddaee20abebe8b4891d75f243120dce8>>
+ * @codegen <<SignedSource::d3722446f615a812f3e336474f9d8d3c>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -90,6 +90,22 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     reason: 'agg' | 'network' | 'unknown';
 };
 export type AqlEditorSearchedAttributesType = {};
+export type GetWorkspaceIdSuccessAttributesType = {};
+export type GetWorkspaceIdFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ValidateAqlSuccessAttributesType = {};
+export type ValidateAqlFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemaSuccessAttributesType = {};
+export type ObjectSchemaFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemasSuccessAttributesType = {};
+export type ObjectSchemasFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -148,5 +164,29 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
+    /**
+     * Fired when fetching a workspace Id is successful. */
+    'operational.getWorkspaceId.success': GetWorkspaceIdSuccessAttributesType;
+    /**
+     * Fired when fetching a workspace Id fails. */
+    'operational.getWorkspaceId.failed': GetWorkspaceIdFailedAttributesType;
+    /**
+     * Fired when making a request to validateAQL is successful. */
+    'operational.validateAql.success': ValidateAqlSuccessAttributesType;
+    /**
+     * Fired when making a request to validateAQL fails. */
+    'operational.validateAql.failed': ValidateAqlFailedAttributesType;
+    /**
+     * Fired when fetching an object schema is successful. */
+    'operational.objectSchema.success': ObjectSchemaSuccessAttributesType;
+    /**
+     * Fired when fetching an object schema fails. */
+    'operational.objectSchema.failed': ObjectSchemaFailedAttributesType;
+    /**
+     * Fired when fetching object schemas is successful. */
+    'operational.objectSchemas.success': ObjectSchemasSuccessAttributesType;
+    /**
+     * Fired when fetching object schemas fails. */
+    'operational.objectSchemas.failed': ObjectSchemasFailedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types/services/cmdbService.d.ts

@@ -1,7 +1,11 @@
+import { EventKey } from '../analytics/generated/analytics.types';
+import createEventPayload from '../analytics/generated/create-event-payload';
 import { AqlValidateResponse, FetchObjectSchemasResponse } from '../types/assets/types';
-export declare const getWorkspaceId: () => Promise<string>;
+type AnalyticsFireEvent = <K extends EventKey>(...params: Parameters<typeof createEventPayload<K>>) => void;
+export declare const getWorkspaceId: (fireEvent?: AnalyticsFireEvent) => Promise<string>;
 export declare const validateAql: (workspaceId: string, data: {
     qlQuery: string;
-}) => Promise<AqlValidateResponse>;
-export declare const fetchObjectSchema: (workspaceId: string, schemaId: string) => Promise<import("../types/assets/types").ObjectSchema>;
-export declare const fetchObjectSchemas: (workspaceId: string, query?: string) => Promise<FetchObjectSchemasResponse>;
+}, fireEvent?: AnalyticsFireEvent) => Promise<AqlValidateResponse>;
+export declare const fetchObjectSchema: (workspaceId: string, schemaId: string, fireEvent?: AnalyticsFireEvent) => Promise<import("../types/assets/types").ObjectSchema>;
+export declare const fetchObjectSchemas: (workspaceId: string, query?: string, fireEvent?: AnalyticsFireEvent) => Promise<FetchObjectSchemasResponse>;
+export {};

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::ddaee20abebe8b4891d75f243120dce8>>
+ * @codegen <<SignedSource::d3722446f615a812f3e336474f9d8d3c>>
  * @codegenCommand yarn workspace @atlassian/analytics-tooling run analytics:codegen link-datasource
  */
 export type PackageMetaDataType = {
@@ -90,6 +90,22 @@ export type ErrorShownBasicSearchDropdownAttributesType = {
     reason: 'agg' | 'network' | 'unknown';
 };
 export type AqlEditorSearchedAttributesType = {};
+export type GetWorkspaceIdSuccessAttributesType = {};
+export type GetWorkspaceIdFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ValidateAqlSuccessAttributesType = {};
+export type ValidateAqlFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemaSuccessAttributesType = {};
+export type ObjectSchemaFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
+export type ObjectSchemasSuccessAttributesType = {};
+export type ObjectSchemasFailedAttributesType = {
+    statusCodeGroup: '1xx' | '3xx' | '4xx' | '5xx' | 'unknown';
+};
 export type AnalyticsEventAttributes = {
     /**
      * Fires when user sees modal dialog. */
@@ -148,5 +164,29 @@ export type AnalyticsEventAttributes = {
     /**
      * Fired when search is initiated via the search icon or enter key press for aql editor input field. */
     'ui.aqlEditor.searched': AqlEditorSearchedAttributesType;
+    /**
+     * Fired when fetching a workspace Id is successful. */
+    'operational.getWorkspaceId.success': GetWorkspaceIdSuccessAttributesType;
+    /**
+     * Fired when fetching a workspace Id fails. */
+    'operational.getWorkspaceId.failed': GetWorkspaceIdFailedAttributesType;
+    /**
+     * Fired when making a request to validateAQL is successful. */
+    'operational.validateAql.success': ValidateAqlSuccessAttributesType;
+    /**
+     * Fired when making a request to validateAQL fails. */
+    'operational.validateAql.failed': ValidateAqlFailedAttributesType;
+    /**
+     * Fired when fetching an object schema is successful. */
+    'operational.objectSchema.success': ObjectSchemaSuccessAttributesType;
+    /**
+     * Fired when fetching an object schema fails. */
+    'operational.objectSchema.failed': ObjectSchemaFailedAttributesType;
+    /**
+     * Fired when fetching object schemas is successful. */
+    'operational.objectSchemas.success': ObjectSchemasSuccessAttributesType;
+    /**
+     * Fired when fetching object schemas fails. */
+    'operational.objectSchemas.failed': ObjectSchemasFailedAttributesType;
 };
 export type EventKey = keyof AnalyticsEventAttributes;

package/dist/types-ts4.5/services/cmdbService.d.ts

@@ -1,7 +1,11 @@
+import { EventKey } from '../analytics/generated/analytics.types';
+import createEventPayload from '../analytics/generated/create-event-payload';
 import { AqlValidateResponse, FetchObjectSchemasResponse } from '../types/assets/types';
-export declare const getWorkspaceId: () => Promise<string>;
+type AnalyticsFireEvent = <K extends EventKey>(...params: Parameters<typeof createEventPayload<K>>) => void;
+export declare const getWorkspaceId: (fireEvent?: AnalyticsFireEvent) => Promise<string>;
 export declare const validateAql: (workspaceId: string, data: {
     qlQuery: string;
-}) => Promise<AqlValidateResponse>;
-export declare const fetchObjectSchema: (workspaceId: string, schemaId: string) => Promise<import("../types/assets/types").ObjectSchema>;
-export declare const fetchObjectSchemas: (workspaceId: string, query?: string) => Promise<FetchObjectSchemasResponse>;
+}, fireEvent?: AnalyticsFireEvent) => Promise<AqlValidateResponse>;
+export declare const fetchObjectSchema: (workspaceId: string, schemaId: string, fireEvent?: AnalyticsFireEvent) => Promise<import("../types/assets/types").ObjectSchema>;
+export declare const fetchObjectSchemas: (workspaceId: string, query?: string, fireEvent?: AnalyticsFireEvent) => Promise<FetchObjectSchemasResponse>;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -59,11 +59,11 @@
     "@atlaskit/select": "^16.7.0",
     "@atlaskit/smart-card": "^26.42.0",
     "@atlaskit/spinner": "^15.6.0",
-    "@atlaskit/tag": "^11.6.0",
+    "@atlaskit/tag": "^12.0.0",
     "@atlaskit/textfield": "5.6.8",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.28.0",
-    "@atlaskit/tooltip": "^17.8.0",
+    "@atlaskit/tooltip": "^18.0.0",
     "@atlaskit/ufo": "^0.2.4",
     "@atlassianlabs/jql-editor": "^2.0.1",
     "@babel/runtime": "^7.0.0",