@atlaskit/editor-plugin-card 1.0.5 → 1.1.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-plugin-card
 
+## 1.1.0
+
+### Minor Changes
+
+- [#76379](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/76379) [`1550bb6f5bde`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1550bb6f5bde) - Updating links for link-preferences to be dependent on staging environment
+
+### Patch Changes
+
+- Updated dependencies
+
+## 1.0.6
+
+### Patch Changes
+
+- [#75568](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/75568) [`cf557c64b311`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/cf557c64b311) - Updated DatasourceErrorBoundary to pass error, datasourceId and datasourceModalType to LazyLoadedDatasourceRenderFailedAnalyticsWrapper
+
 ## 1.0.5
 
 ### Patch Changes

package/dist/cjs/datasourceErrorBoundary.js

@@ -29,7 +29,8 @@ var DatasourceErrorBoundary = exports.DatasourceErrorBoundary = /*#__PURE__*/fun
     }
     _this = _super.call.apply(_super, [this].concat(args));
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
-      isError: false
+      isError: false,
+      error: null
     });
     return _this;
   }
@@ -42,7 +43,8 @@ var DatasourceErrorBoundary = exports.DatasourceErrorBoundary = /*#__PURE__*/fun
       // prevent re-render children with error
       if (this.state.isError) {
         this.setState({
-          isError: true
+          isError: true,
+          error: error
         });
       }
     }
@@ -52,13 +54,22 @@ var DatasourceErrorBoundary = exports.DatasourceErrorBoundary = /*#__PURE__*/fun
       var _this$props = this.props,
         url = _this$props.url,
         UnsupportedComponent = _this$props.unsupportedComponent,
-        view = _this$props.view;
+        view = _this$props.view,
+        datasourceModalType = _this$props.datasourceModalType,
+        datasourceId = _this$props.datasourceId;
       if (this.state.isError) {
         if (url && (0, _adfSchema.isSafeUrl)(url)) {
-          return /*#__PURE__*/_react.default.createElement(_linkDatasource.LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, (0, _doc.setSelectedCardAppearance)('inline', undefined)(view.state, view.dispatch));
+          return /*#__PURE__*/_react.default.createElement(_linkDatasource.LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+            datasourceId: datasourceId,
+            error: this.state.error
+          }, (0, _doc.setSelectedCardAppearance)('inline', undefined)(view.state, view.dispatch));
         } else {
           var unsupportedComponent = UnsupportedComponent ? /*#__PURE__*/_react.default.createElement(UnsupportedComponent, null) : null;
-          return /*#__PURE__*/_react.default.createElement(_linkDatasource.LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, unsupportedComponent);
+          return /*#__PURE__*/_react.default.createElement(_linkDatasource.LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+            datasourceModalType: datasourceModalType,
+            datasourceId: datasourceId,
+            error: this.state.error
+          }, unsupportedComponent);
         }
       } else {
         return this.props.children;
@@ -68,7 +79,8 @@ var DatasourceErrorBoundary = exports.DatasourceErrorBoundary = /*#__PURE__*/fun
     key: "getDerivedStateFromError",
     value: function getDerivedStateFromError(error) {
       return {
-        isError: true
+        isError: true,
+        error: error
       };
     }
   }]);

package/dist/cjs/nodeviews/datasource.js

