@griddo/ax 11.0.29-rc.0 → 11.0.30-rc.0

package/src/containers/Forms/constants.tsx

@@ -0,0 +1,46 @@
+const NAME = "forms";
+
+const SET_FORMS = `${NAME}/SET_FORMS`;
+const SET_FORM_CONTENT = `${NAME}/SET_FORM_CONTENT`;
+const SET_SCHEMA = `${NAME}/SET_SCHEMA`;
+const SET_TAB = `${NAME}/SET_TAB`;
+const SET_TEMPLATE = `${NAME}/SET_TEMPLATE`;
+const SET_CURRENT_FORM_ID = `${NAME}/SET_CURRENT_FORM_ID`;
+const SET_SELECTED_CONTENT = `${NAME}/SET_SELECTED_CONTENT`;
+const SET_SELECTED_PARENT = `${NAME}/SET_SELECTED_PARENT`;
+const SET_SELECTED_EDITOR_ID = `${NAME}/SET_SELECTED_ID`;
+const SET_BREADCRUMB = `${NAME}/SET_BREADCRUMB`;
+const SET_COPY_MODULE = `${NAME}/SET_COPY_MODULE`;
+const SET_SUMMARY = `${NAME}/SET_SUMMARY`;
+const SET_CURRENT_FORM_CATEGORIES = `${NAME}/SET_CURRENT_FORM_CATEGORIES`;
+const SET_IS_NEW_TRANSLATION = `${NAME}/SET_IS_NEW_TRANSLATION`;
+const SET_IS_IA_TRANSLATED = `${NAME}/SET_IS_IA_TRANSLATED`;
+
+const ITEMS_PER_PAGE = 50;
+
+const DEFAULT_PARAMS = {
+  page: 1,
+  itemsPerPage: ITEMS_PER_PAGE,
+  pagination: true,
+};
+
+export {
+  NAME,
+  SET_FORMS,
+  SET_FORM_CONTENT,
+  SET_SCHEMA,
+  SET_TAB,
+  SET_TEMPLATE,
+  SET_CURRENT_FORM_ID,
+  SET_SELECTED_CONTENT,
+  SET_SELECTED_EDITOR_ID,
+  SET_SELECTED_PARENT,
+  SET_BREADCRUMB,
+  SET_COPY_MODULE,
+  SET_SUMMARY,
+  ITEMS_PER_PAGE,
+  DEFAULT_PARAMS,
+  SET_CURRENT_FORM_CATEGORIES,
+  SET_IS_NEW_TRANSLATION,
+  SET_IS_IA_TRANSLATED,
+};

package/src/containers/Forms/index.tsx

@@ -0,0 +1,4 @@
+import * as formsActions from "./actions";
+import { formsReducer } from "./reducer";
+
+export { formsActions, formsReducer };

package/src/containers/Forms/interfaces.tsx

@@ -0,0 +1,95 @@
+import { FormCategory, FormContent, IBreadcrumbItem, IModule, ISchema } from "@ax/types";
+import {
+  SET_BREADCRUMB,
+  SET_COPY_MODULE,
+  SET_CURRENT_FORM_ID,
+  SET_FORM_CONTENT,
+  SET_FORMS,
+  SET_SCHEMA,
+  SET_SELECTED_CONTENT,
+  SET_SELECTED_EDITOR_ID,
+  SET_SELECTED_PARENT,
+  SET_TAB,
+  SET_TEMPLATE,
+  SET_SUMMARY,
+  SET_CURRENT_FORM_CATEGORIES,
+  SET_IS_NEW_TRANSLATION,
+  SET_IS_IA_TRANSLATED,
+} from "./constants";
+
+export interface ISetForms {
+  type: typeof SET_FORMS;
+  payload: { forms: FormContent[] };
+}
+
+export interface ISetFormContent {
+  type: typeof SET_FORM_CONTENT;
+  payload: { formContent: FormContent | null };
+}
+
+export interface ISetSchema {
+  type: typeof SET_SCHEMA;
+  payload: { schema: ISchema | Record<string, never> };
+}
+
+export interface ISetTemplate {
+  type: typeof SET_TEMPLATE;
+  payload: { template: string };
+}
+
+export interface ISetTab {
+  type: typeof SET_TAB;
+  payload: { tab: string };
+}
+
+export interface ISetSelectedContent {
+  type: typeof SET_SELECTED_CONTENT;
+  payload: { selectedContent: Record<string, unknown> };
+}
+
+export interface ISetSelectedParent {
+  type: typeof SET_SELECTED_PARENT;
+  payload: { selectedParent: Record<string, unknown> | null };
+}
+
+export interface ISetSelectedEditorID {
+  type: typeof SET_SELECTED_EDITOR_ID;
+  payload: { selectedEditorID: number };
+}
+
+export interface ISetCurrentFormID {
+  type: typeof SET_CURRENT_FORM_ID;
+  payload: { currentFormID: number | null };
+}
+
+export interface ISetBreadcrumb {
+  type: typeof SET_BREADCRUMB;
+  payload: { breadcrumb: IBreadcrumbItem[] };
+}
+
+export interface ISetCopyModule {
+  type: typeof SET_COPY_MODULE;
+  payload: { moduleCopy: { date: Date; elements: IModule[] } | null };
+}
+
+export interface ISetSummary {
+  type: typeof SET_SUMMARY;
+  payload: { summary: { total: number; active: number; inactive: number } };
+}
+
+export interface ISetCurrentFormCategories {
+  type: typeof SET_CURRENT_FORM_CATEGORIES;
+  payload: { currentFormCategories: FormCategory[] };
+}
+
+export interface ISetIsNewTranslation {
+  type: typeof SET_IS_NEW_TRANSLATION;
+  payload: { isNewTranslation: boolean };
+}
+
+export interface ISetIsIATranslated {
+  type: typeof SET_IS_IA_TRANSLATED;
+  payload: { isIATranslated: boolean };
+}
+
+export type FormsActionsCreators = ISetForms;

