@atlaskit/link-datasource 1.15.3 → 1.15.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atlaskit/link-datasource
 
+## 1.15.4
+
+### Patch Changes
+
+- [#42840](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42840) [`0358055bfaa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/0358055bfaa) - [ux] Permission error states are now shown in the Assets Config Modal.
+
 ## 1.15.3
 
 ### Patch 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.15.3"
+  packageVersion: "1.15.4"
 };

package/dist/cjs/hooks/useAssetsClient.js

@@ -10,6 +10,13 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("react");
 var _cmdbService = require("../services/cmdbService");
+var handleAssetsClientErrors = function handleAssetsClientErrors(errorSetter, error) {
+  if (error instanceof Error) {
+    errorSetter(error);
+  } else {
+    errorSetter(new Error('Unexpected error occured'));
+  }
+};
 var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initialParameters) {
   var _useState = (0, _react.useState)(false),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -21,29 +28,51 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
     setWorkspaceId = _useState4[1];
   var _useState5 = (0, _react.useState)(),
     _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-    objectSchema = _useState6[0],
-    setObjectSchema = _useState6[1];
+    workspaceError = _useState6[0],
+    setWorkspaceError = _useState6[1];
   var _useState7 = (0, _react.useState)(),
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
-    error = _useState8[0],
-    setError = _useState8[1];
+    existingObjectSchema = _useState8[0],
+    setExistingObjectSchema = _useState8[1];
+  var _useState9 = (0, _react.useState)(),
+    _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+    existingObjectSchemaError = _useState10[0],
+    setExistingObjectSchemaError = _useState10[1];
+  var _useState11 = (0, _react.useState)(),
+    _useState12 = (0, _slicedToArray2.default)(_useState11, 2),
+    objectSchemas = _useState12[0],
+    setObjectSchemas = _useState12[1];
+  var _useState13 = (0, _react.useState)(),
+    _useState14 = (0, _slicedToArray2.default)(_useState13, 2),
+    totalObjectSchemas = _useState14[0],
+    setTotalObjectSchemas = _useState14[1];
+  var _useState15 = (0, _react.useState)(),
+    _useState16 = (0, _slicedToArray2.default)(_useState15, 2),
+    objectSchemasError = _useState16[0],
+    setObjectSchemasError = _useState16[1];
+
+  /*
+   * 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
+   */
   (0, _react.useEffect)(function () {
     (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
-      var _workspaceId, fetchedObjectSchema;
+      var _workspaceId, fetchedObjectSchema, fetchedObjectSchemasResponse;
       return _regenerator.default.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            setError(undefined);
+            setWorkspaceError(undefined);
             _context.prev = 2;
             _context.next = 5;
             return (0, _cmdbService.getWorkspaceId)();
           case 5:
             _workspaceId = _context.sent;
             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)) {
-              _context.next = 17;
+              _context.next = 18;
               break;
             }
             _context.prev = 8;
@@ -51,38 +80,53 @@ var useAssetsClient = exports.useAssetsClient = function useAssetsClient(initial
             return (0, _cmdbService.fetchObjectSchema)(_workspaceId, initialParameters === null || initialParameters === void 0 ? void 0 : initialParameters.schemaId);
           case 11:
             fetchedObjectSchema = _context.sent;
-            setObjectSchema(fetchedObjectSchema);
-            _context.next = 17;
+            setExistingObjectSchema(fetchedObjectSchema);
+            _context.next = 18;
             break;
           case 15:
             _context.prev = 15;
             _context.t0 = _context["catch"](8);
-          case 17:
-            _context.next = 22;
+            handleAssetsClientErrors(setExistingObjectSchemaError, _context.t0);
+          case 18:
+            _context.prev = 18;
+            _context.next = 21;
+            return (0, _cmdbService.fetchObjectSchemas)(_workspaceId);
+          case 21:
+            fetchedObjectSchemasResponse = _context.sent;
+            setObjectSchemas(fetchedObjectSchemasResponse.values);
+            setTotalObjectSchemas(fetchedObjectSchemasResponse.total);
+            _context.next = 29;
             break;
-          case 19:
-            _context.prev = 19;
-            _context.t1 = _context["catch"](2);
-            if (_context.t1 instanceof Error) {
-              setError(_context.t1);
-            } else {
-              setError(new Error('Unexpected error occured'));
-            }
-          case 22:
-            _context.prev = 22;
+          case 26:
+            _context.prev = 26;
+            _context.t1 = _context["catch"](18);
+            handleAssetsClientErrors(setObjectSchemasError, _context.t1);
+          case 29:
+            _context.next = 34;
+            break;
+          case 31:
+            _context.prev = 31;
+            _context.t2 = _context["catch"](2);
+            handleAssetsClientErrors(setWorkspaceError, _context.t2);
+          case 34:
+            _context.prev = 34;
             setLoading(false);
-            return _context.finish(22);
-          case 25:
+            return _context.finish(34);
+          case 37:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[2, 19, 22, 25], [8, 15]]);
+      }, _callee, null, [[2, 31, 34, 37], [8, 15], [18, 26]]);
     }))();
   }, [initialParameters]);
   return {
     workspaceId: workspaceId,
-    workspaceError: error,
-    objectSchema: objectSchema,
+    workspaceError: workspaceError,
+    existingObjectSchema: existingObjectSchema,
+    existingObjectSchemaError: existingObjectSchemaError,
+    objectSchemas: objectSchemas,
+    totalObjectSchemas: totalObjectSchemas,
+    objectSchemasError: objectSchemasError,
     assetsClientLoading: loading
   };
 };

