@griddo/ax 10.1.96 → 10.2.0

package/src/components/MainWrapper/AppBar/style.tsx

@@ -129,10 +129,11 @@ const Separator = styled.div`
   margin-left: ${(p) => p.theme.spacing.m};
 `;
 
-const IconStatusWrapper = styled.div`
+const IconStatusWrapper = styled.div<{ last: boolean }>`
   position: relative;
   height: ${(p) => p.theme.spacing.m};
   cursor: pointer;
+  margin-right: ${(p) => (p.last ? p.theme.spacing.xs : "0")};
 `;
 
 const Header = styled.section<{ inversed?: boolean }>`

package/src/components/Modal/style.tsx

@@ -30,7 +30,7 @@ export const ModalOverlay = styled.div`
   position: fixed;
   top: 0;
   left: 0;
-  z-index: 1240;
+  z-index: 1250;
   width: 100vw;
   height: 100vh;
   background: ${(p) => p.theme.color.overlay};
@@ -77,7 +77,7 @@ export const ModalHeader = styled.div`
 export const ModalContent = styled.div<{ overflow: string | undefined }>`
   position: relative;
   flex-grow: 1;
-  overflow-y: ${(p) => p.overflow};
+  overflow: ${(p) => p.overflow};
 `;
 
 export const Title = styled.div`

package/src/components/Nav/index.tsx

@@ -3,6 +3,7 @@ import { NavLink } from "react-router-dom";
 
 import { SubNav, MenuItem } from "@ax/components";
 import { INavItem } from "@ax/types";
+import { Restricted } from "@ax/guards";
 
 import * as S from "./style";
 
@@ -16,8 +17,9 @@ const Nav = (props: INavProps): JSX.Element => {
           const isSelected = (current && item.title === current.title) || false;
           const selectedClass = isSelected ? "selected" : "";
           const handleClick = () => onClick(item.path);
-          return (
-            <MenuItem key={key} onClick={handleClick}>
+
+          const menuItem = (
+            <MenuItem onClick={handleClick} key={key}>
               <NavLink to="#" className={selectedClass}>
                 <S.Link active={isSelected} data-testid="nav-link">
                   {item.title}
@@ -25,6 +27,14 @@ const Nav = (props: INavProps): JSX.Element => {
               </NavLink>
             </MenuItem>
           );
+
+          return item.permission ? (
+            <Restricted to={item.permission} key={key}>
+              {menuItem}
+            </Restricted>
+          ) : (
+            menuItem
+          );
         })}
     </SubNav>
   );

package/src/components/PageFinder/index.tsx

@@ -116,7 +116,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
   const getAndSetContentTypes = async () => {
     const { site, lang } = state;
     const { data } = await structuredData.getContentTypes(site, lang);
-    const contentTypes = data.items.map((type: IContentType) => ({ label: type.title, value: type.id }));
+    const contentTypes = data.items ? data.items.map((type: IContentType) => ({ label: type.title, value: type.id })) : [];
     changeContentTypeOptions(contentTypes);
     changeState("type", "all");
   };
@@ -256,7 +256,7 @@ const PageFinder = (props: IPageFinderProps): JSX.Element => {
 
 interface IPageFinderProps {
   onClick: (value: IPage | IPage[]) => void;
-  currentSiteID: number;
+  currentSiteID: number | null;
   isOpen: boolean;
   allSites: ISite[];
   lang: { locale: string; id: number };

package/src/components/SearchField/index.tsx

@@ -14,6 +14,7 @@ const SearchField = (props: ISearchFieldProps): JSX.Element => {
     searchFilters,
     onFilterChange,
     small,
+    autoFocus = true,
     size = "M",
   } = props;
 
@@ -59,13 +60,6 @@ const SearchField = (props: ISearchFieldProps): JSX.Element => {
   };
 
   const showField = isOpen || !closeOnInactive;
-  const inputRef: any = useRef(null);
-
-  useEffect(() => {
-    if (inputRef.current && showField) {
-      inputRef.current.focus();
-    }
-  }, [showField]);
 
   return (
     <S.Wrapper data-testid="search-field-wrapper">
@@ -87,7 +81,6 @@ const SearchField = (props: ISearchFieldProps): JSX.Element => {
             </>
           )}
           <S.Input
-            ref={inputRef}
             type="text"
             value={inputValue}
             onChange={handleChange}
@@ -97,6 +90,7 @@ const SearchField = (props: ISearchFieldProps): JSX.Element => {
             disabled={disabled}
             data-testid="search-input"
             small={small}
+            autoFocus={autoFocus && showField}
             inputSize={size}
           />
           {inputValue.trim() !== "" && searchOnEnter && <S.HelpText>Press ENTER</S.HelpText>}
@@ -128,6 +122,7 @@ export interface ISearchFieldProps {
   searchFilters?: any;
   onFilterChange?(filter: string): void;
   small?: boolean;
+  autoFocus?: boolean;
   size?: "M" | "S" | "XS";
 }
 

package/src/components/TableFilters/PermissionsFilter/index.tsx

@@ -0,0 +1,50 @@
+import React from "react";
+
+import { Icon, FloatingMenu, ListTitle, ListItem } from "@ax/components";
+
+import * as S from "./style";
+
+const PermissionsFilter = ({ sortItems, sortedState }: IPermissionsHeaderProps): JSX.Element => {
+  const { isAscending, sortedByPermissions } = sortedState;
+  const sortAscendingPermissions = () => sortItems("permissions", true);
+  const sortDescendingPermissions = () => sortItems("permissions", false);
+
+  const SortedStateArrow = () =>
+    isAscending ? <Icon name="FullArrowUp" size="16" /> : <Icon name="FullArrowDown" size="16" />;
+
+  const Header = () => (
+    <S.PermissionsHeader isActive={sortedByPermissions}>
+      Permissions
+      <S.IconsWrapper>
+        {sortedByPermissions && <SortedStateArrow />}
+        <S.InteractiveArrow>
+          <Icon name="DownArrow" size="16" />
+        </S.InteractiveArrow>
+      </S.IconsWrapper>
+    </S.PermissionsHeader>
+  );
+
+  const SortedMenu = () => (
+    <FloatingMenu Button={Header} position="left">
+      <ListTitle>Permissions Sorting</ListTitle>
+      <ListItem isSelected={sortedByPermissions && isAscending} onClick={sortAscendingPermissions}>
+        Ascendent
+      </ListItem>
+      <ListItem isSelected={sortedByPermissions && !isAscending} onClick={sortDescendingPermissions}>
+        Descendent
+      </ListItem>
+    </FloatingMenu>
+  );
+
+  return <SortedMenu />;
+};
+
+interface IPermissionsHeaderProps {
+  sortedState: {
+    isAscending: boolean;
+    sortedByPermissions: boolean;
+  };
+  sortItems(orderPointer: string, isAscendent: boolean): void;
+}
+
+export default PermissionsFilter;

package/src/{modules/Users/UserList/HeaderMenus/Name → components/TableFilters/PermissionsFilter}/style.tsx

@@ -1,8 +1,12 @@
 import styled from "styled-components";
 import { Header } from "@ax/components/TableList/style";
 
-const NameHeader = styled(Header)<{ isActive: boolean }>`
+const PermissionsHeader = styled(Header)<{ isActive: boolean }>`
   width: 100%;
+  padding: 0;
+  display: flex;
+  justify-content: center;
+
   &:hover {
     color: ${(p) => p.theme.color.interactive01};
   }
@@ -26,4 +30,4 @@ const InteractiveArrow = styled.div`
   }
 `;
 
-export { NameHeader, IconsWrapper, InteractiveArrow };
+export { PermissionsHeader, IconsWrapper, InteractiveArrow };

package/src/components/TableFilters/RoleFilter/index.tsx

@@ -0,0 +1,61 @@
+import React, { useLayoutEffect, useState } from "react";
+
+import { CheckGroup, FloatingMenu, Icon, ListTitle } from "@ax/components";
+import { areEquals } from "@ax/helpers";
+import { IFilterValue } from "@ax/types";
+
+import * as S from "./style";
+
+const RoleFilter = (props: IRoleFilterProps): JSX.Element => {
+  const { filterItems, value, pointer, center = true, label = "Roles", selectAllOption = "all", filters } = props;
+
+  const initialState = [selectAllOption];
+  const [selectedValue, setSelectedValue] = useState([selectAllOption]);
+
+  useLayoutEffect(() => {
+    const storedValue = value && value[pointer] ? value[pointer].split(",") : [];
+    setSelectedValue(storedValue);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [value]);
+
+  const setQuery = (selection: any) => {
+    if (!selection.length) {
+      selection = initialState;
+    }
+    setSelectedValue(selection);
+    const queryFilters = selection.join(",");
+    filterItems(pointer, queryFilters);
+  };
+
+  const isActive = !areEquals(selectedValue, initialState);
+
+  const Header = () => (
+    <S.Wrapper isActive={isActive} center={center}>
+      {label}
+      <S.IconsWrapper>
+        {isActive ? <Icon name="Filter" size="16" /> : <Icon name="DownArrow" size="16" />}
+      </S.IconsWrapper>
+    </S.Wrapper>
+  );
+
+  return (
+    <FloatingMenu Button={Header} position="left" closeOnSelect={false} isCheckGroup={true}>
+      <ListTitle>Filter by Role</ListTitle>
+      <S.ChecksWrapper>
+        <CheckGroup options={filters} value={selectedValue} onChange={setQuery} selectAllOption={selectAllOption} />
+      </S.ChecksWrapper>
+    </FloatingMenu>
+  );
+};
+
+export interface IRoleFilterProps {
+  filterItems(pointer: string, filter: string): void;
+  value: any;
+  pointer: string;
+  center?: boolean;
+  label?: string;
+  selectAllOption?: string;
+  filters?: IFilterValue[];
+}
+
+export default RoleFilter;

package/src/components/TableFilters/RoleFilter/style.tsx

@@ -0,0 +1,28 @@
+import React from "react";
+import styled from "styled-components";
+import { Header } from "@ax/components/TableList/style";
+
+const Wrapper = styled((props) => <Header {...props} />)<{ isActive: boolean; center: boolean }>`
+  width: 275px;
+  justify-content: ${(p) => (p.center ? "center" : "flex-start")};
+  &:hover {
+    color: ${(p) => p.theme.color.interactive01};
+  }
+`;
+
+const IconsWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  svg {
+    margin-left: 4px;
+  }
+`;
+
+const ChecksWrapper = styled.div`
+  padding: ${(p) => p.theme.spacing.xs} ${(p) => p.theme.spacing.s};
+  height: calc(${(p) => p.theme.spacing.xl} * 3);
+  overflow-y: scroll;
+`;
+
+export { Wrapper, IconsWrapper, ChecksWrapper };