package/src/containers/Forms/reducer.tsx

@@ -0,0 +1,81 @@
+import { FormCategory, FormContent, IBreadcrumbItem, IModule, ISchema } from "@ax/types";
+import {
+  SET_BREADCRUMB,
+  SET_COPY_MODULE,
+  SET_CURRENT_FORM_ID,
+  SET_FORM_CONTENT,
+  SET_FORMS,
+  SET_SCHEMA,
+  SET_SELECTED_CONTENT,
+  SET_SELECTED_EDITOR_ID,
+  SET_SELECTED_PARENT,
+  SET_TAB,
+  SET_TEMPLATE,
+  SET_SUMMARY,
+  SET_CURRENT_FORM_CATEGORIES,
+  SET_IS_NEW_TRANSLATION,
+  SET_IS_IA_TRANSLATED,
+} from "./constants";
+
+export interface IFormsState {
+  forms: FormContent[];
+  formContent: FormContent | null;
+  schema: ISchema | Record<string, never>;
+  template: string;
+  tab: string;
+  currentFormID: number | null;
+  currentFormStatus: string | null;
+  selectedContent: Record<string, unknown>;
+  selectedEditorID: number;
+  selectedParent: Record<string, unknown> | null;
+  breadcrumb: IBreadcrumbItem[];
+  moduleCopy: { date: Date; elements: IModule[] } | null;
+  summary: { total: number; active: number; inactive: number };
+  currentFormCategories: FormCategory[];
+  isNewTranslation: boolean;
+  isIATranslated: boolean;
+}
+
+export const initialState = {
+  forms: [],
+  formContent: null,
+  schema: {},
+  template: "BasicForm",
+  tab: "content",
+  currentFormID: null,
+  currentFormStatus: null,
+  selectedContent: {},
+  selectedEditorID: 0,
+  selectedParent: null,
+  breadcrumb: [],
+  moduleCopy: null,
+  summary: { total: 0, active: 0, inactive: 0 },
+  currentFormCategories: [],
+  isNewTranslation: false,
+  isIATranslated: false,
+};
+
+export function reducer(state = initialState, action: any): IFormsState {
+  switch (action.type) {
+    case SET_FORMS:
+    case SET_FORM_CONTENT:
+    case SET_SCHEMA:
+    case SET_TEMPLATE:
+    case SET_TAB:
+    case SET_CURRENT_FORM_ID:
+    case SET_SELECTED_CONTENT:
+    case SET_SELECTED_EDITOR_ID:
+    case SET_SELECTED_PARENT:
+    case SET_BREADCRUMB:
+    case SET_COPY_MODULE:
+    case SET_SUMMARY:
+    case SET_CURRENT_FORM_CATEGORIES:
+    case SET_IS_NEW_TRANSLATION:
+    case SET_IS_IA_TRANSLATED:
+      return { ...state, ...action.payload };
+    default:
+      return state;
+  }
+}
+
+export { initialState as formsInitialState, reducer as formsReducer };

