@bigbinary/neeto-team-members-frontend 2.13.3 → 2.13.5

package/dist/index.cjs.js

@@ -362,7 +362,7 @@ var useCountries = function useCountries(user) {
         country = _findTimeZoneAndCount.country,
         timeZone = _findTimeZoneAndCount.timeZone;
       setSelectedCountryOption(formatCountryOption(country));
-      setTimeZoneDropdownOptions(formatTimeZoneOptions(country.timeZones));
+      setTimeZoneDropdownOptions(formatTimeZoneOptions(country === null || country === void 0 ? void 0 : country.timeZones));
       setSelectedTimeZoneOption(formatTimeZoneOption(timeZone));
     }
   }, [user, countries]);
@@ -6434,24 +6434,27 @@ var isAdminRole = function isAdminRole(role) {
   return ramda.includes(role, ADMIN_ROLES) ? ramda.equals(ADMIN_ROLE_NAME) : neetoCist.notEquals(ADMIN_ROLE_NAME);
 };
 var renderInitialValues = function renderInitialValues(_ref) {
-  var _roles$, _roles$2;
-  var _ref$additionalValues = _ref.additionalValues,
-    additionalValues = _ref$additionalValues === void 0 ? {} : _ref$additionalValues,
+  var _roles$1$name, _roles$, _roles$2;
+  var _ref$additionalFields = _ref.additionalFieldsInitialValues,
+    additionalFieldsInitialValues = _ref$additionalFields === void 0 ? {} : _ref$additionalFields,
     globalRoles = _ref.globalRoles,
     roles = _ref.roles,
     selectedMember = _ref.selectedMember;
-  return _objectSpread$3(_objectSpread$3({
-    firstName: (selectedMember === null || selectedMember === void 0 ? void 0 : selectedMember.firstName) || "",
-    lastName: (selectedMember === null || selectedMember === void 0 ? void 0 : selectedMember.lastName) || "",
-    emails: selectedMember ? [{
-      label: selectedMember.email,
-      value: selectedMember.email,
-      valid: true
-    }] : [],
-    role: (selectedMember === null || selectedMember === void 0 ? void 0 : selectedMember.role) || ((_roles$ = roles[1]) === null || _roles$ === void 0 ? void 0 : _roles$.name) || ""
-  }, !selectedMember && {
+  if (ramda.isNotNil(selectedMember)) {
+    var keysToPick = ["firstName", "lastName", "role"].concat(_toConsumableArray(ramda.keys(additionalFieldsInitialValues)));
+    return _objectSpread$3(_objectSpread$3(_objectSpread$3({}, additionalFieldsInitialValues), ramda.pick(keysToPick, selectedMember)), {}, {
+      emails: [_objectSpread$3(_objectSpread$3({}, neetoCist.toLabelAndValue(selectedMember.email)), {}, {
+        valid: true
+      })]
+    });
+  }
+  return _objectSpread$3({
+    firstName: "",
+    lastName: "",
+    emails: [],
+    role: (_roles$1$name = (_roles$ = roles[1]) === null || _roles$ === void 0 ? void 0 : _roles$.name) !== null && _roles$1$name !== void 0 ? _roles$1$name : "",
     appRoles: generateAppsRolesInitialValue(globalRoles, (_roles$2 = roles[1]) === null || _roles$2 === void 0 ? void 0 : _roles$2.name)
-  }), additionalValues);
+  }, additionalFieldsInitialValues);
 };
 var renderPayload = function renderPayload(_ref2) {
   var appRoles = _ref2.appRoles,
@@ -6687,30 +6690,6 @@ var NameInputs = function NameInputs(_ref) {
   }));
 };
 
