@griddo/ax 10.6.1 → 10.6.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "10.6.1",
+  "version": "10.6.2",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -232,5 +232,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7c09ff5f84d88f828072c1e328345173f2cdf992"
+  "gitHead": "ef432960c88ef815e7c788be85c61955f717b6c4"
 }

package/src/components/SideModal/SideModalOption/index.tsx

@@ -24,7 +24,7 @@ const SideModalOption = (props: IProps) => {
   const label = isNavigationDefault ? option.title : getDisplayName(optionParam);
 
   const setOption = () => {
-    if(handleClick) {
+    if (handleClick) {
       handleClick(option);
       toggleModal();
     }

package/src/components/SideModal/index.tsx

@@ -92,8 +92,8 @@ const SideModal = (props: ISideModalProps): JSX.Element | null => {
     const selectedClass = isSelected ? "selected" : "";
 
     return (
-      <MenuItem key={`${value}${i}`} className={selectedClass}>
-        <S.NavLink onClick={filterOptions} data-testid="side-modal-nav-link">
+      <MenuItem key={`${value}${i}`} className={selectedClass} onClick={filterOptions}>
+        <S.NavLink data-testid="side-modal-nav-link">
           <S.Link data-testid="side-modal-link" active={isSelected}>
             {label}
           </S.Link>

package/src/modules/Content/OptionTable/index.tsx

@@ -40,7 +40,11 @@ const OptionTable = (props: IOptionTableProps): JSX.Element => {
     });
   };
 
-  const currentType = currentStructuredData ? currentStructuredData.dataPacks[0] : "basics";
+  const currentType = currentStructuredData
+    ? currentStructuredData.dataPacks[0]
+    : filters.length
+    ? filters[0].value
+    : "";
 
   const initialState: IOptionTableStore = {
     columnValues: filterOptions(currentType, "type"),
@@ -125,10 +129,17 @@ const OptionTable = (props: IOptionTableProps): JSX.Element => {
     });
 
     setValues(filteredOptionsByDataPack);
-    const selectedTemplate =
+
+    const currentStructuredDataTemplate: string | undefined =
       currentStructuredData && currentStructuredData.schema.templates
         ? currentStructuredData.schema.templates[0]
-        : selectedValue;
+        : undefined;
+
+    const selectedTemplate =
+      filteredOptionsByDataPack.find((opt) => opt.value === currentStructuredDataTemplate)?.value ||
+      filteredOptionsByDataPack[0]?.value ||
+      "";
+
     selectOption(selectedTemplate, filteredOptionsByDataPack);
   };
 

package/src/modules/Content/utils.tsx

@@ -4,34 +4,38 @@ import { pageStatus } from "@ax/containers/PageEditor/interfaces";
 import { IDataPack, IPage, IStructuredData } from "@ax/types";
 
 const getTemplatesFilters = (activatedDataPacks: IDataPack[]) => {
-  const filters: { label: string; value: string; mode: string }[] = [];
   const activatedDataPacksIds = getActivatedDataPacksIds(activatedDataPacks);
   const { templates } = schemas;
 
-  Object.keys(templates).forEach((schema: any) => {
-    const { type, dataPacks } = templates[schema];
-    const isActivated = !dataPacks || activatedDataPacksIds.some((id: string) => dataPacks.indexOf(id) >= 0);
-
-    if (isActivated) {
-      !dataPacks
-        ? filters.push({ ...type })
-        : dataPacks.forEach((dataPack: string) => {
-            const currentDataPack = activatedDataPacks.find(
-              (activatedDataPack: IDataPack) => dataPack === activatedDataPack.id
-            );
-
-            if (currentDataPack) {
-              filters.push({
-                label: currentDataPack?.title,
-                value: currentDataPack?.id,
-                mode: type.mode,
-              });
-            }
-          });
-    }
-  });
+  const filters: { label: string; value: string; mode?: string }[] = Object.keys(templates)
+    .filter((templateName: string) => !templates[templateName].dataPacks)
+    .map((templateName: string) => templates[templateName].type);
+
+  Object.keys(templates)
+    .filter((templateName: string) => Array.isArray(templates[templateName].dataPacks))
+    .forEach((templateName: string) => {
+      const { type, dataPacks } = templates[templateName];
+      const isActivated = activatedDataPacksIds.some((id: string) => dataPacks.indexOf(id) >= 0);
+
+      if (isActivated) {
+        dataPacks.forEach((dataPack: string) => {
+          const currentDataPack = activatedDataPacks.find(
+            (activatedDataPack: IDataPack) => dataPack === activatedDataPack.id
+          );
+
+          if (currentDataPack) {
+            filters.push({
+              label: currentDataPack?.title,
+              value: currentDataPack?.id,
+              mode: type.mode,
+            });
+          }
+        });
+      }
+    });
 
   const uniqueFilters: { label: string; value: string; mode: string }[] = filterDuplicatedValues(filters);
+
   return uniqueFilters;
 };
 
@@ -103,9 +107,6 @@ const getOptionFilters = (options: IStructuredData[], activatedDataPacks: IDataP
   const filters = [...templateFilters, ...mappedOptions];
   const uniqueFilters = [...new Map(filters.map((item: any) => [item.value, item])).values()];
   const sortedUniqueFilters = uniqueFilters.sort((a, b) => a.label.localeCompare(b.label));
-  const staticFilterIdx = sortedUniqueFilters.findIndex((filter) => filter.value === "static");
-  const staticFilter = sortedUniqueFilters.splice(staticFilterIdx, 1);
-  sortedUniqueFilters.unshift(...staticFilter);
   return sortedUniqueFilters;
 };