package/dist/cjs/services/cmdbService.js

@@ -8,51 +8,151 @@ exports.validateAql = exports.getWorkspaceId = exports.fetchObjectSchemas = expo
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 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 _workspaceDetailsResp;
-    var url, workspaceDetailsResponse;
+    var url, _workspaceDetailsResp, workspaceDetailsResponse, error;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           url = '/rest/servicedesk/cmdb/latest/workspace';
-          _context.next = 3;
+          _context.prev = 1;
+          _context.next = 4;
           return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
-        case 3:
+        case 4:
           workspaceDetailsResponse = _context.sent;
           if ((_workspaceDetailsResp = workspaceDetailsResponse.results) !== null && _workspaceDetailsResp !== void 0 && _workspaceDetailsResp.length) {
-            _context.next = 6;
+            _context.next = 7;
             break;
           }
-          throw new Error('No workspace results found');
-        case 6:
-          return _context.abrupt("return", workspaceDetailsResponse.results[0].id);
+          throw new _cmdbService.PermissionError('No workspace results found');
         case 7:
+          return _context.abrupt("return", workspaceDetailsResponse.results[0].id);
+        case 10:
+          _context.prev = 10;
+          _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
+            if ((0, _cmdbService.getStatusCodeGroup)(error) !== '5xx' && error.statusCode !== 429) {
+              error = new _cmdbService.PermissionError('Failed to fetch workspace');
+            }
+          }
+          throw error;
+        case 15:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[1, 10]]);
   }));
   return function getWorkspaceId() {
     return _ref.apply(this, arguments);
   };
 }();
-var validateAql = exports.validateAql = function validateAql(workspaceId, data) {
-  var url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/aql/validate");
-  return (0, _linkingCommon.request)('post', url, {
-    qlQuery: data.qlQuery,
-    context: 'SMART_LINKS'
-  }, undefined, [200, 201, 202, 203, 204]);
-};
-var fetchObjectSchema = exports.fetchObjectSchema = function fetchObjectSchema(workspaceId, schemaId) {
-  var url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/").concat(schemaId);
-  return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
-};
-var fetchObjectSchemas = exports.fetchObjectSchemas = function fetchObjectSchemas(workspaceId, query) {
-  var queryParams = new URLSearchParams();
-  queryParams.set('maxResults', '20');
-  queryParams.set('includeCounts', 'false');
-  query && queryParams.set('query', query);
-  var url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/list?").concat(queryParams);
-  return (0, _linkingCommon.request)('get', url, undefined, undefined, [200, 201, 202, 203, 204]);
-};
+var validateAql = exports.validateAql = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(workspaceId, data) {
+    var url, error;
+    return _regenerator.default.wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/aql/validate");
+          _context2.prev = 1;
+          _context2.next = 4;
+          return (0, _linkingCommon.request)('post', url, {
+            qlQuery: data.qlQuery,
+            context: 'SMART_LINKS'
+          }, undefined, [200, 201, 202, 203, 204]);
+        case 4:
+          return _context2.abrupt("return", _context2.sent);
+        case 7:
+          _context2.prev = 7;
+          _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
+            if (error.statusCode === 401 || error.statusCode === 403) {
+              error = new _cmdbService.PermissionError('Failed to fetch object schemas');
+            }
+          }
+          throw error;
+        case 12:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[1, 7]]);
+  }));
+  return function validateAql(_x, _x2) {
+    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;
+    return _regenerator.default.wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/").concat(schemaId);
+          _context3.prev = 1;
+          _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;
+          _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
+            if (error.statusCode === 401 || error.statusCode === 403) {
+              error = new _cmdbService.PermissionError('Failed to fetch object schemas');
+            }
+          }
+          throw error;
+        case 12:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[1, 7]]);
+  }));
+  return function fetchObjectSchema(_x3, _x4) {
+    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;
+    return _regenerator.default.wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          queryParams = new URLSearchParams();
+          queryParams.set('maxResults', '20');
+          queryParams.set('includeCounts', 'false');
+          query && queryParams.set('query', query);
+          url = "/gateway/api/jsm/assets/workspace/".concat(workspaceId, "/v1/objectschema/list?").concat(queryParams);
+          _context4.prev = 5;
+          _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;
+          _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
+            if (error.statusCode === 401 || error.statusCode === 403) {
+              error = new _cmdbService.PermissionError('Failed to fetch object schemas');
+            }
+          }
+          throw error;
+        case 16:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4, null, [[5, 11]]);
+  }));
+  return function fetchObjectSchemas(_x5, _x6) {
+    return _ref4.apply(this, arguments);
+  };
+}();

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

