@atlaskit/link-datasource 1.15.3 → 1.16.0

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

@@ -36,7 +36,7 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
   return (0, _react.jsx)(_form.default, {
     onSubmit: onFormSubmit
   }, function (_ref) {
-    var _initialSearchData$ob, _initialSearchData$aq;
+    var _initialSearchData$ob, _initialSearchData$ob2, _initialSearchData$aq;
     var formProps = _ref.formProps;
     return (0, _react.jsx)(_styled.FormContainer, (0, _extends2.default)({}, formProps, {
       id: SEARCH_FORM_ID
@@ -45,6 +45,7 @@ var AssetsSearchContainer = exports.AssetsSearchContainer = function AssetsSearc
     }, modalTitle, (0, _react.jsx)(_styled.SchemaSelectContainer, null, (0, _react.jsx)(_objectSchemaSelect.AssetsObjectSchemaSelect, {
       value: (_initialSearchData$ob = initialSearchData.objectSchema) !== null && _initialSearchData$ob !== void 0 ? _initialSearchData$ob : undefined,
       workspaceId: workspaceId,
+      initialObjectSchemas: (_initialSearchData$ob2 = initialSearchData.objectSchemas) !== null && _initialSearchData$ob2 !== void 0 ? _initialSearchData$ob2 : undefined,
       classNamePrefix: "assets-datasource-modal--object-schema-select"
     }))), (0, _react.jsx)(_styled.FormRowContainer, null, (0, _react.jsx)(_aqlSearchInput.AqlSearchInput, {
       value: (_initialSearchData$aq = initialSearchData.aql) !== null && _initialSearchData$aq !== void 0 ? _initialSearchData$aq : DEFAULT_AQL_QUERY,

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

@@ -9,16 +9,13 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends")
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = require("react");
-var _react2 = require("@emotion/react");
+var _react = require("@emotion/react");
 var _debouncePromise = _interopRequireDefault(require("debounce-promise"));
 var _reactIntlNext = require("react-intl-next");
 var _form = require("@atlaskit/form");
 var _select = require("@atlaskit/select");
 var _constants = require("@atlaskit/theme/constants");
-var _analytics = require("../../../../analytics");
 var _useObjectSchemas2 = require("../../../../hooks/useObjectSchemas");
 var _types = require("../../../../types/assets/types");
 var _styled = require("../styled");
@@ -51,74 +48,35 @@ var selectInAModalStyleFixProps = exports.selectInAModalStyleFixProps = {
 var AssetsObjectSchemaSelect = exports.AssetsObjectSchemaSelect = function AssetsObjectSchemaSelect(_ref) {
   var value = _ref.value,
     workspaceId = _ref.workspaceId,
+    initialObjectSchemas = _ref.initialObjectSchemas,
     _ref$classNamePrefix = _ref.classNamePrefix,
     classNamePrefix = _ref$classNamePrefix === void 0 ? 'assets-datasource-modal--object-schema-select' : _ref$classNamePrefix;
-  var _useState = (0, _react.useState)(null),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    defaultOptions = _useState2[0],
-    setDefaultOptions = _useState2[1];
-  var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
-    fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useIntl = (0, _reactIntlNext.useIntl)(),
     formatMessage = _useIntl.formatMessage;
   var _useObjectSchemas = (0, _useObjectSchemas2.useObjectSchemas)(workspaceId),
     fetchObjectSchemas = _useObjectSchemas.fetchObjectSchemas,
     objectSchemasLoading = _useObjectSchemas.objectSchemasLoading;
   var selectedObjectSchema = value ? (0, _utils.objectSchemaToSelectOption)(value) : undefined;
-  (0, _react.useEffect)(function () {
-    var fetchInitialData = /*#__PURE__*/function () {
-      var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-        var _yield$fetchObjectSch, objectSchemas, totalObjectSchemas;
-        return _regenerator.default.wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.next = 2;
-              return fetchObjectSchemas('');
-            case 2:
-              _yield$fetchObjectSch = _context.sent;
-              objectSchemas = _yield$fetchObjectSch.objectSchemas;
-              totalObjectSchemas = _yield$fetchObjectSch.totalObjectSchemas;
-              // We only want to send modal ready event once after we've fetched the schema count
-              fireEvent('ui.modal.ready.datasource', {
-                schemasCount: totalObjectSchemas !== null && totalObjectSchemas !== void 0 ? totalObjectSchemas : 0,
-                instancesCount: null
-              });
-              setDefaultOptions(mapObjectSchemasToOptions(objectSchemas));
-            case 7:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function fetchInitialData() {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    if (defaultOptions === null) {
-      fetchInitialData();
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
   var loadOptions = /*#__PURE__*/function () {
-    var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(inputValue) {
-      var _yield$fetchObjectSch2, objectSchemas;
-      return _regenerator.default.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(inputValue) {
+      var _yield$fetchObjectSch, objectSchemas;
+      return _regenerator.default.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context2.next = 2;
+            _context.next = 2;
             return fetchObjectSchemas(inputValue);
           case 2:
-            _yield$fetchObjectSch2 = _context2.sent;
-            objectSchemas = _yield$fetchObjectSch2.objectSchemas;
-            return _context2.abrupt("return", mapObjectSchemasToOptions(objectSchemas));
+            _yield$fetchObjectSch = _context.sent;
+            objectSchemas = _yield$fetchObjectSch.objectSchemas;
+            return _context.abrupt("return", mapObjectSchemasToOptions(objectSchemas));
           case 5:
           case "end":
-            return _context2.stop();
+            return _context.stop();
         }
-      }, _callee2);
+      }, _callee);
     }));
     return function loadOptions(_x) {
-      return _ref3.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var debouncedLoadOptions = (0, _debouncePromise.default)(loadOptions, SEARCH_DEBOUNCE_MS);
@@ -128,22 +86,22 @@ var AssetsObjectSchemaSelect = exports.AssetsObjectSchemaSelect = function Asset
     }
     return undefined;
   };
-  return (0, _react2.jsx)(_styled.FieldContainer, null, (0, _react2.jsx)(_form.Field, {
+  return (0, _react.jsx)(_styled.FieldContainer, null, (0, _react.jsx)(_form.Field, {
     name: _types.objectSchemaKey,
     defaultValue: selectedObjectSchema,
     validate: function validate(value) {
       return validateSchema(value);
     }
-  }, function (_ref4) {
-    var _ref4$fieldProps = _ref4.fieldProps,
-      _onChange = _ref4$fieldProps.onChange,
-      onFocus = _ref4$fieldProps.onFocus,
-      restFieldProps = (0, _objectWithoutProperties2.default)(_ref4$fieldProps, _excluded);
-    return (0, _react2.jsx)(_select.AsyncSelect, (0, _extends2.default)({
+  }, function (_ref3) {
+    var _ref3$fieldProps = _ref3.fieldProps,
+      _onChange = _ref3$fieldProps.onChange,
+      onFocus = _ref3$fieldProps.onFocus,
+      restFieldProps = (0, _objectWithoutProperties2.default)(_ref3$fieldProps, _excluded);
+    return (0, _react.jsx)(_select.AsyncSelect, (0, _extends2.default)({
       autoFocus: true,
       classNamePrefix: classNamePrefix,
       isLoading: objectSchemasLoading,
-      defaultOptions: defaultOptions !== null && defaultOptions !== void 0 ? defaultOptions : [],
+      defaultOptions: mapObjectSchemasToOptions(initialObjectSchemas),
       isSearchable: true,
       loadOptions: debouncedLoadOptions,
       placeholder: formatMessage(_messages.objectSchemaSelectMessages.placeholder),

package/dist/cjs/ui/jira-issues-modal/basic-filters/hooks/useFilterOptions.js

@@ -38,28 +38,29 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
     var _ref3,
       pageCursor,
       searchString,
+      isNewSearch,
       isRequestLikeInitialSearch,
       initialResponseData,
       response,
-      isNewSearch,
       _args = arguments;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _ref3 = _args.length > 0 && _args[0] !== undefined ? _args[0] : {}, pageCursor = _ref3.pageCursor, searchString = _ref3.searchString;
-          setStatus('loading');
+          isNewSearch = !pageCursor;
+          isNewSearch ? setStatus('loading') : setStatus('loadingMore');
           isRequestLikeInitialSearch = !pageCursor && !searchString;
           initialResponseData = initialData.current;
-          _context.prev = 4;
+          _context.prev = 5;
           if (!(isRequestLikeInitialSearch && initialResponseData)) {
-            _context.next = 9;
+            _context.next = 10;
             break;
           }
           _context.t0 = initialResponseData;
-          _context.next = 12;
+          _context.next = 13;
           break;
-        case 9:
-          _context.next = 11;
+        case 10:
+          _context.next = 12;
           return getFieldValues({
             cloudId: cloudId,
             jql: '',
@@ -67,18 +68,17 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
             searchString: searchString,
             pageCursor: pageCursor
           });
-        case 11:
-          _context.t0 = _context.sent;
         case 12:
+          _context.t0 = _context.sent;
+        case 13:
           response = _context.t0;
           if (!(response.errors && response.errors.length > 0)) {
-            _context.next = 16;
+            _context.next = 17;
             break;
           }
           setStatus('rejected');
           return _context.abrupt("return");
-        case 16:
-          isNewSearch = !pageCursor;
+        case 17:
           if (isNewSearch) {
             setFilterOptions((0, _transformers.mapFieldValuesToFilterOptions)(response));
             if (isRequestLikeInitialSearch) {
@@ -98,13 +98,13 @@ var useFilterOptions = exports.useFilterOptions = function useFilterOptions(_ref
           break;
         case 23:
           _context.prev = 23;
-          _context.t1 = _context["catch"](4);
+          _context.t1 = _context["catch"](5);
           setStatus('rejected');
         case 26:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[4, 23]]);
+    }, _callee, null, [[5, 23]]);
   })), [cloudId, filterOptions, filterType, getFieldValues]);
   return {
     filterOptions: filterOptions,

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/index.js

@@ -57,7 +57,8 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
     filterOptions = _useFilterOptions.filterOptions,
     fetchFilterOptions = _useFilterOptions.fetchFilterOptions,
     totalCount = _useFilterOptions.totalCount,
-    status = _useFilterOptions.status;
+    status = _useFilterOptions.status,
+    pageCursor = _useFilterOptions.pageCursor;
   var _useDebouncedCallback = (0, _useDebounce.useDebouncedCallback)(function (searchString) {
       fetchFilterOptions({
         searchString: searchString
@@ -96,6 +97,14 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
       });
     }
   }, [fetchFilterOptions, searchTerm, status]);
+  var handleShowMore = (0, _react.useCallback)(function () {
+    if (pageCursor) {
+      fetchFilterOptions({
+        pageCursor: pageCursor,
+        searchString: searchTerm
+      });
+    }
+  }, [fetchFilterOptions, pageCursor, searchTerm]);
   (0, _react.useEffect)(function () {
     if (status === 'resolved') {
       var _pickerRef$current;
@@ -106,8 +115,11 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
   var filterOptionsLength = filterOptions.length;
   var isError = status === 'rejected';
   var isLoading = status === 'loading' || status === 'empty';
+  var isLoadingMore = status === 'loadingMore';
   var isEmpty = status === 'resolved' && filterOptionsLength === 0;
-  var shouldShowFooter = status === 'resolved' && filterOptionsLength > 0;
+  var areAllResultsLoaded = filterOptions.length === totalCount;
+  var shouldShowFooter = (status === 'resolved' || isLoadingMore) && filterOptions.length > 0; // footer should not disappear when there is an inline spinner for loading more data
+  var shouldDisplayShowMoreButton = status === 'resolved' && !!pageCursor && !areAllResultsLoaded;
   var options = isLoading || isError ? [] : filterOptions; // if not set to [], for eg: on loading, no loading UI will be shown
 
   return /*#__PURE__*/_react.default.createElement(_select.PopupSelect, {
@@ -136,7 +148,10 @@ var AsyncPopupSelect = function AsyncPopupSelect(_ref) {
         return /*#__PURE__*/_react.default.createElement(_menuList.default, (0, _extends2.default)({}, props, {
           isError: isError,
           isEmpty: isEmpty,
-          isLoading: isLoading
+          isLoading: isLoading,
+          isLoadingMore: isLoadingMore,
+          showMore: shouldDisplayShowMoreButton,
+          handleShowMore: handleShowMore
         }));
       },
       DropdownIndicator: _dropdownIndicator.default,

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/messages.js

@@ -34,5 +34,10 @@ var asyncPopupSelectMessages = exports.asyncPopupSelectMessages = {
     id: 'linkDataSource.basic-filter.assignee.label',
     description: 'Label to be displayed for assignee filter dropdown button.',
     defaultMessage: 'Assignee'
+  },
+  showMoreMessage: {
+    id: 'linkDataSource.basic-filter.showMoreButton',
+    defaultMessage: 'Show more',
+    description: 'The text to show more options in dropdown'
   }
 };

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/async-popup-select/showMoreButton.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _reactIntlNext = require("react-intl-next");
+var _button = _interopRequireDefault(require("@atlaskit/button"));
+var _messages = require("./messages");
+var ShowMoreButton = function ShowMoreButton(_ref) {
+  var onShowMore = _ref.onShowMore;
+  var _useIntl = (0, _reactIntlNext.useIntl)(),
+    formatMessage = _useIntl.formatMessage;
+  return /*#__PURE__*/_react.default.createElement(_button.default, {
+    onClick: onShowMore,
+    appearance: "link",
+    testId: "jlol-basic-filter-popup-select--show-more-button"
+  }, formatMessage(_messages.asyncPopupSelectMessages.showMoreMessage));
+};
+var _default = exports.default = ShowMoreButton;

package/dist/cjs/ui/jira-issues-modal/basic-filters/ui/menu-list/index.js

@@ -7,18 +7,33 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
+var _primitives = require("@atlaskit/primitives");
 var _select = require("@atlaskit/select");
+var _spinner = _interopRequireDefault(require("@atlaskit/spinner"));
+var _showMoreButton = _interopRequireDefault(require("../async-popup-select/showMoreButton"));
 var _errorMessage = _interopRequireDefault(require("./errorMessage"));
 var _loadingMessage = _interopRequireDefault(require("./loadingMessage"));
 var _noOptionsMessage = _interopRequireDefault(require("./noOptionsMessage"));
-var _excluded = ["isLoading", "isError", "isEmpty", "children"];
+var _excluded = ["isLoading", "isLoadingMore", "isError", "isEmpty", "showMore", "handleShowMore", "children"];
 var CustomMenuList = function CustomMenuList(_ref) {
   var isLoading = _ref.isLoading,
+    isLoadingMore = _ref.isLoadingMore,
     isError = _ref.isError,
     isEmpty = _ref.isEmpty,
+    showMore = _ref.showMore,
+    handleShowMore = _ref.handleShowMore,
     children = _ref.children,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var getChildComponent = function getChildComponent() {
+  var shouldDisplayShowMore = showMore && !isLoadingMore;
+  var isLoadingMoreData = !shouldDisplayShowMore && isLoadingMore;
+  var InlineSpinner = function InlineSpinner() {
+    return /*#__PURE__*/_react.default.createElement(_primitives.Flex, {
+      justifyContent: "center"
+    }, /*#__PURE__*/_react.default.createElement(_spinner.default, {
+      size: "medium"
+    }));
+  };
+  var renderChildren = function renderChildren() {
     if (isLoading) {
       return /*#__PURE__*/_react.default.createElement(_loadingMessage.default, null);
     }
@@ -28,8 +43,10 @@ var CustomMenuList = function CustomMenuList(_ref) {
     if (isEmpty) {
       return /*#__PURE__*/_react.default.createElement(_noOptionsMessage.default, null);
     }
-    return children;
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children, shouldDisplayShowMore && /*#__PURE__*/_react.default.createElement(_showMoreButton.default, {
+      onShowMore: handleShowMore
+    }), isLoadingMoreData && /*#__PURE__*/_react.default.createElement(InlineSpinner, null));
   };
-  return /*#__PURE__*/_react.default.createElement(_select.components.MenuList, props, getChildComponent());
+  return /*#__PURE__*/_react.default.createElement(_select.components.MenuList, props, renderChildren());
 };
 var _default = exports.default = CustomMenuList;

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/hooks/useAssetsClient.js

@@ -1,32 +1,52 @@
 import { useEffect, useState } from 'react';
-import { fetchObjectSchema, getWorkspaceId } from '../services/cmdbService';
+import { fetchObjectSchema, fetchObjectSchemas, getWorkspaceId } from '../services/cmdbService';
+const handleAssetsClientErrors = (errorSetter, error) => {
+  if (error instanceof Error) {
+    errorSetter(error);
+  } else {
+    errorSetter(new Error('Unexpected error occured'));
+  }
+};
 export const useAssetsClient = initialParameters => {
   const [loading, setLoading] = useState(false);
   const [workspaceId, setWorkspaceId] = useState();
-  const [objectSchema, setObjectSchema] = useState();
-  const [error, setError] = useState();
+  const [workspaceError, setWorkspaceError] = useState();
+  const [existingObjectSchema, setExistingObjectSchema] = useState();
+  const [existingObjectSchemaError, setExistingObjectSchemaError] = useState();
+  const [objectSchemas, setObjectSchemas] = useState();
+  const [totalObjectSchemas, setTotalObjectSchemas] = useState();
+  const [objectSchemasError, setObjectSchemasError] = useState();
+
+  /*
+   * We wrap this in nested try/catch blocks because we want to handle
+   * workspaceError/existingObjectSchemaError/objectSchemasError differently
+   * if we need to implement more initial data fetching/errors we should look at a store
+   */
   useEffect(() => {
     (async () => {
       setLoading(true);
-      setError(undefined);
+      setWorkspaceError(undefined);
       try {
         const workspaceId = await getWorkspaceId();
         setWorkspaceId(workspaceId);
-        // Check schema from initial parameters still exists and fetch name for schema select
+        // 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);
-            setObjectSchema(fetchedObjectSchema);
-          } catch {
-            // Could update this to check if status is 404 and set objectSchemaError
+            setExistingObjectSchema(fetchedObjectSchema);
+          } catch (fetchObjectSchemaError) {
+            handleAssetsClientErrors(setExistingObjectSchemaError, fetchObjectSchemaError);
           }
         }
-      } catch (err) {
-        if (err instanceof Error) {
-          setError(err);
-        } else {
-          setError(new Error('Unexpected error occured'));
+        try {
+          const fetchedObjectSchemasResponse = await fetchObjectSchemas(workspaceId);
+          setObjectSchemas(fetchedObjectSchemasResponse.values);
+          setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
+        } catch (fetchObjectSchemasError) {
+          handleAssetsClientErrors(setObjectSchemasError, fetchObjectSchemasError);
         }
+      } catch (getWorkspaceIdError) {
+        handleAssetsClientErrors(setWorkspaceError, getWorkspaceIdError);
       } finally {
         setLoading(false);
       }
@@ -34,8 +54,12 @@ export const useAssetsClient = initialParameters => {
   }, [initialParameters]);
   return {
     workspaceId,
-    workspaceError: error,
-    objectSchema,
+    workspaceError,
+    existingObjectSchema,
+    existingObjectSchemaError,
+    objectSchemas,
+    totalObjectSchemas,
+    objectSchemasError,
     assetsClientLoading: loading
   };
 };

package/dist/es2019/services/cmdbService.js

@@ -1,29 +1,75 @@
 import { request } from '@atlaskit/linking-common';
+import { FetchError, getStatusCodeGroup, mapFetchErrors, PermissionError } from './cmdbService.utils';
 export const getWorkspaceId = async () => {
-  var _workspaceDetailsResp;
   const url = '/rest/servicedesk/cmdb/latest/workspace';
-  const workspaceDetailsResponse = await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
-  if (!((_workspaceDetailsResp = workspaceDetailsResponse.results) !== null && _workspaceDetailsResp !== void 0 && _workspaceDetailsResp.length)) {
-    throw new Error('No workspace results found');
+  try {
+    var _workspaceDetailsResp;
+    const workspaceDetailsResponse = await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+    if (!((_workspaceDetailsResp = workspaceDetailsResponse.results) !== null && _workspaceDetailsResp !== void 0 && _workspaceDetailsResp.length)) {
+      throw new PermissionError('No workspace results found');
+    }
+    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
+      if (getStatusCodeGroup(error) !== '5xx' && error.statusCode !== 429) {
+        error = new PermissionError('Failed to fetch workspace');
+      }
+    }
+    throw error;
   }
-  return workspaceDetailsResponse.results[0].id;
 };
-export const validateAql = (workspaceId, data) => {
+export const validateAql = async (workspaceId, data) => {
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/aql/validate`;
-  return request('post', url, {
-    qlQuery: data.qlQuery,
-    context: 'SMART_LINKS'
-  }, undefined, [200, 201, 202, 203, 204]);
+  try {
+    return await request('post', url, {
+      qlQuery: data.qlQuery,
+      context: 'SMART_LINKS'
+    }, undefined, [200, 201, 202, 203, 204]);
+  } catch (err) {
+    let error = mapFetchErrors(err);
+    if (error instanceof FetchError) {
+      // TODO Fire error operational event for aql here before remapping to PermissionError
+      if (error.statusCode === 401 || error.statusCode === 403) {
+        error = new PermissionError('Failed to fetch object schemas');
+      }
+    }
+    throw error;
+  }
 };
-export const fetchObjectSchema = (workspaceId, schemaId) => {
+export const fetchObjectSchema = async (workspaceId, schemaId) => {
   const url = `/gateway/api/jsm/assets/workspace/${workspaceId}/v1/objectschema/${schemaId}`;
-  return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+  try {
+    return await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+  } catch (err) {
+    let error = mapFetchErrors(err);
+    if (error instanceof FetchError) {
+      // TODO Fire error operational event for object schema here before remapping to PermissionError
+      if (error.statusCode === 401 || error.statusCode === 403) {
+        error = new PermissionError('Failed to fetch object schemas');
+      }
+    }
+    throw error;
+  }
 };
-export const fetchObjectSchemas = (workspaceId, query) => {
+export const fetchObjectSchemas = async (workspaceId, query) => {
   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}`;
-  return request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+  try {
+    return await request('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
+  } catch (err) {
+    let error = mapFetchErrors(err);
+    if (error instanceof FetchError) {
+      // TODO Fire error operational event for object schemas here before remapping to PermissionError
+      if (error.statusCode === 401 || error.statusCode === 403) {
+        error = new PermissionError('Failed to fetch object schemas');
+      }
+    }
+    throw error;
+  }
 };

package/dist/es2019/services/cmdbService.utils.js

@@ -0,0 +1,39 @@
+export const mapFetchErrors = error => {
+  if (error instanceof Response && !error.ok) {
+    return new FetchError(error.status, `Error server response: ${error.status}`);
+  }
+  return error;
+};
+export const getStatusCodeGroup = error => {
+  if (error instanceof FetchError) {
+    const {
+      statusCode
+    } = error;
+    if (statusCode >= 100 && statusCode < 200) {
+      return '1xx';
+    }
+    if (statusCode >= 300 && statusCode < 400) {
+      return '3xx';
+    }
+    if (statusCode >= 400 && statusCode < 500) {
+      return '4xx';
+    }
+    if (statusCode >= 500 && statusCode < 600) {
+      return '5xx';
+    }
+  }
+  return 'unknown';
+};
+export class PermissionError extends Error {
+  constructor(message) {
+    super(message);
+    this.name = 'PermissionError';
+  }
+}
+export class FetchError extends Error {
+  constructor(statusCode, message) {
+    super(message || `Fetch call failed with status code: ${statusCode}`);
+    this.name = 'FetchError';
+    this.statusCode = statusCode;
+  }
+}