package/src/components/TableFilters/UsersFilter/index.tsx

@@ -0,0 +1,55 @@
+import React from "react";
+
+import { Icon, FloatingMenu, ListTitle, ListItem } from "@ax/components";
+
+import * as S from "./style";
+
+const UsersFilter = (props: IUsersFilterProps): JSX.Element => {
+  const { sortItems, sortedState } = props;
+  const { isAscending, sortedByUsers } = sortedState;
+
+  const sortByUsers = (isAscending: boolean) => sortItems('users', isAscending);
+  const sortAscendingUsers = () => sortByUsers(true);
+  const sortDescendingUsers = () => sortByUsers(false);
+
+  const SortedStateArrow = () =>
+    isAscending ? <Icon name="FullArrowUp" size="16" /> : <Icon name="FullArrowDown" size="16" />;
+    
+  const isActive = sortedByUsers;
+  const title = 'Users';
+
+  const Header = () => (
+    <S.UsersHeader isActive={isActive} data-testid="users-filter-header">
+      {title}
+      <S.IconsWrapper>
+        {isActive ? (
+          <SortedStateArrow />
+        ) : (
+          <S.InteractiveArrow data-testid="users-filter-interactive-arrow">
+            <Icon name="DownArrow" size="16" />
+          </S.InteractiveArrow>
+        )}
+      </S.IconsWrapper>
+    </S.UsersHeader>
+  );
+
+  return (
+    <FloatingMenu Button={Header} position="left">
+      <ListTitle>Number of users</ListTitle>
+      <ListItem isSelected={sortedByUsers && isAscending} onClick={sortAscendingUsers}>
+        Ascendent
+      </ListItem>
+      <ListItem isSelected={sortedByUsers && !isAscending} onClick={sortDescendingUsers}>
+        Descendent
+      </ListItem>
+    </FloatingMenu>
+  );
+};
+
+export interface IUsersFilterProps {
+  sortedState: any;
+  sortItems(orderPointer: string, isAscendent: boolean): void;
+  pointer?: string;
+}
+
+export default UsersFilter;