@@ -0,0 +1,64 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.mapFetchErrors = exports.getStatusCodeGroup = exports.PermissionError = exports.FetchError = void 0;
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
+var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+var mapFetchErrors = exports.mapFetchErrors = function mapFetchErrors(error) {
+  if (error instanceof Response && !error.ok) {
+    return new FetchError(error.status, "Error server response: ".concat(error.status));
+  }
+  return error;
+};
+var getStatusCodeGroup = exports.getStatusCodeGroup = function getStatusCodeGroup(error) {
+  if (error instanceof FetchError) {
+    var statusCode = error.statusCode;
+    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';
+};
+var PermissionError = exports.PermissionError = /*#__PURE__*/function (_Error) {
+  (0, _inherits2.default)(PermissionError, _Error);
+  var _super = _createSuper(PermissionError);
+  function PermissionError(message) {
+    var _this;
+    (0, _classCallCheck2.default)(this, PermissionError);
+    _this = _super.call(this, message);
+    _this.name = 'PermissionError';
+    return _this;
+  }
+  return (0, _createClass2.default)(PermissionError);
+}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
+var FetchError = exports.FetchError = /*#__PURE__*/function (_Error2) {
+  (0, _inherits2.default)(FetchError, _Error2);
+  var _super2 = _createSuper(FetchError);
+  function FetchError(statusCode, message) {
+    var _this2;
+    (0, _classCallCheck2.default)(this, FetchError);
+    _this2 = _super2.call(this, message || "Fetch call failed with status code: ".concat(statusCode));
+    _this2.name = 'FetchError';
+    _this2.statusCode = statusCode;
+    return _this2;
+  }
+  return (0, _createClass2.default)(FetchError);
+}( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));

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

