@atlaskit/link-datasource 1.16.5 → 1.17.1

package/dist/es2019/ui/jira-issues-modal/basic-filters/ui/async-popup-select/trigger.js

@@ -1,24 +1,44 @@
 import React, { forwardRef } from 'react';
 import { FormattedMessage } from 'react-intl-next';
+import Badge from '@atlaskit/badge';
 import Button from '@atlaskit/button/standard-button';
 import ChevronDownIcon from '@atlaskit/icon/glyph/chevron-down';
+import { Box, Flex, xcss } from '@atlaskit/primitives';
 import { asyncPopupSelectMessages } from './messages';
+const triggerButtonLabelStyles = xcss({
+  textOverflow: 'ellipsis',
+  overflow: 'hidden',
+  maxWidth: '150px'
+});
+const badgeStyles = xcss({
+  marginLeft: 'space.050'
+});
 const PopupTrigger = /*#__PURE__*/forwardRef(({
   filterType,
   isSelected,
   isDisabled,
-  onClick
+  onClick,
+  selectedOptions
 }, ref) => {
+  const [firstOption] = selectedOptions || [];
+  const hasOptions = selectedOptions && selectedOptions.length > 0;
   return /*#__PURE__*/React.createElement(Button, {
     ref: ref,
     appearance: "default",
-    isSelected: isSelected,
+    isSelected: isSelected || hasOptions,
     isDisabled: isDisabled,
     onClick: onClick,
     testId: `jlol-basic-filter-${filterType}-trigger`,
     iconAfter: /*#__PURE__*/React.createElement(ChevronDownIcon, {
       label: ""
     })
-  }, /*#__PURE__*/React.createElement(FormattedMessage, asyncPopupSelectMessages[`${filterType}Label`]));
+  }, /*#__PURE__*/React.createElement(Flex, null, /*#__PURE__*/React.createElement(Box, {
+    xcss: triggerButtonLabelStyles
+  }, /*#__PURE__*/React.createElement(FormattedMessage, asyncPopupSelectMessages[`${filterType}Label`]), firstOption && /*#__PURE__*/React.createElement(React.Fragment, null, ": ", firstOption.label)), selectedOptions && selectedOptions.length > 1 && /*#__PURE__*/React.createElement(Flex, {
+    xcss: badgeStyles,
+    alignItems: "center"
+  }, /*#__PURE__*/React.createElement(Badge, {
+    appearance: "primary"
+  }, "+", selectedOptions.length - 1))));
 });
 export default PopupTrigger;

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

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { Flex, xcss } from '@atlaskit/primitives';
 import { isValidJql } from '../utils';
 import AsyncPopupSelect from './async-popup-select';
