@atlaskit/feedback-collector 14.3.4 → 14.4.1

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/feedback-collector
 
+## 14.4.1
+
+### Patch Changes
+
+- Updated dependencies
+
+## 14.4.0
+
+### Minor Changes
+
+- [`2b6afea21ef37`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2b6afea21ef37) -
+  Move the privacy policy link out of the label element
+- [`fe108a4620163`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/fe108a4620163) -
+  Product/App term refresh
+
 ## 14.3.4
 
 ### Patch Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -163,7 +163,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "14.3.3" || 'Unknown, at least 11.0.0';
+      return "14.4.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",

package/dist/cjs/components/FeedbackFlag.js

@@ -9,6 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _flag = require("@atlaskit/flag");
 var _statusSuccessCheckCircle = _interopRequireDefault(require("@atlaskit/icon/core/migration/status-success--check-circle"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _colors = require("@atlaskit/theme/colors");
 var _messages = require("../messages");
 var _IntlProviderWithResolvedMessages = require("./IntlProviderWithResolvedMessages");
@@ -24,7 +25,7 @@ var FeedbackFlag = function FeedbackFlag(_ref) {
       label: "Success"
     }),
     id: "feedbackSent",
-    description: description || formatMessage(_messages.messages.feedbackSuccessFlagDescription),
+    description: description || formatMessage((0, _platformFeatureFlags.fg)('product-terminology-refresh') ? _messages.messages.feedbackSuccessFlagDescriptionAppify : _messages.messages.feedbackSuccessFlagDescription),
     title: title || formatMessage(_messages.messages.feedbackSuccessFlagTitle)
   });
 };

package/dist/cjs/components/FeedbackForm.js

@@ -268,23 +268,24 @@ var FeedbackForm = function FeedbackForm(_ref) {
       name: "can-be-contacted"
     }, function (_ref6) {
       var fieldProps = _ref6.fieldProps;
-      return /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, (0, _extends2.default)({}, fieldProps, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_checkbox.Checkbox, (0, _extends2.default)({}, fieldProps, {
         "aria-describedby": undefined // JCA11Y-1988
         ,
-        label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _extends2.default)({}, _messages.messages.canBeContactedLabel, {
-          values: {
-            a: function a(chunks) {
-              return /*#__PURE__*/_react.default.createElement(_link.default, {
-                href: "https://www.atlassian.com/legal/privacy-policy",
-                target: "_blank"
-              }, chunks);
-            }
-          }
-        })),
+        label: canBeContactedLabel || /*#__PURE__*/_react.default.createElement(_reactIntlNext.FormattedMessage, (0, _platformFeatureFlags.fg)('product-terminology-refresh') ? _messages.messages.canBeContactedLabelAppify : _messages.messages.canBeContactedLabel),
         onChange: function onChange(event) {
           return setCanBeContacted(event.target.checked);
         }
-      }));
+      })), /*#__PURE__*/_react.default.createElement("span", {
+        style: {
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+          paddingInlineStart: "var(--ds-space-300, 24px)",
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+          marginInlineStart: "var(--ds-space-050, 4px)"
+        }
+      }, /*#__PURE__*/_react.default.createElement(_link.default, {
+        href: "https://www.atlassian.com/legal/privacy-policy",
+        target: "_blank"
+      }, formatMessage(_messages.messages.privacyPolicy))));
     }), /*#__PURE__*/_react.default.createElement(_form.Field, {
       name: "enroll-in-research-group"
     }, function (_ref7) {

package/dist/cjs/messages.js

@@ -18,9 +18,14 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
   },
   canBeContactedLabel: {
     id: 'feedback-collector.can-be-contacted.label',
-    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
     description: 'The checkbox label to give consent to be contacted about their feedback'
   },
+  privacyPolicy: {
+    id: 'feedback-collector.privacy-policy',
+    defaultMessage: 'Atlassian Privacy Policy',
+    description: 'The text content for the Privacy Policy link'
+  },
   summaryPlaceholder: {
     id: 'feedback-collector.summary-placeholder',
     defaultMessage: "Let us know what's on your mind",
@@ -156,6 +161,16 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: "What's on your mind?",
     description: 'The textarea label where users can write their suggestion for custom feedback collector'
   },
+  canBeContactedLabelAppify: {
+    id: 'feedback-collector.can-be-contacted.label-appify',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    description: 'The checkbox label to give consent to be contacted about their feedback'
+  },
+  feedbackSuccessFlagDescriptionAppify: {
+    id: 'feedback-collector.success-flag.description-appify',
+    defaultMessage: 'Your valuable feedback helps us continually improve our apps.',
+    description: 'Description shown when feedback is successfully submitted'
+  },
   validationErrorTypeRequired: {
     id: 'feedback-collector.validation.type.required',
     defaultMessage: 'Please select a feedback type',

package/dist/es2019/components/FeedbackCollector.js

@@ -91,7 +91,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "14.3.3" || 'Unknown, at least 11.0.0';
+    return "14.4.0" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;

package/dist/es2019/components/FeedbackFlag.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/migration/status-success--check-circle';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { G300 } from '@atlaskit/theme/colors';
 import { messages } from '../messages';
 import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
@@ -19,7 +20,7 @@ const FeedbackFlag = ({
       label: "Success"
     }),
     id: "feedbackSent",
-    description: description || formatMessage(messages.feedbackSuccessFlagDescription),
+    description: description || formatMessage(fg('product-terminology-refresh') ? messages.feedbackSuccessFlagDescriptionAppify : messages.feedbackSuccessFlagDescription),
     title: title || formatMessage(messages.feedbackSuccessFlagTitle)
   });
 };