@@ -29,6 +29,8 @@ var _fetchMessagesForLocale = require("../../../common/utils/locale/fetch-messag
 var _useAssetsClient2 = require("../../../hooks/useAssetsClient");
 var _useDatasourceTableState = require("../../../hooks/useDatasourceTableState");
 var _en = _interopRequireDefault(require("../../../i18n/en"));
+var _cmdbService = require("../../../services/cmdbService.utils");
+var _accessRequired = require("../../../ui/common/error-state/access-required");
 var _modalLoadingError = require("../../common/error-state/modal-loading-error");
 var _searchContainer = require("../search-container");
 var _loadingState = require("../search-container/loading-state");
@@ -43,6 +45,9 @@ var modalBodyWrapperStyles = (0, _react2.css)({
   height: '420px',
   overflow: 'auto'
 });
+var modalBodyErrorWrapperStyles = (0, _react2.css)({
+  alignItems: 'center'
+});
 var AssetsModalTitle = (0, _react2.jsx)(_modalDialog.ModalTitle, null, (0, _react2.jsx)(_reactIntlNext.FormattedMessage, _messages.modalMessages.insertObjectsTitle));
 var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
   var datasourceId = props.datasourceId,
@@ -66,17 +71,53 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     _useState8 = (0, _slicedToArray2.default)(_useState7, 2),
     isNewSearch = _useState8[0],
     setIsNewSearch = _useState8[1];
+  var _useState9 = (0, _react.useState)(),
+    _useState10 = (0, _slicedToArray2.default)(_useState9, 2),
+    errorState = _useState10[0],
+    setErrorState = _useState10[1];
   var _useDatasourceAnalyti = (0, _analytics.useDatasourceAnalyticsEvents)(),
     fireEvent = _useDatasourceAnalyti.fireEvent;
   var _useRef = (0, _react.useRef)((0, _uuid.v4)()),
     modalRenderInstanceId = _useRef.current;
-
-  // If a workspaceError occurs this is a critical error
   var _useAssetsClient = (0, _useAssetsClient2.useAssetsClient)(initialParameters),
     workspaceId = _useAssetsClient.workspaceId,
     workspaceError = _useAssetsClient.workspaceError,
-    objectSchema = _useAssetsClient.objectSchema,
+    existingObjectSchema = _useAssetsClient.existingObjectSchema,
+    existingObjectSchemaError = _useAssetsClient.existingObjectSchemaError,
+    objectSchemas = _useAssetsClient.objectSchemas,
+    objectSchemasError = _useAssetsClient.objectSchemasError,
+    totalObjectSchemas = _useAssetsClient.totalObjectSchemas,
     assetsClientLoading = _useAssetsClient.assetsClientLoading;
+
+  /* ------------------------------ PERMISSIONS ------------------------------ */
+  (0, _react.useEffect)(function () {
+    if (workspaceError) {
+      // If a workspaceError occurs this is a critical error
+      if (workspaceError instanceof _cmdbService.PermissionError) {
+        setErrorState('permission');
+      } else {
+        setErrorState('network');
+      }
+    }
+  }, [workspaceError]);
+  (0, _react.useEffect)(function () {
+    if (objectSchemasError) {
+      // We only care about permission errors for objectSchemas fetching as the user can retry this action
+      if (objectSchemasError instanceof _cmdbService.PermissionError) {
+        setErrorState('permission');
+      }
+    }
+  }, [objectSchemasError]);
+  (0, _react.useEffect)(function () {
+    if (existingObjectSchemaError) {
+      // We only care about permission errors for existingObjectSchema fetching as the user can retry this action
+      if (existingObjectSchemaError instanceof _cmdbService.PermissionError) {
+        setErrorState('permission');
+      }
+    }
+  }, [existingObjectSchemaError]);
+  /* ------------------------------ END PERMISSIONS ------------------------------ */
+
   var parameters = (0, _react.useMemo)(function () {
     return {
       aql: aql || '',
@@ -114,6 +155,15 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       destinationObjectTypes: destinationObjectTypes
     };
   }, [destinationObjectTypes, extensionKey]);
+  (0, _react.useEffect)(function () {
+    // We only want to send modal ready event once after we've fetched the schema count
+    if (totalObjectSchemas !== undefined) {
+      fireEvent('ui.modal.ready.datasource', {
+        schemasCount: totalObjectSchemas,
+        instancesCount: null
+      });
+    }
+  }, [fireEvent, totalObjectSchemas]);
   (0, _react.useEffect)(function () {
     fireEvent('screen.datasourceModalDialog.viewed', {});
   }, [fireEvent]);
@@ -167,7 +217,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  var isDisabled = !!workspaceError || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
+  var isDisabled = !!errorState || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
     var _data$key;
     var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),
@@ -269,8 +319,20 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       return _ref.apply(this, arguments);
     };
   }(), [aql, reset, schemaId, status]);