package/src/containers/Forms/utils.tsx

@@ -0,0 +1,42 @@
+import { deepClone, getDefaultSchema } from "@ax/helpers";
+
+const addElement = (element: any) => {
+  const defaultSchema = getDefaultSchema(element.component);
+  for (const key in defaultSchema) {
+    element[key] = defaultSchema[key];
+  }
+};
+
+const updateCollection = (elementType: string, prevCollection: any[]) => {
+  const newModule = getDefaultSchema(elementType);
+  return [...prevCollection, newModule];
+};
+
+const getUpdatedComponents = (editorContent: any, element: any, key: string) => {
+  const { editorID, type } = element;
+  const isCollectionItem = typeof type === "string";
+  const updatedDefault = isCollectionItem ? deepClone(editorContent) : editorContent;
+
+  const mapValues = (item: any) => {
+    if (item.editorID !== undefined && item.editorID === editorID) {
+      if (isCollectionItem) {
+        item[key] = updateCollection(type, item[key]);
+      } else {
+        addElement(type);
+      }
+    }
+
+    const itemKeys = Object.keys(item);
+    itemKeys.forEach((key: string) => {
+      const containedValue = item[key];
+      if (containedValue && typeof containedValue === "object") {
+        mapValues(containedValue);
+      }
+    });
+  };
+
+  mapValues(updatedDefault);
+  return updatedDefault;
+};
+
+export { getUpdatedComponents };

package/src/containers/Navigation/Menu/actions.tsx

