@griddo/ax 1.73.28 → 1.74.0

package/config/griddo-config/index.js

@@ -8,11 +8,23 @@ const isComponentLibraryEnv = __dirname.includes("node_modules");
 
 const componentsBundlePolyfillPath = path.resolve(__dirname, "./cx-polyfills/componentsBundle.js");
 
-const resolveComponentsPath = (customPath = "") =>
-  isComponentLibraryEnv
+/**
+ * Devuelve la ruta completa del path común entre instancia-components y Griddo monorepo.
+ * @param {string} customPath slug del path común entre instancia y monorepo del que se quiere obtener la ruta.
+ * @returns {string | undefined} la ruta completa si el path existe o de lo contrario undefined.
+ */
+const resolveComponentsPath = (customPath = "") => {
+  const filePath = isComponentLibraryEnv
     ? path.resolve(pkgDir.sync(process.cwd()), customPath)
     : path.resolve(pkgDir.sync(__dirname), "../griddo-components", customPath);
 
+  if (fs.existsSync(filePath)) {
+    return filePath;
+  }
+
+  return undefined;
+};
+
 const resolveBuilderSSRPath = () => {
   const builderSSRPolyfillPath = path.resolve(__dirname, "./cx-polyfills/builder.ssr.js");
   const builderSSRPath = resolveComponentsPath("builder.ssr.js");
@@ -28,6 +40,14 @@ const getComponentsJSConfig = () => {
   return tsConfigPath || jsConfigPath || false;
 };
 
+/**
+ * Devuelve la ruta completa de archivo de configuración de Griddo en la instancia: `griddo.config.js|ts`
+ * @returns {string | undefined} la ruta completa del archivo de configuración
+ */
+const resolveComponentsGriddoConfig = () => {
+  return resolveComponentsPath("griddo.config.js") || resolveComponentsPath("griddo.config.ts");
+};
+
 const getComponentsLibAliases = () => {
   const xsConfig = require(getComponentsJSConfig());
 
@@ -48,7 +68,7 @@ const getComponentsLibAliases = () => {
     {
       components: componentsBundlePolyfillPath,
       __componentsIndex: resolveComponentsPath("src/index.js"),
-      __componentsConfig: resolveComponentsPath("griddo.config.js"),
+      __componentsConfig: resolveComponentsGriddoConfig(),
       __ssrConfig: resolveBuilderSSRPath(),
       __ssrHelpers: path.resolve(__dirname, "./ssrHelpers"),
     }
@@ -103,4 +123,5 @@ module.exports = {
   // projectAliases: mergeComponentsAliases(griddoComponentsLibAliases, griddoAxAliases),
   componentsStaticPath,
   componentsStaticPathExists,
+  resolveComponentsGriddoConfig,
 };

package/config/webpackSchemas.config.js

@@ -18,15 +18,13 @@ const createConfig = ({ input, output }) => ({
   module: {
     rules: [
       {
-        test: /\.m?js$/,
+        test: /\.m?[tj]s$/,
+        resolve: { extensions: [".ts", ".js"] },
         exclude: /(node_modules|bower_components)/,
         use: {
           loader: "babel-loader",
           options: {
-            presets: [
-              ['@babel/preset-env', {targets: {node: 'current'}}],
-              '@babel/preset-typescript'
-            ]
+            presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-typescript"],
           },
         },
       },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@griddo/ax",
   "description": "Griddo Author Experience",
-  "version": "1.73.28",
+  "version": "1.74.0",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -181,6 +181,7 @@
     "jest-styled-components": "^7.0.8",
     "prettier": "^2.3.0",
     "react-test-render": "1.1.2",
+    "react-test-renderer": "^18.2.0",
     "redux-mock-store": "^1.5.4",
     "ts-jest": "^27.1.4"
   },
@@ -228,5 +229,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "26ba8a0083248cbf8ee953aca8a2a3888ab60dfc"
+  "gitHead": "e88b4badd147dea446fe3d489b623837ab0e6f51"
 }

package/scripts/griddo-sync-schemas.js

@@ -8,7 +8,7 @@ const path = require("path");
 const fs = require("fs");
 const compiler = require("../config/webpackSchemas.config");
 
-const { resolveComponentsPath } = require("../config/griddo-config");
+const { resolveComponentsPath, resolveComponentsGriddoConfig } = require("../config/griddo-config");
 
 dotenv.config({ path: findUp.sync(".env") });
 
@@ -21,8 +21,9 @@ const API_DEV_KEY = process.env.developerKey;
 async function main() {
   console.clear();
   const tempFile = "__griddo_config_parsed__.js";
+  const componentsGriddoConfig = resolveComponentsGriddoConfig();
 
-  const inputFile = resolveComponentsPath("griddo.config.js");
+  const inputFile = componentsGriddoConfig;
   const outputFile = `${__dirname}/${tempFile}`;
 
   if (fs.existsSync(outputFile)) {
@@ -35,7 +36,7 @@ async function main() {
     }
 
     await compiler({
-      input: resolveComponentsPath("griddo.config.js"),
+      input: componentsGriddoConfig,
       output: { filename: tempFile, path: __dirname },
     });
 

package/src/__mocks__/axios/SitesList.ts

@@ -0,0 +1,84 @@
+import { structuredDataMock } from "./../store/SitesList";
+
+export const sitesResponse = {
+  data: {
+    totalItems: 22,
+    page: "1",
+    recentSites: [
+      { siteId: 1, lastAccess: "2022-09-12T13:28:31.000Z" },
+      { siteId: 2, lastAccess: "2022-09-09T09:40:49.000Z" },
+    ],
+    allSites: [
+      {
+        id: 1,
+        name: "Site 1",
+        theme: "default-theme",
+        author: 2,
+        pages: [
+          3573, 3619, 3691, 3692, 3693, 3694, 3696, 3697, 3698, 3699, 3700, 3701, 3702, 3703, 3704, 3709, 3710, 3711,
+          3712, 3834, 3835, 3925, 3926, 3954, 3955, 3956, 3958, 3960, 4007, 4008, 4010, 4018, 4073, 4078, 4084, 4109,
+          4125, 4126, 4275,
+        ],
+        published: "2022-02-21T11:00:14.000Z",
+        modified: "2022-08-24T10:53:12.000Z",
+        languageSites: [181, 185],
+        deleted: 0,
+        thumbnail: null,
+        timezone: "Europe/Madrid",
+        favicon: null,
+        hash: null,
+        bigAvatar: "http://images.dev.griddo.io/panorama-8c94a8f3-2dd8-4eb0-a181-97c26cdca93d",
+        smallAvatar: "http://images.dev.griddo.io/rotenmeier-174e689c-8374-4037-8057-096c79f1c54c_1",
+        socials: null,
+        rendering: false,
+        slug: "/clara-site",
+        isPublished: false,
+        renderingHours: 0,
+        shouldBeUpdated: false,
+        updated: true,
+        navigationModules: null,
+        lastAccess: "2022-09-12T13:28:31.000Z",
+        home: "//cx.dev.griddo.io/pre-griddo/clara-site",
+      },
+      {
+        id: 2,
+        name: "Site 2",
+        theme: "default-theme",
+        author: 2,
+        pages: [3654, 3729, 3997, 4014, 4074, 4304],
+        published: "2021-11-03T10:10:17.000Z",
+        modified: "2022-05-23T11:49:42.000Z",
+        languageSites: [144],
+        deleted: 0,
+        thumbnail: "http://images.dev.griddo.io/macbeth-palau-de-les-arts-opera-valencia-5x2-1_1",
+        timezone: "Pacific/Pago_Pago",
+        favicon: "http://images.dev.griddo.io/griddo-site-thumbnail-ec2ab0ba-9424-4424-8f60-222ec746902d_4",
+        hash: "6c301f95-a1e7-412b-823d-2958fd1fbe01",
+        bigAvatar: "http://images.dev.griddo.io/griddo-site-thumbnail-ec2ab0ba-9424-4424-8f60-222ec746902d_6",
+        smallAvatar: "http://images.dev.griddo.io/griddo-site-thumbnail-ec2ab0ba-9424-4424-8f60-222ec746902d_5",
+        socials: { instagram: "instagram demo" },
+        rendering: false,
+        slug: "/demo-site",
+        isPublished: true,
+        renderingHours: 0,
+        shouldBeUpdated: true,
+        updated: false,
+        navigationModules: null,
+        lastAccess: "2022-09-09T09:40:49.000Z",
+        home: "//cx.dev.griddo.io/pre-griddo/demo",
+      },
+    ],
+  },
+  status: 200,
+  statusText: "Ok",
+  headers: {},
+  config: {},
+};
+
+export const structuredDataResponse = {
+  data: structuredDataMock,
+  status: 200,
+  statusText: "Ok",
+  headers: {},
+  config: {},
+};