@griddo/ax 1.59.11 → 1.60.3

package/config/webpackSchemas.config.js

@@ -27,6 +27,13 @@ const createConfig = ({ input, output }) => ({
           },
         },
       },
+
+      // This is for ignoring images defined in the schemas in order to prevent
+      // API crashing (it hasn't webpack)
+      {
+        test: /\.(png|jpe?g|gif)$/i,
+        use: [{ loader: "ignore-loader" }],
+      },
     ],
   },
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.59.11",
+  "version": "1.60.3",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -88,6 +88,7 @@
     "fs-extra": "7.0.1",
     "html-webpack-plugin": "4.5.0",
     "identity-obj-proxy": "3.0.0",
+    "ignore-loader": "^0.1.2",
     "is-wsl": "^1.1.0",
     "jest": "24.9.0",
     "jest-environment-jsdom-fourteen": "0.1.0",
@@ -241,5 +242,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f36fe6e77608ca067d10df476a6c6f954063e756"
+  "gitHead": "b2a9f7a0c26dc3b050299d1197efaf5a0566163e"
 }

package/src/GlobalStore.tsx

@@ -17,6 +17,7 @@ import { socialReducer, socialInitialState } from "./containers/Settings/Social/
 import { usersReducer, usersInitialState } from "./containers/Users/reducer";
 import { galleryReducer, galleryInitialState } from "./containers/Gallery/reducer";
 import { domainsReducer, domainsInitialState } from "./containers/Domains/reducer";
+import { redirectsReducer, redirectsInitialState } from "./containers/Redirects/reducer";
 
 import { IRootState } from "@ax/types";
 
@@ -47,6 +48,7 @@ export class GlobalStore {
       users: usersReducer as Reducer<any, Action<any>>,
       gallery: galleryReducer as Reducer<any, Action<any>>,
       domains: domainsReducer as Reducer<any, Action<any>>,
+      redirects: redirectsReducer as Reducer<any, Action<any>>,
     });
 
     const rootReducer = (state: IRootState | undefined, action: any) => {
@@ -65,6 +67,7 @@ export class GlobalStore {
           users: usersInitialState,
           gallery: galleryInitialState,
           domains: domainsInitialState,
+          redirects: redirectsInitialState,
         };
       }
 

package/src/api/index.tsx

@@ -14,6 +14,7 @@ import social from "./social";
 import files from "./files";
 import users from "./users";
 import domains from "./domains";
