@griddo/ax 1.75.231 → 1.75.233

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.75.231",
+  "version": "1.75.233",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -36,8 +36,7 @@
     "test:dev:coverage": "npm run test:coverage -- --watch",
     "lint": "eslint .",
     "format": "prettier -w .",
-    "start:test": "env-cmd -f env/.env.development node scripts/dev.js",
-    "cypress:open": "cypress open"
+    "start:test": "env-cmd -f env/.env.development node scripts/dev.js"
   },
   "dependencies": {
     "@atlaskit/tree": "^8.2.0",
@@ -50,7 +49,6 @@
     "@testing-library/react": "^13.0.0",
     "@testing-library/user-event": "^14.0.4",
     "@types/compress.js": "^1.1.0",
-    "@types/cypress": "^1.1.3",
     "@types/draft-js": "^0.10.44",
     "@types/lodash.isequal": "^4.5.5",
     "@types/markdown-draft-js": "^2.2.2",
@@ -84,7 +82,6 @@
     "connected-react-router": "^6.9.2",
     "css-loader": "^4.3.0",
     "css-minimizer-webpack-plugin": "3.0.2",
-    "cypress-iframe": "^1.0.1",
     "date-fns": "^2.21.3",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
@@ -169,12 +166,10 @@
     "@types/jest": "^27.4.1",
     "@types/redux-mock-store": "^1.0.3",
     "babel-jest": "^27.5.1",
-    "cypress": "^12.3.0",
     "eslint": "^6.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-react-app": "^5.0.2",
     "eslint-loader": "^4.0.2",
-    "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-flowtype": "^5.7.2",
     "eslint-plugin-import": "^2.23.4",
     "eslint-plugin-jsx-a11y": "6.2.3",
@@ -235,5 +230,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "48ced14dbfe0a94cd6bad63ecf0242d48360690b"
+  "gitHead": "0c4bf25fd3bc162c209e0f5eb641d82c7d10e99e"
 }

package/src/api/structuredData.tsx

@@ -120,7 +120,6 @@ const getDataContents = (params: IGetStructuredDataParams, siteID?: number | nul
     filterQuery,
     relatedFields = false,
     order,
-    lang,
   } = params;
 
   const url = siteID ? `${host}/site/${siteID}${endpoint}` : `${host}${endpoint}`;
