@griddo/ax 1.69.9 → 1.72.1

package/src/containers/Sites/actions.tsx

@@ -10,6 +10,7 @@ import {
   SET_SAVED_SITE_INFO,
   DEFAULT_PARAMS,
   SET_CURRENT_SITE_ERROR_PAGES,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 import {
   ISetSitesAction,
@@ -21,6 +22,7 @@ import {
   ISetCurrentSiteLanguagesAction,
   ISetSavedSiteInfoAction,
   ISetCurrentSiteErrorPages,
+  ISetContentFilters,
 } from "./interfaces";
 
 import { ISite, IGetSitePagesParams, ISettingsForm, IGetGlobalPagesParams, IPage } from "@ax/types";
@@ -77,6 +79,10 @@ function setCurrentSiteErrorPages(currentSiteErrorPages: number[]): ISetCurrentS
   return { type: SET_CURRENT_SITE_ERROR_PAGES, payload: { currentSiteErrorPages } };
 }
 
+function setContentFilters(contentFilters: Record<string, string> | null): ISetContentFilters {
+  return { type: SET_CONTENT_FILTERS, payload: { contentFilters } };
+}
+
 // TODO: hay que controlar que cuando da error la API borrar los sites ya guardados y sacar el error (ver los siguientes FIXME)
 function getSites(): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
@@ -507,4 +513,5 @@ export {
   removeUsersBulk,
   setCurrentSiteErrorPages,
   resetCurrentSiteErrorPages,
+  setContentFilters,
 };

package/src/containers/Sites/constants.tsx

@@ -10,6 +10,7 @@ export const SET_CURRENT_SITE_LANGUAGES: string | null = `${NAME}/SET_CURRENT_SI
 export const SET_INITIAL_VALUES = `${NAME}/SET_INITIAL_VALUES`;
 export const SET_SAVED_SITE_INFO = `${NAME}/SET_SAVED_SITE_INFO`;
 export const SET_CURRENT_SITE_ERROR_PAGES = `${NAME}/SET_CURRENT_SITE_ERROR_PAGES`;
+export const SET_CONTENT_FILTERS = `${NAME}/SET_CONTENT_FILTERS`;
 
 export const ITEMS_PER_PAGE = 50;
 

package/src/containers/Sites/interfaces.tsx

@@ -9,6 +9,7 @@ import {
   SET_INITIAL_VALUES,
   SET_SAVED_SITE_INFO,
   SET_CURRENT_SITE_ERROR_PAGES,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 import { ISite } from "@ax/types";
 
@@ -62,4 +63,9 @@ export interface ISetCurrentSiteErrorPages {
   payload: { currentSiteErrorPages: number[] };
 }
 
+export interface ISetContentFilters {
+  type: typeof SET_CONTENT_FILTERS;
+  payload: { contentFilters: Record<string,string> | null };
+}
+
 export type SitesActionsCreators = ISetSitesAction & ISetCurrentSiteInfoAction;

package/src/containers/Sites/reducer.tsx

@@ -9,6 +9,7 @@ import {
   SET_INITIAL_VALUES,
   SET_SAVED_SITE_INFO,
   SET_CURRENT_SITE_ERROR_PAGES,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 
 import { ISite, IPage, ILanguage } from "@ax/types";
@@ -26,6 +27,7 @@ export interface ISitesState {
   currentSiteLanguages: ILanguage[];
   savedSiteInfo: any;
   currentSiteErrorPages: number[];
+  contentFilters: Record<string, string> | null;
 }
 
 export const initialState = {
@@ -39,6 +41,7 @@ export const initialState = {
   currentSiteLanguages: [],
   savedSiteInfo: null,
   currentSiteErrorPages: [],
+  contentFilters: null,
 };
 
 export function reducer(state = initialState, action: SitesActionsCreators): ISitesState {
@@ -53,6 +56,7 @@ export function reducer(state = initialState, action: SitesActionsCreators): ISi
     case SET_INITIAL_VALUES:
     case SET_SAVED_SITE_INFO:
     case SET_CURRENT_SITE_ERROR_PAGES:
+    case SET_CONTENT_FILTERS:
       return { ...state, ...action.payload };
     default:
       return state;

package/src/containers/StructuredData/actions.tsx

@@ -16,6 +16,7 @@ import {
   SET_SCHEMA_VERSION,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 
 import {
@@ -30,9 +31,17 @@ import {
   ISetSchemaVersion,
   ISetErrors,
   ISetValidated,
+  ISetContentFilters,
 } from "./interfaces";
 import { prepareStructuredDataContent, getTaxonomies, filterStructuredDataByID, getTypes } from "./utils";
-import { IStructuredData, IStructuredDataContent, ICategory, IGetStructuredDataParams, IErrorItem } from "@ax/types";
+import {
+  IStructuredData,
+  IStructuredDataContent,
+  ICategory,
+  IGetStructuredDataParams,
+  IErrorItem,
+  IStructuredDataQueryValues,
+} from "@ax/types";
 import { structuredData } from "@ax/api";
 import { setTotalItems } from "@ax/containers/Sites/actions";
 import { appActions } from "@ax/containers/App";
@@ -102,30 +111,33 @@ function setValidated(validated: boolean): ISetValidated {
   return { type: SET_VALIDATED, payload: { validated } };
 }
 
+function setContentFilters(contentFilters: Record<string, IStructuredDataQueryValues> | null): ISetContentFilters {
+  return { type: SET_CONTENT_FILTERS, payload: { contentFilters } };
+}
+
 function updateFormValue(valueObj: any): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const {
       structuredData: { form },
     } = getState();
-    const updatedForm = { ...form, content: { ...form.content, ...valueObj } };
+    const updatedForm = { ...form, content: { ...form?.content, ...valueObj } };
     dispatch(updateForm(updatedForm));
   };
 }
 
-function resetForm(): (dispatch: Dispatch, getState: any) => void {
+function resetForm(setDefault?: boolean): (dispatch: Dispatch, getState: any) => void {
   return (dispatch, getState) => {
     const {
-      structuredData: {
-        currentStructuredData: { defaultValues },
-      },
+      structuredData: { currentStructuredData },
     } = getState();
 
-    const updatedForm = { content: defaultValues };
+    const formContent = setDefault && currentStructuredData ? { content: currentStructuredData.defaultValues } : null;
 
     dispatch(setEntity(null));
-    dispatch(updateForm(updatedForm));
+    dispatch(updateForm(formContent));
     dispatch(setErrors([]));
     dispatch(setValidated(false));
+    dispatch(setCurrentDataID(null));
   };
 }
 
@@ -559,4 +571,5 @@ export {
   setFilter,
   validateForm,
   deleteError,
+  setContentFilters,
 };

package/src/containers/StructuredData/constants.tsx

@@ -15,6 +15,7 @@ const SET_FILTER: string | null = `${NAME}/SET_FILTER`;
 const SET_SCHEMA_VERSION: string | null = `${NAME}/SET_SCHEMA_VERSION`;
 const SET_ERRORS = `${NAME}/SET_ERRORS`;
 const SET_VALIDATED = `${NAME}/SET_VALIDATED`;
+const SET_CONTENT_FILTERS = `${NAME}/SET_CONTENT_FILTERS`;
 
 const ITEMS_PER_PAGE = 50;
 
@@ -45,4 +46,5 @@ export {
   SET_SCHEMA_VERSION,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_CONTENT_FILTERS,
 };

package/src/containers/StructuredData/interfaces.tsx

@@ -12,9 +12,10 @@ import {
   SET_SCHEMA_VERSION,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 
-import { IStructuredData, IStructuredDataContent, ICategory, IErrorItem } from "@ax/types";
+import { IStructuredData, IStructuredDataContent, ICategory, IErrorItem, IStructuredDataQueryValues } from "@ax/types";
 
 export interface ISetCategories {
   type: typeof SET_CATEGORIES;
@@ -80,6 +81,11 @@ export interface ISetValidated {
   payload: { validated: boolean };
 }
 
+export interface ISetContentFilters {
+  type: typeof SET_CONTENT_FILTERS;
+  payload: { contentFilters: Record<string, IStructuredDataQueryValues> | null };
+}
+
 export type CategoryActionsCreators = ISetCategories & ISetCurrentData;
 
 export type StructuredDataActionsCreators = CategoryActionsCreators &

package/src/containers/StructuredData/reducer.tsx

@@ -1,4 +1,4 @@
-import { IStructuredData, IStructuredDataContent, ICategory, IErrorItem } from "@ax/types";
+import { IStructuredData, IStructuredDataContent, ICategory, IErrorItem, IStructuredDataQueryValues } from "@ax/types";
 import {
   SET_CATEGORIES,
   SET_STRUCTURED_DATA,
@@ -15,6 +15,7 @@ import {
   SET_SCHEMA_VERSION,
   SET_ERRORS,
   SET_VALIDATED,
+  SET_CONTENT_FILTERS,
 } from "./constants";
 
 import { StructuredDataActionsCreators } from "./interfaces";
@@ -34,6 +35,7 @@ export interface IStructuredDataState {
   schemaVersion: string;
   errors: IErrorItem[];
   validated: boolean;
+  contentFilters: Record<string, IStructuredDataQueryValues> | null;
 }
 
 export const initialState = {
@@ -51,6 +53,7 @@ export const initialState = {
   schemaVersion: "",
   errors: [],
   validated: false,
+  contentFilters: null,
 };
 
 export function reducer(state = initialState, action: StructuredDataActionsCreators): IStructuredDataState {
@@ -70,6 +73,7 @@ export function reducer(state = initialState, action: StructuredDataActionsCreat
     case SET_SCHEMA_VERSION:
     case SET_ERRORS:
     case SET_VALIDATED:
+    case SET_CONTENT_FILTERS:
       return { ...state, ...action.payload };
     default:
       return state;

package/src/helpers/fields.tsx

@@ -1,5 +1,5 @@
-const fields = require.context("./../components/Fields", true);
+import * as components from "@ax/components/Fields";
 
-const getFieldByPath = (name: string) => fields(`./${name}/index.tsx`).default;
+const getFieldByPath = (name: string): (() => JSX.Element) => (components as Record<string, any>)[name];
 
 export { getFieldByPath };

package/src/helpers/index.tsx

@@ -99,6 +99,8 @@ import { isDevelopment } from "./environment";
 
 import { getDefaultTheme } from "./themes";
 
+import { parseTheme } from "./parseTheme";
+
 export {
   isComponentEmpty,
   setAsContainedComponent,
@@ -180,4 +182,5 @@ export {
   getDefaultNavigationModules,
   isMultipleNavigationModules,
   areEqual,
+  parseTheme,
 };