@bigbinary/neeto-team-members-frontend 4.0.1 → 4.1.1

package/dist/index.js

@@ -1,13 +1,13 @@
 import { globalProps, taxonomies } from '@bigbinary/neeto-commons-frontend/initializers';
 import require$$0, { useState, createElement, useEffect, useMemo, useRef, Fragment as Fragment$1, memo, useCallback } from 'react';
-import { removeBy, nullSafe, noop, isPresent, findById, isNotEmpty, findBy, _findBy, replaceById, keysToSnakeCase, notEquals, toLabelAndValue, filterBy, slugify } from '@bigbinary/neeto-cist';
+import { removeBy, nullSafe, noop, isPresent, findById, isNotEmpty, findBy, _findBy, replaceById, keysToSnakeCase, toLabelAndValue, notEquals, filterBy, slugify } from '@bigbinary/neeto-cist';
 import { useMutationWithInvalidation, withT, useQueryParams, withTitle, useFuncDebounce, useDebounce, useBreakpoints } from '@bigbinary/neeto-commons-frontend/react-utils';
 import Container from '@bigbinary/neeto-molecules/Container';
 import NeetoHeader from '@bigbinary/neeto-molecules/Header';
 import Button from '@bigbinary/neetoui/Button';
 import { useTranslation, Trans } from 'react-i18next';
 import { useQuery, QueryClient, QueryCache, QueryClientProvider, keepPreviousData, useMutation } from '@tanstack/react-query';
-import { prop, pluck, mergeLeft, includes, keys, isEmpty, replace as replace$1, is, append, concat, equals, groupBy, not, map, identical, modify, __, filter as filter$1, identity, clamp, curry, isNil, toLower, assoc, trim, isNotNil, pick, move, head, reverse } from 'ramda';
+import { prop, pluck, mergeLeft, includes, keys, isEmpty, replace as replace$1, is, append, concat, equals, groupBy, not, map, identical, modify, __, filter, identity, clamp, curry, assoc, isNil, trim, toLower, isNotNil, pick, move, head, reverse } from 'ramda';
 import axios from 'axios';
 import i18next, { t as t$1 } from 'i18next';
 import { DEFAULT_PAGE_INDEX, DEFAULT_STALE_TIME, PLURAL, SINGULAR, DEFAULT_PAGE_SIZE as DEFAULT_PAGE_SIZE$1 } from '@bigbinary/neeto-commons-frontend/constants';
@@ -51,7 +51,7 @@ import Up from '@bigbinary/neeto-icons/Up';
 import { getQueryParams, buildUrl, hyphenize, currencyFormat, showThumbsUpToastr } from '@bigbinary/neeto-commons-frontend/utils';
 import { buildFiltersFromURL, Bar } from '@bigbinary/neeto-filters-frontend';
 import { useHiddenColumns } from '@bigbinary/neeto-molecules/Columns';
-import { useHistory, matchPath } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import require$$0$1 from 'util';
 import Dropdown from '@bigbinary/neetoui/Dropdown';
 import Tag from '@bigbinary/neetoui/Tag';
@@ -65,7 +65,6 @@ import MultiEmailInput from '@bigbinary/neetoui/formik/MultiEmailInput';
 import Radio$1 from '@bigbinary/neetoui/formik/Radio';
 import Warning from '@bigbinary/neeto-icons/Warning';
 import Checkbox$1 from '@bigbinary/neetoui/formik/Checkbox';
