@griddo/ax 11.7.3 → 11.7.4-rc.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "11.7.3",
+  "version": "11.7.4-rc.0",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Diego M. Béjar <diego.bejar@secuoyas.com>",
@@ -223,5 +223,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "35cccad9fe3f0eaf9e2331184ac382d5312c60fb"
+  "gitHead": "8434d0fcbd72920360133228104819ad375a9892"
 }

package/src/api/sites.tsx

@@ -114,6 +114,11 @@ const SERVICES: { [key: string]: IServiceConfig } = {
     endpoint: "/select/sites",
     method: "GET",
   },
+  SET_SITE_ACTIVITY: {
+    ...template,
+    endpoint: "/site-activity/",
+    method: "POST",
+  },
 };
 
 const getAllSites = async (params: IGetSitesParams = { recentSitesNumber: 7 }) => {
@@ -371,6 +376,14 @@ const unpublishSiteBulk = (ids: number[]) => sendRequest(SERVICES.UNPUBLISH_SITE
 
 const getSelectSites = () => sendRequest(SERVICES.GET_SELECT_SITES);
 
+const setSiteActivity = async (siteID: number) => {
+  const { host, endpoint } = SERVICES.SET_SITE_ACTIVITY;
+
+  SERVICES.SET_SITE_ACTIVITY.dynamicUrl = `${host}${endpoint}${siteID}`;
+
+  return sendRequest(SERVICES.SET_SITE_ACTIVITY);
+};
+
 export default {
   getAllSites,
   getSiteInfo,
@@ -393,4 +406,5 @@ export default {
   removePageBulk,
   removeUsersBulk,
   getSelectSites,
+  setSiteActivity,
 };

package/src/api/utils.tsx

@@ -31,16 +31,24 @@ const getLang = (): Record<string, unknown> => {
   return { lang };
 };
 
+const getSite = (): Record<string, unknown> => {
+  const site = JSON.parse(localStorage.getItem("siteID") || "{}");
+
+  return { site };
+};
+
 const getHeaders = (headers: Record<string, unknown>, hasToken: boolean) => {
   return hasToken
     ? {
         ...headers,
         ...getToken(),
         ...getLang(),
+        ...getSite(),
       }
     : {
         ...headers,
         ...getLang(),
+        ...getSite(),
       };
 };
 

package/src/containers/Sites/actions.tsx

@@ -50,6 +50,7 @@ import {
   ISiteListConfig,
   IQueryValue,
   IThemeElements,
+  IRootState,
 } from "@ax/types";
 import { sites, languages, dataPack, social, structuredData, analytics, pages } from "@ax/api";
 import { appActions } from "@ax/containers/App";
@@ -87,6 +88,7 @@ function setSitesByLang(sitesList: ISite[]): ISetSitesByLangAction {
 }
 
 function setCurrentSiteInfo(currentSiteInfo: ISite | null): ISetCurrentSiteInfoAction {
+  localStorage.setItem("siteID", JSON.stringify(currentSiteInfo?.id || "global"));
   return { type: SET_CURRENT_SITE_INFO, payload: { currentSiteInfo } };
 }
 
@@ -161,7 +163,7 @@ function getSites(params: IGetSitesParams = { recentSitesNumber: 7 }): (dispatch
   };
 }
 
-function getSite(siteID: number): (dispatch: Dispatch, getState: any) => Promise<void> {
+function getSite(siteID: number): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const responseActions = {
@@ -201,7 +203,7 @@ function getSitesByLang(params: IGetSitesParams): (dispatch: Dispatch) => Promis
   };
 }
 
-function saveSettings(form: ISettingsForm): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+function saveSettings(form: ISettingsForm): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -233,7 +235,7 @@ function saveSettings(form: ISettingsForm): (dispatch: Dispatch, getState: any)
   };
 }
 
