@bigbinary/neeto-team-members-frontend 2.8.7 → 2.8.9

package/dist/index.cjs.js

@@ -1824,7 +1824,7 @@ var Header$3 = function Header(_ref) {
     t = _useTranslation.t;
   var isUpdatePermissionGranted = config.permissions.update;
   return /*#__PURE__*/React__default["default"].createElement(NeetoHeader__default["default"], {
-    breadcrumbs: renderBreadcrumbs(config === null || config === void 0 ? void 0 : (_config$header = config.header) === null || _config$header === void 0 ? void 0 : _config$header.breadcrumbs),
+    breadcrumbs: renderBreadcrumbs(config === null || config === void 0 || (_config$header = config.header) === null || _config$header === void 0 ? void 0 : _config$header.breadcrumbs),
     className: "ntm-roles-header",
     searchProps: renderSearchProps(searchString, setSearchString),
     actionBlock: isDirty ? /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(neetoui.Tooltip, {
@@ -2317,8 +2317,8 @@ var filterPermissionsBySearch = function filterPermissionsBySearch(searchTerm, p
   newValue.forEach(function (value) {
     var permissions = value.get("permissions");
     var filteredPermissions = permissions.filter(function (permission) {
-      var _permission$descripti, _permission$descripti2, _permission$descripti3;
-      return permission === null || permission === void 0 ? void 0 : (_permission$descripti = permission.description) === null || _permission$descripti === void 0 ? void 0 : (_permission$descripti2 = _permission$descripti.toLowerCase()) === null || _permission$descripti2 === void 0 ? void 0 : (_permission$descripti3 = _permission$descripti2.trim()) === null || _permission$descripti3 === void 0 ? void 0 : _permission$descripti3.includes(searchTerm.toLowerCase().trim());
+      var _permission$descripti;
+      return permission === null || permission === void 0 || (_permission$descripti = permission.description) === null || _permission$descripti === void 0 || (_permission$descripti = _permission$descripti.toLowerCase()) === null || _permission$descripti === void 0 || (_permission$descripti = _permission$descripti.trim()) === null || _permission$descripti === void 0 ? void 0 : _permission$descripti.includes(searchTerm.toLowerCase().trim());
     });
     value.set("permissions", filteredPermissions);
   });
@@ -2489,14 +2489,14 @@ var Delete = function Delete(_ref) {
     cancelButtonLabel: t("neetoTeamMembers.buttons.cancel"),
     isOpen: isOpen,
     isSubmitting: isDeleting,
-    submitButtonLabel: t("neetoTeamMembers.buttons.proceed"),
+    submitButtonLabel: t("neetoTeamMembers.buttons.delete"),
+    title: t("neetoTeamMembers.labels.deleteRole"),
     message: /*#__PURE__*/React__default["default"].createElement(reactI18next.Trans, {
       i18nKey: "neetoTeamMembers.alerts.messages.deletingRole",
       values: {
         name: selectedRole === null || selectedRole === void 0 ? void 0 : selectedRole.name
       }
     }),
-    title: t("neetoTeamMembers.labels.deleteRole"),
     onClose: onClose,
     onSubmit: handleDelete
   });
@@ -5675,11 +5675,12 @@ var getDefaultColumns = function getDefaultColumns(_ref5) {
   var displayStatusTag = _ref5.displayStatusTag,
     handleUpdateRole = _ref5.handleUpdateRole,
     handleUpdateStatus = _ref5.handleUpdateStatus,
+    otherColumns = _ref5.otherColumns,
     permissions = _ref5.permissions;
   return [{
     dataIndex: "name",
-    fixed: "left",
     key: "name",
+    fixed: pure.isNotEmpty(otherColumns),
     render: function render(_, tableData) {
       return renderNameColumn({
         displayStatusTag: displayStatusTag,
@@ -5733,13 +5734,14 @@ var getColumnData = function getColumnData(_ref7) {
     handleUpdateStatus = _ref7.handleUpdateStatus,
     memberFilter = _ref7.memberFilter;
   var displayStatusTag = ramda.identical(memberFilter, MEMBER_FILTER.ALL.value);
+  var otherColumns = (_config$otherColumns = config === null || config === void 0 ? void 0 : config.otherColumns) !== null && _config$otherColumns !== void 0 ? _config$otherColumns : [];
   var defaultColumns = getDefaultColumns({
     displayStatusTag: displayStatusTag,
     handleUpdateRole: handleUpdateRole,
     handleUpdateStatus: handleUpdateStatus,
+    otherColumns: otherColumns,
     permissions: config.permissions
   });
-  var otherColumns = (_config$otherColumns = config === null || config === void 0 ? void 0 : config.otherColumns) !== null && _config$otherColumns !== void 0 ? _config$otherColumns : [];
   var columns = defaultColumns.map(function (column) {
     var otherColumn = otherColumns.find(function (_ref8) {
       var dataIndex = _ref8.dataIndex;
@@ -5888,7 +5890,7 @@ var useFilters = function useFilters(_ref) {
   var defaultNeetoFilters = neetoFiltersFrontend.buildFiltersFromURL((_config$filterColumns = config === null || config === void 0 ? void 0 : config.filterColumns) !== null && _config$filterColumns !== void 0 ? _config$filterColumns : defaultNeetoFiltersColumns());
   var _useState3 = React.useState(_objectSpread$6(_objectSpread$6(_objectSpread$6({}, DEFAULT_FILTER_VALUES), config === null || config === void 0 ? void 0 : config.defaultFilterValues), {}, {
       neetoFilters: defaultNeetoFilters,
-      category: getValidCategory(URL_CATEGORY_FILTER_VALUE, config === null || config === void 0 ? void 0 : (_config$defaultFilter = config.defaultFilterValues) === null || _config$defaultFilter === void 0 ? void 0 : _config$defaultFilter.category)
+      category: getValidCategory(URL_CATEGORY_FILTER_VALUE, config === null || config === void 0 || (_config$defaultFilter = config.defaultFilterValues) === null || _config$defaultFilter === void 0 ? void 0 : _config$defaultFilter.category)
     })),
     _useState4 = _slicedToArray(_useState3, 2),
     filters = _useState4[0],
@@ -6401,7 +6403,7 @@ var useTeams = function useTeams(_ref) {
       keys: keys
     };
     setSelectedRows(_objectSpread$5({}, rows));
-    config === null || config === void 0 ? void 0 : (_config$table = config.table) === null || _config$table === void 0 ? void 0 : (_config$table$onRowSe = _config$table.onRowSelect) === null || _config$table$onRowSe === void 0 ? void 0 : _config$table$onRowSe.call(_config$table, {
+    config === null || config === void 0 || (_config$table = config.table) === null || _config$table === void 0 || (_config$table$onRowSe = _config$table.onRowSelect) === null || _config$table$onRowSe === void 0 ? void 0 : _config$table$onRowSe.call(_config$table, {
       rows: rows,
       resetSelectedRows: resetSelectedRows,
       rowData: rowData
@@ -6548,7 +6550,7 @@ var RolesDropdown = function RolesDropdown(_ref) {
       suffix: /*#__PURE__*/React__default["default"].createElement(neetoIcons.Right, {
         size: 16
       })
-    }, t("neetoTeamMembers.common.changeRole")),
+    }, t("neetoTeamMembers.buttons.changeRole")),
     onClick: handleClick,
     onClose: handleOnClose
   }, /*#__PURE__*/React__default["default"].createElement(Menu$2, null, isSearchable && /*#__PURE__*/React__default["default"].createElement("div", {
@@ -6603,20 +6605,20 @@ var Left = function Left(_ref) {
     setBulkUpdateRole = _useState4[1];
   var hasSelectedRows = pure.isNotEmpty(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.keys);
   var selectedMembersCountValues = {
-    count: (_selectedRows$keys$le = selectedRows === null || selectedRows === void 0 ? void 0 : (_selectedRows$keys = selectedRows.keys) === null || _selectedRows$keys === void 0 ? void 0 : _selectedRows$keys.length) !== null && _selectedRows$keys$le !== void 0 ? _selectedRows$keys$le : 0,
+    count: (_selectedRows$keys$le = selectedRows === null || selectedRows === void 0 || (_selectedRows$keys = selectedRows.keys) === null || _selectedRows$keys === void 0 ? void 0 : _selectedRows$keys.length) !== null && _selectedRows$keys$le !== void 0 ? _selectedRows$keys$le : 0,
     metaName: metaName({
       count: hasSelectedRows ? selectedRows.keys.length : filteredCount
     }).toLocaleLowerCase(),
     totalCount: filteredCount !== null && filteredCount !== void 0 ? filteredCount : 0
   };
-  var hasDeactivateMembers = selectedRows === null || selectedRows === void 0 ? void 0 : (_selectedRows$active = selectedRows.active) === null || _selectedRows$active === void 0 ? void 0 : _selectedRows$active.some(function (active) {
+  var hasDeactivateMembers = selectedRows === null || selectedRows === void 0 || (_selectedRows$active = selectedRows.active) === null || _selectedRows$active === void 0 ? void 0 : _selectedRows$active.some(function (active) {
     return !active;
   });
   var _useBulkUpdateMembers = useBulkUpdateMembers({
       onSuccess: function onSuccess() {
-        var _config$bulkUpdateMem, _config$bulkUpdateMem2;
+        var _config$bulkUpdateMem;
         setSelectedRows(DEFAULT_SELECTED_ROWS);
-        config === null || config === void 0 ? void 0 : (_config$bulkUpdateMem = config.bulkUpdateMembers) === null || _config$bulkUpdateMem === void 0 ? void 0 : (_config$bulkUpdateMem2 = _config$bulkUpdateMem.onSuccess) === null || _config$bulkUpdateMem2 === void 0 ? void 0 : _config$bulkUpdateMem2.callback();
+        config === null || config === void 0 || (_config$bulkUpdateMem = config.bulkUpdateMembers) === null || _config$bulkUpdateMem === void 0 || (_config$bulkUpdateMem = _config$bulkUpdateMem.onSuccess) === null || _config$bulkUpdateMem === void 0 ? void 0 : _config$bulkUpdateMem.callback();
       }
     }),
     bulkUpdateMember = _useBulkUpdateMembers.mutate;
@@ -6672,6 +6674,12 @@ var Left = function Left(_ref) {
     selectedAlert.onSubmit(bulkUpdateRole);
     setAlertType("");
   };
+  var getButtonLabel = function getButtonLabel(type) {
+    if (type === "role") {
+      return t("neetoTeamMembers.buttons.changeRole");
+    }
+    return type === "deactivate" ? t("neetoTeamMembers.buttons.deactivate") : t("neetoTeamMembers.buttons.activate");
+  };
   return /*#__PURE__*/React__default["default"].createElement("div", {
     className: "neeto-ui-flex neeto-ui-items-center neeto-ui-gap-4"
   }, /*#__PURE__*/React__default["default"].createElement(neetoui.Typography, {
@@ -6713,8 +6721,9 @@ var Left = function Left(_ref) {
     roles: roles,
     setAlertType: setAlertType,
     setBulkUpdateRole: setBulkUpdateRole
-  }), config === null || config === void 0 ? void 0 : (_config$otherBulkActi = config.otherBulkActions) === null || _config$otherBulkActi === void 0 ? void 0 : _config$otherBulkActi.call(config))))), /*#__PURE__*/React__default["default"].createElement(neetoui.Alert, {
+  }), config === null || config === void 0 || (_config$otherBulkActi = config.otherBulkActions) === null || _config$otherBulkActi === void 0 ? void 0 : _config$otherBulkActi.call(config))))), /*#__PURE__*/React__default["default"].createElement(neetoui.Alert, {
     isOpen: selectedAlert,
+    submitButtonLabel: getButtonLabel(selectedAlert === null || selectedAlert === void 0 ? void 0 : selectedAlert.type),
     title: selectedAlert === null || selectedAlert === void 0 ? void 0 : selectedAlert.title,
     message: /*#__PURE__*/React__default["default"].createElement(reactI18next.Trans, {
       i18nKey: selectedAlert === null || selectedAlert === void 0 ? void 0 : selectedAlert.message,
@@ -6794,7 +6803,7 @@ var Header = function Header(_ref) {
         });
       });
     }
-  }, config === null || config === void 0 ? void 0 : (_config$header2 = config.header) === null || _config$header2 === void 0 ? void 0 : _config$header2.otherProps));
+  }, config === null || config === void 0 || (_config$header2 = config.header) === null || _config$header2 === void 0 ? void 0 : _config$header2.otherProps));
 };
 var Header$1 = /*#__PURE__*/React.memo(Header);
 
@@ -6910,7 +6919,7 @@ var getProductName = function getProductName(activeAppRoles) {
 };
 var getActiveRole = function getActiveRole(activeAppRoles, role) {
   var _activeAppRoles$2;
-  return (activeAppRoles === null || activeAppRoles === void 0 ? void 0 : (_activeAppRoles$2 = activeAppRoles[0]) === null || _activeAppRoles$2 === void 0 ? void 0 : _activeAppRoles$2.activeRole) || role;
+  return (activeAppRoles === null || activeAppRoles === void 0 || (_activeAppRoles$2 = activeAppRoles[0]) === null || _activeAppRoles$2 === void 0 ? void 0 : _activeAppRoles$2.activeRole) || role;
 };
 var getDefaultRole = function getDefaultRole(roles, currentAppRole, appName) {
   var _globalProps$appName;
@@ -7333,18 +7342,18 @@ var ManageMember = function ManageMember(_ref) {
   var filteredRoles = getFilteredRoles(rolesList, config);
   var _useCreateMember = useCreateMember({
       onSuccess: function onSuccess() {
-        var _config$createMember, _config$createMember$;
+        var _config$createMember;
         handleClose();
-        config === null || config === void 0 ? void 0 : (_config$createMember = config.createMember) === null || _config$createMember === void 0 ? void 0 : (_config$createMember$ = _config$createMember.onSuccess) === null || _config$createMember$ === void 0 ? void 0 : _config$createMember$.callback();
+        config === null || config === void 0 || (_config$createMember = config.createMember) === null || _config$createMember === void 0 || (_config$createMember = _config$createMember.onSuccess) === null || _config$createMember === void 0 ? void 0 : _config$createMember.callback();
       }
     }),
     createMember = _useCreateMember.mutate,
     isCreatingMember = _useCreateMember.isLoading;
   var _useUpdateMember = useUpdateMember({
       onSuccess: function onSuccess() {
-        var _config$updateMember, _config$updateMember$;
+        var _config$updateMember;
         handleClose();
-        config === null || config === void 0 ? void 0 : (_config$updateMember = config.updateMember) === null || _config$updateMember === void 0 ? void 0 : (_config$updateMember$ = _config$updateMember.onSuccess) === null || _config$updateMember$ === void 0 ? void 0 : _config$updateMember$.callback();
+        config === null || config === void 0 || (_config$updateMember = config.updateMember) === null || _config$updateMember === void 0 || (_config$updateMember = _config$updateMember.onSuccess) === null || _config$updateMember === void 0 ? void 0 : _config$updateMember.callback();
       }
     }),
     updateMember = _useUpdateMember.mutate,
@@ -7555,9 +7564,9 @@ var TeamMembers = function TeamMembers(_ref) {
     isRolesLoading = _useFetchRoles.isLoading;
   var _useUpdateMember = useUpdateMember({
       onSuccess: function onSuccess() {
-        var _config$updateMember, _config$updateMember$;
+        var _config$updateMember;
         handleAlertClose();
-        config === null || config === void 0 ? void 0 : (_config$updateMember = config.updateMember) === null || _config$updateMember === void 0 ? void 0 : (_config$updateMember$ = _config$updateMember.onSuccess) === null || _config$updateMember$ === void 0 ? void 0 : _config$updateMember$.callback();
+        config === null || config === void 0 || (_config$updateMember = config.updateMember) === null || _config$updateMember === void 0 || (_config$updateMember = _config$updateMember.onSuccess) === null || _config$updateMember === void 0 ? void 0 : _config$updateMember.callback();
       }
     }),
     updateMember = _useUpdateMember.mutate,
@@ -7582,7 +7591,7 @@ var TeamMembers = function TeamMembers(_ref) {
     selectedRows = _useTeams.selectedRows,
     setIsOpen = _useTeams.setIsOpen,
     setSelectedRows = _useTeams.setSelectedRows;
-  config === null || config === void 0 ? void 0 : (_config$fetchApiRespo = config.fetchApiResponse) === null || _config$fetchApiRespo === void 0 ? void 0 : _config$fetchApiRespo.call(config, {
+  config === null || config === void 0 || (_config$fetchApiRespo = config.fetchApiResponse) === null || _config$fetchApiRespo === void 0 ? void 0 : _config$fetchApiRespo.call(config, {
     team: team
   });
   var updateMemberAlertProps = {
@@ -7590,7 +7599,7 @@ var TeamMembers = function TeamMembers(_ref) {
     metaName: metaName,
     config: config
   };
-  config === null || config === void 0 ? void 0 : (_config$table = config.table) === null || _config$table === void 0 ? void 0 : (_config$table$onDropd = _config$table.onDropdownClick) === null || _config$table$onDropd === void 0 ? void 0 : _config$table$onDropd.call(_config$table, {
+  config === null || config === void 0 || (_config$table = config.table) === null || _config$table === void 0 || (_config$table$onDropd = _config$table.onDropdownClick) === null || _config$table$onDropd === void 0 ? void 0 : _config$table$onDropd.call(_config$table, {
     handleUpdateRole: handleUpdateRole,
     handleUpdateStatus: handleUpdateStatus
   });
@@ -7702,8 +7711,8 @@ var TeamMembers = function TeamMembers(_ref) {
     isOpen: isOpen.alert,
     isSubmitting: isUpdatingMember,
     message: renderUpdateAlert("message", updateMemberAlertProps),
-    submitButtonLabel: t("neetoTeamMembers.buttons.proceed"),
     title: renderUpdateAlert("title", updateMemberAlertProps),
+    submitButtonLabel: selectedMember !== null && selectedMember !== void 0 && selectedMember.active ? t("neetoTeamMembers.buttons.deactivate") : t("neetoTeamMembers.buttons.activate"),
     onClose: handleAlertClose,
     onSubmit: handleUpdateMember
   })));