@griddo/ax 10.6.9 → 10.6.11

package/src/modules/Users/UserList/UserItem/index.tsx

@@ -22,6 +22,7 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
     resendInvitation,
     isSiteView = false,
     roles,
+    hoverCheck,
     toggleDeleteToast,
   } = props;
 
@@ -169,7 +170,7 @@ const UserItem = (props: IUserItemProps): JSX.Element => {
           <CheckField
             name={user.name}
             value={user.id ?? ""}
-            checked={isSelected}
+            checked={isSelected || (hoverCheck && !actionIsDisabled)}
             onChange={handleOnChange}
             disabled={actionIsDisabled}
           />
@@ -248,6 +249,7 @@ interface IProps {
   isSelected: boolean;
   isSiteView?: boolean;
   roles: IRole[];
+  hoverCheck: boolean;
   onChange: (value: ICheck) => void;
   onClick: (id: number) => void;
   toggleDeleteToast: () => void;

package/src/modules/Users/UserList/index.tsx

@@ -74,6 +74,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
     addToBulkSelection,
     selectAllItems,
     selectedItems,
+    setHoverCheck,
   } = useBulkSelection(usersIds);
 
   useEffect(() => {
@@ -110,9 +111,21 @@ const UserList = (props: IUserListProps): JSX.Element => {
 
   const unselectAllItems = () => resetBulkSelection();
 
-  const selectItems = () => (checkState.isAllSelected ? unselectAllItems() : handleSelectAll());
+  const checkAllEditableSelected = () =>
+    isSiteView
+      ? pageUsers.filter((user) => !user.isSuperAdmin).length === selectedItems.all.length
+      : checkState.isAllSelected;
 
-  const handleSelectAll = () => selectAllItems();
+  const selectItems = () => (checkAllEditableSelected() ? unselectAllItems() : handleSelectAll());
+
+  const bulkFilter = (bulkSelection: number[]) => {
+    const activeUsers = isSiteView
+      ? bulkSelection.filter((item) => pageUsers.find((user) => user.id === item)?.isSuperAdmin === false)
+      : bulkSelection;
+    return { all: activeUsers };
+  };
+
+  const handleSelectAll = () => selectAllItems(bulkFilter);
 
   const onScroll = (e: any) => setIsScrolling(e.target.scrollTop > 0);
 
@@ -160,10 +173,12 @@ const UserList = (props: IUserListProps): JSX.Element => {
     setFiltersSelection(filterPointer, filtersSelected);
   };
 
-  const handleClick = (id: number) => async () => {
-    resetUserData();
-    await getUser(id);
-    setHistoryPush(`${BASE_URL}/edit`);
+  const handleClick = (id: number | null) => async () => {
+    if (id) {
+      resetUserData();
+      await getUser(id);
+      setHistoryPush(`${BASE_URL}/edit`);
+    }
   };
 
   const TableHeader = (
@@ -181,6 +196,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
       filterItems={filterItems}
       sortedListStatus={sortedListStatus}
       roles={roles}
+      setHoverCheck={setHoverCheck}
     />
   );
 
@@ -238,7 +254,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
                 </S.EmptyWrapper>
               ) : (
                 pageUsers &&
-                pageUsers.map((user: any) => {
+                pageUsers.map((user) => {
                   const isItemSelected = isSelected(user.id);
                   return (
                     <UserItem
@@ -252,6 +268,7 @@ const UserList = (props: IUserListProps): JSX.Element => {
                       onClick={handleClick(user.id)}
                       roles={roles}
                       toggleDeleteToast={handleToggleToast}
+                      hoverCheck={checkState.hoverCheck}
                     />
                   );
                 })

package/src/types/index.tsx

@@ -96,6 +96,7 @@ export interface IAPIPage {
   canBeTranslated: boolean;
   originalLanguage: number;
   language: number;
+  publicationScheduled: string | null;
 }
 
 export interface IPage extends IAPIPage {
@@ -502,6 +503,7 @@ export interface IStructuredDataContent {
   structuredData: string;
   fromPage: boolean;
   dataPacks: string[];
+  publicationScheduled: string | null;
 }
 
 export interface IStructuredDataCategory {