@griddo/ax 1.65.10 → 1.65.13

package/src/components/Fields/UrlField/utils.tsx

@@ -1,6 +1,58 @@
+import { getSchema } from "@ax/helpers";
 import { IPage, ISelectOption } from "@ax/types";
 
+const findSchemaComponentArrays = (component: string) => {
+  const keys: string[] = [];
+  const schemaTabs = getSchema(component).configTabs;
+  schemaTabs.forEach((tab: any) => {
+    tab.fields.forEach((field: any) => {
+      if (field.type === "ComponentArray") {
+        keys.push(field.key);
+      }
+    });
+  });
+  return keys;
+};
+
+const findAnchorsFromModule = (module: any) => {
+  if (!module) return [];
+  let options: ISelectOption[] = [];
+
+  if (module.anchorID && module.anchorID.trim() !== "") {
+    const option = { value: module.anchorID, label: module.anchorID };
+    options.push(option);
+  }
+
+  const arrayKeys = findSchemaComponentArrays(module.component);
+  if (arrayKeys.length) {
+    arrayKeys.forEach((key: string) => {
+      module[key].forEach((element: any) => {
+        const subOptions = findAnchorsFromModule(element);
+        options = [...options, ...subOptions];
+      });
+    });
+  }
+
+  return options;
+};
+
 const findAnchorsFromPage = (page: IPage): ISelectOption[] => {
+  let options: ISelectOption[] = [];
+  const { template } = page;
+  const sections = Object.keys(template)
+    .map((key: string) => template[key])
+    .filter((value: any) => typeof value === "object" && value !== null && value.component === "Section");
+
+  sections.forEach((section: any) => {
+    section.modules.forEach((module: any) => {
+      const sectionOptions = findAnchorsFromModule(module);
+      options = [...options, ...sectionOptions];
+    });
+  });
+  return options;
+};
+
+const findTabsFromPage = (page: IPage): ISelectOption[] => {
   const options: ISelectOption[] = [];
   const { template } = page;
   const sections = Object.keys(template)
@@ -9,20 +61,10 @@ const findAnchorsFromPage = (page: IPage): ISelectOption[] => {
 
   sections.forEach((section: any) => {
     section.modules.forEach((module: any) => {
-      if (module.anchorID && module.anchorID.trim() !== "") {
-        const option = { value: module.anchorID, label: module.anchorID };
-        options.push(option);
-      }
-      if (module.elements) {
+      if (module.hasGriddoMultiPage && module.elements) {
         module.elements.forEach((element: any) => {
-          element.componentModules &&
-            Array.isArray(element.componentModules) &&
-            element.componentModules.forEach((component: any) => {
-              if (component.anchorID && component.anchorID.trim() !== "") {
-                const option = { value: component.anchorID, label: component.anchorID };
-                options.push(option);
-              }
-            });
+          const option = { value: element.sectionSlug, label: element.title };
+          options.push(option);
         });
       }
     });
@@ -30,4 +72,22 @@ const findAnchorsFromPage = (page: IPage): ISelectOption[] => {
   return options;
 };
 
-export { findAnchorsFromPage };
+const findAnchorsFromTab = (page: IPage, tabSlug: string): ISelectOption[] => {
+  let options: ISelectOption[] = [];
+  const { template } = page;
+  const sections = Object.keys(template)
+    .map((key: string) => template[key])
+    .filter((value: any) => typeof value === "object" && value !== null && value.component === "Section");
+
+  sections.forEach((section: any) => {
+    section.modules.forEach((module: any) => {
+      if (module.hasGriddoMultiPage) {
+        const tab = module.elements.find((elem: any) => elem.sectionSlug === tabSlug);
+        options = findAnchorsFromModule(tab);
+      }
+    });
+  });
+  return options;
+};
+
+export { findAnchorsFromPage, findTabsFromPage, findAnchorsFromTab };

package/src/components/FieldsBehavior/index.tsx

@@ -73,7 +73,7 @@ const FieldsBehavior = (props: any): JSX.Element => {
   };
   return (
     <S.Wrapper error={errorField} className={wrapperClass} showTitle={showTitle} id={objKey}>
-      <S.Content error={errorField}>
+      <S.Content data-testid="contentWrapper" error={errorField}>
         <Field {...props} showAdvanced={showAdvanced} handleValidation={handleValidation} error={errorField} />
       </S.Content>
       <S.Header className="fieldHeader">

package/src/types/index.tsx

@@ -164,6 +164,7 @@ export interface IUrlField {
   noFollow?: boolean;
   anchor?: string;
   title?: string;
+  subSlug?: string;
 }
 
 export interface IHeadingField {
@@ -720,11 +721,11 @@ export interface IDimensionsGroup {
 }
 
 export interface ITemplate {
-  dataPacks: string[],
-  id: string,
-  thumbnails: Record<string, string>,
-  title: string,
-  type: { label: string, value: string, mode: string },
+  dataPacks: string[];
+  id: string;
+  thumbnails: Record<string, string>;
+  title: string;
+  type: { label: string; value: string; mode: string };
 }
 
 export type Field =