-function getGlobalPages(params: IGetGlobalPagesParams, filterQuery: string): (dispatch: any) => Promise<void> {
+function getGlobalPages(params: IGetGlobalPagesParams, filterQuery: string): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       const responseActions = {
@@ -249,13 +251,13 @@ function getGlobalPages(params: IGetGlobalPagesParams, filterQuery: string): (di
 
       await handleRequest(callback, responseActions, [appActions.setIsLoading])(dispatch);
     } catch (e) {
-      console.log("error");
-      console.log(e); // FIXME: capturar errores
+      console.log(e);
     }
   };
 }
 
-function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) => Promise<void> {
+// TODO: refactor
+function setSiteInfo(currentSiteInfo: ISite): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -266,7 +268,7 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
       dispatch(appActions.setIsLoading(true));
 
       resetSiteValues(currentSiteInfo.id)(dispatch);
-      dispatch(structuredDataActions.resetStructuredData());
+      structuredDataActions.resetStructuredData()(dispatch);
       dispatch(setCurrentSiteInfo(currentSiteInfo));
       await getRoles({ siteId: currentSiteInfo.id }, undefined, false)(dispatch);
 
@@ -287,7 +289,7 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
         dispatch(setLanguage(lang));
         dispatch(setCurrentSiteLanguages(siteLanguages));
       } else {
-        console.log("Error en sites getSiteLanguages"); // FIXME: capturar errores mejor
+        console.log("Error en sites getSiteLanguages");
       }
 
       // get site activated dataPacks
@@ -297,10 +299,10 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
         const data = dataPackResponse.data.items;
         const orderedData = data.sort(sortBy("title", false));
         dispatch(dataPacksActions.setActivated(orderedData));
-        dispatch(dataPacksActions.getSiteModules());
-        dispatch(dataPacksActions.getSiteTemplates());
+        dataPacksActions.getSiteModules()(dispatch, getState);
+        dataPacksActions.getSiteTemplates()(dispatch, getState);
       } else {
-        console.log("Error en sites getSiteDataPacks"); // FIXME: capturar errores mejor
+        console.log("Error en sites getSiteDataPacks");
       }
 
       // get site socials
@@ -308,7 +310,7 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
       if (isReqOk(socialResponse.status)) {
         dispatch(socialActions.setSocial(socialResponse.data));
       } else {
-        console.log("Error en sites getSocial"); // FIXME: capturar errores mejor
+        console.log("Error en sites getSocial");
       }
 
       // get structuredData
@@ -325,7 +327,7 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
           structuredDataActions.setStructuredData({ ...currentStructuredData, site: structuredDataValues.site })
         );
       } else {
-        console.log("Error en sites getStructuredData"); // TODO: capturar errores mejor
+        console.log("Error en sites getStructuredData");
       }
 
       // get analytics
@@ -333,17 +335,19 @@ function setSiteInfo(currentSiteInfo: ISite): (dispatch: any, getState: any) =>
       if (isReqOk(socialResponse.status)) {
         dispatch(analyticsActions.setAnalytics(analyticsResponse.data));
       } else {
-        console.log("Error en sites getAnalytics"); // FIXME: capturar errores mejor
+        console.log("Error en sites getAnalytics");
       }
 
       getUserCurrentPermissions()(dispatch, getState);
+
+      await sites.setSiteActivity(currentSiteInfo.id);
     } catch (e) {
-      console.log(e); // FIXME: capturar errores
+      console.log(e);
     }
   };
 }
 
-function getFilteredContent(filter: any): (dispatch: any, getState: any) => Promise<void> {
+function getFilteredContent(filter: any): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const { value, fromPage } = filter;
@@ -354,6 +358,8 @@ function getFilteredContent(filter: any): (dispatch: any, getState: any) => Prom
         app: { token },
       } = getState();
 