-var LabelWithIcon = function LabelWithIcon(_ref) {
-  var _ref$required = _ref.required,
-    required = _ref$required === void 0 ? false : _ref$required,
-    _ref$label = _ref.label,
-    label = _ref$label === void 0 ? "" : _ref$label,
-    _ref$tooltipProps = _ref.tooltipProps,
-    tooltipProps = _ref$tooltipProps === void 0 ? {
-      content: ""
-    } : _ref$tooltipProps,
-    _ref$iconProps = _ref.iconProps,
-    iconProps = _ref$iconProps === void 0 ? {
-      onClick: neetoCist.noop
-    } : _ref$iconProps;
-  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Label, {
-    className: "pr-1",
-    required: required
-  }, label), /*#__PURE__*/React__default["default"].createElement(neetoui.Tooltip, _extends({
-    position: "right"
-  }, tooltipProps), /*#__PURE__*/React__default["default"].createElement("span", null, /*#__PURE__*/React__default["default"].createElement(neetoIcons.Info, _extends({
-    className: "ntm-members-radio-group__icon",
-    size: 16
-  }, iconProps)))));
-};
-
 var RolesRadioGroup = function RolesRadioGroup(_ref) {
   var config = _ref.config,
     globalRoles = _ref.globalRoles,
@@ -6721,7 +6700,6 @@ var RolesRadioGroup = function RolesRadioGroup(_ref) {
     roles = _ref$roles === void 0 ? [] : _ref$roles;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var history = reactRouterDom.useHistory();
   var _useFormikContext = formik$1.useFormikContext(),
     values = _useFormikContext.values,
     setFieldValue = _useFormikContext.setFieldValue;
@@ -6749,19 +6727,19 @@ var RolesRadioGroup = function RolesRadioGroup(_ref) {
     stacked: true,
     className: "ntm-members-radio-group flex-grow-0",
     "data-cy": "ntm-manage-member-roles-group",
+    labelProps: {
+      className: "neeto-ui-radio__label w-full"
+    },
     name: "role",
-    label: /*#__PURE__*/React__default["default"].createElement(LabelWithIcon, {
-      required: true,
-      iconProps: {
-        onClick: function onClick() {
-          return history.push(config.pathToRolesPage);
-        }
-      },
-      label: t("neetoTeamMembers.common.role", constants.SINGULAR),
-      tooltipProps: {
-        content: t("neetoTeamMembers.tooltips.clickToViewPermissions")
-      }
-    }),
+    label: /*#__PURE__*/React__default["default"].createElement("span", {
+      className: "flex w-full items-center justify-between"
+    }, /*#__PURE__*/React__default["default"].createElement(neetoui.Label, {
+      required: true
+    }, " ", t("neetoTeamMembers.common.role", constants.SINGULAR)), /*#__PURE__*/React__default["default"].createElement(neetoui.Button, {
+      label: t("neetoTeamMembers.labels.manageRole", constants.PLURAL),
+      style: "link",
+      to: config.pathToRolesPage
+    })),
     onChange: function onChange(_ref3) {
       var value = _ref3.target.value;
       setFieldValue("role", value);
@@ -6789,7 +6767,7 @@ var RolesRadioGroup = function RolesRadioGroup(_ref) {
 function ownKeys$1(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$1(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$1(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$1(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var ManageMember = function ManageMember(_ref) {
-  var _manageMemberComponen;
+  var _manageMemberComponen, _config$additionalFie2;
   var config = _ref.config,
     onComplete = _ref.onComplete,
     _ref$roles = _ref.roles,
@@ -6910,6 +6888,7 @@ var ManageMember = function ManageMember(_ref) {
     });
   };
   var renderFormPage = function renderFormPage(page, emails, role) {
+    var _config$additionalFie;
     switch (page) {
       case FORM_PAGES.MAIN:
         return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, selectedMember && /*#__PURE__*/React__default["default"].createElement(NameInputs, {
@@ -6924,7 +6903,7 @@ var ManageMember = function ManageMember(_ref) {
           role: role,
           isEdit: !!selectedMember,
           roles: filteredRoles
-        }), config.additionalFieldsComponents);
+        }), (_config$additionalFie = config.additionalFields) === null || _config$additionalFie === void 0 ? void 0 : _config$additionalFie.component);
       case FORM_PAGES.APP_LIST:
         return /*#__PURE__*/React__default["default"].createElement(AppList, {
           globalRoles: globalRoles,
@@ -6967,7 +6946,7 @@ var ManageMember = function ManageMember(_ref) {
     ref: formReference,
     formikProps: _objectSpread$1(_objectSpread$1({}, MANAGE_MEMBERS_FORMIK_PROPS), {}, {
       initialValues: renderInitialValues({
-        additionalValues: config.additionalFieldsInitialValues,
+        additionalFieldsInitialValues: (_config$additionalFie2 = config.additionalFields) === null || _config$additionalFie2 === void 0 ? void 0 : _config$additionalFie2.initialValues,
         globalRoles: globalRoles,
         roles: filteredRoles,
         selectedMember: selectedMember