Merge branch 'master' into UIU-2942

folio-org · Sep 29, 2023 · aae8fe6 · aae8fe6
2 parents 9e0a45f + 06f6ea7
commit aae8fe6
Show file tree

Hide file tree

Showing 34 changed files with 89 additions and 69 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -85,9 +85,9 @@
 * ECS - Filter users by "User Type". Refs UIU-2943.
 * Users App: Consume {{FormattedDate}} and {{FormattedTime}} via stripes-component. Refs UIU-1860.
 * ECS - Prevent editing of specific shadow user data. Refs UIU-2951.
+* Relabel "Users: Can create new user" to "Users: Can create and edit users". Refs UIU-2955.
 * Assign/unassign a users affiliations adjustments. Refs UIU-2942.
 
-
 ## [9.0.0](https://github.com/folio-org/ui-users/tree/v9.0.0) (2023-02-20)
 [Full Changelog](https://github.com/folio-org/ui-users/compare/v8.1.0...v9.0.0)
 

diff --git a/package.json b/package.json
@@ -116,7 +116,7 @@
       },
       {
         "permissionName": "ui-users.create",
-        "displayName": "Users: Can create new user",
+        "displayName": "Users: Can create and edit users",
         "description": "Some subperms can be deleted later when bl does updates and ModulePermissions can be used",
         "subPermissions": [
           "ui-users.edit",

diff --git a/src/views/UserSearch/UserSearch.js b/src/views/UserSearch/UserSearch.js
@@ -45,8 +45,6 @@ import CashDrawerReconciliationReportPDF from '../../components/data/reports/cas
 import CashDrawerReconciliationReportCSV from '../../components/data/reports/cashDrawerReconciliationReportCSV';
 import FinancialTransactionsReport from '../../components/data/reports/FinancialTransactionsReport';
 import LostItemsLink from '../../components/LostItemsLink';
-import { getCentralTenantId, isConsortiumEnabled } from '../../components/util';
-import { USER_TYPES } from '../../constants';
 import Filters from './Filters';
 
 import css from './UserSearch.css';
@@ -652,7 +650,6 @@ class UserSearch extends React.Component {
       onNeedMoreData,
       resources,
       contentRef,
-      stripes,
       mutator: { resultOffset, cashDrawerReportSources },
       stripes: { timezone },
       okapi: { currentUser },
@@ -719,12 +716,6 @@ class UserSearch extends React.Component {
       email: user => get(user, ['personal', 'email']),
     };
 
-    const { PATRON, SHADOW, STAFF, SYSTEM } = USER_TYPES;
-    const isCentralTenant = getCentralTenantId(stripes);
-    const isConsortium = isConsortiumEnabled(stripes);
-    const defaultSelectedUserTypes = isCentralTenant ? [STAFF, SHADOW, SYSTEM] : [STAFF, PATRON, SYSTEM];
-    const initialFilters = isConsortium ? { userType: defaultSelectedUserTypes } : {};
-
     return (
       <HasCommand commands={this.shortcuts}>
         <div data-test-user-instances ref={contentRef}>
@@ -734,7 +725,6 @@ class UserSearch extends React.Component {
             onComponentWillUnmount={onComponentWillUnmount}
             initialSearch={initialSearch}
             initialSearchState={{ query: '' }}
-            initialFilterState={initialFilters}
           >
             {
               ({

diff --git a/translations/ui-users/ar.json b/translations/ui-users/ar.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/ber.json b/translations/ui-users/ber.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/ca.json b/translations/ui-users/ca.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/cs_CZ.json b/translations/ui-users/cs_CZ.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Čtenář",
     "information.userType.staff": "Zaměstnanci",
     "information.userType.shadow": "Stín",
-    "information.userType.system": "Systém"
+    "information.userType.system": "Systém",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/da.json b/translations/ui-users/da.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Gebyr-/bødehistorik: Kan oprette, redigere og fjerne konti",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Brugere: Kan redigere brugerprofil",
     "permission.editperms": "Brugere: Kan tildele og fjerne tildeling af brugerrettigheder til brugere",
     "permission.editproxies": "Brugere: Kan oprette, redigere og fjerne proxyer",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/de.json b/translations/ui-users/de.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/en.json b/translations/ui-users/en.json
@@ -986,7 +986,7 @@
   "filters.status.active": "Active",
   "filters.status.inactive": "Inactive",
   "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-  "permission.create": "Users: Can create new user",
+  "permission.create": "Users: Can create and edit users",
   "permission.edit": "Users: Can edit user profile",
   "permission.editperms": "Users: Can assign and unassign permissions to users",
   "permission.editproxies": "Users: Can create, edit and remove proxies",

diff --git a/translations/ui-users/en_GB.json b/translations/ui-users/en_GB.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/en_SE.json b/translations/ui-users/en_SE.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/en_US.json b/translations/ui-users/en_US.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/es.json b/translations/ui-users/es.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/es_419.json b/translations/ui-users/es_419.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Personal",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "Sistema"
+    "information.userType.system": "Sistema",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/es_ES.json b/translations/ui-users/es_ES.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/fr.json b/translations/ui-users/fr.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/fr_FR.json b/translations/ui-users/fr_FR.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/he.json b/translations/ui-users/he.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/hi_IN.json b/translations/ui-users/hi_IN.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/hu.json b/translations/ui-users/hu.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/it_IT.json b/translations/ui-users/it_IT.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/ja.json b/translations/ui-users/ja.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/ko.json b/translations/ui-users/ko.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "하나 이상의 차단 된 작업이 선택된 경우 표시 할 메시지는 필수 필드입니다.",
     "settings.error.noCheckbox": "메시지를 표시하려면 하나 이상의 차단된 작업을 선택해야 합니다.",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/nb.json b/translations/ui-users/nb.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/nn.json b/translations/ui-users/nn.json
@@ -592,7 +592,7 @@
     "settings.error.noMessage": "Message to be displayed is a required field if one or more Blocked actions selected",
     "settings.error.noCheckbox": "One or more Blocked actions must be selected for Message to be displayed to be used",
     "permission.accounts": "Fee/Fine History: Can create, edit and remove accounts",
-    "permission.create": "Users: Can create new user",
+    "permission.create": "Users: Can create and edit users",
     "permission.edit": "Users: Can edit user profile",
     "permission.editperms": "Users: Can assign and unassign permissions to users",
     "permission.editproxies": "Users: Can create, edit and remove proxies",
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }
diff --git a/translations/ui-users/pl.json b/translations/ui-users/pl.json
@@ -1136,5 +1136,6 @@
     "information.userType.patron": "Patron",
     "information.userType.staff": "Staff",
     "information.userType.shadow": "Shadow",
-    "information.userType.system": "System"
+    "information.userType.system": "System",
+    "userType": "User type"
 }