+import redirects from "./redirects";
 
 export {
   sites,
@@ -32,4 +33,5 @@ export {
   files,
   users,
   domains,
+  redirects,
 };

package/src/api/redirects.tsx

@@ -0,0 +1,71 @@
+import { template } from "./config";
+import { IServiceConfig, sendRequest } from "./utils";
+
+const SERVICES: { [key: string]: IServiceConfig } = {
+  GET_REDIRECTS: {
+    ...template,
+    endpoint: "/redirects",
+    method: "GET",
+  },
+  CREATE_REDIRECT: {
+    ...template,
+    endpoint: "/redirect",
+    method: "POST",
+  },
+  UPDATE_REDIRECT: {
+    ...template,
+    endpoint: "/redirect/",
+    method: "PUT",
+  },
+  DELETE_REDIRECT: {
+    ...template,
+    endpoint: "/redirect/",
+    method: "DELETE",
+  },
+  DELETE_REDIRECT_BULK: {
+    ...template,
+    endpoint: "/redirects/bulk",
+    method: "DELETE",
+  },
+};
+
+const getRedirects = async (params: any, filters?: string) => {
+  const { page, itemsPerPage, pagination } = params;
+
+  const { host, endpoint } = SERVICES.GET_REDIRECTS;
+
+  SERVICES.GET_REDIRECTS.dynamicUrl = `${host}${endpoint}?page=${page}&itemsPerPage=${itemsPerPage}&pagination=${pagination}${filters}`;
+
+  return sendRequest(SERVICES.GET_REDIRECTS);
+};
+
+const createRedirect = async (redirect: any, force?: boolean) => {
+  const { host, endpoint } = SERVICES.CREATE_REDIRECT;
+
+  const forceString = force ? "?force=1" : "";
+  SERVICES.CREATE_REDIRECT.dynamicUrl = `${host}${endpoint}${forceString}`;
+
+  return sendRequest(SERVICES.CREATE_REDIRECT, { ...redirect });
+};
+
+const updateRedirect = async (redirect: any, redirectID: number) => {
+  const { host, endpoint } = SERVICES.UPDATE_REDIRECT;
+
+  SERVICES.UPDATE_REDIRECT.dynamicUrl = `${host}${endpoint}${redirectID}`;
+
+  return sendRequest(SERVICES.UPDATE_REDIRECT, { ...redirect });
+};
+
+const deleteRedirect = async (redirectID: number) => {
+  const { host, endpoint } = SERVICES.DELETE_REDIRECT;
+
+  SERVICES.DELETE_REDIRECT.dynamicUrl = `${host}${endpoint}${redirectID}`;
+
+  return sendRequest(SERVICES.DELETE_REDIRECT);
+};
+
+const deleteRedirectsBulk = async (ids: number[]) => {
+  return sendRequest(SERVICES.DELETE_REDIRECT_BULK, { ids });
+};
+
+export default { getRedirects, createRedirect, updateRedirect, deleteRedirect, deleteRedirectsBulk };

package/src/api/sites.tsx

@@ -39,11 +39,6 @@ const SERVICES: { [key: string]: IServiceConfig } = {
     endpoint: ["/site/", "/pages/structured-data/"],
     method: "GET",
   },
-  GET_ORDERED_SITE_PAGES: {
-    ...template,
-    endpoint: ["/site/", "/pages"],
-    method: "GET",
-  },
   GET_SITE_IMAGES: {
     ...template,
     endpoint: ["/site/", "/images"],
@@ -112,47 +107,38 @@ const getSiteInfo = async (siteID: number) => {
   return sendRequest(SERVICES.GET_SITE_INFO);
 };
 
-const getOrderedSitePages = async (siteID: number | string, query: string) => {
-  const {
-    host,
-    endpoint: [prefix, suffix],
-  } = SERVICES.GET_ORDERED_SITE_PAGES;
-
-  SERVICES.GET_ORDERED_SITE_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}${query}`;
-
-  return sendRequest(SERVICES.GET_ORDERED_SITE_PAGES);
-};
-
 const getStructuredSitePages = async (params: IGetSitePagesParams, structuredData: string, filterQuery?: string) => {
   const {
     host,
     endpoint: [prefix, suffix],
   } = SERVICES.GET_SITE_STRUCTURED_PAGES;
 
-  const { siteID, deleted, page, itemsPerPage, query } = params;
+  const { siteID, deleted, page, itemsPerPage, query, format } = params;
 
   const filters = filterQuery ? `${filterQuery}&` : "?";
 
   SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}${structuredData}${filters}deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
 
-  if (query && query.trim() !== "") {
-    SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&query=${query}`;
-  }
+  if (query && query.trim() !== "") SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&query=${query}`;
+  if (format) SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&format=${format}`;
 
   return sendRequest(SERVICES.GET_SITE_STRUCTURED_PAGES);
 };
 
-const getSitePages = async (params: IGetSitePagesParams) => {
+const getSitePages = async (params: IGetSitePagesParams, filterQuery?: string): Promise<AxiosResponse> => {
   const {
     host,
     endpoint: [prefix, suffix],
   } = SERVICES.GET_SITE_PAGES;
 
-  const { siteID, deleted, page, itemsPerPage, query, filterStructuredData, lang } = params;
+  const { siteID, deleted, page, itemsPerPage, query, filterStructuredData, lang, format } = params;
+
+  const filters = filterQuery ? `${filterQuery}&` : "?";
 
-  SERVICES.GET_SITE_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}?deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
+  SERVICES.GET_SITE_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}${filters}deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
   if (query && query.trim() !== "") SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&query=${query}`;
   if (filterStructuredData) SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&filterStructuredData=${filterStructuredData}`;
+  if (format) SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&format=${format}`;
 
   const dataHeader = {
     ...(lang && { lang })
@@ -164,12 +150,13 @@ const getSitePages = async (params: IGetSitePagesParams) => {
 const getGlobalPages = async (params: IGetGlobalPagesParams, filterQuery?: string): Promise<AxiosResponse> => {
   const { host, endpoint } = SERVICES.GET_GLOBAL_PAGES;
 
-  const { deleted, page, itemsPerPage, query, filterStructuredData } = params;
+  const { deleted, page, itemsPerPage, query, filterStructuredData, format } = params;
 
   SERVICES.GET_GLOBAL_PAGES.dynamicUrl = `${host}${endpoint}?deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
   if (query && query.trim() !== "") SERVICES.GET_GLOBAL_PAGES.dynamicUrl += `&query=${query}`;
   if (filterStructuredData) SERVICES.GET_GLOBAL_PAGES.dynamicUrl += `&filterStructuredData=${filterStructuredData}`;
   if (filterQuery) SERVICES.GET_GLOBAL_PAGES.dynamicUrl += filterQuery;