package/dist/es2019/components/FeedbackForm.js

@@ -212,19 +212,22 @@ const FeedbackForm = ({
     name: "can-be-contacted"
   }, ({
     fieldProps
-  }) => /*#__PURE__*/React.createElement(Checkbox, _extends({}, fieldProps, {
+  }) => /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, _extends({}, fieldProps, {
     "aria-describedby": undefined // JCA11Y-1988
     ,
-    label: canBeContactedLabel || /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.canBeContactedLabel, {
-      values: {
-        a: chunks => /*#__PURE__*/React.createElement(Link, {
-          href: "https://www.atlassian.com/legal/privacy-policy",
-          target: "_blank"
-        }, chunks)
-      }
-    })),
+    label: canBeContactedLabel || /*#__PURE__*/React.createElement(FormattedMessage, fg('product-terminology-refresh') ? messages.canBeContactedLabelAppify : messages.canBeContactedLabel),
     onChange: event => setCanBeContacted(event.target.checked)
-  }))), /*#__PURE__*/React.createElement(Field, {
+  })), /*#__PURE__*/React.createElement("span", {
+    style: {
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+      paddingInlineStart: "var(--ds-space-300, 24px)",
+      // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+      marginInlineStart: "var(--ds-space-050, 4px)"
+    }
+  }, /*#__PURE__*/React.createElement(Link, {
+    href: "https://www.atlassian.com/legal/privacy-policy",
+    target: "_blank"
+  }, formatMessage(messages.privacyPolicy))))), /*#__PURE__*/React.createElement(Field, {
     name: "enroll-in-research-group"
   }, ({
     fieldProps

package/dist/es2019/messages.js

@@ -12,9 +12,14 @@ export const messages = defineMessages({
   },
   canBeContactedLabel: {
     id: 'feedback-collector.can-be-contacted.label',
-    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
     description: 'The checkbox label to give consent to be contacted about their feedback'
   },
+  privacyPolicy: {
+    id: 'feedback-collector.privacy-policy',
+    defaultMessage: 'Atlassian Privacy Policy',
+    description: 'The text content for the Privacy Policy link'
+  },
   summaryPlaceholder: {
     id: 'feedback-collector.summary-placeholder',
     defaultMessage: "Let us know what's on your mind",
@@ -150,6 +155,16 @@ export const messages = defineMessages({
     defaultMessage: "What's on your mind?",
     description: 'The textarea label where users can write their suggestion for custom feedback collector'
   },
+  canBeContactedLabelAppify: {
+    id: 'feedback-collector.can-be-contacted.label-appify',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    description: 'The checkbox label to give consent to be contacted about their feedback'
+  },
+  feedbackSuccessFlagDescriptionAppify: {
+    id: 'feedback-collector.success-flag.description-appify',
+    defaultMessage: 'Your valuable feedback helps us continually improve our apps.',
+    description: 'Description shown when feedback is successfully submitted'
+  },
   validationErrorTypeRequired: {
     id: 'feedback-collector.validation.type.required',
     defaultMessage: 'Please select a feedback type',

package/dist/esm/components/FeedbackCollector.js

@@ -154,7 +154,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "14.3.3" || 'Unknown, at least 11.0.0';
+      return "14.4.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",

package/dist/esm/components/FeedbackFlag.js

@@ -2,6 +2,7 @@ import React from 'react';
 import { useIntl } from 'react-intl-next';
 import { AutoDismissFlag } from '@atlaskit/flag';
 import SuccessIcon from '@atlaskit/icon/core/migration/status-success--check-circle';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { G300 } from '@atlaskit/theme/colors';
 import { messages } from '../messages';
 import { IntlProviderWithResolvedMessages } from './IntlProviderWithResolvedMessages';
@@ -17,7 +18,7 @@ var FeedbackFlag = function FeedbackFlag(_ref) {
       label: "Success"
     }),
     id: "feedbackSent",
-    description: description || formatMessage(messages.feedbackSuccessFlagDescription),
+    description: description || formatMessage(fg('product-terminology-refresh') ? messages.feedbackSuccessFlagDescriptionAppify : messages.feedbackSuccessFlagDescription),
     title: title || formatMessage(messages.feedbackSuccessFlagTitle)
   });
 };

package/dist/esm/components/FeedbackForm.js

@@ -259,23 +259,24 @@ var FeedbackForm = function FeedbackForm(_ref) {
       name: "can-be-contacted"
     }, function (_ref6) {
       var fieldProps = _ref6.fieldProps;
-      return /*#__PURE__*/React.createElement(Checkbox, _extends({}, fieldProps, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Checkbox, _extends({}, fieldProps, {
         "aria-describedby": undefined // JCA11Y-1988
         ,
-        label: canBeContactedLabel || /*#__PURE__*/React.createElement(FormattedMessage, _extends({}, messages.canBeContactedLabel, {
-          values: {
-            a: function a(chunks) {
-              return /*#__PURE__*/React.createElement(Link, {
-                href: "https://www.atlassian.com/legal/privacy-policy",
-                target: "_blank"
-              }, chunks);
-            }
-          }
-        })),
+        label: canBeContactedLabel || /*#__PURE__*/React.createElement(FormattedMessage, fg('product-terminology-refresh') ? messages.canBeContactedLabelAppify : messages.canBeContactedLabel),
         onChange: function onChange(event) {
           return setCanBeContacted(event.target.checked);
         }
-      }));
+      })), /*#__PURE__*/React.createElement("span", {
+        style: {
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+          paddingInlineStart: "var(--ds-space-300, 24px)",
+          // eslint-disable-next-line @atlaskit/ui-styling-standard/enforce-style-prop -- Ignored via go/DSP-18766
+          marginInlineStart: "var(--ds-space-050, 4px)"
+        }
+      }, /*#__PURE__*/React.createElement(Link, {
+        href: "https://www.atlassian.com/legal/privacy-policy",
+        target: "_blank"
+      }, formatMessage(messages.privacyPolicy))));
     }), /*#__PURE__*/React.createElement(Field, {
       name: "enroll-in-research-group"
     }, function (_ref7) {

package/dist/esm/messages.js

@@ -12,9 +12,14 @@ export var messages = defineMessages({
   },
   canBeContactedLabel: {
     id: 'feedback-collector.can-be-contacted.label',
-    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian products and services. I acknowledge the Atlassian Privacy Policy.',
     description: 'The checkbox label to give consent to be contacted about their feedback'
   },
+  privacyPolicy: {
+    id: 'feedback-collector.privacy-policy',
+    defaultMessage: 'Atlassian Privacy Policy',
+    description: 'The text content for the Privacy Policy link'
+  },
   summaryPlaceholder: {
     id: 'feedback-collector.summary-placeholder',
     defaultMessage: "Let us know what's on your mind",
@@ -150,6 +155,16 @@ export var messages = defineMessages({
     defaultMessage: "What's on your mind?",
     description: 'The textarea label where users can write their suggestion for custom feedback collector'
   },
+  canBeContactedLabelAppify: {
+    id: 'feedback-collector.can-be-contacted.label-appify',
+    defaultMessage: 'Yes, Atlassian teams can contact me to learn about my experiences to improve Atlassian apps and services. I acknowledge the <a>Atlassian Privacy Policy</a>.',
+    description: 'The checkbox label to give consent to be contacted about their feedback'
+  },
+  feedbackSuccessFlagDescriptionAppify: {
+    id: 'feedback-collector.success-flag.description-appify',
+    defaultMessage: 'Your valuable feedback helps us continually improve our apps.',
+    description: 'Description shown when feedback is successfully submitted'
+  },
   validationErrorTypeRequired: {
     id: 'feedback-collector.validation.type.required',
     defaultMessage: 'Please select a feedback type',

package/dist/types/messages.d.ts

@@ -14,6 +14,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    privacyPolicy: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     summaryPlaceholder: {
         id: string;
         defaultMessage: string;
@@ -149,6 +154,16 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    canBeContactedLabelAppify: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    feedbackSuccessFlagDescriptionAppify: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     validationErrorTypeRequired: {
         id: string;
         defaultMessage: string;

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

@@ -14,6 +14,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    privacyPolicy: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     summaryPlaceholder: {
         id: string;
         defaultMessage: string;
@@ -149,6 +154,16 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    canBeContactedLabelAppify: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    feedbackSuccessFlagDescriptionAppify: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     validationErrorTypeRequired: {
         id: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/feedback-collector",
-	"version": "14.3.4",
+	"version": "14.4.1",
 	"description": "A component that collects feedback across Atlassian products.",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -41,15 +41,15 @@
 		"@atlaskit/checkbox": "^17.1.0",
 		"@atlaskit/flag": "^17.3.0",
 		"@atlaskit/form": "^12.2.0",
-		"@atlaskit/icon": "^28.0.0",
+		"@atlaskit/icon": "^28.1.0",
 		"@atlaskit/link": "^3.2.0",
 		"@atlaskit/modal-dialog": "^14.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/section-message": "^8.5.0",
+		"@atlaskit/section-message": "^8.6.0",
 		"@atlaskit/select": "^21.2.0",
 		"@atlaskit/textarea": "^8.0.0",
-		"@atlaskit/theme": "^19.0.0",
-		"@atlaskit/tokens": "^6.0.0",
+		"@atlaskit/theme": "^20.0.0",
+		"@atlaskit/tokens": "^6.1.0",
 		"@babel/runtime": "^7.0.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
@@ -91,6 +91,9 @@
 		"dst-a11y__replace-anchor-with-link__belugas-feedba": {
 			"type": "boolean"
 		},
+		"product-terminology-refresh": {
+			"type": "boolean"
+		},
 		"feedback-collector-custom-validation": {
 			"type": "boolean"
 		}