-import MenuBar from '@bigbinary/neeto-molecules/MenuBar';
 import UserCircle from '@bigbinary/neeto-icons/UserCircle';
 
 function _typeof$1(o) {
@@ -5089,7 +5088,7 @@ var Roles = function Roles(_ref) {
     bulkUpdate = _useBulkUpdateRoles.mutate;
   var permissions = sortPermissionsBySequence(permissionData);
   var permissionGroups = getPermissionGroups(permissions);
-  var filteredRoles = filter$1(function (_ref2) {
+  var filteredRoles = filter(function (_ref2) {
     var name = _ref2.name;
     return includes(searchTerm.toLowerCase().trim(), name.toLowerCase().trim());
   }, isNotEmpty(modifiedRoles) ? modifiedRoles : roles);
@@ -7328,26 +7327,7 @@ var useMembersCreationStatus = function useMembersCreationStatus(jobId, options)
 
 var _getQueryParams = getQueryParams(),
   page = _getQueryParams.page,
-  pageSize = _getQueryParams.pageSize,
-  filter = _getQueryParams.filter;
-var MEMBER_FILTER = {
-  ACTIVE: {
-    label: "neetoTeamMembers.common.active",
-    value: "ACTIVE",
-    defaultCount: 0
-  },
-  DEACTIVATED: {
-    label: "neetoTeamMembers.common.deactivated",
-    value: "DEACTIVATED",
-    defaultCount: 0
-  },
-  ALL: {
-    label: "neetoTeamMembers.common.all",
-    value: "ALL",
-    defaultCount: 0
-  }
-};
-var DEFAULT_MEMBER_FILTER = MEMBER_FILTER.ACTIVE.value;
+  pageSize = _getQueryParams.pageSize;
 var DEFAULT_RADIX = 10;
 var DEFAULT_IS_OPEN_VALUES = {
   menuBar: false,
@@ -7357,7 +7337,6 @@ var DEFAULT_IS_OPEN_VALUES = {
 var DEFAULT_FILTER_VALUES = {
   page: clamp(1, Infinity, parseInt(page)) || DEFAULT_PAGE_INDEX,
   pageSize: clamp(10, 100, parseInt(pageSize)) || DEFAULT_PAGE_SIZE$1,
-  category: (filter === null || filter === void 0 ? void 0 : filter.toUpperCase()) || DEFAULT_MEMBER_FILTER,
   sortBy: "",
   orderBy: "",
   neetoFilters: []
@@ -7375,12 +7354,10 @@ function _objectSpread$9(e) { for (var r = 1; r < arguments.length; r++) { var t
 var MenuItem$2 = Dropdown.MenuItem;
 var renderNameColumn = function renderNameColumn(_ref) {
   var config = _ref.config,
-    displayStatusTag = _ref.displayStatusTag,
     handleUpdateRole = _ref.handleUpdateRole,
     handleUpdateStatus = _ref.handleUpdateStatus,
     tableData = _ref.tableData;
-  var active = tableData.active,
-    name = tableData.displayName,
+  var name = tableData.displayName,
     imageUrl = tableData.profileImageUrl,
     subscriptionPlan = tableData.subscriptionPlan;
   return /*#__PURE__*/jsxs("div", {
@@ -7397,11 +7374,6 @@ var renderNameColumn = function renderNameColumn(_ref) {
         "data-cy": "ntm-member-name-".concat(hyphenize(name)),
         style: "body2",
         children: name
-      }), displayStatusTag && /*#__PURE__*/jsx(Tag, {
-        "data-cy": "ntm-member-status-tag",
-        style: active ? "primary" : "secondary",
-        type: "outline",
-        label: active ? i18next.t(MEMBER_FILTER.ACTIVE.label) : i18next.t(MEMBER_FILTER.DEACTIVATED.label)
       }), subscriptionPlan === SUBSCRIPTION_PLANS.PRO && /*#__PURE__*/jsx(Tag, {
         className: "neeto-ui-text-transform-uppercase",
         "data-cy": "ntm-member-subscription-plan-tag",
@@ -7441,22 +7413,14 @@ var renderDropdownButton = function renderDropdownButton(_ref2) {
       }
     },
     menuTopChildren: /*#__PURE__*/jsxs(Fragment, {
-      children: [/*#__PURE__*/jsx(Tooltip, {
-        disabled: tableData.active,
-        position: "top",
-        content: i18next.t("neetoTeamMembers.tooltips.activateUserToEdit", SINGULAR),
-        children: /*#__PURE__*/jsx("span", {
-          children: /*#__PURE__*/jsx(MenuItem$2.Button, {
-            className: "ntm-dropdown__button",
-            "data-cy": "ntm-edit-member-button",
-            isDisabled: not(tableData.active),
-            size: "small",
-            onClick: function onClick() {
-              return tableData.active && handleUpdateRole(tableData);
-            },
-            children: i18next.t("neetoTeamMembers.common.edit")
-          })
-        })
+      children: [/*#__PURE__*/jsx(MenuItem$2.Button, {
+        className: "ntm-dropdown__button",
+        "data-cy": "ntm-edit-member-button",
+        size: "small",
+        onClick: function onClick() {
+          return handleUpdateRole(tableData);
+        },
+        children: i18next.t("neetoTeamMembers.common.edit")
       }), config === null || config === void 0 || (_config$table = config.table) === null || _config$table === void 0 || (_config$table$dropdow = _config$table.dropdownProps) === null || _config$table$dropdow === void 0 ? void 0 : _config$table$dropdow.call(_config$table, tableData), /*#__PURE__*/jsx(MenuItem$2.Button, {
         className: "ntm-dropdown__button",
         "data-cy": "ntm-deactivate-member-button",
@@ -7464,14 +7428,14 @@ var renderDropdownButton = function renderDropdownButton(_ref2) {
         onClick: function onClick() {
           return handleUpdateStatus(tableData);
         },
-        children: tableData.active ? i18next.t("neetoTeamMembers.common.deactivate") : i18next.t("neetoTeamMembers.common.activate")
+        children: i18next.t("neetoTeamMembers.common.remove")
       })]
     })
   });
 };
 var getDefaultAlertTitle = function getDefaultAlertTitle(_ref3) {
   var member = _ref3.member;
-  return member !== null && member !== void 0 && member.active ? i18next.t("neetoTeamMembers.common.deactivate_", {
+  return member !== null && member !== void 0 && member.active ? i18next.t("neetoTeamMembers.common.remove_", {
     what: taxonomies.member.singular
   }) : i18next.t("neetoTeamMembers.common.activate_", {
     what: taxonomies.member.singular
@@ -7480,15 +7444,14 @@ var getDefaultAlertTitle = function getDefaultAlertTitle(_ref3) {
 var getDefaultAlertMessage = function getDefaultAlertMessage(_ref4) {
   var member = _ref4.member;
   return /*#__PURE__*/jsx(Trans, {
+    i18nKey: "neetoTeamMembers.alerts.messages.removeMember",
     values: _objectSpread$9(_objectSpread$9({}, SINGULAR), {}, {
       person: member === null || member === void 0 ? void 0 : member.displayName
-    }),
-    i18nKey: member !== null && member !== void 0 && member.active ? "neetoTeamMembers.alerts.messages.deactivateMember" : "neetoTeamMembers.alerts.messages.activateMember"
+    })
   });
 };
 var getDefaultColumns = function getDefaultColumns(_ref5) {
   var config = _ref5.config,
-    displayStatusTag = _ref5.displayStatusTag,
     handleUpdateRole = _ref5.handleUpdateRole,
     handleUpdateStatus = _ref5.handleUpdateStatus,
     otherColumns = _ref5.otherColumns,
@@ -7501,7 +7464,6 @@ var getDefaultColumns = function getDefaultColumns(_ref5) {
     render: function render(_, tableData) {
       return renderNameColumn({
         config: config,
-        displayStatusTag: displayStatusTag,
         handleUpdateRole: handleUpdateRole,
         handleUpdateStatus: handleUpdateStatus,
         tableData: tableData
@@ -7549,13 +7511,10 @@ var getColumnData = function getColumnData(_ref8) {
   var config = _ref8.config,
     handleUpdateRole = _ref8.handleUpdateRole,
     handleUpdateStatus = _ref8.handleUpdateStatus,
-    memberFilter = _ref8.memberFilter,
     isSize = _ref8.isSize;
-  var displayStatusTag = 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({
     config: config,
-    displayStatusTag: displayStatusTag,
     handleUpdateRole: handleUpdateRole,
     handleUpdateStatus: handleUpdateStatus,
     otherColumns: otherColumns,
@@ -7577,11 +7536,6 @@ var getColumnData = function getColumnData(_ref8) {
   });
   return columns;
 };
-var renderHeaderTitle = function renderHeaderTitle(filterStatus) {
-  return i18next.t("neetoTeamMembers.common.".concat(toLower(filterStatus), "_"), {
-    what: taxonomies.member.plural
-  });
-};
 var renderUpdateAlert = function renderUpdateAlert(field, props) {
   var _config$alert;
   var config = props.config,
@@ -7596,15 +7550,14 @@ var renderUpdateAlert = function renderUpdateAlert(field, props) {
   }
   return field === "title" ? getDefaultAlertTitle(props) : getDefaultAlertMessage(props);
 };
-var handlePageChange = function handlePageChange(setFilters, filter, history) {
+var handlePageChange = function handlePageChange(setFilters, history) {
   return function (page, pageSize) {
     var searchParams = getQueryParams({
       toCamelCase: false
     });
     history.replace(buildUrl(window.location.pathname, mergeLeft({
       page: page,
-      page_size: pageSize,
-      filter: filter.toLowerCase()
+      page_size: pageSize
     }, searchParams)));
     setFilters(mergeLeft({
       page: page,
@@ -7617,12 +7570,6 @@ var renderPaginationProps = function renderPaginationProps(size) {
     pageSize: parseInt(size, DEFAULT_RADIX)
   };
 };
-var getPerCategoryCount = function getPerCategoryCount(perCategoryCount, category) {
-  return isNil(perCategoryCount) ? MEMBER_FILTER[category].defaultCount : perCategoryCount[category === null || category === void 0 ? void 0 : category.toLowerCase()];
-};
-var clearSelectedMembers = function clearSelectedMembers(previousCategory, currentCategory) {
-  return notEquals(previousCategory, currentCategory) && notEquals(currentCategory, "ALL");
-};
 var defaultNeetoFiltersColumns = function defaultNeetoFiltersColumns() {
   return [{
     key: "email",
@@ -7679,30 +7626,20 @@ var buildFilterColumns = function buildFilterColumns(_ref11) {
     return mergeLeft(emailConfig, column);
   });
 };
-var getValidCategory = function getValidCategory(category) {
-  var defaultCategory = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : MEMBER_FILTER.ACTIVE.value;
-  return Object.values(MEMBER_FILTER).some(function (_ref12) {
-    var value = _ref12.value;
-    return identical(value, category);
-  }) ? category : defaultCategory;
-};
 var getFilteredRoles = function getFilteredRoles() {
   var roles = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return filter$1(removeExcludedRole(config === null || config === void 0 ? void 0 : config.excludedRoles), roles);
+  return filter(removeExcludedRole(config === null || config === void 0 ? void 0 : config.excludedRoles), roles);
 };
-var generateNoDataContent = function generateNoDataContent(_ref13) {
-  var filterCategory = _ref13.filterCategory,
-    buttonProps = _ref13.buttonProps;
+var generateNoDataContent = function generateNoDataContent(_ref12) {
+  var buttonProps = _ref12.buttonProps;
   var disabled = buttonProps.disabled,
     onClick = buttonProps.onClick;
-  var kind = MEMBER_FILTER[filterCategory].value.toLowerCase();
-  var noDataTitleTranslationKey = kind === "all" ? "notFound_" : "notFoundWithKind_";
+  var noDataTitleTranslationKey = "notFound_";
   var noDataTitle = i18next.t("neetoTeamMembers.common.".concat(noDataTitleTranslationKey), {
-    what: taxonomies.member.plural,
-    kind: kind
+    what: taxonomies.member.plural
   });
-  var noDataButtonProps = kind === "deactivated" ? {} : {
+  var noDataButtonProps = {
     "data-cy": "ntm-add-member-button",
     disabled: disabled,
     label: i18next.t("neetoTeamMembers.common.addNew_", {
@@ -7719,14 +7656,13 @@ var generateNoDataContent = function generateNoDataContent(_ref13) {
 function ownKeys$8(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$8(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$8(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$8(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var useFilters = function useFilters(_ref) {
-  var _config$filterColumns, _config$defaultFilter;
+  var _config$filterColumns;
   var config = _ref.config;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var _useQueryParams = useQueryParams(),
     _useQueryParams$searc = _useQueryParams.searchTerm,
-    searchTerm = _useQueryParams$searc === void 0 ? "" : _useQueryParams$searc,
-    filter = _useQueryParams.filter;
+    searchTerm = _useQueryParams$searc === void 0 ? "" : _useQueryParams$searc;
   var searchKeywordProps = {
     node: "first_name,last_name,email",
     value: searchTerm,
@@ -7738,8 +7674,7 @@ var useFilters = function useFilters(_ref) {
     setEmailSearchTerm = _useState2[1];
   var defaultNeetoFilters = buildFiltersFromURL([].concat(_toConsumableArray((_config$filterColumns = config === null || config === void 0 ? void 0 : config.filterColumns) !== null && _config$filterColumns !== void 0 ? _config$filterColumns : defaultNeetoFiltersColumns()), [searchKeywordProps]));
   var _useState3 = useState(_objectSpread$8(_objectSpread$8(_objectSpread$8({}, DEFAULT_FILTER_VALUES), config === null || config === void 0 ? void 0 : config.defaultFilterValues), {}, {
-      neetoFilters: defaultNeetoFilters,
-      category: getValidCategory(filter === null || filter === void 0 ? void 0 : filter.toUpperCase(), config === null || config === void 0 || (_config$defaultFilter = config.defaultFilterValues) === null || _config$defaultFilter === void 0 ? void 0 : _config$defaultFilter.category)
+      neetoFilters: defaultNeetoFilters
     })),
     _useState4 = _slicedToArray(_useState3, 2),
     filters = _useState4[0],
@@ -7807,13 +7742,12 @@ var useTeams = function useTeams(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     selectedRows = _useState6[0],
     setSelectedRows = _useState6[1];
-  var handleUpdateMember = function handleUpdateMember() {
+  var handleRemoveMember = function handleRemoveMember() {
     var _globalProps$user;
     var id = selectedMember.id,
-      active = selectedMember.active,
       email = selectedMember.email;
     var payload = {
-      active: !active
+      active: false
     };
     updateMember({
       id: id,
@@ -7847,10 +7781,9 @@ var useTeams = function useTeams(_ref) {
   var resetSelectedRows = function resetSelectedRows() {
     return setSelectedRows(DEFAULT_SELECTED_ROWS);
   };
-  var handleMemberFilterChange = function handleMemberFilterChange(filter) {
-    setFilters(assoc("category", filter));
-    clearSelectedMembers(filters.category, filter) && setSelectedRows(DEFAULT_SELECTED_ROWS);
-    handlePageChange(setFilters, filter, history)(DEFAULT_PAGE_INDEX, filters.pageSize);
+  var handleMemberFilterChange = function handleMemberFilterChange() {
+    setSelectedRows(DEFAULT_SELECTED_ROWS);
+    handlePageChange(setFilters, history)(DEFAULT_PAGE_INDEX, filters.pageSize);
   };
   var handleTableChange = function handleTableChange(_, __, sorter) {
     setFilters(mergeLeft({
@@ -7880,7 +7813,7 @@ var useTeams = function useTeams(_ref) {
     handlePaneClose: handlePaneClose,
     handleRowSelect: handleRowSelect,
     handleTableChange: handleTableChange,
-    handleUpdateMember: handleUpdateMember,
+    handleRemoveMember: handleRemoveMember,
     handleUpdateRole: handleUpdateRole,
     handleUpdateStatus: handleUpdateStatus,
     isOpen: isOpen,
@@ -7917,12 +7850,12 @@ var Header$2 = function Header(_ref) {
       position: "bottom",
       children: /*#__PURE__*/jsx("span", {
         children: /*#__PURE__*/jsx(Button, {
+          onClick: onClick,
           "data-cy": "ntm-add-member-button",
           disabled: !isCreatePermissionGranted,
           label: t("neetoTeamMembers.common.addNew_", {
             what: taxonomies.member.singular
-          }),
-          onClick: onClick
+          })
         })
       })
     })]
@@ -7931,25 +7864,19 @@ var Header$2 = function Header(_ref) {
 var HeaderActionBlock = /*#__PURE__*/memo(Header$2);
 
 var filterBySearchTerm = function filterBySearchTerm(searchTerm, roles) {
-  return filter$1(function (_ref) {
+  return filter(function (_ref) {
     var name = _ref.name;
     return includes(trim(toLower(searchTerm)), trim(toLower(name)));
   }, roles);
 };
-var getActivateButtonVisible = function getActivateButtonVisible(selectedRows, config) {
-  var _config$hiddenBulkAct;
-  return selectedRows.active.some(function (active) {
-    return active === false;
-  }) && !(config !== null && config !== void 0 && (_config$hiddenBulkAct = config.hiddenBulkActions) !== null && _config$hiddenBulkAct !== void 0 && _config$hiddenBulkAct.includes("activate"));
-};
 var getDeactivatedButtonVisible = function getDeactivatedButtonVisible(selectedRows, config) {
-  var _config$hiddenBulkAct2;
+  var _config$hiddenBulkAct;
   return selectedRows.active.some(function (active) {
     return active === true;
-  }) && !(config !== null && config !== void 0 && (_config$hiddenBulkAct2 = config.hiddenBulkActions) !== null && _config$hiddenBulkAct2 !== void 0 && _config$hiddenBulkAct2.includes("deactivate"));
+  }) && !(config !== null && config !== void 0 && (_config$hiddenBulkAct = config.hiddenBulkActions) !== null && _config$hiddenBulkAct !== void 0 && _config$hiddenBulkAct.includes("remove"));
 };
 
-var Menu$2 = Dropdown.Menu,
+var Menu$1 = Dropdown.Menu,
   MenuItem$1 = Dropdown.MenuItem;
 var RolesDropdown = function RolesDropdown(_ref) {
   var _ref$disabled = _ref.disabled,
@@ -8015,7 +7942,7 @@ var RolesDropdown = function RolesDropdown(_ref) {
         }),
         onClick: handleClick,
         onClose: handleOnClose,
-        children: /*#__PURE__*/jsxs(Menu$2, {
+        children: /*#__PURE__*/jsxs(Menu$1, {
           children: [isSearchable && /*#__PURE__*/jsx("div", {
             className: "neeto-ui-px-3 neeto-ui-py-2",
             onClick: function onClick(event) {
@@ -8054,7 +7981,7 @@ var RolesDropdown = function RolesDropdown(_ref) {
 
 function ownKeys$5(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$5(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$5(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$5(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var Menu$1 = Dropdown.Menu,
+var Menu = Dropdown.Menu,
   MenuItem = Dropdown.MenuItem;
 var Left = function Left(_ref) {
   var _ref2, _selectedRows$keys, _selectedRows$active, _config$hiddenBulkAct, _config$otherBulkActi;
@@ -8106,14 +8033,6 @@ var Left = function Left(_ref) {
   var resetSelectedRows = function resetSelectedRows() {
     return setSelectedRows(DEFAULT_SELECTED_ROWS);
   };
-  var handleActivateMembers = function handleActivateMembers() {
-    return bulkUpdateMember({
-      users: {
-        active: true,
-        emails: selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.emails
-      }
-    });
-  };
   var handleRoleChange = function handleRoleChange(role) {
     var _selectedRows$emails2, _globalProps$user2;
     bulkUpdateMember({
@@ -8128,19 +8047,12 @@ var Left = function Left(_ref) {
     }
   };
   var alertTypes = [{
-    message: "neetoTeamMembers.alerts.messages.deactivateMember",
+    message: "neetoTeamMembers.alerts.messages.removeMember",
     onSubmit: handleDeactivateMembers,
-    title: t("neetoTeamMembers.common.deactivate_", {
+    title: t("neetoTeamMembers.common.remove_", {
       what: selectedMembersCountValues === null || selectedMembersCountValues === void 0 ? void 0 : selectedMembersCountValues.metaName
     }),
-    type: "deactivate"
-  }, {
-    message: "neetoTeamMembers.alerts.messages.activateMember",
-    onSubmit: handleActivateMembers,
-    title: t("neetoTeamMembers.common.activate_", {
-      what: selectedMembersCountValues === null || selectedMembersCountValues === void 0 ? void 0 : selectedMembersCountValues.metaName
-    }),
-    type: "activate"
+    type: "remove"
   }, {
     message: "neetoTeamMembers.alerts.messages.changeRole",
     onSubmit: handleRoleChange,
@@ -8158,7 +8070,7 @@ var Left = function Left(_ref) {
     if (type === "role") {
       return t("neetoTeamMembers.buttons.changeRole");
     }
-    return type === "deactivate" ? t("neetoTeamMembers.buttons.deactivate") : t("neetoTeamMembers.buttons.activate");
+    return t("neetoTeamMembers.buttons.remove");
   };
   return /*#__PURE__*/jsxs("div", {
     className: "neeto-ui-flex neeto-ui-items-center neeto-ui-gap-4",
@@ -8185,21 +8097,14 @@ var Left = function Left(_ref) {
           "data-cy": "ntm-members-take-action-dropdown-button",
           disabled: !isUpdatePermissionGranted,
           label: t("neetoTeamMembers.common.takeAction"),
-          children: /*#__PURE__*/jsxs(Menu$1, {
+          children: /*#__PURE__*/jsxs(Menu, {
             children: [getDeactivatedButtonVisible(selectedRows, config) && /*#__PURE__*/jsx(MenuItem.Button, {
               "data-cy": "ntm-deactivate-members-button",
               disabled: !isUpdatePermissionGranted,
               onClick: function onClick() {
-                return setAlertType("deactivate");
+                return setAlertType("remove");
               },
-              children: t("neetoTeamMembers.common.deactivate")
-            }), getActivateButtonVisible(selectedRows, config) && /*#__PURE__*/jsx(MenuItem.Button, {
-              "data-cy": "ntm-activate-members-button",
-              disabled: !isUpdatePermissionGranted,
-              onClick: function onClick() {
-                return setAlertType("activate");
-              },
-              children: t("neetoTeamMembers.common.activate")
+              children: t("neetoTeamMembers.common.remove")
             }), !(config !== null && config !== void 0 && (_config$hiddenBulkAct = config.hiddenBulkActions) !== null && _config$hiddenBulkAct !== void 0 && _config$hiddenBulkAct.includes("role")) && /*#__PURE__*/jsx(RolesDropdown, {
               roles: roles,
               setAlertType: setAlertType,
@@ -8267,11 +8172,10 @@ var Header = function Header(_ref) {
   var _config$header, _config$header2;
   var config = _ref.config,
     setIsOpen = _ref.setIsOpen,
-    searchProps = _ref.searchProps,
-    filterCategory = _ref.filterCategory;
+    searchProps = _ref.searchProps;
   return /*#__PURE__*/jsx(NeetoHeader, _objectSpread$4({
     searchProps: searchProps,
-    title: renderHeaderTitle(MEMBER_FILTER[filterCategory].value),
+    title: taxonomies.member.plural,
     actionBlock: /*#__PURE__*/jsx(HeaderActionBlock, {
       isCreatePermissionGranted: config.permissions.create,
       otherActionBlock: (_config$header = config.header) === null || _config$header === void 0 ? void 0 : _config$header.otherActionBlock,
@@ -8279,14 +8183,7 @@ var Header = function Header(_ref) {
       onClick: function onClick() {
         return setIsOpen(assoc("manageMember", true));
       }
-    }),
-    menuBarToggle: function menuBarToggle() {
-      return setIsOpen(function (state) {
-        return _objectSpread$4(_objectSpread$4({}, state), {}, {
-          menuBar: !state.menuBar
-        });
-      });
-    }
+    })
   }, config === null || config === void 0 || (_config$header2 = config.header) === null || _config$header2 === void 0 ? void 0 : _config$header2.otherProps));
 };
 var Header$1 = /*#__PURE__*/memo(Header);
@@ -8955,8 +8852,8 @@ var ManageMember = function ManageMember(_ref) {
     totalCount = _useCreateMember$data2.totalCount,
     createMember = _useCreateMember.mutate,
     isCreatingMember = _useCreateMember.isLoading;
-  var refetchInterval = function refetchInterval() {
-    var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+  var refetchInterval = function refetchInterval(query) {
+    var _ref2 = query.state.data || {},
       isCompleted = _ref2.isCompleted;
     if (isCompleted) {
       setIsCreationStatusPollingEnabled(false);
@@ -8966,30 +8863,28 @@ var ManageMember = function ManageMember(_ref) {
   };
   var _useMembersCreationSt = useMembersCreationStatus(jobId, {
       refetchInterval: refetchInterval,
-      enabled: isCreationStatusPollingEnabled,
-      onSuccess: function onSuccess() {
-        var _config$createMember;
-        var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          isCompleted = _ref3.isCompleted,
-          isSuccessful = _ref3.isSuccessful,
-          users = _ref3.users,
-          error = _ref3.error;
-        if (!isCompleted) return;
-        handleClose();
-        config === null || config === void 0 || (_config$createMember = config.createMember) === null || _config$createMember === void 0 || (_config$createMember = _config$createMember.onSuccess) === null || _config$createMember === void 0 || _config$createMember.callback({
-          users: users
-        });
-        if (isSuccessful) {
-          showThumbsUpToastr();
-        } else {
-          Toastr.error(error);
-        }
-        refetchMembers();
-      }
+      enabled: isCreationStatusPollingEnabled
     }),
-    _useMembersCreationSt2 = _useMembersCreationSt.data,
-    _useMembersCreationSt3 = _useMembersCreationSt2 === void 0 ? {} : _useMembersCreationSt2,
-    progress = _useMembersCreationSt3.progress;
+    creationStatus = _useMembersCreationSt.data;
+  useEffect(function () {
+    var _config$createMember;
+    var _ref3 = creationStatus || {},
+      isCompleted = _ref3.isCompleted,
+      isSuccessful = _ref3.isSuccessful,
+      users = _ref3.users,
+      error = _ref3.error;
+    if (!isCompleted) return;
+    handleClose();
+    config === null || config === void 0 || (_config$createMember = config.createMember) === null || _config$createMember === void 0 || (_config$createMember = _config$createMember.onSuccess) === null || _config$createMember === void 0 || _config$createMember.callback({
+      users: users
+    });
+    if (isSuccessful) {
+      showThumbsUpToastr();
+    } else {
+      Toastr.error(error);
+    }
+    refetchMembers();
+  }, [creationStatus]);
   var _useUpdateMember = useUpdateMember({
       onSuccess: function onSuccess() {
         var _config$updateMember;
@@ -9129,7 +9024,7 @@ var ManageMember = function ManageMember(_ref) {
         }, team))
       },
       children: function children(_ref5) {
-        var _manageMemberComponen2, _manageMemberComponen3;
+        var _manageMemberComponen2, _creationStatus$progr, _manageMemberComponen3;
         var values = _ref5.values;
         var emails = values.emails,
           role = values.role;
@@ -9145,7 +9040,7 @@ var ManageMember = function ManageMember(_ref) {
               style: "info",
               children: t("neetoTeamMembers.helpers.memberCreationStatus", {
                 count: emails.length,
-                completedCount: progress === null || progress === void 0 ? void 0 : progress.completedCount,
+                completedCount: creationStatus === null || creationStatus === void 0 || (_creationStatus$progr = creationStatus.progress) === null || _creationStatus$progr === void 0 ? void 0 : _creationStatus$progr.completedCount,
                 totalCount: totalCount
               })
             }), renderFormPage(currentPage, emails, role)]
@@ -9171,32 +9066,6 @@ var ManageMember = function ManageMember(_ref) {
   });
 };
 
-var Menu = function Menu(_ref) {
-  var filterCounts = _ref.filterCounts,
-    handleMemberFilterChange = _ref.handleMemberFilterChange,
-    isMenuOpen = _ref.isMenuOpen,
-    memberFilter = _ref.memberFilter;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var memberFilterKeys = keys(MEMBER_FILTER);
-  return /*#__PURE__*/jsx(MenuBar, {
-    "data-cy": "ntm-members-menubar-heading",
-    showMenu: isMenuOpen,
-    title: taxonomies.member.plural,
-    children: memberFilterKeys.map(function (filter) {
-      return /*#__PURE__*/jsx(MenuBar.Block, {
-        count: getPerCategoryCount(filterCounts, filter),
-        "data-cy": "ntm-members-menubar-".concat(slugify(filter), "-block"),
-        label: t(MEMBER_FILTER[filter].label),
-        active: memberFilterKeys.includes(memberFilter) && identical(filter, memberFilter),
-        onClick: function onClick() {
-          return handleMemberFilterChange(filter);
-        }
-      }, filter);
-    })
-  });
-};
-
 function ownKeys(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(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var TeamMembers = function TeamMembers(_ref) {
@@ -9208,8 +9077,6 @@ var TeamMembers = function TeamMembers(_ref) {
   var _useBreakpoints = useBreakpoints(),
     isSize = _useBreakpoints.isSize;
   var queryParams = useQueryParams();
-  var _queryParams$filter = queryParams.filter,
-    category = _queryParams$filter === void 0 ? MEMBER_FILTER.ACTIVE.value.toLowerCase() : _queryParams$filter;
   var isViewPermissionGranted = config.permissions.view;
   var isCreatePermissionGranted = config.permissions.create;
   var _useState = useState(false),
@@ -9217,8 +9084,8 @@ var TeamMembers = function TeamMembers(_ref) {
     isFiltersPaneOpen = _useState2[0],
     setIsFiltersPaneOpen = _useState2[1];
   useEffect(function () {
-    handleMemberFilterChange(category === null || category === void 0 ? void 0 : category.toUpperCase());
-  }, [category]);
+    handleMemberFilterChange();
+  }, []);
   var _useFilters = useFilters({
       config: config
     }),
@@ -9227,9 +9094,7 @@ var TeamMembers = function TeamMembers(_ref) {
     filterColumns = _useFilters.filterColumns,
     searchProps = _useFilters.searchProps,
     searchKeywordProps = _useFilters.searchKeywordProps;
-  var _useFetchMembers = useFetchMembers(_objectSpread(_objectSpread({}, filters), {}, {
-      category: filters.category.toLowerCase()
-    }), {
+  var _useFetchMembers = useFetchMembers(_objectSpread({}, filters), {
       enabled: isViewPermissionGranted
     }),
     team = _useFetchMembers.data,
@@ -9265,7 +9130,7 @@ var TeamMembers = function TeamMembers(_ref) {
     handlePaneClose = _useTeams.handlePaneClose,
     handleRowSelect = _useTeams.handleRowSelect,
     handleTableChange = _useTeams.handleTableChange,
-    handleUpdateMember = _useTeams.handleUpdateMember,
+    handleRemoveMember = _useTeams.handleRemoveMember,
     handleUpdateRole = _useTeams.handleUpdateRole,
     handleUpdateStatus = _useTeams.handleUpdateStatus,
     isOpen = _useTeams.isOpen,
@@ -9276,8 +9141,7 @@ var TeamMembers = function TeamMembers(_ref) {
   config === null || config === void 0 || (_config$fetchApiRespo = config.fetchApiResponse) === null || _config$fetchApiRespo === void 0 || _config$fetchApiRespo.call(config, {
     team: team
   });
-  var currentCategoryMembersCount = getPerCategoryCount(team === null || team === void 0 ? void 0 : team.perCategoryCount, category.toUpperCase());
-  var hasMembers = currentCategoryMembersCount > 0;
+  var hasMembers = (team === null || team === void 0 ? void 0 : team.activeUsersCount) > 0;
   var updateMemberAlertProps = {
     member: selectedMember,
     config: config
@@ -9291,10 +9155,9 @@ var TeamMembers = function TeamMembers(_ref) {
       config: config,
       handleUpdateRole: handleUpdateRole,
       handleUpdateStatus: handleUpdateStatus,
-      memberFilter: filters.category,
       isSize: isSize
     });
-  }, [filters.category, (_config$table2 = config.table) === null || _config$table2 === void 0 ? void 0 : _config$table2.dropdownProps] // eslint-disable-line react-hooks/exhaustive-deps
+  }, [(_config$table2 = config.table) === null || _config$table2 === void 0 ? void 0 : _config$table2.dropdownProps] // eslint-disable-line react-hooks/exhaustive-deps
   );
 
   var _useHiddenColumns = useHiddenColumns(TEAM_MEMBERS_HIDDEN_COLUMNS),
@@ -9305,13 +9168,12 @@ var TeamMembers = function TeamMembers(_ref) {
       neetoFilters: filters,
       page: DEFAULT_PAGE_INDEX
     }));
-    clearSelectedMembers(filters.category, filters) && setSelectedRows(DEFAULT_SELECTED_ROWS);
+    setSelectedRows(DEFAULT_SELECTED_ROWS);
     history.push(buildUrl(window.location.pathname, mergeLeft({
       page: DEFAULT_PAGE_INDEX
     }, queryParams)));
   };
   var _generateNoDataConten = generateNoDataContent({
-      filterCategory: filters.category,
       buttonProps: {
         onClick: function onClick() {
           return setIsOpen(assoc("manageMember", true));
@@ -9331,16 +9193,10 @@ var TeamMembers = function TeamMembers(_ref) {
     className: "ntm-members",
     children: /*#__PURE__*/jsxs("div", {
       className: "ntm-members-wrapper",
-      children: [/*#__PURE__*/jsx(Menu, {
-        handleMemberFilterChange: handleMemberFilterChange,
-        filterCounts: team === null || team === void 0 ? void 0 : team.perCategoryCount,
-        isMenuOpen: isOpen.menuBar,
-        memberFilter: filters.category
-      }), /*#__PURE__*/jsxs(Container, {
+      children: [/*#__PURE__*/jsxs(Container, {
         children: [/*#__PURE__*/jsx(Header$1, {
           config: config,
           setIsOpen: setIsOpen,
-          filterCategory: filters.category,
           searchProps: hasMembers ? searchProps : null
         }), /*#__PURE__*/jsx(SubHeader$1, {
           leftActionBlock: /*#__PURE__*/jsx(SubHeader.Left, {
@@ -9371,6 +9227,7 @@ var TeamMembers = function TeamMembers(_ref) {
             columnData: getVisibleColumnData(columns),
             currentPageNumber: parseInt(filters.page, DEFAULT_RADIX),
             "data-cy": "ntm-members-table",
+            handlePageChange: handlePageChange(setFilters, history),
             loading: isMembersFetching,
             paginationProps: renderPaginationProps(filters.pageSize),
             rowData: team === null || team === void 0 ? void 0 : team.members,
@@ -9379,7 +9236,6 @@ var TeamMembers = function TeamMembers(_ref) {
             },
             selectedRowKeys: selectedRows.keys,
             totalCount: team === null || team === void 0 ? void 0 : team.membersCount,
-            handlePageChange: handlePageChange(setFilters, filters.category, history),
             onChange: handleTableChange,
             onColumnHide: function onColumnHide(_ref2) {
               var dataIndex = _ref2.dataIndex;
@@ -9407,10 +9263,10 @@ var TeamMembers = function TeamMembers(_ref) {
         isOpen: isOpen.alert,
         isSubmitting: isUpdatingMember,
         message: renderUpdateAlert("message", updateMemberAlertProps),
+        submitButtonLabel: t("neetoTeamMembers.buttons.remove"),
         title: renderUpdateAlert("title", updateMemberAlertProps),
-        submitButtonLabel: selectedMember !== null && selectedMember !== void 0 && selectedMember.active ? t("neetoTeamMembers.buttons.deactivate") : t("neetoTeamMembers.buttons.activate"),
         onClose: handleAlertClose,
-        onSubmit: handleUpdateMember
+        onSubmit: handleRemoveMember
       })]
     })
   });
@@ -9418,53 +9274,13 @@ var TeamMembers = function TeamMembers(_ref) {
 var index = withTitle(withReactQuery(TeamMembers), taxonomies.member.plural);
 
 var useMembersSidenav = function useMembersSidenav(_ref) {
-  var _globalProps$permissi;
   var route = _ref.route;
-  var canUserViewMembers = globalProps === null || globalProps === void 0 || (_globalProps$permissi = globalProps.permissions) === null || _globalProps$permissi === void 0 ? void 0 : _globalProps$permissi.includes(VIEW_MEMBERS_PERMISSION);
-  var isMembersPageOpen = isNotNil(matchPath(location.pathname, {
-    path: route
-  }));
-  var _useFetchMembersCount = useFetchMembersCountsPerCategory({
-      enabled: canUserViewMembers && isMembersPageOpen
-    }),
-    isCountsLoading = _useFetchMembersCount.isLoading,
-    _useFetchMembersCount2 = _useFetchMembersCount.data,
-    membersCategoryCounts = _useFetchMembersCount2 === void 0 ? {} : _useFetchMembersCount2;
   return {
     icon: UserCircle,
     label: taxonomies.member.plural,
-    isCountsLoading: isCountsLoading,
-    isActive: function isActive() {
-      return isMembersPageOpen;
-    },
     to: route,
-    permissions: VIEW_MEMBERS_PERMISSION,
     "data-cy": "members-nav-tab",
-    items: [{
-      key: "active",
-      label: t$1("neetoTeamMembers.common.active"),
-      to: buildUrl(route, {
-        filter: "active"
-      }),
-      "data-cy": "members-active-block",
-      count: membersCategoryCounts["active"]
-    }, {
-      key: "deactivated",
-      label: t$1("neetoTeamMembers.common.deactivated"),
-      to: buildUrl(route, {
-        filter: "deactivated"
-      }),
-      "data-cy": "members-deactivated-block",
-      count: membersCategoryCounts["deactivated"]
-    }, {
-      key: "all",
-      label: t$1("neetoTeamMembers.common.all"),
-      to: buildUrl(route, {
-        filter: "all"
-      }),
-      "data-cy": "members-all-block",
-      count: membersCategoryCounts["all"]
-    }]
+    permission: hasPermission(VIEW_MEMBERS_PERMISSION)
   };
 };