@atlaskit/feedback-collector 13.11.0 → 13.12.1

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/feedback-collector
 
+## 13.12.1
+
+### Patch Changes
+
+- [#142062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/142062)
+  [`3e38da9d60e87`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3e38da9d60e87) -
+  Add user account id onto feedback ticket for jira
+
+## 13.12.0
+
+### Minor Changes
+
+- [#141944](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/141944)
+  [`b8add80d52126`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/b8add80d52126) -
+  [ux] locale parameter is now required
+
 ## 13.11.0
 
 ### Minor Changes

package/dist/cjs/components/FeedbackButton.js

@@ -35,7 +35,8 @@ var FeedbackButton = function FeedbackButton(props) {
     formatMessage = _useIntl.formatMessage;
   var entrypointId = props.entrypointId,
     atlassianAccountId = props.atlassianAccountId,
-    shouldGetEntitlementDetails = props.shouldGetEntitlementDetails;
+    shouldGetEntitlementDetails = props.shouldGetEntitlementDetails,
+    locale = props.locale;
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_new.default, {
     onClick: function onClick() {
       return setIsOpen(true);
@@ -46,6 +47,7 @@ var FeedbackButton = function FeedbackButton(props) {
       }));
     }
   }, formatMessage(_messages.messages.giveFeedback)), isOpen && /*#__PURE__*/_react.default.createElement(_FeedbackCollector.default, {
+    locale: locale,
     onClose: function onClose() {
       return setIsOpen(false);
     },

package/dist/cjs/components/FeedbackCollector.js

@@ -166,7 +166,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.11.0" || 'Unknown, at least 11.0.0';
+      return "13.12.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -389,6 +389,18 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
         });
       }
     }
+  }, {
+    key: "addAccountIdToContext",
+    value: function addAccountIdToContext(atlassianID) {
+      if (atlassianID) {
+        var contextField = this.props.additionalFields.find(function (field) {
+          return field.id === 'customfield_10047';
+        });
+        if (contextField) {
+          contextField.value = "".concat(contextField.value, "\n\t\t\tatlassian-account-id: ").concat(atlassianID);
+        }
+      }
+    }
   }, {
     key: "mapFormToJSD",
     value: function () {
@@ -415,6 +427,9 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               return this.getAtlassianID();
             case 8:
               atlassianID = _context5.sent;
+              if ((0, _platformFeatureFlags.fg)('jsw_feedback_account_id')) {
+                this.addAccountIdToContext(atlassianID);
+              }
               return _context5.abrupt("return", {
                 fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                   id: this.props.typeFieldId,
@@ -445,7 +460,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                   value: this.props.enrollInResearchDeclineValue
                 }], (0, _toConsumableArray2.default)(this.props.additionalFields)).filter(Boolean)
               });
-            case 10:
+            case 11:
             case "end":
               return _context5.stop();
           }
@@ -487,6 +502,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   return FeedbackCollector;
 }(_react.Component);
 (0, _defineProperty2.default)(FeedbackCollector, "defaultProps", {
+  locale: 'en',
   url: '/gateway/api',
   shouldGetEntitlementDetails: true,
   canBeContactedFieldId: 'customfield_10043',

package/dist/es2019/components/FeedbackButton.js

@@ -20,7 +20,8 @@ const FeedbackButton = props => {
   const {
     entrypointId,
     atlassianAccountId,
-    shouldGetEntitlementDetails
+    shouldGetEntitlementDetails,
+    locale
   } = props;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     onClick: () => setIsOpen(true),
@@ -28,6 +29,7 @@ const FeedbackButton = props => {
       size: "small"
     }))
   }, formatMessage(messages.giveFeedback)), isOpen && /*#__PURE__*/React.createElement(FeedbackCollector, {
+    locale: locale,
     onClose: () => setIsOpen(false),
     onSubmit: () => setDisplayFlag(true),
     atlassianAccountId: atlassianAccountId,

package/dist/es2019/components/FeedbackCollector.js

@@ -91,7 +91,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "13.11.0" || 'Unknown, at least 11.0.0';
+    return "13.12.1" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
@@ -252,6 +252,17 @@ export default class FeedbackCollector extends Component {
       });
     }
   }