+  var renderErrorState = (0, _react.useCallback)(function () {
+    if (errorState) {
+      switch (errorState) {
+        case 'permission':
+          return (0, _react2.jsx)(_accessRequired.AccessRequired, null);
+        case 'network':
+          return (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, null);
+        default:
+          return (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, null);
+      }
+    }
+  }, [errorState]);
   var renderModalTitleContent = (0, _react.useCallback)(function () {
-    if (workspaceError) {
+    if (errorState) {
       return undefined;
     } else {
       if (!workspaceId || assetsClientLoading) {
@@ -282,14 +344,15 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
         workspaceId: workspaceId,
         initialSearchData: {
           aql: aql,
-          objectSchema: objectSchema
+          objectSchema: existingObjectSchema,
+          objectSchemas: objectSchemas
         },
         onSearch: handleOnSearch,
         modalTitle: AssetsModalTitle,
         isSearching: status === 'loading'
       });
     }
-  }, [aql, assetsClientLoading, handleOnSearch, objectSchema, status, workspaceError, workspaceId]);
+  }, [errorState, workspaceId, assetsClientLoading, aql, existingObjectSchema, objectSchemas, handleOnSearch, status]);
   return (0, _react2.jsx)(_intlMessagesProvider.IntlMessagesProvider, {
     defaultMessages: _en.default,
     loaderFn: _fetchMessagesForLocale.fetchMessagesForLocale
@@ -300,8 +363,9 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
     shouldScrollInViewport: true,
     shouldCloseOnOverlayClick: false
   }, (0, _react2.jsx)(_modalDialog.ModalHeader, null, renderModalTitleContent()), (0, _react2.jsx)(_modalDialog.ModalBody, null, (0, _react2.jsx)("div", {
-    css: modalBodyWrapperStyles
-  }, workspaceError ? (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, null) : (0, _react2.jsx)(_renderAssetsContent.RenderAssetsContent, {
+    css: [modalBodyWrapperStyles, errorState && modalBodyErrorWrapperStyles]
+  }, errorState ? renderErrorState() : (0, _react2.jsx)(_renderAssetsContent.RenderAssetsContent, {
+    isFetchingInitialData: assetsClientLoading,
     status: status,
     responseItems: responseItems,
     visibleColumnKeys: visibleColumnKeys,

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

@@ -1,18 +1,23 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RenderAssetsContent = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
+var _react2 = require("@emotion/react");
 var _accessRequired = require("../../../common/error-state/access-required");
 var _modalLoadingError = require("../../../common/error-state/modal-loading-error");
 var _noResults = require("../../../common/error-state/no-results");
 var _issueLikeTable = require("../../../issue-like-table");
 var _initialStateView = require("./initial-state-view");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+/** @jsx jsx */
+
+// This is to prevent y scrollbar when initially fetching data
+var emptyStateOverrideStyles = (0, _react2.css)({
+  height: '420px',
+  overflow: 'hidden'
+});
 var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsContent(props) {
   var status = props.status,
     responseItems = props.responseItems,
@@ -23,10 +28,11 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
     columns = props.columns,
     defaultVisibleColumnKeys = props.defaultVisibleColumnKeys,
     onVisibleColumnKeysChange = props.onVisibleColumnKeysChange,
-    modalRenderInstanceId = props.modalRenderInstanceId;
+    modalRenderInstanceId = props.modalRenderInstanceId,
+    isFetchingInitialData = props.isFetchingInitialData;
   var resolvedWithNoResults = status === 'resolved' && !responseItems.length;
   var issueLikeDataTableView = (0, _react.useMemo)(function () {
-    return /*#__PURE__*/_react.default.createElement(_issueLikeTable.IssueLikeDataTableView, {
+    return (0, _react2.jsx)(_issueLikeTable.IssueLikeDataTableView, {
       testId: "asset-datasource-table",
       status: status,
       columns: columns,
@@ -39,16 +45,23 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
       parentContainerRenderInstanceId: modalRenderInstanceId
     });
   }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
-  if (status === 'rejected') {
-    return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, null);
+  if (isFetchingInitialData) {
+    // Placing this check first as it's a priority before all others
+    return (0, _react2.jsx)("div", {
+      css: emptyStateOverrideStyles
+    }, (0, _react2.jsx)(_issueLikeTable.EmptyState, {
+      testId: "assets-aql-datasource-modal--loading-state"
+    }));
+  } else if (status === 'rejected') {
+    return (0, _react2.jsx)(_modalLoadingError.ModalLoadingError, null);
   } else if (status === 'unauthorized') {
-    return /*#__PURE__*/_react.default.createElement(_accessRequired.AccessRequired, null);
+    return (0, _react2.jsx)(_accessRequired.AccessRequired, null);
   } else if (status === 'empty') {
-    return /*#__PURE__*/_react.default.createElement(_initialStateView.InitialStateView, null);
+    return (0, _react2.jsx)(_initialStateView.InitialStateView, null);
   } else if (resolvedWithNoResults) {
-    return /*#__PURE__*/_react.default.createElement(_noResults.NoResults, null);
+    return (0, _react2.jsx)(_noResults.NoResults, null);
   } else if (status === 'loading' && !columns.length) {
-    return /*#__PURE__*/_react.default.createElement(_issueLikeTable.EmptyState, {
+    return (0, _react2.jsx)(_issueLikeTable.EmptyState, {
       testId: "assets-aql-datasource-modal--loading-state"
     });
   }

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,