package/src/components/TableFilters/UsersFilter/style.tsx

@@ -0,0 +1,31 @@
+import React from "react";
+import styled from "styled-components";
+import { Header } from "@ax/components/TableList/style";
+
+const UsersHeader = styled((props) => <Header {...props} />)<{ isActive: boolean }>`
+  width: 100%;
+  min-width: 88px;
+  &:hover {
+    color: ${(p) => p.theme.color.interactive01};
+  }
+`;
+
+const IconsWrapper = styled.div`
+  display: flex;
+  align-items: center;
+  flex-direction: row;
+  svg {
+    margin-left: 4px;
+  }
+`;
+
+const InteractiveArrow = styled.div`
+  display: flex;
+  svg {
+    path {
+      fill: ${(p) => p.theme.color.interactive01};
+    }
+  }
+`;
+
+export { UsersHeader, IconsWrapper, InteractiveArrow };

package/src/components/TableFilters/index.tsx

@@ -10,6 +10,9 @@ import DateFilter from "./DateFilter";
 import CheckGroupFilter from "./CheckGroupFilter";
 import StateFilter from "./StateFilter";
 import LastAccessFilter from "./LastAccessFilter";
+import PermissionsFilter from "./PermissionsFilter";
+import UsersFilter from "./UsersFilter";
+import RoleFilter from "./RoleFilter";
 
 export {
   CategoryFilter,
@@ -24,4 +27,7 @@ export {
   CheckGroupFilter,
   StateFilter,
   LastAccessFilter,
+  PermissionsFilter,
+  UsersFilter,
+  RoleFilter,
 };

package/src/components/TableList/TableItem/style.tsx

@@ -24,13 +24,13 @@ export const Row = styled.div<{ selected: boolean; global?: boolean }>`
   display: flex;
   flex-flow: row;
   border: 1px solid ${(p) => p.theme.color.uiLine};
-  border-radius: 4px;
+  border-radius: ${(p) => p.theme.radii.s};
   margin-bottom: ${(p) => p.theme.spacing.xs};
   cursor: pointer;
   :before {
     content: "";
     background-color: ${(p) => (p.selected ? p.theme.color.overlayPressedPrimary : `transparent`)};
-    border-radius: 4px;
+    border-radius: ${(p) => p.theme.radii.s};
     position: absolute;
     top: 0;
     left: 0;

package/src/components/TableList/style.tsx

@@ -18,7 +18,7 @@ const TableHeader = styled.div<{hasFixedHeader?: boolean}>`
   width: 100%;
   position: relative; /* fallback */
   position: ${(p) => p.hasFixedHeader ? `sticky` : `relative`};
-  z-index: 1;
+  z-index: 6;
   top: 0;
   background: ${(p) => p.theme.color.uiBackground01};
 `;

package/src/components/index.tsx

@@ -45,9 +45,12 @@ import {
   TranslationsFilter,
   TypeFilter,
   DateFilter,
+  LastAccessFilter,
+  PermissionsFilter,
+  UsersFilter,
+  RoleFilter,
   CheckGroupFilter,
   StateFilter,
-  LastAccessFilter,
 } from "./TableFilters";
 
 import ActionMenu from "./ActionMenu";
@@ -151,6 +154,9 @@ export {
   TypeFilter,
   StateFilter,
   LastAccessFilter,
+  PermissionsFilter,
+  UsersFilter,
+  RoleFilter,
   // Components
   ActionMenu,
   Avatar,

package/src/containers/App/actions.tsx

@@ -196,13 +196,13 @@ function getGlobalSettings(): (dispatch: Dispatch) => Promise<void> {
     try {
       const response: { status: number; data: any } = await global.getSettings();
 
-      if (isReqOk(response.status)) {
+      if (isReqOk(response?.status)) {
         dispatch(setGlobalSettings(response.data));
       } else {
-        console.log("Error en getSettings"); // TODO: capturar errores mejor
+        console.log("Error en getSettings");
       }
     } catch (e) {
-      console.log(e); // TODO: capturar error bien
+      console.log(e);
     }
   };
 }

package/src/containers/PageEditor/actions.tsx

@@ -34,7 +34,8 @@ import {
 import { appActions } from "@ax/containers/App";
 import { navigationActions } from "@ax/containers/Navigation";
 import { structuredDataActions } from "@ax/containers/StructuredData";
-import { setCurrentSiteErrorPages } from "@ax/containers/Sites/actions";
+import { sitesActions } from "@ax/containers/Sites";
+import { usersActions } from "@ax/containers/Users";
 import { pages, sites, structuredData } from "@ax/api";
 import {
   getDefaultPageNavigation,
@@ -76,6 +77,7 @@ import {
   IUserEditing,
   IStructuredDataContent,
   INotification,
+  IPageLanguage,
 } from "@ax/types";
 import {
   ISetBreadcrumb,
@@ -207,29 +209,20 @@ function setTranslatedParent(): (dispatch: Dispatch, getState: any) => void {
     try {
       const {
         app: { lang },
-        pageEditor: {
-          selectedEditorID,
-          editorContent: { parent, site, entity, language },
-        },
+        pageEditor: { editorContent },
       } = getState();
 
-      const responseActions = {
-        handleSuccess: (data: any) => {
-          const { items } = data;
-          const translatedParent = items.filter(
-            (item: any) => (item.languageId === lang.id && language !== lang.id && item.pageId) || null
-          );
-          const translatedParentId = translatedParent && translatedParent[0] ? translatedParent[0].pageId : null;
-          updateEditorContent(selectedEditorID, "parent", translatedParentId)(dispatch, getState);
-        },
-        handleError: (response: any) => handleError(response)(dispatch),
-      };
+      const { language, pageLanguages } = editorContent;
 
-      const callback = async () => pages.getPageLanguages(parent, site, entity);
+      const translatedParent = pageLanguages.find(
+        (item: IPageLanguage) => (item.languageId !== lang.id && language !== lang.id && item.pageId) || null
+      );
+      const translatedParentId = translatedParent ? translatedParent.pageId : null;
+      const updatedContent = { ...editorContent, parent: translatedParentId };
 
-      await handleRequest(callback, responseActions, [])(dispatch);
+      dispatch(setEditorContent(updatedContent));
     } catch (e) {
-      console.log(e); // TODO: capturar error bien
+      console.log(e);
     }
   };
 }
@@ -591,7 +584,7 @@ function updatePageStatus(
           if (errors.length) pagesWithErrors.push(page.id);
         });
 
-        dispatch(setCurrentSiteErrorPages(pagesWithErrors));
+        dispatch(sitesActions.setCurrentSiteErrorPages(pagesWithErrors));
       }
 
       const validIds = ids.filter((id) => !pagesWithErrors.includes(id));
@@ -1265,6 +1258,7 @@ function getGlobalFromLocalPage(): (dispatch: Dispatch, getState: any) => Promis
       dispatch(setSitePageID(currentPageID));
       dispatch(setCurrentPageID(originalGlobalPage));
       structuredDataActions.setSelectedStructuredData(structuredData, "global")(dispatch, getState);
+      usersActions.getUserCurrentPermissions()(dispatch, getState);
     } catch (e) {
       console.log(e);
     }

package/src/containers/Redirects/actions.tsx

@@ -30,6 +30,7 @@ function setTotalImports(totalImports: number): ISetTotalImports {
 function getRedirects(params: any, filters?: string): (dispatch: any) => Promise<void> {
   return async (dispatch) => {
     try {
+      dispatch(setRedirects([]));
       const callback = async () => redirects.getRedirects(params, filters);
 
       const responseActions = {

package/src/containers/Sites/actions.tsx

@@ -56,7 +56,7 @@ const { setIsLoading, setIsSaving, setLanguage } = appActions;
 const { resetDefaultsValues } = navigationActions;
 const { resetMenuValues } = menuActions;
 const { getAnalytics } = analyticsActions;
-const { getUsers } = usersActions;
+const { getUsers, getUserCurrentPermissions, getRoles } = usersActions;
 
 function setSites(sitesList: ISite[]): ISetSitesAction {
   return { type: SET_SITES, payload: { sites: sitesList } };
@@ -74,7 +74,7 @@ function setSitesByLang(sitesList: ISite[]): ISetSitesByLangAction {
   return { type: SET_SITES_BY_LANG, payload: { sitesByLang: sitesList } };
 }
 
-function setCurrentSiteInfo(currentSiteInfo: ISite): ISetCurrentSiteInfoAction {
+function setCurrentSiteInfo(currentSiteInfo: ISite | null): ISetCurrentSiteInfoAction {
   return { type: SET_CURRENT_SITE_INFO, payload: { currentSiteInfo } };
 }
 
@@ -210,8 +210,10 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
 
       dispatch(setIsLoading(true));
 
-      resetSiteValues(dispatch);
+      resetSiteValues(currentSiteInfo.id)(dispatch);
+      dispatch(structuredDataActions.resetStructuredData());
       dispatch(setCurrentSiteInfo(currentSiteInfo));
+      await getRoles({ siteId: currentSiteInfo.id }, undefined, false)(dispatch);
 
       // get site languages
       const response: any = await languages.getSiteLanguages(currentSiteInfo.id);
@@ -275,6 +277,9 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
       } else {
         console.log("Error en sites getAnalytics"); // FIXME: capturar errores mejor
       }
+
+      getUserCurrentPermissions()(dispatch, getState);
+
     } catch (e) {
       console.log(e); // FIXME: capturar errores
     }
@@ -442,14 +447,16 @@ function unpublishSitesBulk(ids: number[], params?: IGetSitesParams): (dispatch:
   };
 }
 
-const resetSiteValues = (dispatch: Dispatch) => {
-  dispatch(setFilter("unique-pages"));
-  resetDefaultsValues()(dispatch);
-  resetPageEditor()(dispatch);
-  resetMenuValues(dispatch);
-  dispatch(setCurrentSitePages([]));
-  dispatch(setTotalItems(0));
-  getAnalytics()(dispatch);
+function resetSiteValues(siteID: number): (dispatch: Dispatch) => void {
+  return async (dispatch) => {
+    dispatch(setFilter("unique-pages"));
+    resetDefaultsValues()(dispatch);
+    resetPageEditor()(dispatch);
+    resetMenuValues(dispatch);
+    dispatch(setCurrentSitePages([]));
+    dispatch(setTotalItems(0));
+    getAnalytics(siteID)(dispatch);
+  }
 };
 
 function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: any) => Promise<void> {
@@ -460,6 +467,7 @@ function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: any) => Promise<v
       } = getState();
 
       dispatch(setSavedSiteInfo(currentSiteInfo));
+      dispatch(setCurrentSiteInfo(null));
     } catch (e) {
       console.log(e);
     }
@@ -505,13 +513,13 @@ function importPageFromGlobal(pageID: number | number[]): (dispatch: any, getSta
   };
 }
 
-function removeUsersBulk(siteId: number, users: number[]): (dispatch: Dispatch, getState: any) => Promise<void> {
-  return async (dispatch, getState) => {
+function removeUsersBulk(siteId: number, users: number[]): (dispatch: Dispatch) => Promise<void> {
+  return async (dispatch) => {
     try {
       const response = await sites.removeUsersBulk(siteId, users);
       if (isReqOk(response.status)) {
         const params = { filterQuery: "?order=dateCreated" };
-        getUsers(params)(dispatch);
+        getUsers(params, siteId)(dispatch);
       }
     } catch (e) {
       console.log(e); // TODO: capturar error bien

package/src/containers/Sites/interfaces.tsx

@@ -12,7 +12,7 @@ import {
   SET_CURRENT_SITE_ERROR_PAGES,
   SET_CONTENT_FILTERS,
   SET_SITES_TOTAL_ITEMS,
-  SET_CONFIG
+  SET_CONFIG,
 } from "./constants";
 import { ISite, ISiteListConfig } from "@ax/types";
 
@@ -43,7 +43,7 @@ export interface ISetSitesByLangAction {
 
 export interface ISetCurrentSiteInfoAction {
   type: typeof SET_CURRENT_SITE_INFO;
-  payload: { currentSiteInfo: ISite };
+  payload: { currentSiteInfo: ISite | null };
 }
 
 export interface ISetCurrentSitePagesAction {
@@ -80,10 +80,10 @@ export interface ISetContentFilters {
   type: typeof SET_CONTENT_FILTERS;
   payload: { contentFilters: Record<string, string> | null };
 }
+
 export interface ISetConfig {
   type: typeof SET_CONFIG;
   payload: { config: ISiteListConfig };
 }
 
 export type SitesActionsCreators = ISetSitesAction & ISetCurrentSiteInfoAction;
-