@griddo/ax 10.1.24 → 10.1.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.1.24",
+  "version": "10.1.26",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -230,5 +230,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9f7d623c271600fa67301cfa3609055775af1445"
+  "gitHead": "f1f5da2db006932f062152997b46556a670b21dc"
 }

package/src/components/ConfigPanel/Form/ConnectedField/PageConnectedField/TemplateManager/index.tsx

@@ -2,10 +2,10 @@ import React from "react";
 import { connect } from "react-redux";
 
 import { IDataPack, IErrorItem, IRootState, ISite } from "@ax/types";
+import { getModuleCategories } from "@ax/helpers";
+import Field from "../Field";
 
 import * as S from "./style";
-import Field from "../Field";
-import { getModuleCategories } from "@ax/helpers";
 
 export const TemplateManager = (props: IProps): JSX.Element => {
   const {
@@ -37,7 +37,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
   const modulesDataPacks = activatedPacks.map((pack: IDataPack) => pack.modules).flat();
 
   const getFieldProps = (field: any) => {
-    const { key, type, whiteList = [], slugTo } = field;
+    const { key, type, whiteList = [], slugTo, readonly } = field;
     const isArr = type === "ComponentArray";
     const currentContent = isArr ? templateContent[key] : templateContent;
     const fieldObjKey = !isArr ? `${key}` : `modules`;
@@ -70,6 +70,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
       currentContent,
       handleUpdate,
       error,
+      readonly
     };
   };
 
@@ -78,7 +79,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
       {isConfig && templateFields && <S.Title>Template Options</S.Title>}
       {templateFields &&
         templateFields.map((templateField: any, index: number) => {
-          const { whiteList, categories, key, fieldObjKey, mappedField, currentContent, handleUpdate, error } =
+          const { whiteList, categories, key, fieldObjKey, mappedField, currentContent, handleUpdate, error, readonly } =
             getFieldProps(templateField);
 
           return (
@@ -106,6 +107,7 @@ export const TemplateManager = (props: IProps): JSX.Element => {
               template={template}
               setHistoryPush={setHistoryPush}
               lang={lang}
+              readonly={readonly}
             />
           );
         })}

package/src/components/ConfigPanel/Form/ConnectedField/PageConnectedField/index.tsx

@@ -3,9 +3,9 @@ import { connect } from "react-redux";
 
 import { getTemplate, isModuleDisabled, slugify, areEqual } from "@ax/helpers";
 import { IRootState } from "@ax/types";
+import { pageEditorActions } from "@ax/containers/PageEditor";
 
 import TemplateManager from "./TemplateManager";
-import { pageEditorActions } from "@ax/containers/PageEditor";
 import Field from "./Field";
 
 const PageConnectedField = (props: any) => {
@@ -61,7 +61,8 @@ const PageConnectedField = (props: any) => {
       objKey === "parent" &&
       isTemplateActivated &&
       templateConfig &&
-      templateConfig.modifiableOnPage === false) ||
+      templateConfig.modifiableOnPage === false &&
+      templateConfig.defaultParent) ||
     isReadOnly;
 
   const defaultParent =
@@ -70,7 +71,7 @@ const PageConnectedField = (props: any) => {
   const hasDefaultIndex = isTemplateActivated && templateConfig && templateConfig.indexDefault !== undefined;
 
   const isFieldReadOnly =
-    (["parent", "slug"].includes(objKey) &&  isPageHome) || parentIsReadOnly;
+    (["parent", "slug"].includes(objKey) &&  isPageHome) || parentIsReadOnly || field.readonly;
 
   const isDisabled =
     (!isGlobal &&

package/src/containers/Sites/actions.tsx

@@ -397,13 +397,11 @@ function publishSite(siteID: number, params?: IGetSitesParams): (dispatch: Dispa
   };
 }
 
-function publishSitesBulk(ids: number[]): (dispatch: Dispatch) => Promise<void> {
+function publishSitesBulk(ids: number[], params?: IGetSitesParams): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       const responseActions = {
-        handleSuccess: () => {
-          getSites()(dispatch);
-        },
+        handleSuccess: () => getSites(params)(dispatch),
         handleError: (response: any) => appActions.handleError(response)(dispatch),
       };
       const callback = async () => sites.publishSiteBulk(ids);
@@ -428,13 +426,11 @@ function unpublishSite(siteID: number, params?: IGetSitesParams): (dispatch: Dis
   };
 }
 
-function unpublishSitesBulk(ids: number[]): (dispatch: Dispatch) => Promise<void> {
+function unpublishSitesBulk(ids: number[], params?: IGetSitesParams): (dispatch: Dispatch) => Promise<void> {
   return async (dispatch) => {
     try {
       const responseActions = {
-        handleSuccess: () => {
-          getSites()(dispatch);
-        },
+        handleSuccess: () => getSites(params)(dispatch),
         handleError: (response: any) => appActions.handleError(response)(dispatch),
       };
       const callback = async () => sites.unpublishSiteBulk(ids);

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

@@ -255,15 +255,14 @@ const SitesList = (props: ISitesListProps): JSX.Element => {
 
   const bulkPublishAction = async (isPublish: boolean) => {
     const { notPublished, published } = selectedItems;
+    const params = getParams();
+
     if (notPublished.length > 0 && isPublish) {
-      publishSitesBulk(notPublished);
+      await publishSitesBulk(notPublished, params);
     }
     if (published.length > 0 && !isPublish) {
-      unpublishSitesBulk(published);
+      await unpublishSitesBulk(published, params);
     }
-
-    const params = getParams();
-    getSites(params);
     unselectAllItems();
   };
 
@@ -383,9 +382,9 @@ const mapStateToProps = (state: IRootState) => ({
 interface IDispatchProps {
   setHistoryPush(path: string, isEditor?: boolean): void;
   saveSettings(form: ISettingsForm): Promise<boolean>;
-  getSites(params: IGetSitesParams): void;
-  publishSitesBulk(ids: number[]): void;
-  unpublishSitesBulk(ids: number[]): void;
+  getSites(params: IGetSitesParams): Promise<void>;
+  publishSitesBulk(ids: number[], params?: IGetSitesParams): Promise<void>;
+  unpublishSitesBulk(ids: number[], params?: IGetSitesParams): Promise<void>;
   setListConfig(config: ISiteListConfig): void;
 }