@atlaskit/feedback-collector 13.1.3 → 13.2.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @atlaskit/feedback-collector
 
+## 13.2.0
+
+### Minor Changes
+
+- [#43003](https://bitbucket.org/atlassian/atlassian-frontend/pull-requests/43003) [`84ce39f5f04`](https://bitbucket.org/atlassian/atlassian-frontend/commits/84ce39f5f04) - Fix shouldShowOptInCheckboxes to not always return undefined
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 13.1.3
 
 ### Patch Changes

package/dist/cjs/components/FeedbackCollector.js

@@ -18,6 +18,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _buffer = require("buffer");
 var _react = _interopRequireWildcard(require("react"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _isApiGatewayUrl = require("../utils/is-api-gateway-url");
 var _Truncate = _interopRequireDefault(require("../utils/Truncate"));
 var _FeedbackForm = _interopRequireDefault(require("./FeedbackForm"));
@@ -43,6 +44,9 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "state", {
+      anonymousFeedback: true
+    });
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "postFeedback", /*#__PURE__*/function () {
       var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(formValues) {
         var entrypointId, fetchUrl, formData, body, postData;
@@ -106,6 +110,32 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
     return _this;
   }
   (0, _createClass2.default)(FeedbackCollector, [{
+    key: "componentDidMount",
+    value: function () {
+      var _componentDidMount = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+        var anonymousFeedback;
+        return _regenerator.default.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.shouldShowOptInCheckboxesNew();
+            case 2:
+              anonymousFeedback = !_context2.sent;
+              this.setState({
+                anonymousFeedback: anonymousFeedback
+              });
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function componentDidMount() {
+        return _componentDidMount.apply(this, arguments);
+      }
+      return componentDidMount;
+    }()
+  }, {
     key: "getGatewayUrl",
     value: function getGatewayUrl() {
       var _this$props = this.props,
@@ -136,20 +166,20 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.1.3" || 'Unknown, at least 11.0.0';
+      return "13.2.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
     value: function () {
-      var _getEntitlementInformation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
+      var _getEntitlementInformation = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
         var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
         var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3;
-        return _regenerator.default.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regenerator.default.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               url = this.getGatewayUrl(); // jira / confluence / bitbucket / trello
               if (!window.location.host.includes('bitbucket.org')) {
-                _context2.next = 9;
+                _context3.next = 9;
                 break;
               }
               productName = 'Bitbucket';
@@ -157,16 +187,16 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[id="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
               hasPremium = entitlementDetails['hasPremium'];
               productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
-              _context2.next = 24;
+              _context3.next = 24;
               break;
             case 9:
               if (!['trellis.coffee', 'trello.com'].includes(window.location.host)) {
-                _context2.next = 14;
+                _context3.next = 14;
                 break;
               }
               productName = 'Trello';
               productKey = 'trello';
-              _context2.next = 24;
+              _context3.next = 24;
               break;
             case 14:
               if (document.querySelector('meta[id="confluence-context-path"]')) {
@@ -176,8 +206,8 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                 productName = 'Jira';
                 productKey = 'jira-software.ondemand';
               }
-              _context2.prev = 15;
-              _context2.next = 18;
+              _context3.prev = 15;
+              _context3.next = 18;
               return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -187,12 +217,12 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                 credentials: 'include'
               } : {}));
             case 18:
-              entitlementDetails = _context2.sent;
-              _context2.next = 24;
+              entitlementDetails = _context3.sent;
+              _context3.next = 24;
               break;
             case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](15);
+              _context3.prev = 21;
+              _context3.t0 = _context3["catch"](15);
               entitlementDetails = undefined;
             case 24:
               entitlementInformation = [];
@@ -215,12 +245,12 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                 id: 'cloudId',
                 value: cloudSiteId
               });
-              return _context2.abrupt("return", entitlementInformation);
+              return _context3.abrupt("return", entitlementInformation);
             case 29:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[15, 21]]);
+        }, _callee3, this, [[15, 21]]);
       }));
       function getEntitlementInformation() {
         return _getEntitlementInformation.apply(this, arguments);
@@ -247,21 +277,21 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "getAtlassianID",
     value: function () {
-      var _getAtlassianID = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
+      var _getAtlassianID = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
         var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json;
-        return _regenerator.default.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regenerator.default.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _this$props3 = this.props, atlassianAccountId = _this$props3.atlassianAccountId, shouldGetEntitlementDetails = _this$props3.shouldGetEntitlementDetails;
-              _context3.prev = 1;
+              _context4.prev = 1;
               if (!(atlassianAccountId || !shouldGetEntitlementDetails)) {
-                _context3.next = 4;
+                _context4.next = 4;
                 break;
               }
-              return _context3.abrupt("return", atlassianAccountId);
+              return _context4.abrupt("return", atlassianAccountId);
             case 4:
               url = this.getGatewayUrl();
-              _context3.next = 7;
+              _context4.next = 7;
               return fetch("".concat(url, "/me"), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -271,21 +301,21 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
                 credentials: 'include'
               } : {}));
             case 7:
-              result = _context3.sent;
-              _context3.next = 10;
+              result = _context4.sent;
+              _context4.next = 10;
               return result.json();
             case 10:
-              json = _context3.sent;
-              return _context3.abrupt("return", json.account_id);
+              json = _context4.sent;
+              return _context4.abrupt("return", json.account_id);
             case 14:
-              _context3.prev = 14;
-              _context3.t0 = _context3["catch"](1);
-              return _context3.abrupt("return", undefined);
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](1);
+              return _context4.abrupt("return", undefined);
             case 17:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[1, 14]]);
+        }, _callee4, this, [[1, 14]]);
       }));
       function getAtlassianID() {
         return _getAtlassianID.apply(this, arguments);
@@ -310,6 +340,24 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
       // @ts-ignore
       return response;
     }
+  }, {
+    key: "shouldShowOptInCheckboxesNew",
+    value: function shouldShowOptInCheckboxesNew() {
+      var _this2 = this;
+      return new Promise(function (resolve) {
+        if (_this2.props.anonymousFeedback) {
+          resolve(!_this2.props.anonymousFeedback);
+        }
+        if (_this2.props.atlassianAccountId) {
+          resolve(true);
+        }
+        _this2.getAtlassianID().then(function (result) {
+          resolve(result !== undefined);
+        }).catch(function () {
+          resolve(false);
+        });
+      });
+    }
   }, {
     key: "getDescription",
     value: function getDescription(formValues) {
@@ -344,29 +392,29 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
   }, {
     key: "mapFormToJSD",
     value: function () {
-      var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(formValues) {
+      var _mapFormToJSD = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(formValues) {
         var entitlementInformation, atlassianID;
-        return _regenerator.default.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator.default.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               entitlementInformation = null;
               if (!this.props.shouldGetEntitlementDetails) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
-              _context4.next = 4;
+              _context5.next = 4;
               return this.getEntitlementInformation();
             case 4:
-              entitlementInformation = _context4.sent;
+              entitlementInformation = _context5.sent;
             case 5:
               if (this.props.email) {
                 this.addEmailToContext();
               }
-              _context4.next = 8;
+              _context5.next = 8;
               return this.getAtlassianID();
             case 8:
-              atlassianID = _context4.sent;
-              return _context4.abrupt("return", {
+              atlassianID = _context5.sent;
+              return _context5.abrupt("return", {
                 fields: [].concat((0, _toConsumableArray2.default)(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                   id: this.props.typeFieldId,
                   value: this.getTypeFieldValue(formValues.type)
@@ -398,9 +446,9 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
               });
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function mapFormToJSD(_x2) {
         return _mapFormToJSD.apply(this, arguments);
@@ -427,7 +475,7 @@ var FeedbackCollector = exports.default = /*#__PURE__*/function (_Component) {
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
         locale: this.props.locale,
-        anonymousFeedback: anonymousFeedback,
+        anonymousFeedback: (0, _platformFeatureFlags.getBooleanFF)('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel
       });
     }

package/dist/es2019/components/FeedbackCollector.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { Buffer } from 'buffer';
 import React, { Component } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
 import truncate from '../utils/Truncate';
 import FeedbackForm from './FeedbackForm';
@@ -12,6 +13,9 @@ const singleLineTruncatedText = (text, length = MAX_SUMMARY_LENGTH_CHARS) => {
 export default class FeedbackCollector extends Component {
   constructor(...args) {
     super(...args);
+    _defineProperty(this, "state", {
+      anonymousFeedback: true
+    });
     _defineProperty(this, "postFeedback", async formValues => {
       const entrypointId = this.props.entrypointId;
       let fetchUrl = this.getFeedbackUrl();
@@ -54,6 +58,12 @@ export default class FeedbackCollector extends Component {
       setTimeout(() => this.props.onSubmit(formValues), this.props.timeoutOnSubmit);
     });
   }
+  async componentDidMount() {
+    const anonymousFeedback = !(await this.shouldShowOptInCheckboxesNew());
+    this.setState({
+      anonymousFeedback
+    });
+  }
   getGatewayUrl() {
     const {
       customGatewayUrl,
@@ -81,7 +91,7 @@ export default class FeedbackCollector extends Component {
     return FeedbackCollector.defaultProps.url;
   }
   getPackageVersion() {
-    return "13.1.3" || 'Unknown, at least 11.0.0';
+    return "13.2.0" || 'Unknown, at least 11.0.0';
   }
   async getEntitlementInformation() {
     var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
@@ -203,6 +213,21 @@ export default class FeedbackCollector extends Component {
     // @ts-ignore
     return response;
   }
+  shouldShowOptInCheckboxesNew() {
+    return new Promise(resolve => {
+      if (this.props.anonymousFeedback) {
+        resolve(!this.props.anonymousFeedback);
+      }
+      if (this.props.atlassianAccountId) {
+        resolve(true);
+      }
+      this.getAtlassianID().then(result => {
+        resolve(result !== undefined);
+      }).catch(() => {
+        resolve(false);
+      });
+    });
+  }
   getDescription(formValues) {
     return formValues.description || this.props.descriptionDefaultValue;
   }
@@ -285,7 +310,7 @@ export default class FeedbackCollector extends Component {
       onSubmit: this.postFeedback,
       onClose: this.props.onClose,
       locale: this.props.locale,
-      anonymousFeedback: anonymousFeedback,
+      anonymousFeedback: getBooleanFF('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
       selectLabel: this.props.selectLabel
     });
   }

package/dist/esm/components/FeedbackCollector.js

@@ -14,6 +14,7 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
 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; } }
 import { Buffer } from 'buffer';
 import React, { Component } from 'react';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { isApiGatewayUrl } from '../utils/is-api-gateway-url';
 import truncate from '../utils/Truncate';
 import FeedbackForm from './FeedbackForm';
@@ -33,6 +34,9 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
       args[_key] = arguments[_key];
     }
     _this = _super.call.apply(_super, [this].concat(args));
+    _defineProperty(_assertThisInitialized(_this), "state", {
+      anonymousFeedback: true
+    });
     _defineProperty(_assertThisInitialized(_this), "postFeedback", /*#__PURE__*/function () {
       var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(formValues) {
         var entrypointId, fetchUrl, formData, body, postData;
@@ -96,6 +100,32 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
     return _this;
   }
   _createClass(FeedbackCollector, [{
+    key: "componentDidMount",
+    value: function () {
+      var _componentDidMount = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+        var anonymousFeedback;
+        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              _context2.next = 2;
+              return this.shouldShowOptInCheckboxesNew();
+            case 2:
+              anonymousFeedback = !_context2.sent;
+              this.setState({
+                anonymousFeedback: anonymousFeedback
+              });
+            case 4:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, this);
+      }));
+      function componentDidMount() {
+        return _componentDidMount.apply(this, arguments);
+      }
+      return componentDidMount;
+    }()
+  }, {
     key: "getGatewayUrl",
     value: function getGatewayUrl() {
       var _this$props = this.props,
@@ -126,20 +156,20 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getPackageVersion",
     value: function getPackageVersion() {
-      return "13.1.3" || 'Unknown, at least 11.0.0';
+      return "13.2.0" || 'Unknown, at least 11.0.0';
     }
   }, {
     key: "getEntitlementInformation",
     value: function () {
-      var _getEntitlementInformation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+      var _getEntitlementInformation = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
         var _entitlementDetails, _entitlementDetails2, _productName, _entitlement, _productEntitlement;
         var url, productName, productEntitlement, entitlementDetails, productKey, _document$querySelect, hasPremium, entitlement, entitlementInformation, cloudSiteId, _entitlementDetails3;
-        return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
               url = this.getGatewayUrl(); // jira / confluence / bitbucket / trello
               if (!window.location.host.includes('bitbucket.org')) {
-                _context2.next = 9;
+                _context3.next = 9;
                 break;
               }
               productName = 'Bitbucket';
@@ -147,16 +177,16 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               entitlementDetails = JSON.parse(JSON.stringify((_document$querySelect = document.querySelector('meta[id="bb-bootstrap"]')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.getAttribute('data-current-user')));
               hasPremium = entitlementDetails['hasPremium'];
               productEntitlement = hasPremium ? 'PREMIUM' : 'STANDARD';
-              _context2.next = 24;
+              _context3.next = 24;
               break;
             case 9:
               if (!['trellis.coffee', 'trello.com'].includes(window.location.host)) {
-                _context2.next = 14;
+                _context3.next = 14;
                 break;
               }
               productName = 'Trello';
               productKey = 'trello';
-              _context2.next = 24;
+              _context3.next = 24;
               break;
             case 14:
               if (document.querySelector('meta[id="confluence-context-path"]')) {
@@ -166,8 +196,8 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 productName = 'Jira';
                 productKey = 'jira-software.ondemand';
               }
-              _context2.prev = 15;
-              _context2.next = 18;
+              _context3.prev = 15;
+              _context3.next = 18;
               return fetch("".concat(url, "/customer-context/entitlements/").concat(window.location.host), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -177,12 +207,12 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 credentials: 'include'
               } : {}));
             case 18:
-              entitlementDetails = _context2.sent;
-              _context2.next = 24;
+              entitlementDetails = _context3.sent;
+              _context3.next = 24;
               break;
             case 21:
-              _context2.prev = 21;
-              _context2.t0 = _context2["catch"](15);
+              _context3.prev = 21;
+              _context3.t0 = _context3["catch"](15);
               entitlementDetails = undefined;
             case 24:
               entitlementInformation = [];
@@ -205,12 +235,12 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 id: 'cloudId',
                 value: cloudSiteId
               });
-              return _context2.abrupt("return", entitlementInformation);
+              return _context3.abrupt("return", entitlementInformation);
             case 29:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
-        }, _callee2, this, [[15, 21]]);
+        }, _callee3, this, [[15, 21]]);
       }));
       function getEntitlementInformation() {
         return _getEntitlementInformation.apply(this, arguments);
@@ -237,21 +267,21 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "getAtlassianID",
     value: function () {
-      var _getAtlassianID = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+      var _getAtlassianID = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
         var _this$props3, atlassianAccountId, shouldGetEntitlementDetails, url, result, json;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _this$props3 = this.props, atlassianAccountId = _this$props3.atlassianAccountId, shouldGetEntitlementDetails = _this$props3.shouldGetEntitlementDetails;
-              _context3.prev = 1;
+              _context4.prev = 1;
               if (!(atlassianAccountId || !shouldGetEntitlementDetails)) {
-                _context3.next = 4;
+                _context4.next = 4;
                 break;
               }
-              return _context3.abrupt("return", atlassianAccountId);
+              return _context4.abrupt("return", atlassianAccountId);
             case 4:
               url = this.getGatewayUrl();
-              _context3.next = 7;
+              _context4.next = 7;
               return fetch("".concat(url, "/me"), _objectSpread({
                 method: 'GET',
                 headers: {
@@ -261,21 +291,21 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
                 credentials: 'include'
               } : {}));
             case 7:
-              result = _context3.sent;
-              _context3.next = 10;
+              result = _context4.sent;
+              _context4.next = 10;
               return result.json();
             case 10:
-              json = _context3.sent;
-              return _context3.abrupt("return", json.account_id);
+              json = _context4.sent;
+              return _context4.abrupt("return", json.account_id);
             case 14:
-              _context3.prev = 14;
-              _context3.t0 = _context3["catch"](1);
-              return _context3.abrupt("return", undefined);
+              _context4.prev = 14;
+              _context4.t0 = _context4["catch"](1);
+              return _context4.abrupt("return", undefined);
             case 17:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[1, 14]]);
+        }, _callee4, this, [[1, 14]]);
       }));
       function getAtlassianID() {
         return _getAtlassianID.apply(this, arguments);
@@ -300,6 +330,24 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
       // @ts-ignore
       return response;
     }