+  addAccountIdToContext(atlassianID) {
+    if (atlassianID) {
+      const contextField = this.props.additionalFields.find(field => {
+        return field.id === 'customfield_10047';
+      });
+      if (contextField) {
+        contextField.value = `${contextField.value}
+			atlassian-account-id: ${atlassianID}`;
+      }
+    }
+  }
   async mapFormToJSD(formValues) {
     var _this$props, _this$props2;
     let entitlementInformation = null;
@@ -262,6 +273,9 @@ export default class FeedbackCollector extends Component {
       this.addEmailToContext();
     }
     const atlassianID = await this.getAtlassianID();
+    if (fg('jsw_feedback_account_id')) {
+      this.addAccountIdToContext(atlassianID);
+    }
     return {
       fields: [...(entitlementInformation !== null && entitlementInformation || []), this.props.showTypeField ? {
         id: this.props.typeFieldId,
@@ -320,6 +334,7 @@ export default class FeedbackCollector extends Component {
   }
 }
 _defineProperty(FeedbackCollector, "defaultProps", {
+  locale: 'en',
   url: '/gateway/api',
   shouldGetEntitlementDetails: true,
   canBeContactedFieldId: 'customfield_10043',

package/dist/esm/components/FeedbackButton.js

@@ -25,7 +25,8 @@ var FeedbackButton = function FeedbackButton(props) {
     formatMessage = _useIntl.formatMessage;
   var entrypointId = props.entrypointId,
     atlassianAccountId = props.atlassianAccountId,
-    shouldGetEntitlementDetails = props.shouldGetEntitlementDetails;
+    shouldGetEntitlementDetails = props.shouldGetEntitlementDetails,
+    locale = props.locale;
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return setIsOpen(true);
@@ -36,6 +37,7 @@ var FeedbackButton = function FeedbackButton(props) {
       }));
     }
   }, formatMessage(messages.giveFeedback)), isOpen && /*#__PURE__*/React.createElement(FeedbackCollector, {
+    locale: locale,
     onClose: function onClose() {
       return setIsOpen(false);
     },

package/dist/esm/components/FeedbackCollector.js

@@ -156,7 +156,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.11.0" || 'Unknown, at least 11.0.0';
+      return "13.12.1" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
@@ -379,6 +379,18 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         });
       }
     }
+  }, {
+    key: "addAccountIdToContext",
+    value: function addAccountIdToContext(atlassianID) {
+      if (atlassianID) {
+        var contextField = this.props.additionalFields.find(function (field) {
+          return field.id === 'customfield_10047';
+        });
+        if (contextField) {
+          contextField.value = "".concat(contextField.value, "\n\t\t\tatlassian-account-id: ").concat(atlassianID);
+        }
+      }
+    }
   }, {
     key: "mapFormToJSD",
     value: function () {
@@ -405,6 +417,9 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               return this.getAtlassianID();
             case 8:
               atlassianID = _context5.sent;
+              if (fg('jsw_feedback_account_id')) {
+                this.addAccountIdToContext(atlassianID);
+              }
               return _context5.abrupt("return", {
                 fields: [].concat(_toConsumableArray(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                   id: this.props.typeFieldId,
@@ -435,7 +450,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                   value: this.props.enrollInResearchDeclineValue
                 }], _toConsumableArray(this.props.additionalFields)).filter(Boolean)
               });
-            case 10:
+            case 11:
             case "end":
               return _context5.stop();
           }