@@ -13,7 +13,6 @@ import {
   SET_MENU_FORM_DATA,
   SET_ORIGINAL_MENU,
   SET_TOTAL_ITEMS,
-  SET_CURRENT_MENU,
 } from "./constants";
 import {
   ISetSavedMenus,
@@ -23,7 +22,6 @@ import {
   ISetMenuForm,
   ISetSavedMenu,
   ISetTotalItems,
-  ISetCurrentMenu,
 } from "./interfaces";
 import { menuInitialState } from "./reducer";
 
@@ -72,12 +70,8 @@ function setTotalItems(totalItems: number): ISetTotalItems {
   return { type: SET_TOTAL_ITEMS, payload: { totalItems } };
 }
 
-function setCurrentMenu(currentMenu: string): ISetCurrentMenu {
-  return { type: SET_CURRENT_MENU, payload: { currentMenu } };
-}
-
 const getStateValues = (getState: any) => {
-  const { savedMenus, savedMenu, editorMenu, id, currentMenu } = getState().menu;
+  const { savedMenus, savedMenu, editorMenu, id, type } = getState().menu;
   const { currentSiteInfo } = getState().sites;
   const { isSaving, isLoading, lang } = getState().app;
 
@@ -86,7 +80,7 @@ const getStateValues = (getState: any) => {
     savedMenu,
     editorMenu,
     id,
-    currentMenu,
+    type,
     currentSiteInfo,
     isLoading,
     isSaving,
@@ -108,13 +102,13 @@ function setEditorMenuContent(menus: IMenu[], menuType: string, dispatch: Dispat
 function getMenus(): (dispatch: Dispatch, getState: any) => Promise<void> {
   return async (dispatch, getState) => {
     try {
-      const { currentSiteInfo, currentMenu } = getStateValues(getState);
+      const { currentSiteInfo, type } = getStateValues(getState);
       const id = currentSiteInfo && currentSiteInfo.id;
 
       const responseActions = {
         handleSuccess: (menus: IMenu[]) => {
           dispatch(setSavedMenus(menus));
-          setEditorMenuContent(menus, currentMenu, dispatch);
+          setEditorMenuContent(menus, type, dispatch);
           updateTotalItems(dispatch, getState);
         },
         handleError: () => console.log("Error en getMenus"),
@@ -234,7 +228,7 @@ function deleteMenuItem(
 function updateMenu(): (dispatch: Dispatch, getState: any) => Promise<void> {
   return async (dispatch, getState) => {
     try {
-      const { savedMenu, editorMenu, currentMenu, id, currentSiteInfo } = getStateValues(getState);
+      const { savedMenu, editorMenu, type, id, currentSiteInfo } = getStateValues(getState);
       const editorMenuClean = removeMenuEditorIds(editorMenu.elements);
       savedMenu.elements = editorMenuClean;
 
@@ -244,7 +238,7 @@ function updateMenu(): (dispatch: Dispatch, getState: any) => Promise<void> {
           const updatedMenusResponse = await menus.getMenus(currentSiteId);
           const updatedMenus = updatedMenusResponse.data;
           dispatch(setSavedMenus(updatedMenus));
-          setEditorMenuContent(updatedMenus, currentMenu, dispatch);
+          setEditorMenuContent(updatedMenus, type, dispatch);
         },
         handleError: () => console.log("Error en updateMenu"),
       };
@@ -334,5 +328,4 @@ export {
   resetMenuValues,
   reorderMenu,
   updateFormValue,
-  setCurrentMenu,
 };

package/src/containers/Navigation/Menu/reducer.tsx

@@ -6,7 +6,6 @@ import {
   SET_ITEM,
   SET_MENU_FORM_DATA,
   SET_TOTAL_ITEMS,
-  SET_CURRENT_MENU,
 } from "./constants";
 
 import { MenuActionsCreators } from "./interfaces";
@@ -20,7 +19,6 @@ export interface IMenuState {
   item: IMenuItem | null;
   form: IMenuForm;
   totalItems: number;
-  currentMenu: string;
 }
 
 const initialState = {
@@ -39,7 +37,6 @@ const initialState = {
     footerStyle: "",
   },
   totalItems: 0,
-  currentMenu: "",
 };
 
 function reducer(state = initialState, action: MenuActionsCreators): IMenuState {
@@ -51,7 +48,6 @@ function reducer(state = initialState, action: MenuActionsCreators): IMenuState
     case SET_ITEM:
     case SET_MENU_FORM_DATA:
     case SET_TOTAL_ITEMS:
-    case SET_CURRENT_MENU:
       return { ...state, ...action.payload };
     default:
       return state;

package/src/containers/PageEditor/actions.tsx

@@ -360,8 +360,8 @@ function getPage(pageID?: number, global?: boolean): (dispatch: Dispatch, getSta
           page.draftFromPage && !page.publicationScheduled
             ? pageStatus.MODIFIED
             : isNewTranslation
-            ? pageStatus.OFFLINE
-            : page.liveStatus.status;
+              ? pageStatus.OFFLINE
+              : page.liveStatus.status;
 
         if (isReqOk(response.status)) {
           addTemplate(page.templateId)(dispatch);
@@ -899,6 +899,7 @@ function copyModule(editorID: number[]): (dispatch: Dispatch, getState: any) =>
     editorID.forEach((id) => {
       const { element: originalElement } = findByEditorID(sections, id);
       if (originalElement) {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const { editorID, parentEditorID, ...element } = originalElement;
         modulesToCopy.push(element);
       }

package/src/containers/PageEditor/reducer.tsx

@@ -1,4 +1,4 @@
-import { IPage, IBreadcrumbItem, ISchema, IErrorItem, IUserEditing, IModule } from "@ax/types";
+import { IPage, IBreadcrumbItem, ISchema, IErrorItem, IUserEditing, IModule, IPageLanguage } from "@ax/types";
 
 import {
   SET_EDITOR_CONTENT,
@@ -39,7 +39,7 @@ export interface IPageEditorState {
   currentPageID: number | null;
   currentPageStatus: string | null;
   currentPageName: string;
-  currentPageLanguages: any[];
+  currentPageLanguages: IPageLanguage[];
   isNewTranslation: boolean;
   templateConfig: any;
   selectedParent: Record<string, unknown> | null;

package/src/forms/editor.tsx

@@ -56,7 +56,9 @@ const generateEditorIDs = (originalPageContent: any) => {
   const setEditorID = (component: any, parentID: number | null) => {
     if (!component || typeof component !== "object") return component;
 
-    if ("component" in component || ("type" in component && component.type === "template")) {
+    const isTemplate = "type" in component && (component.type === "template" || component.type === "formTemplate");
+
+    if ("component" in component || isTemplate) {
       component.editorID = lastGeneratedID++;
       component.parentEditorID = parentID;
     }

package/src/helpers/index.tsx

@@ -59,6 +59,11 @@ import {
   getNavigationModules,
   getDefaultNavigationModules,
   isMultipleNavigationModules,
+  getFormTemplate,
+  getDefaultFormTemplate,
+  getFormTemplates,
+  getFormTemplateThumbnails,
+  getSchemaFormCategories,
 } from "./schemas";
 
 import {
@@ -70,7 +75,7 @@ import {
   getGlobalPageTypes,
 } from "./structuredData";
 
-import { getThumbnailProps } from "./thumbnails";
+import { getThumbnailProps, getFormTemplateThumbnailProps } from "./thumbnails";
 
 import { getFieldByPath } from "./fields";
 
@@ -152,6 +157,7 @@ export {
   getStructuredDataFromPage,
   getCurrentPageStructuredData,
   getThumbnailProps,
+  getFormTemplateThumbnailProps,
   slugify,
   getFieldByPath,
   isReqOk,
@@ -203,6 +209,11 @@ export {
   getNavigationModules,
   getDefaultNavigationModules,
   isMultipleNavigationModules,
+  getFormTemplate,
+  getDefaultFormTemplate,
+  getFormTemplates,
+  getFormTemplateThumbnails,
+  getSchemaFormCategories,
   areEqual,
   parseTheme,
   stripHtml,

package/src/helpers/schemas.tsx

@@ -1,9 +1,19 @@
-import { schemas, moduleCategories } from "components";
 import { sortBy } from "@ax/helpers";
-import { ISchema, ModuleCategoryInfo } from "@ax/types";
 import { pageSchemas } from "@ax/schemas";
-
-const allSchemas = { ...schemas.all, ...pageSchemas };
+import { ISchema, ModuleCategoryInfo } from "@ax/types";
+import { config } from "components";
+
+const schemas = config.schemas.ui;
+const schemasConfig = config.schemas.config;
+const formSchemas = config.schemas.forms;
+const contentTypesSchemas = config.schemas.contentTypes;
+const moduleCategories = config.schemas.config.moduleCategories;
+const allSchemas = {
+  ...schemas.modules,
+  ...schemas.components,
+  ...formSchemas.fields,
+  ...pageSchemas,
+};
 
 const getSchema = (name: string) => allSchemas[name];
 
@@ -44,6 +54,14 @@ const getTemplate = (name: string) => schemas.templates[name];
 
 const getDefaultTemplate = (name: string) => schemas.templates[name].default;
 
+const getFormTemplates = (): Record<string, ISchema> => formSchemas.templates;
+
+const getFormTemplate = (name: string) => formSchemas.templates[name];
+
+const getDefaultFormTemplate = (name: string) => formSchemas.templates[name].default;
+
+const getSchemaFormCategories = (): { label: string; value: string }[] => formSchemas.categories;
+
 const getTemplateThumbnails = (name: string, theme?: string) => {
   if (!schemas.templates[name]?.thumbnails) return null;
 
@@ -52,11 +70,14 @@ const getTemplateThumbnails = (name: string, theme?: string) => {
     : schemas.templates[name] && schemas.templates[name].thumbnails;
 };
 
-const getDataPackSchema = (name: string) => schemas.dataPacks[name];
+const getFormTemplateThumbnails = (name: string): Record<string, string> | null =>
+  formSchemas.templates[name]?.thumbnails ? formSchemas.templates[name].thumbnails : null;
+
+const getDataPackSchema = (name: string) => contentTypesSchemas.dataPacks[name];
 
-const getDisplayName = (component: string): string => {
-  const schema: ISchema = getSchema(component);
-  return schema?.displayName || "";
+const getDisplayName = (component: string) => {
+  const schema = getSchema(component);
+  return schema?.displayName;
 };
 
 const getSchemaType = (component: string) => {
@@ -74,7 +95,7 @@ const getTemplateDisplayName = (template: string) => {
   return schema ? schema.displayName : undefined;
 };
 
-const getMenuItems = (type: string): { fields: any[] } | undefined => schemas.menuItems[type];
+const getMenuItems = (type: string): { fields: any[] } | undefined => schemasConfig.menuItems[type];
 
 const filterByCategory = (options: any, category: string) =>
   options.filter((option: any) => allSchemas[option]?.category === category);
@@ -164,4 +185,9 @@ export {
   getNavigationModules,
   getDefaultNavigationModules,
   isMultipleNavigationModules,
+  getFormTemplate,
+  getDefaultFormTemplate,
+  getFormTemplates,
+  getFormTemplateThumbnails,
+  getSchemaFormCategories,
 };

package/src/helpers/structuredData.tsx

@@ -1,4 +1,6 @@
-import { schemas } from "components";
+import { config } from "components";
+
+const schemas = config.schemas.contentTypes;
 
 const getStructuredDataFromPage = (site: any) => site.filter((data: any) => data.fromPage);
 

package/src/helpers/themes.tsx

@@ -1,7 +1,9 @@
 import { IDataPack, IGriddoTheme, ISchema, ITemplateOption, IThemeElements } from "@ax/types";
-import { themes } from "components";
+import { config } from "components";
 import { getSchema } from "@ax/helpers";
 
+const themes = config.schemas.config.themes;
+
 const getDefaultTheme = (): string => {
   const defaultTheme = (themes as IGriddoTheme[]).find((theme) => theme.default);
   const theme = defaultTheme ? defaultTheme.value : themes[0].value;

package/src/helpers/thumbnails.tsx

@@ -1,4 +1,4 @@
-import { getSchemaThumbnails, getTemplateThumbnails } from "./schemas";
+import { getFormTemplateThumbnails, getSchemaThumbnails, getTemplateThumbnails } from "./schemas";
 
 const imageExists = (src: string) => {
   const req = new XMLHttpRequest();
@@ -41,4 +41,22 @@ const getThumbnailProps = (option: any, template: boolean, theme: string, path?:
   };
 };
 
-export { getThumbnailProps };
+const getFormTemplateThumbnailProps = (template: string) => {
+  const thumbnails = getFormTemplateThumbnails(template);
+
+  if (!thumbnails) {
+    return false;
+  }
+
+  const fallback = thumbnails["2x"];
+  const imgDensity1x = thumbnails["1x"];
+  const srcSet = `${imgDensity1x} 1x, ${fallback} 2x`;
+
+  return {
+    srcSet,
+    src: fallback,
+    alt: template,
+  };
+};
+
+export { getThumbnailProps, getFormTemplateThumbnailProps };

package/src/modules/Analytics/GroupPanel/utils.tsx

@@ -1,4 +1,6 @@
-import { schemas } from "components";
+import { config } from "components";
+
+const schemas = config.schemas.ui;
 
 const getTemplateOptions = (): ITemplateOption[] => {
   const { templates } = schemas;

package/src/modules/App/Routing/NavMenu/index.tsx

@@ -5,7 +5,8 @@ import { version } from "./../../../../../package.json";
 
 import { IRouter, multisite, site } from "@ax/routes";
 
-import { IRootState, ISite } from "@ax/types";
+import { ILanguage, IRootState, ISite } from "@ax/types";
+import { IGlobalSettings } from "@ax/containers/App/reducer";
 import { appActions } from "@ax/containers/App";
 import { Icon, Tag } from "@ax/components";
 import { Restricted } from "@ax/guards";
@@ -16,7 +17,9 @@ import { NavProvider } from "./context";
 import * as S from "./style";
 
 const NavMenu = (props: IProps) => {
-  const { location, setHistoryPush, logout, currentSiteInfo, siteLanguages, lang, categories } = props;
+  const { location, setHistoryPush, logout, currentSiteInfo, siteLanguages, lang, categories, globalSettings } = props;
+
+  const { useForms } = globalSettings;
 
   const [isOpened, setIsOpened] = useState(false);
 
@@ -60,10 +63,15 @@ const NavMenu = (props: IProps) => {
     setHistoryPush(profileRoute);
   };
 
+  const filteredSiteRoutes = site.filter((route: IRouter) => useForms || (!useForms && !route.path.includes("/forms")));
+  const filteredMultisiteRoutes = multisite.filter(
+    (route: IRouter) => useForms || (!useForms && !route.path.includes("/forms"))
+  );
+
   const config: IConfig = isSite
     ? {
         type: "site",
-        routes: [...site],
+        routes: [...filteredSiteRoutes],
         logo: (
           <>
             <S.LogoSite src={siteLogo} alt="Logo" />
@@ -73,7 +81,7 @@ const NavMenu = (props: IProps) => {
       }
     : {
         type: "multisite",
-        routes: [...multisite],
+        routes: [...filteredMultisiteRoutes],
         logo: (
           <>
             <S.Logo src={logoPlaceholder} alt="Logo Griddo" />
@@ -201,8 +209,9 @@ interface IConfig {
 interface INavMenuProps {
   categories: any;
   currentSiteInfo: ISite | null;
-  siteLanguages: any[];
-  lang: any;
+  siteLanguages: ILanguage[];
+  lang: { locale: string; id: number };
+  globalSettings: IGlobalSettings;
 }
 
 const mapStateToProps = (state: IRootState) => ({
@@ -210,6 +219,7 @@ const mapStateToProps = (state: IRootState) => ({
   currentSiteInfo: state.sites.currentSiteInfo,
   siteLanguages: state.sites.currentSiteLanguages,
   lang: state.app.lang,
+  globalSettings: state.app.globalSettings,
 });
 
 type IProps = INavMenuProps & IDispatchProps & RouteComponentProps;