@@ -230,11 +230,13 @@ var Datasource = exports.Datasource = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render() {
+      var _attrs$datasource;
       var attrs = this.node.attrs;
       return (0, _react2.jsx)(_datasourceErrorBoundary.DatasourceErrorBoundary, {
         unsupportedComponent: _ui.UnsupportedInline,
         view: this.view,
-        url: attrs.url
+        url: attrs.url,
+        datasourceId: attrs === null || attrs === void 0 || (_attrs$datasource = attrs.datasource) === null || _attrs$datasource === void 0 ? void 0 : _attrs$datasource.id
       }, (0, _react2.jsx)("div", {
         className: _styles.DATASOURCE_INNER_CONTAINER_CLASSNAME,
         style: {

package/dist/cjs/toolbar.js

@@ -12,6 +12,7 @@ var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _card = require("@atlaskit/editor-common/card");
+var _constants = require("@atlaskit/editor-common/constants");
 var _messages = _interopRequireWildcard(require("@atlaskit/editor-common/messages"));
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -87,7 +88,7 @@ var openLinkSettings = exports.openLinkSettings = function openLinkSettings(edit
     if (!(state.selection instanceof _state.NodeSelection)) {
       return false;
     }
-    window.open('https://id.atlassian.com/manage-profile/link-preferences');
+    process.env.NODE_ENV === 'production' ? window.open(_constants.productionLinkPreferencesUrl) : window.open(_constants.stagingLinkPreferencesUrl);
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;

package/dist/cjs/ui/DatasourceModal/ModalWithState.js

@@ -19,7 +19,8 @@ var ModalWithState = function ModalWithState(_ref) {
     return null;
   }
   return /*#__PURE__*/_react.default.createElement(_datasourceErrorBoundary.DatasourceErrorBoundary, {
-    view: editorView
+    view: editorView,
+    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
   }, /*#__PURE__*/_react.default.createElement(_CardContextProvider.CardContextProvider, null, function (_ref2) {
     var cardContext = _ref2.cardContext;
     return /*#__PURE__*/_react.default.createElement(_index.DatasourceModal, {

package/dist/es2019/datasourceErrorBoundary.js

@@ -8,12 +8,14 @@ export class DatasourceErrorBoundary extends React.Component {
   constructor(...args) {
     super(...args);
     _defineProperty(this, "state", {
-      isError: false
+      isError: false,
+      error: null
     });
   }
   static getDerivedStateFromError(error) {
     return {
-      isError: true
+      isError: true,
+      error
     };
   }
   componentDidCatch(error) {
@@ -23,7 +25,8 @@ export class DatasourceErrorBoundary extends React.Component {
     // prevent re-render children with error
     if (this.state.isError) {
       this.setState({
-        isError: true
+        isError: true,
+        error
       });
     }
   }
@@ -31,14 +34,23 @@ export class DatasourceErrorBoundary extends React.Component {
     const {
       url,
       unsupportedComponent: UnsupportedComponent,
-      view
+      view,
+      datasourceModalType,
+      datasourceId
     } = this.props;
     if (this.state.isError) {
       if (url && isSafeUrl(url)) {
-        return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
+        return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+          datasourceId: datasourceId,
+          error: this.state.error
+        }, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
       } else {
         const unsupportedComponent = UnsupportedComponent ? /*#__PURE__*/React.createElement(UnsupportedComponent, null) : null;
-        return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, unsupportedComponent);
+        return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+          datasourceModalType: datasourceModalType,
+          datasourceId: datasourceId,
+          error: this.state.error
+        }, unsupportedComponent);
       }
     } else {
       return this.props.children;

package/dist/es2019/nodeviews/datasource.js

@@ -185,13 +185,15 @@ export class Datasource extends ReactNodeView {
     return domRef;
   }
   render() {
+    var _attrs$datasource;
     const {
       attrs
     } = this.node;
     return jsx(DatasourceErrorBoundary, {
       unsupportedComponent: UnsupportedInline,
       view: this.view,
-      url: attrs.url
+      url: attrs.url,
+      datasourceId: attrs === null || attrs === void 0 ? void 0 : (_attrs$datasource = attrs.datasource) === null || _attrs$datasource === void 0 ? void 0 : _attrs$datasource.id
     }, jsx("div", {
       className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
       style: {

package/dist/es2019/toolbar.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from '@atlaskit/editor-common/constants';
 import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { SmallerEditIcon } from '@atlaskit/editor-common/ui';
@@ -75,7 +76,7 @@ export const openLinkSettings = editorAnalyticsApi => (state, dispatch) => {
   if (!(state.selection instanceof NodeSelection)) {
     return false;
   }
-  window.open('https://id.atlassian.com/manage-profile/link-preferences');
+  process.env.NODE_ENV === 'production' ? window.open(productionLinkPreferencesUrl) : window.open(stagingLinkPreferencesUrl);
   if (dispatch) {
     const {
       tr,

package/dist/es2019/ui/DatasourceModal/ModalWithState.js

@@ -14,7 +14,8 @@ const ModalWithState = ({
     return null;
   }
   return /*#__PURE__*/React.createElement(DatasourceErrorBoundary, {
-    view: editorView
+    view: editorView,
+    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
   }, /*#__PURE__*/React.createElement(CardContextProvider, null, ({
     cardContext
   }) => /*#__PURE__*/React.createElement(DatasourceModal, {

package/dist/esm/datasourceErrorBoundary.js

@@ -23,7 +23,8 @@ export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
     }
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "state", {
-      isError: false
+      isError: false,
+      error: null
     });
     return _this;
   }
@@ -36,7 +37,8 @@ export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
       // prevent re-render children with error
       if (this.state.isError) {
         this.setState({
-          isError: true
+          isError: true,
+          error: error
         });
       }
     }
@@ -46,13 +48,22 @@ export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
       var _this$props = this.props,
         url = _this$props.url,
         UnsupportedComponent = _this$props.unsupportedComponent,
-        view = _this$props.view;
+        view = _this$props.view,
+        datasourceModalType = _this$props.datasourceModalType,
+        datasourceId = _this$props.datasourceId;
       if (this.state.isError) {
         if (url && isSafeUrl(url)) {
-          return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
+          return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+            datasourceId: datasourceId,
+            error: this.state.error
+          }, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
         } else {
           var unsupportedComponent = UnsupportedComponent ? /*#__PURE__*/React.createElement(UnsupportedComponent, null) : null;
-          return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, null, unsupportedComponent);
+          return /*#__PURE__*/React.createElement(LazyLoadedDatasourceRenderFailedAnalyticsWrapper, {
+            datasourceModalType: datasourceModalType,
+            datasourceId: datasourceId,
+            error: this.state.error
+          }, unsupportedComponent);
         }
       } else {
         return this.props.children;
@@ -62,7 +73,8 @@ export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
     key: "getDerivedStateFromError",
     value: function getDerivedStateFromError(error) {
       return {
-        isError: true
+        isError: true,
+        error: error
       };
     }
   }]);

package/dist/esm/nodeviews/datasource.js

@@ -224,11 +224,13 @@ export var Datasource = /*#__PURE__*/function (_ReactNodeView) {
   }, {
     key: "render",
     value: function render() {
+      var _attrs$datasource;
       var attrs = this.node.attrs;
       return jsx(DatasourceErrorBoundary, {
         unsupportedComponent: UnsupportedInline,
         view: this.view,
-        url: attrs.url
+        url: attrs.url,
+        datasourceId: attrs === null || attrs === void 0 || (_attrs$datasource = attrs.datasource) === null || _attrs$datasource === void 0 ? void 0 : _attrs$datasource.id
       }, jsx("div", {
         className: DATASOURCE_INNER_CONTAINER_CLASSNAME,
         style: {

package/dist/esm/toolbar.js

@@ -6,6 +6,7 @@ import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
 import { ACTION, ACTION_SUBJECT, buildOpenedSettingsPayload, buildVisitedLinkPayload, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import { buildLayoutButtons, commandWithMetadata } from '@atlaskit/editor-common/card';
+import { productionLinkPreferencesUrl, stagingLinkPreferencesUrl } from '@atlaskit/editor-common/constants';
 import commonMessages, { linkMessages, linkToolbarMessages, cardMessages as messages } from '@atlaskit/editor-common/messages';
 import { FLOATING_TOOLBAR_LINKPICKER_CLASSNAME, richMediaClassName } from '@atlaskit/editor-common/styles';
 import { SmallerEditIcon } from '@atlaskit/editor-common/ui';
@@ -77,7 +78,7 @@ export var openLinkSettings = function openLinkSettings(editorAnalyticsApi) {
     if (!(state.selection instanceof NodeSelection)) {
       return false;
     }
-    window.open('https://id.atlassian.com/manage-profile/link-preferences');
+    process.env.NODE_ENV === 'production' ? window.open(productionLinkPreferencesUrl) : window.open(stagingLinkPreferencesUrl);
     if (dispatch) {
       var tr = state.tr,
         type = state.selection.node.type;

package/dist/esm/ui/DatasourceModal/ModalWithState.js

@@ -12,7 +12,8 @@ var ModalWithState = function ModalWithState(_ref) {
     return null;
   }
   return /*#__PURE__*/React.createElement(DatasourceErrorBoundary, {
-    view: editorView
+    view: editorView,
+    datasourceModalType: cardState === null || cardState === void 0 ? void 0 : cardState.datasourceModalType
   }, /*#__PURE__*/React.createElement(CardContextProvider, null, function (_ref2) {
     var cardContext = _ref2.cardContext;
     return /*#__PURE__*/React.createElement(DatasourceModal, {

package/dist/types/datasourceErrorBoundary.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { APIError } from '@atlaskit/smart-card';
 import type { DatasourceProps } from './nodeviews/datasource';
 export type DatasourceErrorBoundaryProps = {
@@ -6,13 +7,17 @@ export type DatasourceErrorBoundaryProps = {
     unsupportedComponent?: React.ComponentType;
     handleError?: () => void;
     view: DatasourceProps['view'];
+    datasourceModalType?: DatasourceModalType;
+    datasourceId?: string;
 };
 export declare class DatasourceErrorBoundary extends React.Component<DatasourceErrorBoundaryProps> {
     state: {
         isError: boolean;
+        error: null;
     };
     static getDerivedStateFromError(error: Error | APIError): {
         isError: boolean;
+        error: Error | APIError;
     };
     componentDidCatch(error: Error | APIError): void;
     render(): React.ReactNode;

package/dist/types-ts4.5/datasourceErrorBoundary.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { DatasourceModalType } from '@atlaskit/editor-common/types';
 import type { APIError } from '@atlaskit/smart-card';
 import type { DatasourceProps } from './nodeviews/datasource';
 export type DatasourceErrorBoundaryProps = {
@@ -6,13 +7,17 @@ export type DatasourceErrorBoundaryProps = {
     unsupportedComponent?: React.ComponentType;
     handleError?: () => void;
     view: DatasourceProps['view'];
+    datasourceModalType?: DatasourceModalType;
+    datasourceId?: string;
 };
 export declare class DatasourceErrorBoundary extends React.Component<DatasourceErrorBoundaryProps> {
     state: {
         isError: boolean;
+        error: null;
     };
     static getDerivedStateFromError(error: Error | APIError): {
         isError: boolean;
+        error: Error | APIError;
     };
     componentDidCatch(error: Error | APIError): void;
     render(): React.ReactNode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -35,13 +35,13 @@
     "@atlaskit/adf-schema": "^35.5.1",
     "@atlaskit/analytics-next": "^9.2.0",
     "@atlaskit/custom-steps": "^0.0.13",
-    "@atlaskit/editor-common": "^78.7.0",
+    "@atlaskit/editor-common": "^78.9.0",
     "@atlaskit/editor-plugin-analytics": "^1.0.0",
     "@atlaskit/editor-plugin-decorations": "^1.0.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
     "@atlaskit/editor-plugin-floating-toolbar": "^1.2.0",
     "@atlaskit/editor-plugin-grid": "^1.0.0",
-    "@atlaskit/editor-plugin-hyperlink": "^1.0.0",
+    "@atlaskit/editor-plugin-hyperlink": "^1.1.0",
     "@atlaskit/editor-plugin-width": "^1.0.0",
     "@atlaskit/editor-prosemirror": "3.0.0",
     "@atlaskit/editor-shared-styles": "^2.9.0",
@@ -53,7 +53,7 @@
     "@atlaskit/linking-common": "^5.3.0",
     "@atlaskit/linking-types": "^8.6.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/primitives": "^3.0.0",
+    "@atlaskit/primitives": "^3.2.0",
     "@atlaskit/smart-card": "^26.48.0",
     "@atlaskit/theme": "^12.6.0",
     "@atlaskit/tokens": "^1.38.0",