+  if (format) SERVICES.GET_GLOBAL_PAGES.dynamicUrl = SERVICES.GET_GLOBAL_PAGES.dynamicUrl + `&format=${format}`;
 
   return sendRequest(SERVICES.GET_GLOBAL_PAGES);
 };
@@ -317,7 +304,6 @@ export default {
   getSiteInfo,
   getSitePages,
   getSitePagesLight,
-  getOrderedSitePages,
   getStructuredSitePages,
   getSiteImages,
   deleteSite,

package/src/components/Fields/TextArea/index.tsx

@@ -33,6 +33,8 @@ const TextArea = (props: ITextAreaProps): JSX.Element => {
     handleValidation && handleValidation(e.target.value);
   };
 
+  const errorString = error ? "true" : "false";
+
   return (
     <S.TextArea
       name={name}
@@ -42,7 +44,7 @@ const TextArea = (props: ITextAreaProps): JSX.Element => {
       onChange={handleOnChange}
       onBlur={handleOnBlur}
       placeholder={placeholder}
-      error={error}
+      error={errorString}
       disabled={disabled}
     />
   );

package/src/components/Fields/TextArea/style.tsx

@@ -1,15 +1,15 @@
 import styled from "styled-components";
 import TextareaAutosize from "react-textarea-autosize";
 
-export const TextArea = styled(TextareaAutosize)<{ error: boolean | undefined }>`
-  ${p => p.theme.textStyle.fieldContent};
-  border: 1px solid ${p => (p.error === true ? p.theme.color.error : p.theme.color.uiLine)};
+export const TextArea = styled(TextareaAutosize)<{ error: string }>`
+  ${(p) => p.theme.textStyle.fieldContent};
+  border: 1px solid ${(p) => (p.error === "true" ? p.theme.color.error : p.theme.color.uiLine)};
   border-radius: 4px;
-  background-color: ${p => p.theme.color.uiBackground02};
-  color: ${p => p.theme.color.textHighEmphasis};
-  padding: ${p => p.theme.spacing.s};
+  background-color: ${(p) => p.theme.color.uiBackground02};
+  color: ${(p) => p.theme.color.textHighEmphasis};
+  padding: ${(p) => p.theme.spacing.s};
   height: auto;
-  margin-bottom: ${p => p.theme.spacing.xxs};
+  margin-bottom: ${(p) => p.theme.spacing.xxs};
   width: 100%;
   resize: none;
   overflow: auto;
@@ -17,15 +17,15 @@ export const TextArea = styled(TextareaAutosize)<{ error: boolean | undefined }>
   &:active,
   &:focus {
     outline: none;
-    border-color: ${(p) => (p.error === true ? p.theme.color.error : p.theme.color.interactive01)};
+    border-color: ${(p) => (p.error === "true" ? p.theme.color.error : p.theme.color.interactive01)};
   }
 
   &::placeholder {
-    color: ${p => p.theme.color.textLowEmphasis};
+    color: ${(p) => p.theme.color.textLowEmphasis};
   }
 
   &:disabled {
-    color: ${p => p.theme.color.interactiveDisabled};
-    border-color: ${p => p.theme.color.interactiveDisabled};
+    color: ${(p) => p.theme.color.interactiveDisabled};
+    border-color: ${(p) => p.theme.color.interactiveDisabled};
   }
 `;

package/src/components/FloatingPanel/style.tsx

@@ -13,11 +13,16 @@ export const Header = styled.div`
   padding: 0 ${(p) => p.theme.spacing.m};
 `;
 
-export const Wrapper = styled.section<{ right?: boolean; isOpen: boolean; isOpenedSecond: boolean | undefined; secondary?: boolean }>`
+export const Wrapper = styled.section<{
+  right?: boolean;
+  isOpen: boolean;
+  isOpenedSecond: boolean | undefined;
+  secondary?: boolean;
+}>`
   position: fixed;
   right: 0;
   top: 0;
-  z-index: 1000;
+  z-index: 1200;
   width: calc(${(p) => p.theme.spacing.xl} * 6);
   height: 100vh;
   background: ${(p) => p.theme.colors.uiBackground01};

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

@@ -8,7 +8,7 @@ import { IFilterValue } from "@ax/types";
 import * as S from "./style";
 
 const SiteFilter = (props: ISiteFilterProps): JSX.Element => {
-  const { filterItems, value } = props;
+  const { filterItems, value, pointer, center = true } = props;
 
   const filters: IFilterValue[] = [
     {
@@ -18,8 +18,8 @@ const SiteFilter = (props: ISiteFilterProps): JSX.Element => {
     },
   ];
 
-  const storedValue = value.split(",");
-  const parsedValue = storedValue.map((value) => (isNumber(value) ? parseInt(value) : value));
+  const storedValue = value && value[pointer] ? value[pointer].split(",") : [];
+  const parsedValue = storedValue.map((value: any) => (isNumber(value) ? parseInt(value) : value));
   const [initialState] = useState(parsedValue);
   const selectAllOption = "all";
   const [selectedValue, setSelectedValue] = useState([...initialState]);
@@ -58,14 +58,13 @@ const SiteFilter = (props: ISiteFilterProps): JSX.Element => {
     }
     setSelectedValue(selection);
     const queryFilters = selection.join(",");
-    const pointer = "filterSites";
     filterItems(pointer, queryFilters);
   };
 
   const isActive = !areEquals(selectedValue, initialState);
 
   const Header = () => (
-    <S.Site isActive={isActive}>
+    <S.Site isActive={isActive} center={center}>
       Site
       <S.IconsWrapper>
         <Icon name="Filter" size="16" />
@@ -85,7 +84,9 @@ const SiteFilter = (props: ISiteFilterProps): JSX.Element => {
 
 interface ISiteFilterProps {
   filterItems(pointer: string, filter: string): void;
-  value: string;
+  value: any;
+  pointer: string;
+  center?: boolean;
 }
 
 export default SiteFilter;

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

@@ -1,9 +1,9 @@
 import styled from "styled-components";
 import { Header } from "@ax/components/TableList/style";
 
-const Site = styled(Header)<{ isActive: boolean }>`
+const Site = styled(Header)<{ isActive: boolean; center: boolean }>`
   width: 170px;
-  justify-content: center;
+  justify-content: ${(p) => (p.center ? "center" : "flex-start")};
   &:hover {
     color: ${(p) => p.theme.color.interactive01};
   }

package/src/containers/Redirects/actions.tsx

@@ -0,0 +1,129 @@
+import { redirects } from "@ax/api";
+import { appActions } from "@ax/containers/App";
+import { handleRequest } from "@ax/helpers";
+import { DEFAULT_PARAMS, ERROR_CODE, SET_REDIRECTS, SET_TOTAL_ITEMS } from "./constants";
+import { ISetRedirects, ISetTotalItems } from "./interfaces";
+
+function setRedirects(redirects: any[]): ISetRedirects {
+  return { type: SET_REDIRECTS, payload: { redirects } };
+}
+
+function setTotalItems(totalItems: number): ISetTotalItems {
+  return { type: SET_TOTAL_ITEMS, payload: { totalItems } };
+}
+
+function getRedirects(params: any, filters?: string): (dispatch: any) => Promise<void> {
+  return async (dispatch) => {
+    try {
+      const callback = async () => redirects.getRedirects(params, filters);
+
+      const responseActions = {
+        handleSuccess: (response: any) => {
+          const { items, totalItems } = response;
+          dispatch(setRedirects(items));
+          dispatch(setTotalItems(totalItems));
+        },
+        handleError: (response: any) => appActions.handleError(response)(dispatch),
+      };
+
+      await handleRequest(callback, responseActions, [appActions.setIsLoading])(dispatch);
+    } catch (e) {
+      console.log(e);
+    }
+  };
+}
+
+function addRedirect(
+  redirect: { from: string; to: string | number },
+  errorAction: () => void,
+  force?: boolean,
+  filter?: string
+): (dispatch: any, getState: any) => Promise<void> {
+  return async (dispatch, getState) => {
+    try {
+      const {
+        sites: { currentSiteInfo },
+      } = getState();
+
+      const callback = async () => redirects.createRedirect(redirect, force);
+
+      const responseActions = {
+        handleSuccess: () => {
+          const params = { ...DEFAULT_PARAMS };
+          const siteFilterQuery = currentSiteInfo && currentSiteInfo.id ? `&sites=${currentSiteInfo.id}` : filter;
+          dispatch(getRedirects(params, siteFilterQuery));
+        },
+        handleError: (response: any) => {
+          const { status } = response;
+
+          status === ERROR_CODE.isBeingUsed ? errorAction() : appActions.handleError(response)(dispatch);
+        },
+      };
+
+      await handleRequest(callback, responseActions, [])(dispatch);
+    } catch (e) {
+      console.log(e);
+    }
+  };
+}
+
+function updateRedirect(
+  redirect: { from: string; to: string | number },
+  redirectID: number,
+  filter?: string
+): (dispatch: any, getState: any) => Promise<void> {
+  return async (dispatch, getState) => {
+    try {
+      const {
+        sites: { currentSiteInfo },
+      } = getState();
+
+      const callback = async () => redirects.updateRedirect(redirect, redirectID);
+
+      const responseActions = {
+        handleSuccess: () => {
+          const params = { ...DEFAULT_PARAMS };
+          const siteFilterQuery = currentSiteInfo && currentSiteInfo.id ? `&sites=${currentSiteInfo.id}` : filter;
+          dispatch(getRedirects(params, siteFilterQuery));
+        },
+        handleError: (response: any) => appActions.handleError(response)(dispatch),
+      };
+
+      await handleRequest(callback, responseActions, [])(dispatch);
+    } catch (e) {
+      console.log(e);
+    }
+  };
+}
+
+function deleteRedirect(
+  redirectID: number | number[],
+  filter?: string
+): (dispatch: any, getState: any) => Promise<boolean> {
+  return async (dispatch, getState) => {
+    try {
+      const {
+        sites: { currentSiteInfo },
+      } = getState();
+
+      const callback = async () =>
+        Array.isArray(redirectID) ? redirects.deleteRedirectsBulk(redirectID) : redirects.deleteRedirect(redirectID);
+
+      const responseActions = {
+        handleSuccess: () => {
+          const params = { ...DEFAULT_PARAMS };
+          const siteFilterQuery = currentSiteInfo && currentSiteInfo.id ? `&sites=${currentSiteInfo.id}` : filter;
+          dispatch(getRedirects(params, siteFilterQuery));
+        },
+        handleError: (response: any) => appActions.handleError(response)(dispatch),
+      };
+
+      return await handleRequest(callback, responseActions, [])(dispatch);
+    } catch (e) {
+      console.log(e);
+      return false;
+    }
+  };
+}
+
+export { getRedirects, addRedirect, updateRedirect, deleteRedirect };

package/src/containers/Redirects/constants.tsx

@@ -0,0 +1,18 @@
+const NAME = "redirects";
+
+const SET_REDIRECTS = `${NAME}/SET_REDIRECTS`;
+const SET_TOTAL_ITEMS = `${NAME}/SET_TOTAL_ITEMS`;
+
+const ITEMS_PER_PAGE = 50;
+
+const DEFAULT_PARAMS = {
+  page: 1,
+  itemsPerPage: ITEMS_PER_PAGE,
+  pagination: true,
+};
+
+const ERROR_CODE = {
+  isBeingUsed: 409,
+};
+
+export { NAME, SET_REDIRECTS, SET_TOTAL_ITEMS, ERROR_CODE, DEFAULT_PARAMS, ITEMS_PER_PAGE };

package/src/containers/Redirects/index.tsx

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

package/src/containers/Redirects/interfaces.tsx

@@ -0,0 +1,13 @@
+import { SET_REDIRECTS, SET_TOTAL_ITEMS } from "./constants";
+
+export interface ISetRedirects {
+  type: typeof SET_REDIRECTS;
+  payload: { redirects: any[] };
+}
+
+export interface ISetTotalItems {
+  type: typeof SET_TOTAL_ITEMS;
+  payload: { totalItems: number };
+}
+
+export type RedirectsActionsCreators = ISetRedirects;

package/src/containers/Redirects/reducer.tsx

@@ -0,0 +1,24 @@
+import { SET_REDIRECTS, SET_TOTAL_ITEMS } from "./constants";
+import { RedirectsActionsCreators } from "./interfaces";
+
+export interface IRedirectsState {
+  redirects: any[];
+  totalItems: number;
+}
+
+export const initialState = {
+  redirects: [],
+  totalItems: 0,
+};
+
+export function reducer(state = initialState, action: RedirectsActionsCreators): IRedirectsState {
+  switch (action.type) {
+    case SET_REDIRECTS:
+    case SET_TOTAL_ITEMS:
+      return { ...state, ...action.payload };
+    default:
+      return state;
+  }
+}
+
+export { initialState as redirectsInitialState, reducer as redirectsReducer };

package/src/containers/Settings/DataPacks/constants.tsx

@@ -1,17 +1,17 @@
-const NAME: string = "dataPacks";
+const NAME = "dataPacks";
 
-const SET_ACTIVATED: string = `${NAME}/SET_ACTIVATED`;
-const SET_SELECTED: string = `${NAME}/SET_SELECTED`;
-const SET_CONFIG_FORM_DATA: string = `${NAME}/SET_CONFIG_FORM_DATA`;
-const SET_AVAILABLE: string = `${NAME}/SET_AVAILABLE`;
-const SET_CATEGORIES: string = `${NAME}/SET_CATEGORIES`;
-const SET_MODULES: string = `${NAME}/SET_MODULES`;
-const SET_TEMPLATES: string = `${NAME}/SET_TEMPLATES`;
+const SET_ACTIVATED = `${NAME}/SET_ACTIVATED`;
+const SET_SELECTED = `${NAME}/SET_SELECTED`;
+const SET_CONFIG_FORM_DATA = `${NAME}/SET_CONFIG_FORM_DATA`;
+const SET_AVAILABLE = `${NAME}/SET_AVAILABLE`;
+const SET_CATEGORIES = `${NAME}/SET_CATEGORIES`;
+const SET_MODULES = `${NAME}/SET_MODULES`;
+const SET_TEMPLATES = `${NAME}/SET_TEMPLATES`;
 
 // TODO ERROR DICTIONARY
 const ERROR_CODE = {
-  isBeingUsed: 409
-}
+  isBeingUsed: 409,
+};
 
 export {
   SET_ACTIVATED,
@@ -21,5 +21,5 @@ export {
   SET_CATEGORIES,
   SET_MODULES,
   SET_TEMPLATES,
-  ERROR_CODE
+  ERROR_CODE,
 };

package/src/containers/Sites/actions.tsx

@@ -112,28 +112,6 @@ function saveSettings(form: ISettingsForm): (dispatch: Dispatch, getState: any)
   };
 }
 
-function getOrderedSitePages(siteId: number | string, query: string): (dispatch: any) => Promise<void> {
-  return async (dispatch) => {
-    try {
-      dispatch(setIsLoading(true));
-      const response: any = await sites.getOrderedSitePages(siteId, query);
-
-      if (isReqOk(response.status)) {
-        const { items, totalItems } = response.data;
-        dispatch(setCurrentSitePages(items));
-        dispatch(setTotalItems(totalItems));
-        dispatch(setIsLoading(false));
-      } else {
-        console.log("Error en getOrderedSitePages"); // FIXME: capturar errores mejor
-        dispatch(setIsLoading(false));
-      }
-    } catch (e) {
-      console.log("error");
-      console.log(e); // FIXME: capturar errores
-    }
-  };
-}
-
 function getGlobalPages(params: IGetGlobalPagesParams, filterQuery: string): (dispatch: any) => Promise<void> {
   return async (dispatch) => {
     try {
@@ -269,7 +247,7 @@ function getSitePages(
       dispatch(setIsLoading(true));
       const response: any = structuredData
         ? await sites.getStructuredSitePages(params, structuredData, filterQuery)
-        : await sites.getSitePages(params);
+        : await sites.getSitePages(params, filterQuery);
 
       if (isReqOk(response.status)) {
         const { items, totalItems } = response.data;
@@ -455,14 +433,12 @@ function removePageFromSite(
 }
 
 export {
-  // setSites,
   setCurrentSiteInfo,
   setCurrentSitePages,
   setFilter,
   setTotalItems,
   setCurrentSiteLanguages,
   getSites,
-  getOrderedSitePages,
   setSiteInfo,
   getFilteredContent,
   getSitePages,