+  }, {
+    key: "shouldShowOptInCheckboxesNew",
+    value: function shouldShowOptInCheckboxesNew() {
+      var _this2 = this;
+      return new Promise(function (resolve) {
+        if (_this2.props.anonymousFeedback) {
+          resolve(!_this2.props.anonymousFeedback);
+        }
+        if (_this2.props.atlassianAccountId) {
+          resolve(true);
+        }
+        _this2.getAtlassianID().then(function (result) {
+          resolve(result !== undefined);
+        }).catch(function () {
+          resolve(false);
+        });
+      });
+    }
   }, {
     key: "getDescription",
     value: function getDescription(formValues) {
@@ -334,29 +382,29 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
   }, {
     key: "mapFormToJSD",
     value: function () {
-      var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(formValues) {
+      var _mapFormToJSD = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(formValues) {
         var entitlementInformation, atlassianID;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
               entitlementInformation = null;
               if (!this.props.shouldGetEntitlementDetails) {
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
               }
-              _context4.next = 4;
+              _context5.next = 4;
               return this.getEntitlementInformation();
             case 4:
-              entitlementInformation = _context4.sent;
+              entitlementInformation = _context5.sent;
             case 5:
               if (this.props.email) {
                 this.addEmailToContext();
               }
-              _context4.next = 8;
+              _context5.next = 8;
               return this.getAtlassianID();
             case 8:
-              atlassianID = _context4.sent;
-              return _context4.abrupt("return", {
+              atlassianID = _context5.sent;
+              return _context5.abrupt("return", {
                 fields: [].concat(_toConsumableArray(entitlementInformation !== null && entitlementInformation || []), [this.props.showTypeField ? {
                   id: this.props.typeFieldId,
                   value: this.getTypeFieldValue(formValues.type)
@@ -388,9 +436,9 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
               });
             case 10:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
       function mapFormToJSD(_x2) {
         return _mapFormToJSD.apply(this, arguments);
@@ -417,7 +465,7 @@ var FeedbackCollector = /*#__PURE__*/function (_Component) {
         onSubmit: this.postFeedback,
         onClose: this.props.onClose,
         locale: this.props.locale,
-        anonymousFeedback: anonymousFeedback,
+        anonymousFeedback: getBooleanFF('platform.proforma-form-builder-feedback_hupaz') ? this.state.anonymousFeedback : anonymousFeedback,
         selectLabel: this.props.selectLabel
       });
     }

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

@@ -101,6 +101,10 @@ export interface Props {
     selectLabel?: string;
 }
 export default class FeedbackCollector extends Component<Props> {
+    state: {
+        anonymousFeedback: boolean;
+    };
+    componentDidMount(): Promise<void>;
     static defaultProps: {
         url: string;
         shouldGetEntitlementDetails: boolean;
@@ -156,6 +160,7 @@ export default class FeedbackCollector extends Component<Props> {
     getTypeFieldValue(dtype: SelectValue): FieldValueType;
     getAtlassianID(): Promise<string | undefined>;
     shouldShowOptInCheckboxes(): boolean;
+    shouldShowOptInCheckboxesNew(): Promise<boolean>;
     getDescription(formValues: FormFields): FieldValueType;
     getSummary(formValues: FormFields): FieldValueType;
     getCustomerName(): FieldValueType;

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

@@ -101,6 +101,10 @@ export interface Props {
     selectLabel?: string;
 }
 export default class FeedbackCollector extends Component<Props> {
+    state: {
+        anonymousFeedback: boolean;
+    };
+    componentDidMount(): Promise<void>;
     static defaultProps: {
         url: string;
         shouldGetEntitlementDetails: boolean;
@@ -157,6 +161,7 @@ export default class FeedbackCollector extends Component<Props> {
     getTypeFieldValue(dtype: SelectValue): FieldValueType;
     getAtlassianID(): Promise<string | undefined>;
     shouldShowOptInCheckboxes(): boolean;
+    shouldShowOptInCheckboxesNew(): Promise<boolean>;
     getDescription(formValues: FormFields): FieldValueType;
     getSummary(formValues: FormFields): FieldValueType;
     getCustomerName(): FieldValueType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/feedback-collector",
-  "version": "13.1.3",
+  "version": "13.2.0",
   "description": "A component that collects feedback across Atlassian products.",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -34,12 +34,13 @@
     "access": "public"
   },
   "dependencies": {
-    "@atlaskit/button": "^16.13.0",
+    "@atlaskit/button": "^16.15.0",
     "@atlaskit/checkbox": "^13.0.0",
     "@atlaskit/flag": "^15.2.0",
     "@atlaskit/form": "^9.0.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/modal-dialog": "^12.8.0",
+    "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/section-message": "^6.4.0",
     "@atlaskit/select": "^16.7.0",
     "@atlaskit/textarea": "^4.7.0",
@@ -81,5 +82,10 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1"
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.1",
+  "platform-feature-flags": {
+    "platform.proforma-form-builder-feedback_hupaz": {
+      "type": "boolean"
+    }
+  }
 }

package/report.api.md

@@ -39,6 +39,8 @@ class FeedbackCollector extends Component<Props> {
   // (undocumented)
   addEmailToContext(): void;
   // (undocumented)
+  componentDidMount(): Promise<void>;
+  // (undocumented)
   static defaultProps: {
     url: string;
     shouldGetEntitlementDetails: boolean;
@@ -113,6 +115,12 @@ class FeedbackCollector extends Component<Props> {
   render(): JSX.Element;
   // (undocumented)
   shouldShowOptInCheckboxes(): boolean;
+  // (undocumented)
+  shouldShowOptInCheckboxesNew(): Promise<boolean>;
+  // (undocumented)
+  state: {
+    anonymousFeedback: boolean;
+  };
 }
 export default FeedbackCollector;
 

package/tmp/api-report-tmp.d.ts

@@ -28,6 +28,8 @@ class FeedbackCollector extends Component<Props> {
     // (undocumented)
     addEmailToContext(): void;
     // (undocumented)
+    componentDidMount(): Promise<void>;
+    // (undocumented)
     static defaultProps: {
         url: string;
         shouldGetEntitlementDetails: boolean;
@@ -102,6 +104,12 @@ class FeedbackCollector extends Component<Props> {
     render(): JSX.Element;
     // (undocumented)
     shouldShowOptInCheckboxes(): boolean;
+    // (undocumented)
+    shouldShowOptInCheckboxesNew(): Promise<boolean>;
+    // (undocumented)
+    state: {
+        anonymousFeedback: boolean;
+    };
 }
 export default FeedbackCollector;