@@ -131,11 +130,7 @@ const getDataContents = (params: IGetStructuredDataParams, siteID?: number | nul
   if (order) SERVICES.GET_DATA_CONTENTS.dynamicUrl += `&order=${order}`;
   if (filterQuery) SERVICES.GET_DATA_CONTENTS.dynamicUrl += filterQuery;
 
-  const dataHeader = {
-    ...(lang && { lang }),
-  };
-
-  return sendRequest(SERVICES.GET_DATA_CONTENTS, null, dataHeader);
+  return sendRequest(SERVICES.GET_DATA_CONTENTS, null);
 };
 
 const createDataContent = (data: any) => {

package/src/containers/StructuredData/actions.tsx

@@ -292,7 +292,7 @@ function getTranslatedCategory(
           const { content } = response;
           dispatch(
             setCategory({
-              id: response.data.id,
+              id: response.id,
               name: content.title,
               code: content.code,
               lang,

package/src/modules/Categories/CategoriesList/CategoryItem/index.tsx

@@ -117,9 +117,7 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
   );
 
   const translations = isTranslatable ? (
-    <FloatingMenu Button={FlagsButton}>
-      {languageMenu()}
-    </FloatingMenu>
+    <FloatingMenu Button={FlagsButton}>{languageMenu()}</FloatingMenu>
   ) : (
     "Not translatable"
   );
@@ -141,7 +139,7 @@ const CategoryItem = (props: ICategoryItemProps): JSX.Element => {
           <S.StyledActionMenu icon="more" options={menuOptions} tooltip="Actions" />
         </S.ActionsCell>
       </S.CategoryRow>
-      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} item={category} getContents={getContents}/>
+      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} item={category} getContents={getContents} />
     </>
   );
 };

package/src/modules/Categories/CategoriesList/CategoryNav/NavItem/index.tsx

@@ -9,7 +9,11 @@ import * as S from "./style";
 const NavItem = (props: IProps): JSX.Element => {
   const { current, categories, dataPack, onClick, isFirst } = props;
 
-  const [isOpen, setIsOpen] = useState(isFirst);
+  const initialState = current
+    ? categories.map((category: IStructuredData) => category.id).includes(current.id)
+    : isFirst;
+
+  const [isOpen, setIsOpen] = useState(initialState);
 
   const toggleOpen = () => setIsOpen(!isOpen);
 
@@ -25,16 +29,14 @@ const NavItem = (props: IProps): JSX.Element => {
       </S.NavLink>
       <S.Dropdown isOpen={isOpen}>
         {categories &&
-          categories.map((category: IStructuredData, key: number) => {
+          categories.map((category: IStructuredData) => {
             const isSelected = !!current && category.id === current.id;
             const selectedClass = isSelected ? "selected" : "";
             const handleClick = () => onClick(category.id);
             return (
-              <MenuItem key={key} onClick={handleClick}>
+              <MenuItem key={category.id} onClick={handleClick}>
                 <NavLink to="#" className={selectedClass}>
-                  <S.Link active={isSelected}>
-                    {category.title}
-                  </S.Link>
+                  <S.Link active={isSelected}>{category.title}</S.Link>
                 </NavLink>
               </MenuItem>
             );

package/src/modules/Categories/CategoriesList/CategoryNav/index.tsx

@@ -2,10 +2,11 @@ import React from "react";
 
 import { IDataPack, IStructuredData } from "@ax/types";
 import { SubNav } from "@ax/components";
+import { sortBy } from "@ax/helpers";
 import NavItem from "./NavItem";
 
 const CategoryNav = (props: IProps): JSX.Element => {
-  const { current, categories, onClick, dataPacks } = props;
+  const { current, categories, onClick, dataPacks, setSelectedCategory, scope } = props;
 
   return (
     <SubNav>
@@ -14,12 +15,17 @@ const CategoryNav = (props: IProps): JSX.Element => {
           const dataPackCategories = categories.filter((cat: IStructuredData) => cat.dataPacks.includes(dataPack.id));
           const hasCategories = dataPackCategories.length > 0;
           if (hasCategories) {
+            const isFirst = result.length === 0;
+            const orderedCategories = dataPackCategories.sort(sortBy("title", false));
+            if (isFirst && !current) {
+              setSelectedCategory(orderedCategories[0].id, scope);
+            }
             result.push(
               <NavItem
                 key={dataPack.title}
-                isFirst={result.length === 0}
+                isFirst={isFirst}
                 dataPack={dataPack}
-                categories={dataPackCategories}
+                categories={orderedCategories}
                 current={current}
                 onClick={onClick}
               />
@@ -36,6 +42,8 @@ interface IProps {
   categories: IStructuredData[];
   onClick(id: string): void;
   dataPacks: IDataPack[];
+  setSelectedCategory(id: string, scope: string): void;
+  scope: string;
 }
 
 export default CategoryNav;

package/src/modules/Categories/CategoriesList/index.tsx

@@ -45,7 +45,6 @@ const CategoriesList = (props: IProps): JSX.Element => {
   const scope = currentSiteID ? "site" : "global";
   const currentCategories =
     scope === "site" ? getFilteredStructuredData(activatedDataPacks, categories[scope]) : categories[scope];
-  const firstCategoryID = currentCategories[0] ? currentCategories[0].id : null;
 
   const catIds = currentDataContent && currentDataContent.map((cat: any) => cat.id);
 
@@ -63,12 +62,11 @@ const CategoriesList = (props: IProps): JSX.Element => {
     return {
       page,
       itemsPerPage,
-      lang: lang.locale,
       pagination: true,
       deleted: false,
       include_draft: false,
     };
-  }, [lang.locale, page]);
+  }, [page]);
 
   const getContents = useCallback(
     (id: string) => {
@@ -81,11 +79,12 @@ const CategoriesList = (props: IProps): JSX.Element => {
   );
 
   useEffect(() => {
-    getContents(firstCategoryID);
-  }, [firstCategoryID, getContents]);
+    currentStructuredData && getContents(currentStructuredData.id);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lang, currentStructuredData]);
 
   const handleClick = (dataID: string) => {
-    getContents(dataID);
+    setSelectedCategory(dataID, scope);
   };
 
   const { isOpen, toggleModal } = useModal();
@@ -181,6 +180,8 @@ const CategoriesList = (props: IProps): JSX.Element => {
           categories={currentCategories}
           onClick={handleClick}
           dataPacks={activatedDataPacks}
+          setSelectedCategory={setSelectedCategory}
+          scope={scope}
         />
         <S.TableWrapper>
           <ErrorToast />
@@ -217,7 +218,7 @@ const CategoriesList = (props: IProps): JSX.Element => {
           </TableList>
         </S.TableWrapper>
       </S.CategoryListWrapper>
-      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} getContents={getContents}/>
+      <CategoryPanel isOpen={isOpen} toggleModal={toggleModal} getContents={getContents} />
       {isVisible && <Toast {...toastProps} />}
     </MainWrapper>
   );

package/src/modules/StructuredData/StructuredDataList/index.tsx

@@ -497,7 +497,8 @@ const StructuredDataList = (props: IProps): JSX.Element => {
     values: getOptionValues(structuredData),
   };
 
-  const notEditableText = "This content comes from an external source. You can not edit it or create a new one.";
+  const notEditableText =
+    "Sorry, this content cannot be edited because it comes from an external source or belongs to a preconfigured system.";
 
   const languageProps = {
     globalLangs: isAllPages || isDataTranslatable ? globalLangs : null,