+      if (!currentSiteInfo) return;
+
       if (value === "unique-pages" || fromPage) {
         const params = {
           siteID: currentSiteInfo.id,
@@ -366,11 +372,11 @@ function getFilteredContent(filter: any): (dispatch: any, getState: any) => Prom
           token,
           ...DEFAULT_PARAMS,
         };
-        dispatch(structuredDataActions.setSelectedStructuredData(value, "site"));
+        structuredDataActions.setSelectedStructuredData(value, "site")(dispatch, getState);
         structuredDataActions.getStructuredDataContents(params, currentSiteInfo.id)(dispatch, getState);
       }
     } catch (e) {
-      console.log(e); // FIXME: capturar errores mejor
+      console.log(e);
     }
   };
 }
@@ -379,7 +385,7 @@ function getSitePages(
   params: IGetSitePagesParams,
   structuredData?: string | null,
   filterQuery?: string
-): (dispatch: any) => Promise<void> {
+): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       dispatch(appActions.setIsLoading(true));
@@ -396,12 +402,12 @@ function getSitePages(
       }
       dispatch(appActions.setIsLoading(false));
     } catch (e) {
-      console.log(e); // FIXME: capturar errores mejor
+      console.log(e);
     }
   };
 }
 
-function getAllSitePages(params: IGetSitePagesParams): (dispatch: any) => Promise<void> {
+function getAllSitePages(params: IGetSitePagesParams): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       const responseActions = {
@@ -416,12 +422,12 @@ function getAllSitePages(params: IGetSitePagesParams): (dispatch: any) => Promis
 
       await handleRequest(callback, responseActions, [])(dispatch);
     } catch (e) {
-      console.log(e); // FIXME: capturar errores mejor
+      console.log(e);
     }
   };
 }
 
-function getSiteLanguages(siteID: number): (dispatch: any) => Promise<void> {
+function getSiteLanguages(siteID: number): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       dispatch(appActions.setIsLoading(true));
@@ -538,13 +544,15 @@ function resetSiteValues(siteID: number): (dispatch: Dispatch) => void {
   };
 }
 
