@atlaskit/link-datasource 1.12.1 → 1.12.3

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/link-datasource
 
+## 1.12.3
+
+### Patch Changes
+
+- [#42706](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42706) [`c3c9a5ec9c9`](https://bitbucket.org/atlassian/atlassian-frontend/commits/c3c9a5ec9c9) - Fix a problem where when column dragging start on top of a label - it drags whole table
+
+## 1.12.2
+
+### Patch Changes
+
+- [#42675](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/42675) [`bce00b9b36f`](https://bitbucket.org/atlassian/atlassian-frontend/commits/bce00b9b36f) - [ux] Updated Assets Config Modal to also show unauthorized state
+  Updated useDatasourceTableState to return unauthorized state on 401 & 403 responses
+- Updated dependencies
+
 ## 1.12.1
 
 ### 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.12.1"
+  packageVersion: "1.12.3"
 };

package/dist/cjs/hooks/useDatasourceTableState.js

@@ -102,13 +102,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat((0, _toConsumableArray2.default)(columns), (0, _toConsumableArray2.default)(newColumns)));
-          _context.next = 20;
+          _context.next = 23;
           break;
         case 17:
           _context.prev = 17;
           _context.t0 = _context["catch"](2);
+          if (!(_context.t0 instanceof Response && (_context.t0.status === 401 || _context.t0.status === 403))) {
+            _context.next = 22;
+            break;
+          }
+          setStatus('unauthorized');
+          return _context.abrupt("return");
+        case 22:
           setStatus('rejected');
-        case 20:
+        case 23:
         case "end":
           return _context.stop();
       }
@@ -221,13 +228,20 @@ var useDatasourceTableState = exports.useDatasourceTableState = function useData
             });
           }
           setStatus('resolved');
-          _context2.next = 38;
+          _context2.next = 41;
           break;
         case 35:
           _context2.prev = 35;
           _context2.t0 = _context2["catch"](6);
+          if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
+            _context2.next = 40;
+            break;
+          }
+          setStatus('unauthorized');
+          return _context2.abrupt("return");
+        case 40:
           setStatus('rejected');
-        case 38:
+        case 41:
         case "end":
           return _context2.stop();
       }

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