@@ -477,6 +492,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   return FeedbackCollector;
 }(Component);
 _defineProperty(FeedbackCollector, "defaultProps", {
+  locale: 'en',
   url: '/gateway/api',
   shouldGetEntitlementDetails: true,
   canBeContactedFieldId: 'customfield_10043',

package/dist/types/components/FeedbackButton.d.ts

@@ -3,6 +3,7 @@ type Props = PropsWithChildren<{
     entrypointId: string;
     atlassianAccountId?: string;
     shouldGetEntitlementDetails?: boolean;
+    locale: string;
 }>;
 declare const FeedbackButtonWithIntl: (props: Props) => JSX.Element;
 export default FeedbackButtonWithIntl;

package/dist/types/components/FeedbackCollector.d.ts

@@ -86,8 +86,8 @@ export interface Props {
     onClose: () => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
-    /**  Optional locale for i18n */
-    locale?: string;
+    /**  Locale for i18n */
+    locale: string;
     /** Optional custom modal content */
     customContent?: React.ReactChild;
     /**  Override to hide the default text fields for feedback */
@@ -113,6 +113,7 @@ export default class FeedbackCollector extends Component<Props> {
     };
     componentDidMount(): Promise<void>;
     static defaultProps: {
+        locale: string;
         url: string;
         shouldGetEntitlementDetails: boolean;
         canBeContactedFieldId: string;
@@ -172,6 +173,7 @@ export default class FeedbackCollector extends Component<Props> {
     getSummary(formValues: FormFields): FieldValueType;
     getCustomerName(): FieldValueType;
     addEmailToContext(): void;
+    addAccountIdToContext(atlassianID: string | undefined): void;
     mapFormToJSD(formValues: FormFields): Promise<FeedbackType>;
     postFeedback: (formValues: FormFields) => Promise<void>;
     render(): JSX.Element;

package/dist/types/components/FeedbackForm.d.ts

@@ -47,6 +47,6 @@ export interface OptionType {
     value: SelectValue;
 }
 declare const FeedbackFormWithIntl: FunctionComponent<Props & {
-    locale?: string;
+    locale: string;
 }>;
 export default FeedbackFormWithIntl;

package/dist/types-ts4.5/components/FeedbackButton.d.ts

@@ -3,6 +3,7 @@ type Props = PropsWithChildren<{
     entrypointId: string;
     atlassianAccountId?: string;
     shouldGetEntitlementDetails?: boolean;
+    locale: string;
 }>;
 declare const FeedbackButtonWithIntl: (props: Props) => JSX.Element;
 export default FeedbackButtonWithIntl;

package/dist/types-ts4.5/components/FeedbackCollector.d.ts

@@ -86,8 +86,8 @@ export interface Props {
     onClose: () => void;
     /** Function that will be called optimistically after a delay when the feedback is submitted. */
     onSubmit: (formFields: FormFields) => void;
-    /**  Optional locale for i18n */
-    locale?: string;
+    /**  Locale for i18n */
+    locale: string;
     /** Optional custom modal content */
     customContent?: React.ReactChild;
     /**  Override to hide the default text fields for feedback */
@@ -113,6 +113,7 @@ export default class FeedbackCollector extends Component<Props> {
     };
     componentDidMount(): Promise<void>;
     static defaultProps: {
+        locale: string;
         url: string;
         shouldGetEntitlementDetails: boolean;
         canBeContactedFieldId: string;
@@ -173,6 +174,7 @@ export default class FeedbackCollector extends Component<Props> {
     getSummary(formValues: FormFields): FieldValueType;
     getCustomerName(): FieldValueType;
     addEmailToContext(): void;
+    addAccountIdToContext(atlassianID: string | undefined): void;
     mapFormToJSD(formValues: FormFields): Promise<FeedbackType>;
     postFeedback: (formValues: FormFields) => Promise<void>;
     render(): JSX.Element;

package/dist/types-ts4.5/components/FeedbackForm.d.ts

@@ -47,6 +47,6 @@ export interface OptionType {
     value: SelectValue;
 }
 declare const FeedbackFormWithIntl: FunctionComponent<Props & {
-    locale?: string;
+    locale: string;
 }>;
 export default FeedbackFormWithIntl;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "13.11.0",
+	"version": "13.12.1",
 	"description": "A component that collects feedback across Atlassian products.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -44,13 +44,13 @@
 		"@atlaskit/form": "^10.5.0",
 		"@atlaskit/icon": "^22.18.0",
 		"@atlaskit/link": "^1.2.1",
-		"@atlaskit/modal-dialog": "^12.15.0",
+		"@atlaskit/modal-dialog": "^12.16.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/section-message": "^6.6.0",
-		"@atlaskit/select": "^17.18.0",
+		"@atlaskit/select": "^17.19.0",
 		"@atlaskit/textarea": "^5.6.0",
 		"@atlaskit/theme": "^13.0.0",
-		"@atlaskit/tokens": "^1.59.0",
+		"@atlaskit/tokens": "^1.60.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -95,6 +95,9 @@
 		},
 		"underlined_iph_links": {
 			"type": "boolean"
+		},
+		"jsw_feedback_account_id": {
+			"type": "boolean"
 		}
 	}
 }