@@ -10,13 +10,15 @@ const BasicFilterContainer = ({
   jql,
   cloudId
 }) => {
-  const [selection] = useState([]);
+  const [selection, setSelection] = useState([]);
   useEffect(() => {
     if (isValidJql(jql)) {
       // hydrate hook call goes in here
     }
   }, [jql]);
-  const handleSelectionChange = () => {};
+  const handleSelectionChange = useCallback(options => {
+    setSelection(options);
+  }, [setSelection]);
   return /*#__PURE__*/React.createElement(Flex, {
     xcss: basicFilterContainerStyles,
     gap: "space.100",

package/dist/esm/analytics/constants.js

@@ -1,5 +1,5 @@
 export var EVENT_CHANNEL = 'media';
 export var packageMetaData = {
   packageName: "@atlaskit/link-datasource",
-  packageVersion: "1.16.5"
+  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/useDatasourceTableState.js

@@ -13,6 +13,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     fieldKeys = _ref$fieldKeys === void 0 ? [] : _ref$fieldKeys;
   var _useDatasourceAnalyti = useDatasourceAnalyticsEvents(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
+  var idFieldCount = 1;
+  var keyFieldCount = 1;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     defaultVisibleColumnKeys = _useState2[0],
@@ -21,42 +23,48 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     lastRequestedFieldKeys = _useState4[0],
     setLastRequestedFieldKeys = _useState4[1];
-  var _useState5 = useState('empty'),
+  var _useState5 = useState({
+      properties: []
+    }),
     _useState6 = _slicedToArray(_useState5, 2),
-    status = _useState6[0],
-    setStatus = _useState6[1];
-  var _useState7 = useState([]),
+    fullSchema = _useState6[0],
+    setFullSchema = _useState6[1];
+  var _useState7 = useState('empty'),
     _useState8 = _slicedToArray(_useState7, 2),
-    responseItems = _useState8[0],
-    setResponseItems = _useState8[1];
-  var _useState9 = useState(true),
+    status = _useState8[0],
+    setStatus = _useState8[1];
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    hasNextPage = _useState10[0],
-    setHasNextPage = _useState10[1];
-  var _useState11 = useState(undefined),
+    responseItems = _useState10[0],
+    setResponseItems = _useState10[1];
+  var _useState11 = useState(true),
     _useState12 = _slicedToArray(_useState11, 2),
-    nextCursor = _useState12[0],
-    setNextCursor = _useState12[1];
-  var _useState13 = useState([]),
+    hasNextPage = _useState12[0],
+    setHasNextPage = _useState12[1];
+  var _useState13 = useState(undefined),
     _useState14 = _slicedToArray(_useState13, 2),
-    columns = _useState14[0],
-    setColumns = _useState14[1];
-  var _useState15 = useState(undefined),
+    nextCursor = _useState14[0],
+    setNextCursor = _useState14[1];
+  var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    totalCount = _useState16[0],
-    setTotalCount = _useState16[1];
-  var _useState17 = useState(false),
+    columns = _useState16[0],
+    setColumns = _useState16[1];
+  var _useState17 = useState(undefined),
     _useState18 = _slicedToArray(_useState17, 2),
-    shouldForceRequest = _useState18[0],
-    setShouldForceRequest = _useState18[1];
-  var _useState19 = useState([]),
+    totalCount = _useState18[0],
+    setTotalCount = _useState18[1];
+  var _useState19 = useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    destinationObjectTypes = _useState20[0],
-    setDestinationObjectTypes = _useState20[1];
-  var _useState21 = useState(),
+    shouldForceRequest = _useState20[0],
+    setShouldForceRequest = _useState20[1];
+  var _useState21 = useState([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    extensionKey = _useState22[0],
-    setExtensionKey = _useState22[1];
+    destinationObjectTypes = _useState22[0],
+    setDestinationObjectTypes = _useState22[1];
+  var _useState23 = useState(),
+    _useState24 = _slicedToArray(_useState23, 2),
+    extensionKey = _useState24[0],
+    setExtensionKey = _useState24[1];
   var _useDatasourceClientE = useDatasourceClientExtension(),
     getDatasourceData = _useDatasourceClientE.getDatasourceData,
     getDatasourceDetails = _useDatasourceClientE.getDatasourceDetails;
@@ -114,21 +122,39 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       }
     }, _callee, null, [[2, 17]]);
   })), [columns, datasourceId, getDatasourceDetails, parameters]);