@@ -167,7 +167,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || assetsClientLoading || !aql || !schemaId;
+  var isDisabled = !!workspaceError || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = (0, _react.useCallback)(function () {
     var _data$key;
     var _responseItems = (0, _slicedToArray2.default)(responseItems, 1),

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.RenderAssetsContent = void 0;
 var _react = _interopRequireWildcard(require("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");
@@ -40,6 +41,8 @@ var RenderAssetsContent = exports.RenderAssetsContent = function RenderAssetsCon
   }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
   if (status === 'rejected') {
     return /*#__PURE__*/_react.default.createElement(_modalLoadingError.ModalLoadingError, null);
+  } else if (status === 'unauthorized') {
+    return /*#__PURE__*/_react.default.createElement(_accessRequired.AccessRequired, null);
   } else if (status === 'empty') {
     return /*#__PURE__*/_react.default.createElement(_initialStateView.InitialStateView, null);
   } else if (resolvedWithNoResults) {

package/dist/cjs/ui/common/error-state/access-required.js

@@ -55,6 +55,7 @@ var AccessRequired = exports.AccessRequired = function AccessRequired(_ref2) {
   }, [fireEvent]);
   if (url) {
     return (0, _react2.jsx)(_emptyState.default, {
+      testId: "datasource--access-required-with-url",
       header: formatMessage(_messages.loadingErrorMessages.accessRequiredWithSite),
       description: (0, _react2.jsx)(Description, {
         message: formatMessage(_messages.loadingErrorMessages.accessInstructions),
@@ -64,6 +65,7 @@ var AccessRequired = exports.AccessRequired = function AccessRequired(_ref2) {
     });
   }
   return (0, _react2.jsx)(_emptyState.default, {
+    testId: "datasource--access-required",
     header: formatMessage(_messages.loadingErrorMessages.accessRequired),
     description: formatMessage(_messages.loadingErrorMessages.accessInstructions),
     renderImage: IconContainer

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

@@ -373,6 +373,11 @@ var IssueLikeDataTableView = exports.IssueLikeDataTableView = function IssueLike
     }, _callee, null, [[3, 9]]);
   })), [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   return (0, _react2.jsx)("div", {
+    /* There is required contentEditable={true} in editor-card-plugin
+     * But this brakes how DND works. We set contentEditable={false} to allow DND to work
+     * when dragging is initiated on top of a column label.
+     */
+    contentEditable: false,
     ref: containerRef,
     css: scrollableContainerHeight ? scrollableContainerStyles : null,
     style: scrollableContainerHeight ? {

package/dist/es2019/analytics/constants.js

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

package/dist/es2019/hooks/useDatasourceTableState.js

@@ -49,6 +49,10 @@ export const useDatasourceTableState = ({
       const newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
       newColumns.length > 0 && setColumns([...columns, ...newColumns]);
     } catch (e) {
+      if (e instanceof Response && (e.status === 401 || e.status === 403)) {
+        setStatus('unauthorized');
+        return;
+      }
       setStatus('rejected');
     }
   }, [columns, datasourceId, getDatasourceDetails, parameters]);
@@ -131,6 +135,10 @@ export const useDatasourceTableState = ({
       }
       setStatus('resolved');
     } catch (e) {
+      if (e instanceof Response && (e.status === 401 || e.status === 403)) {
+        setStatus('unauthorized');
+        return;
+      }
       setStatus('rejected');
     }
   }, [parameters, fieldKeys, nextCursor, getDatasourceData, datasourceId, responseItems === null || responseItems === void 0 ? void 0 : responseItems.length, applySchemaProperties, fireEvent]);

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

@@ -144,7 +144,7 @@ const PlainAssetsConfigModal = props => {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  const isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || assetsClientLoading || !aql || !schemaId;
+  const isDisabled = !!workspaceError || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   const retrieveUrlForSmartCardRender = useCallback(() => {
     var _data$key, _data$key$data;
     const [data] = responseItems;

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

@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react';
+import { AccessRequired } from '../../../common/error-state/access-required';
 import { ModalLoadingError } from '../../../common/error-state/modal-loading-error';
 import { NoResults } from '../../../common/error-state/no-results';
 import { EmptyState, IssueLikeDataTableView } from '../../../issue-like-table';
@@ -31,6 +32,8 @@ export const RenderAssetsContent = props => {
   }), [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
   if (status === 'rejected') {
     return /*#__PURE__*/React.createElement(ModalLoadingError, null);
+  } else if (status === 'unauthorized') {
+    return /*#__PURE__*/React.createElement(AccessRequired, null);
   } else if (status === 'empty') {
     return /*#__PURE__*/React.createElement(InitialStateView, null);
   } else if (resolvedWithNoResults) {

package/dist/es2019/ui/common/error-state/access-required.js

@@ -49,6 +49,7 @@ export const AccessRequired = ({
   }, [fireEvent]);
   if (url) {
     return jsx(EmptyState, {
+      testId: "datasource--access-required-with-url",
       header: formatMessage(loadingErrorMessages.accessRequiredWithSite),
       description: jsx(Description, {
         message: formatMessage(loadingErrorMessages.accessInstructions),
@@ -58,6 +59,7 @@ export const AccessRequired = ({
     });
   }
   return jsx(EmptyState, {
+    testId: "datasource--access-required",
     header: formatMessage(loadingErrorMessages.accessRequired),
     description: formatMessage(loadingErrorMessages.accessInstructions),
     renderImage: IconContainer

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

@@ -326,6 +326,11 @@ export const IssueLikeDataTableView = ({
     }
   }, [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   return jsx("div", {
+    /* There is required contentEditable={true} in editor-card-plugin
+     * But this brakes how DND works. We set contentEditable={false} to allow DND to work
+     * when dragging is initiated on top of a column label.
+     */
+    contentEditable: false,
     ref: containerRef,
     css: scrollableContainerHeight ? scrollableContainerStyles : null,
     style: scrollableContainerHeight ? {

package/dist/esm/analytics/constants.js

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

package/dist/esm/hooks/useDatasourceTableState.js

@@ -95,13 +95,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
           allColumns = schema.properties;
           newColumns = allColumns.filter(isColumnNotPresentInCurrentColumnsList);
           newColumns.length > 0 && setColumns([].concat(_toConsumableArray(columns), _toConsumableArray(newColumns)));
-          _context.next = 20;
+          _context.next = 23;
           break;
         case 17:
           _context.prev = 17;
           _context.t0 = _context["catch"](2);
+          if (!(_context.t0 instanceof Response && (_context.t0.status === 401 || _context.t0.status === 403))) {
+            _context.next = 22;
+            break;
+          }
+          setStatus('unauthorized');
+          return _context.abrupt("return");
+        case 22:
           setStatus('rejected');
-        case 20:
+        case 23:
         case "end":
           return _context.stop();
       }
@@ -214,13 +221,20 @@ export var useDatasourceTableState = function useDatasourceTableState(_ref) {
             });
           }
           setStatus('resolved');
-          _context2.next = 38;
+          _context2.next = 41;
           break;
         case 35:
           _context2.prev = 35;
           _context2.t0 = _context2["catch"](6);
+          if (!(_context2.t0 instanceof Response && (_context2.t0.status === 401 || _context2.t0.status === 403))) {
+            _context2.next = 40;
+            break;
+          }
+          setStatus('unauthorized');
+          return _context2.abrupt("return");
+        case 40:
           setStatus('rejected');
-        case 38:
+        case 41:
         case "end":
           return _context2.stop();
       }

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

@@ -158,7 +158,7 @@ var PlainAssetsConfigModal = function PlainAssetsConfigModal(props) {
       setVisibleColumnKeys(defaultVisibleColumnKeys);
     }
   }, [defaultVisibleColumnKeys, isNewSearch]);
-  var isDisabled = !!workspaceError || status === 'rejected' || status === 'loading' || status === 'empty' || assetsClientLoading || !aql || !schemaId;
+  var isDisabled = !!workspaceError || status !== 'resolved' || assetsClientLoading || !aql || !schemaId;
   var retrieveUrlForSmartCardRender = useCallback(function () {
     var _data$key;
     var _responseItems = _slicedToArray(responseItems, 1),

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

@@ -1,4 +1,5 @@
 import React, { useMemo } from 'react';
+import { AccessRequired } from '../../../common/error-state/access-required';
 import { ModalLoadingError } from '../../../common/error-state/modal-loading-error';
 import { NoResults } from '../../../common/error-state/no-results';
 import { EmptyState, IssueLikeDataTableView } from '../../../issue-like-table';
@@ -31,6 +32,8 @@ export var RenderAssetsContent = function RenderAssetsContent(props) {
   }, [columns, defaultVisibleColumnKeys, hasNextPage, loadDatasourceDetails, onNextPage, onVisibleColumnKeysChange, responseItems, status, visibleColumnKeys, modalRenderInstanceId]);
   if (status === 'rejected') {
     return /*#__PURE__*/React.createElement(ModalLoadingError, null);
+  } else if (status === 'unauthorized') {
+    return /*#__PURE__*/React.createElement(AccessRequired, null);
   } else if (status === 'empty') {
     return /*#__PURE__*/React.createElement(InitialStateView, null);
   } else if (resolvedWithNoResults) {

package/dist/esm/ui/common/error-state/access-required.js

@@ -47,6 +47,7 @@ export var AccessRequired = function AccessRequired(_ref2) {
   }, [fireEvent]);
   if (url) {
     return jsx(EmptyState, {
+      testId: "datasource--access-required-with-url",
       header: formatMessage(loadingErrorMessages.accessRequiredWithSite),
       description: jsx(Description, {
         message: formatMessage(loadingErrorMessages.accessInstructions),
@@ -56,6 +57,7 @@ export var AccessRequired = function AccessRequired(_ref2) {
     });
   }
   return jsx(EmptyState, {
+    testId: "datasource--access-required",
     header: formatMessage(loadingErrorMessages.accessRequired),
     description: formatMessage(loadingErrorMessages.accessInstructions),
     renderImage: IconContainer

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

@@ -366,6 +366,11 @@ export var IssueLikeDataTableView = function IssueLikeDataTableView(_ref) {
     }, _callee, null, [[3, 9]]);
   })), [parentContainerRenderInstanceId, extensionKey, hasFullSchema, onLoadDatasourceDetails]);
   return jsx("div", {
+    /* There is required contentEditable={true} in editor-card-plugin
+     * But this brakes how DND works. We set contentEditable={false} to allow DND to work
+     * when dragging is initiated on top of a column label.
+     */
+    contentEditable: false,
     ref: containerRef,
     css: scrollableContainerHeight ? scrollableContainerStyles : null,
     style: scrollableContainerHeight ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/link-datasource",
-  "version": "1.12.1",
+  "version": "1.12.3",
   "description": "UI Components to support linking platform dataset feature",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
     "@atlaskit/jql-editor-autocomplete-rest": "^2.0.0",
     "@atlaskit/link-client-extension": "^1.8.0",
     "@atlaskit/link-provider": "^1.6.12",
-    "@atlaskit/linking-common": "^4.14.0",
+    "@atlaskit/linking-common": "^4.15.0",
     "@atlaskit/linking-types": "^8.4.0",
     "@atlaskit/lozenge": "^11.4.0",
     "@atlaskit/modal-dialog": "^12.8.0",