-function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: any) => Promise<void> {
+function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: () => IRootState) => Promise<void> {
   return async (dispatch, getState) => {
     try {
       const {
         sites: { currentSiteInfo },
       } = getState();
 
+      if (!currentSiteInfo) return;
+
       dispatch(setSavedSiteInfo(currentSiteInfo));
       dispatch(setCurrentSiteInfo(null));
     } catch (e) {
@@ -553,13 +561,17 @@ function saveCurrentSiteInfo(): (dispatch: Dispatch, getState: any) => Promise<v
   };
 }
 
-function importPageFromGlobal(pageID: number | number[]): (dispatch: any, getState: any) => Promise<boolean> {
+function importPageFromGlobal(
+  pageID: number | number[]
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         sites: { currentSiteInfo, currentFilter },
       } = getState();
 
+      if (!currentSiteInfo) return false;
+
       const responseActions = {
         handleSuccess: () => {
           const params = {
@@ -609,7 +621,7 @@ function removeUsersBulk(siteId: number, users: number[]): (dispatch: Dispatch)
 function removePageFromSite(
   pageID: number | number[],
   refresh = true
-): (dispatch: any, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
@@ -617,6 +629,8 @@ function removePageFromSite(
         structuredData: { currentStructuredData },
       } = getState();
 
+      if (!currentSiteInfo) return false;
+
       const responseActions = {
         handleSuccess: () => {
           const params = {
@@ -654,13 +668,15 @@ function removePageFromSite(
 function deleteAndRemoveFromSiteBulk(
   pageIds: number[],
   globalPageIds: number[]
-): (dispatch: Dispatch, getState: any) => Promise<boolean> {
+): (dispatch: Dispatch, getState: () => IRootState) => Promise<boolean> {
   return async (dispatch, getState) => {
     try {
       const {
         sites: { currentSiteInfo },
       } = getState();
 
+      if (!currentSiteInfo) return false;
+
       let responseErrorPages: any = { data: { code: null, message: null } };
 
       const getMessageErrors = () => {

package/src/containers/Sites/reducer.tsx

@@ -48,7 +48,10 @@ const config: ISiteListConfig = {
   displayRecentSites: false,
   mode: "grid",
   filter: "&order=lastAccess-desc",
-  filterValues: { order: "desc", liveStatus: [{ value: "all", label: "All" }] },
+  filterValues: {
+    order: [{ value: "lastAccess-desc", label: "lastAccess-desc" }],
+    liveStatus: [{ value: "all", label: "All" }],
+  },
   sortedListStatus: {
     isAscending: false,
     sortedByDateCreated: false,

package/src/modules/Forms/FormEditor/Editor/index.tsx

@@ -50,6 +50,12 @@ const Editor = (props: IProps) => {
         content = schema.configTabs[0].fields;
       }
 
+      content.forEach((field) => {
+        if (field.type === "FieldGroup" && field.fields) {
+          content = [...content, ...field.fields];
+        }
+      });
+
       return content.filter((field: ISchemaField) => field.type === "FormFieldArray");
     };
 

package/src/modules/Sites/SitesList/hooks.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useRef, useState } from "react";
-import { IQueryValue, ISitesQueryValues } from "@ax/types";
+import { IQueryValue } from "@ax/types";
 
 const useSortedListStatus = () => {
   const sortedInitialState: {
@@ -28,10 +28,7 @@ const useFilterQuery = (defaultValues?: { order: IQueryValue[]; liveStatus: IQue
     liveStatus: [{ value: "all", label: "All" }],
   };
 
-  const [query, setQuery] = useState(defaultValues || initialQueryValues);
-  const [currentFilterQuery, setCurrentFilterQuery] = useState("");
-
-  const setFilterQuery = (filterValues: ISitesQueryValues) => {
+  const getFiltersQuery = (filterValues: Record<string, IQueryValue[]>): string => {
     const { order, liveStatus } = filterValues;
 
     let filterQuery = "";
@@ -39,7 +36,7 @@ const useFilterQuery = (defaultValues?: { order: IQueryValue[]; liveStatus: IQue
       return values.length && values[0].value !== "all" ? `&${pointer}=${values[0].value}` : "";
     };
 
-    const isNotInitialValue = (pointer: keyof ISitesQueryValues) => {
+    const isNotInitialValue = (pointer: keyof Record<string, IQueryValue[]>) => {
       return filterValues[pointer] && initialQueryValues[pointer] !== filterValues[pointer];
     };
 
@@ -48,11 +45,18 @@ const useFilterQuery = (defaultValues?: { order: IQueryValue[]; liveStatus: IQue
       filterQuery = `${filterQuery}${query}`;
     }
 
-    if (isNotInitialValue("order")) {
-      const query = currentQuery("order", order);
-      filterQuery = `${filterQuery}${query}`;
-    }
+    const query = currentQuery("order", order);
+    filterQuery = `${filterQuery}${query}`;
+
+    return filterQuery;
+  };
+
+  const [query, setQuery] = useState(defaultValues || initialQueryValues);
+  const initialFilterQuery = getFiltersQuery(defaultValues || initialQueryValues);
+  const [currentFilterQuery, setCurrentFilterQuery] = useState(initialFilterQuery);
 
+  const setFilterQuery = (filterValues: Record<string, IQueryValue[]>) => {
+    const filterQuery = getFiltersQuery(filterValues);
     setCurrentFilterQuery(filterQuery);
   };
 

package/src/types/index.tsx

@@ -172,7 +172,7 @@ export interface ISiteListConfig {
   displayRecentSites: boolean;
   mode: string;
   filter: string;
-  filterValues: { order: string; liveStatus: IQueryValue[] };
+  filterValues: { order: IQueryValue[]; liveStatus: IQueryValue[] };
   sortedListStatus: {
     isAscending: boolean;
     sortedByDateCreated: boolean;