-  var applySchemaProperties = useCallback(function (properties) {
-    if (!isEqual(columns, properties)) {
-      setColumns(properties);
+  var applySchemaProperties = useCallback(function (schema, fieldKeys) {
+    var properties = schema.properties,
+      _schema$defaultProper = schema.defaultProperties,
+      defaultProperties = _schema$defaultProper === void 0 ? [] : _schema$defaultProper;
+    var propertiesToBeUsed = properties;
+    var propertyKeysToBeUsed = Array.isArray(fieldKeys) && fieldKeys.length > 0 ? fieldKeys : defaultProperties;
+    if (fieldKeys.length > 0 || defaultProperties.length > 0) {
+      propertiesToBeUsed = properties.filter(function (property) {
+        return propertyKeysToBeUsed.includes(property.key);
+      });
+    }
+
+    /*Jira adds identifier fields like id and key to all data responses
+    Since defaultProperties already send back the keyField, we are accounting only
+    for the idField when we are using defaulProperties
+    */
+    if (properties.length > fieldKeys.length + idFieldCount + keyFieldCount && properties.length > defaultProperties.length + idFieldCount) {
+      setFullSchema(schema);
     }
-    var defaultProperties = properties.map(function (prop) {
+    if (!isEqual(columns, propertiesToBeUsed)) {
+      setColumns(propertiesToBeUsed);
+    }
+    var newProperties = propertiesToBeUsed.map(function (prop) {
       return prop.key;
     });
 
     // when loading for the first time, we will need to set default visible props as /data does not give you that info
     // also, since we dont pass any fields, we will need to set this info as lastRequestedFieldKeys
-    if (!isEqual(defaultVisibleColumnKeys, defaultProperties)) {
-      setDefaultVisibleColumnKeys(defaultProperties);
+    if (!isEqual(defaultVisibleColumnKeys, newProperties)) {
+      setDefaultVisibleColumnKeys(newProperties);
     }
-    if (!isEqual(lastRequestedFieldKeys, defaultProperties)) {
-      setLastRequestedFieldKeys(defaultProperties);
+    if (!isEqual(lastRequestedFieldKeys, newProperties)) {
+      setLastRequestedFieldKeys(newProperties);
     }
   }, [columns, defaultVisibleColumnKeys, lastRequestedFieldKeys]);
   var onNextPage = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
@@ -138,6 +164,7 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
       shouldRequestFirstPage,
       _requestInfo$shouldFo,
       shouldForceRequest,
+      isFullSchemaLoaded,
       datasourceDataRequest,
       _yield$getDatasourceD2,
       _yield$getDatasourceD3,
@@ -164,18 +191,19 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           return _context2.abrupt("return");
         case 3:
           _requestInfo$isSchema = requestInfo.isSchemaFromData, isSchemaFromData = _requestInfo$isSchema === void 0 ? true : _requestInfo$isSchema, shouldRequestFirstPage = requestInfo.shouldRequestFirstPage, _requestInfo$shouldFo = requestInfo.shouldForceRequest, shouldForceRequest = _requestInfo$shouldFo === void 0 ? false : _requestInfo$shouldFo;
+          isFullSchemaLoaded = fullSchema.properties.length > 0;
           datasourceDataRequest = {
             parameters: parameters,
             pageSize: DEFAULT_GET_DATASOURCE_DATA_PAGE_SIZE,
             pageCursor: shouldRequestFirstPage ? undefined : nextCursor,
             fields: fieldKeys,
-            includeSchema: isSchemaFromData
+            includeSchema: isFullSchemaLoaded ? false : isSchemaFromData
           };
           setStatus('loading');
-          _context2.prev = 6;
-          _context2.next = 9;
+          _context2.prev = 7;
+          _context2.next = 10;
           return getDatasourceData(datasourceId, datasourceDataRequest, shouldForceRequest);
-        case 9:
+        case 10:
           _yield$getDatasourceD2 = _context2.sent;
           _yield$getDatasourceD3 = _yield$getDatasourceD2.meta;
           access = _yield$getDatasourceD3.access;
@@ -187,12 +215,12 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           _totalCount = _yield$getDatasourceD4.totalCount;
           schema = _yield$getDatasourceD4.schema;
           if (!(access === 'forbidden' || access === 'unauthorized')) {
-            _context2.next = 22;
+            _context2.next = 23;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 22:
+        case 23:
           setExtensionKey(_extensionKey);
           setDestinationObjectTypes(_destinationObjectTypes);
           setTotalCount(_totalCount);
@@ -207,8 +235,8 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           if (fieldKeys.length > 0) {
             setLastRequestedFieldKeys(fieldKeys);
           }
-          if (isSchemaFromData && schema && items.length > 0) {
-            applySchemaProperties(schema.properties);
+          if ((isSchemaFromData && schema || fullSchema.properties.length > 0) && items.length > 0) {
+            applySchemaProperties(schema || fullSchema, fieldKeys);
           }
           isUserLoadingNextPage = (responseItems === null || responseItems === void 0 ? void 0 : responseItems.length) !== 0 && !shouldRequestFirstPage;
           if (isUserLoadingNextPage) {
@@ -221,25 +249,25 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 41;
+          _context2.next = 42;
           break;
-        case 35:
-          _context2.prev = 35;
-          _context2.t0 = _context2["catch"](6);
+        case 36:
+          _context2.prev = 36;
+          _context2.t0 = _context2["catch"](7);
           if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
-            _context2.next = 40;
+            _context2.next = 41;
             break;
           }
           setStatus('unauthorized');
           return _context2.abrupt("return");
-        case 40:
-          setStatus('rejected');
         case 41:
+          setStatus('rejected');
+        case 42:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[6, 35]]);
-  })), [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent]);
+    }, _callee2, null, [[7, 36]]);
+  })), [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent, fullSchema]);
   var reset = useCallback(function (options) {
     setStatus('empty');
     setResponseItems([]);
@@ -247,6 +275,9 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
     setNextCursor(undefined);
     setTotalCount(undefined);
     setLastRequestedFieldKeys([]);
+    setFullSchema({
+      properties: []
+    });
     setShouldForceRequest((options === null || options === void 0 ? void 0 : options.shouldForceRequest) || false);
     if (options !== null && options !== void 0 && options.shouldResetColumns) {
       setColumns([]);

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);
   };
 }();