@griddo/ax 1.63.5 → 1.64.2

package/config/griddo-config/cx-polyfills/builder.ssr.js

@@ -0,0 +1,6 @@
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const onRenderBody = () => {};
+
+export default {
+  onRenderBody,
+};

package/config/griddo-config/cx-polyfills/componentsBundle.js

@@ -0,0 +1,4 @@
+export * from "__componentsConfig";
+export * from "__componentsIndex";
+export { default as builderSSR } from "__ssrConfig";
+export * as ssrHelpers from "__ssrHelpers";

package/config/{griddo-config.js → griddo-config/index.js}

@@ -1,3 +1,4 @@
+const fs = require("fs");
 const path = require("path");
 const findUp = require("find-up");
 
@@ -5,11 +6,21 @@ const pkgDir = require("pkg-dir");
 
 const isComponentLibraryEnv = __dirname.includes("node_modules");
 
+const componentsBundlePolyfillPath = path.resolve(__dirname, "./cx-polyfills/componentsBundle.js");
+
 const resolveComponentsPath = (customPath = "") =>
   isComponentLibraryEnv
     ? path.resolve(pkgDir.sync(process.cwd()), customPath)
     : path.resolve(pkgDir.sync(__dirname), "../griddo-components", customPath);
 
+const resolveBuilderSSRPath = () => {
+  const builderSSRPolyfillPath = path.resolve(__dirname, "./cx-polyfills/builder.ssr.js");
+  const builderSSRPath = resolveComponentsPath("builder.ssr.js");
+  const builderSSRPathExists = fs.existsSync(builderSSRPath);
+
+  return builderSSRPathExists ? builderSSRPath : builderSSRPolyfillPath;
+};
+
 const getComponentsJSConfig = () => {
   const jsConfigPath = findUp.sync("jsconfig.json", { cwd: resolveComponentsPath() });
   const tsConfigPath = findUp.sync("tsconfig.json", { cwd: resolveComponentsPath() });
@@ -34,24 +45,28 @@ const getComponentsLibAliases = () => {
         [aliasKey]: absolutePath,
       };
     },
-    { components: `${resolveComponentsPath()}/src/index.js` }
+    {
+      components: componentsBundlePolyfillPath,
+      __componentsIndex: resolveComponentsPath("src/index.js"),
+      __componentsConfig: resolveComponentsPath("griddo.config.js"),
+      __ssrConfig: resolveBuilderSSRPath(),
+      __ssrHelpers: path.resolve(__dirname, "./ssrHelpers"),
+    }
   );
 };
 
-// TODO: Separar los imports de components de los de AX
 const griddoAxAliases = {
-  "@ax/api": path.resolve(__dirname, "../src/api/"),
-  "@ax/components": path.resolve(__dirname, "../src/components"),
-  "@ax/containers": path.resolve(__dirname, "../src/containers"),
-  "@ax/forms": path.resolve(__dirname, "../src/forms"),
-  "@ax/guards": path.resolve(__dirname, "../src/guards"),
-  "@ax/helpers": path.resolve(__dirname, "../src/helpers/"),
-  "@ax/hooks": path.resolve(__dirname, "../src/hooks/"),
-  "@ax/modules": path.resolve(__dirname, "../src/modules"),
-  "@ax/routes": path.resolve(__dirname, "../src/routes"),
-  "@ax/types": path.resolve(__dirname, "../src/types"),
-  "@ax/schemas": path.resolve(__dirname, "../src/schemas"),
-  ...getComponentsLibAliases(),
+  "@ax/api": path.resolve(__dirname, "../../src/api/"),
+  "@ax/components": path.resolve(__dirname, "../../src/components"),
+  "@ax/containers": path.resolve(__dirname, "../../src/containers"),
+  "@ax/forms": path.resolve(__dirname, "../../src/forms"),
+  "@ax/guards": path.resolve(__dirname, "../../src/guards"),
+  "@ax/helpers": path.resolve(__dirname, "../../src/helpers/"),
+  "@ax/hooks": path.resolve(__dirname, "../../src/hooks/"),
+  "@ax/modules": path.resolve(__dirname, "../../src/modules"),
+  "@ax/routes": path.resolve(__dirname, "../../src/routes"),
+  "@ax/types": path.resolve(__dirname, "../../src/types"),
+  "@ax/schemas": path.resolve(__dirname, "../../src/schemas"),
 };
 
 const griddoComponentsLibAliases = getComponentsLibAliases();
@@ -70,6 +85,10 @@ const mergeComponentsAliases = (...arrs) => {
   return merged;
 };
 
+/* Components Static Paths */
+const componentsStaticPath = resolveComponentsPath("static");
+const componentsStaticPathExists = fs.existsSync(componentsStaticPath);
+
 module.exports = {
   isComponentLibraryEnv,
   componentsPath: resolveComponentsPath(),
@@ -80,6 +99,8 @@ module.exports = {
   griddoAxAliases,
   thereAreAliasConflicts,
   mergeComponentsAliases,
-  projectAliases: griddoAxAliases,
+  projectAliases: { ...griddoAxAliases, ...griddoComponentsLibAliases },
   // projectAliases: mergeComponentsAliases(griddoComponentsLibAliases, griddoAxAliases),
+  componentsStaticPath,
+  componentsStaticPathExists,
 };

package/config/griddo-config/ssrHelpers.js

@@ -0,0 +1,47 @@
+/* eslint-disable @typescript-eslint/no-empty-function */
+
+export const setHeadComponents = (props) => {
+  const headKeyIdentifier = "data-head-component";
+  const headValueIdentifier = "griddo-instance-head-component";
+  const headElementsIdentifier = `[${headKeyIdentifier}="${headValueIdentifier}"]`;
+
+  [...document.querySelectorAll(headElementsIdentifier)].map((e) => e.remove());
+
+  props.map((tag) => {
+    const element = document.createElement(tag.type);
+    element.setAttribute(headKeyIdentifier, headValueIdentifier);
+
+    Object.keys(tag.props).map((attKey) => {
+      if (attKey === "dangerouslySetInnerHTML") {
+        return (element.innerHTML = tag.props.dangerouslySetInnerHTML.__html);
+      }
+      return element.setAttribute(attKey, tag.props[attKey]);
+    });
+
+    document.head.appendChild(element);
+  });
+
+  return props;
+};
+
+export const setHtmlAttributes = (props) => {
+  return props;
+};
+
+export const setBodyAttributes = (props) => {
+  return props;
+};
+
+export const setPreBodyComponents = (props) => {
+  return props;
+};
+
+export const setPostBodyComponents = (props) => {
+  return props;
+};
+
+export const setBodyProps = (props) => {
+  return props;
+};
+
+export const pathname = "ax-editor";

package/config/jest/componentsMock.js

@@ -0,0 +1,29 @@
+module.exports = {
+    schemas: {key: 'schema definition'},
+    parseTheme: theme => {
+        const color = "#000";
+        const gradient = "#000";
+        const shadow = "#000";
+        const mq = "#000";
+        const textStyle = "#000";
+        const breakpoints = "#000";
+        const fontFamily = "#000";
+      
+        const returnObject = {
+          ...theme,
+          fontFamily,
+          color,
+          colors: color,
+          gradient,
+          shadow,
+          mq,
+          textStyle,
+          breakpoints,
+          fontSizes: "#000",
+          negateSpacing: "#000",
+          halfSpacing: "#000",
+          negateHalfSpacing: "#000",
+        };
+        return returnObject;
+    }
+};

package/config/jest/fileMock.js

@@ -0,0 +1 @@
+module.exports = 'test-file-stub'

package/config/jest/setup.js

@@ -0,0 +1,5 @@
+require('babel-plugin-require-context-hook/register')()
+
+module.exports = () =>{
+    global.IS_REACT_ACT_ENVIRONMENT = true;
+}

package/config/jest/styleMock.js

@@ -0,0 +1 @@
+module.exports = {};

package/config/jest/test-utils.js

@@ -0,0 +1,17 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { Provider } from 'react-redux';
+
+// custom render that includes redux provider
+const customRender = (ui, {store, ...renderOptions} = {}) => {
+    const wrapper = ({children}) => {
+        return <Provider store={store}>{children}</Provider>
+    }
+
+    return render(ui, { wrapper: wrapper, ...renderOptions})
+}
+
+// re-export everything
+export * from '@testing-library/react';
+// override render method
+export { customRender as render }

package/config/paths.js

@@ -1,8 +1,9 @@
 const path = require("path");
-const fs = require("fs");
+const fs = require("fs-extra");
 const getPublicUrlOrPath = require("react-dev-utils/getPublicUrlOrPath");
+const chalk = require("react-dev-utils/chalk");
 
-const { resolveComponentsPath } = require("./griddo-config");
+const { resolveComponentsPath, componentsStaticPath, componentsStaticPathExists } = require("./griddo-config");
 
 // Make sure any symlinks in the project folder are resolved:
 // https://github.com/facebook/create-react-app/issues/637
@@ -48,12 +49,38 @@ const resolveModule = (resolveFn, filePath) => {
   return resolveFn(`${filePath}.js`);
 };
 
+/* Static & Public Folder */
+const appPublic = resolveApp("public");
+const appHtml = resolveApp("public/index.html");
+const appWebpackCache = resolveApp("node_modules/.cache");
+const appStaticAssetsCache = componentsStaticPathExists ? path.resolve(appWebpackCache, "axStatic") : appPublic;
+
+function prepareAssetsFolders() {
+  if (!componentsStaticPathExists) return;
+
+  console.log();
+  console.log(chalk.yellow(`Building Static Assets cache`));
+  console.log(componentsStaticPath);
+  console.log(appStaticAssetsCache);
+  console.log();
+
+  fs.mkdirpSync(appStaticAssetsCache);
+
+  fs.copySync(componentsStaticPath, appStaticAssetsCache, {
+    dereference: true,
+  });
+  fs.copySync(appPublic, appStaticAssetsCache, {
+    dereference: true,
+    filter: (file) => file !== appHtml,
+  });
+}
+
 module.exports = {
   dotenv: resolveApp(".env"),
   appPath: resolveApp("."),
   appBuild: path.resolve(process.cwd(), buildPath),
-  appPublic: resolveApp("public"),
-  appHtml: resolveApp("public/index.html"),
+  appPublic,
+  appHtml,
   appIndexJs: resolveModule(resolveApp, "src/index"),
   appPackageJson: resolveApp("package.json"),
   appSrc: resolveApp("src"),
@@ -64,10 +91,14 @@ module.exports = {
   testsSetup: resolveModule(resolveApp, "src/setupTests"),
   proxySetup: resolveApp("src/setupProxy.js"),
   appNodeModules: resolveApp("node_modules"),
-  appWebpackCache: resolveApp("node_modules/.cache"),
+  appWebpackCache,
   appTsBuildInfoFile: resolveApp("node_modules/.cache/tsconfig.tsbuildinfo"),
   swSrc: resolveModule(resolveApp, "src/service-worker"),
   publicUrlOrPath,
+  componentsStaticPath,
+  componentsStaticPathExists,
+  appStaticAssetsCache,
+  prepareAssetsFolders,
 };
 
 module.exports.moduleFileExtensions = moduleFileExtensions;

package/config/webpack.config.js

@@ -407,7 +407,7 @@ module.exports = function (webpackEnv) {
               exclude: /@babel(?:\/|\\{1,2})runtime/,
               loader: require.resolve("babel-loader"),
               options: {
-                babelrc: false,
+                babelrc: true,
                 configFile: false,
                 compact: false,
                 presets: [[require.resolve("babel-preset-react-app/dependencies"), { helpers: true }]],

package/config/webpackDevServer.config.js

@@ -13,6 +13,9 @@ const sockPath = process.env.WDS_SOCKET_PATH; // default: '/sockjs-node'
 const sockPort = process.env.WDS_SOCKET_PORT;
 
 module.exports = function (proxy, allowedHost) {
+  // Merge `public` and `static` paths for development
+  paths.prepareAssetsFolders();
+
   return {
     // WebpackDevServer 2.4.3 introduced a security fix that prevents remote
     // websites from potentially accessing local content through DNS rebinding:
@@ -50,7 +53,7 @@ module.exports = function (proxy, allowedHost) {
     // for files like `favicon.ico`, `manifest.json`, and libraries that are
     // for some reason broken when imported through webpack. If you just want to
     // use an image, put it in `src` and `import` it from JavaScript instead.
-    contentBase: paths.appPublic,
+    contentBase: paths.appStaticAssetsCache,
     contentBasePublicPath: paths.publicUrlOrPath,
     // By default files from `contentBase` will not trigger a page reload.
     watchContentBase: true,

package/config/webpackSchemas.config.js

@@ -23,7 +23,10 @@ const createConfig = ({ input, output }) => ({
         use: {
           loader: "babel-loader",
           options: {
-            presets: ["@babel/preset-env"],
+            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.63.5",
+  "version": "1.64.2",
   "authors": [
     "Álvaro Sánchez' <alvaro.sanches@secuoyas.com>",
     "Carlos Torres <carlos.torres@secuoyas.com>",
@@ -28,23 +28,28 @@
     "build": "node scripts/build.js",
     "build:dev": "env-cmd -f env/.env.development node scripts/build.js",
     "build:bitbucket": "env-cmd -f env/.env npm run build",
-    "test": "node scripts/test.js",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:ci": "jest --runInBand",
+    "test:coverage": "jest --coverage ",
+    "test:dev": "npm run test -- --watch",
+    "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"
   },
   "dependencies": {
     "@atlaskit/tree": "^8.2.0",
-    "@babel/core": "7.14.2",
-    "@babel/preset-env": "^7.14.5",
     "@babel/preset-react": "^7.14.5",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.0-rc.0",
     "@styled-system/prop-types": "5.1.2",
     "@styled-system/theme-get": "^5.1.2",
     "@svgr/webpack": "^5.5.0",
+    "@testing-library/jest-dom": "^5.16.4",
+    "@testing-library/react": "^13.0.0",
+    "@testing-library/user-event": "^14.0.4",
     "@types/compress.js": "^1.1.0",
     "@types/draft-js": "^0.10.44",
-    "@types/jest": "24.0.19",
     "@types/lodash.isequal": "^4.5.5",
     "@types/markdown-draft-js": "^2.2.2",
     "@types/node": "12.11.1",
@@ -55,7 +60,7 @@
     "@types/react-redux": "^7.1.23",
     "@types/react-router-dom": "5.3.3",
     "@types/react-select": "^3.0.8",
-    "@types/react-test-renderer": "16.9.1",
+    "@types/react-test-renderer": "17.0.1",
     "@types/react-textarea-autosize": "^4.3.5",
     "@types/styled-components": "^5.1.25",
     "@types/uuid": "^8.3.1",
@@ -65,9 +70,9 @@
     "add": "^2.0.6",
     "axios": "0.19.0",
     "babel-eslint": "10.0.3",
-    "babel-jest": "^26.6.0",
     "babel-loader": "8.2.2",
     "babel-plugin-named-asset-import": "^0.3.7",
+    "babel-plugin-require-context-hook": "^1.0.0",
     "babel-plugin-root-import": "^6.4.1",
     "babel-plugin-styled-components": "^1.13.2",
     "babel-preset-react-app": "^10.0.0",
@@ -92,10 +97,12 @@
     "identity-obj-proxy": "3.0.0",
     "ignore-loader": "^0.1.2",
     "is-wsl": "^1.1.0",
-    "jest": "24.9.0",
+    "jest-environment-jsdom": "^27.5.1",
     "jest-environment-jsdom-fourteen": "0.1.0",
     "jest-resolve": "24.9.0",
     "jest-watch-typeahead": "0.4.0",
+    "jsdom": "^19.0.0",
+    "jsdom-global": "^3.0.2",
     "lodash.isequal": "4.5.0",
     "markdown-draft-js": "^2.2.1",
     "mini-css-extract-plugin": "0.11.3",
@@ -148,6 +155,11 @@
     "yarn": "^1.22.11"
   },
   "devDependencies": {
+    "@babel/core": "^7.17.7",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/preset-typescript": "^7.16.7",
+    "@types/jest": "^27.4.1",
+    "babel-jest": "^27.5.1",
     "eslint": "^6.1.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-react-app": "^5.0.2",
@@ -158,8 +170,11 @@
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-react": "7.14.3",
     "eslint-plugin-react-hooks": "^4.2.0",
+    "jest": "^27.5.1",
+    "jest-styled-components": "^7.0.8",
     "prettier": "^2.3.0",
-    "react-test-render": "1.1.2"
+    "react-test-render": "1.1.2",
+    "ts-jest": "^27.1.4"
   },
   "resolutions": {
     "react-error-overlay": "6.0.9"
@@ -168,7 +183,14 @@
     "presets": [
       "react-app",
       "@babel/preset-react"
-    ]
+    ],
+    "env": {
+      "test": {
+        "plugins": [
+          "require-context-hook"
+        ]
+      }
+    }
   },
   "browserslist": {
     "production": [
@@ -191,54 +213,6 @@
     "tsconfig.json",
     "tsconfig.paths.json"
   ],
-  "jest": {
-    "roots": [
-      "<rootDir>/src"
-    ],
-    "collectCoverageFrom": [
-      "src/**/*.{js,jsx,ts,tsx}",
-      "!src/**/*.d.ts"
-    ],
-    "setupFiles": [
-      "react-app-polyfill/jsdom"
-    ],
-    "setupFilesAfterEnv": [],
-    "testMatch": [
-      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
-      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
-    ],
-    "testEnvironment": "jest-environment-jsdom-fourteen",
-    "transform": {
-      "^.+\\.(js|jsx|ts|tsx)$": "<rootDir>/node_modules/babel-jest",
-      "^.+\\.css$": "<rootDir>/config/jest/cssTransform.js",
-      "^(?!.*\\.(js|jsx|ts|tsx|css|json)$)": "<rootDir>/config/jest/fileTransform.js"
-    },
-    "transformIgnorePatterns": [
-      "[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$",
-      "^.+\\.module\\.(css|sass|scss)$"
-    ],
-    "modulePaths": [],
-    "moduleNameMapper": {
-      "^react-native$": "react-native-web",
-      "^.+\\.module\\.(css|sass|scss)$": "identity-obj-proxy"
-    },
-    "moduleFileExtensions": [
-      "web.js",
-      "js",
-      "web.ts",
-      "ts",
-      "web.tsx",
-      "tsx",
-      "json",
-      "web.jsx",
-      "jsx",
-      "node"
-    ],
-    "watchPlugins": [
-      "jest-watch-typeahead/filename",
-      "jest-watch-typeahead/testname"
-    ]
-  },
   "peerDependencies": {
     "react": "*",
     "react-dom": "*"
@@ -246,5 +220,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "af01aecc628fe1ec952cc63f21e8f576c090b053"
+  "gitHead": "5db7cf23a29ddbaefa77db1dd1be23a1035d16d3"
 }

package/scripts/build.js

@@ -47,6 +47,8 @@ const config = configFactory("production");
 // browserslist defaults.
 const { checkBrowsers } = require("react-dev-utils/browsersHelper");
 const pkgDir = require("pkg-dir");
+const { prepareAssetsFolders } = require("../config/paths");
+
 checkBrowsers(paths.appPath, isInteractive)
   .then(() => {
     // First, read the current file sizes in build directory.
@@ -58,7 +60,7 @@ checkBrowsers(paths.appPath, isInteractive)
     // if you're in it, you don't end up in Trash
     fs.emptyDirSync(paths.appBuild);
     // Merge with the public folder
-    copyPublicFolder();
+    copyStaticAssets();
     // Start the webpack build
     return build(previousFileSizes);
   })
@@ -159,8 +161,13 @@ function build(previousFileSizes) {
   });
 }
 
+function copyStaticAssets() {
+  prepareAssetsFolders();
+  copyPublicFolder();
+}
+
 function copyPublicFolder() {
-  fs.copySync(paths.appPublic, paths.appBuild, {
+  fs.copySync(paths.appStaticAssetsCache, paths.appBuild, {
     dereference: true,
     filter: (file) => file !== paths.appHtml,
   });

package/src/__mocks__/reducers/analyticsState.tsx

@@ -0,0 +1,14 @@
+const initialState = {
+  scriptCode: "",
+  siteScriptCodeExists: false,
+  dimensions: [{ name: "", values: "" }],
+  groups: [{ templates: "", name: "", dimensions: "" }],
+};
+
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export default (state = initialState, action: { type: unknown }) => {
+  switch (action.type) {
+    default:
+      return state;
+  }
+};

package/src/__mocks__/reducers/pageEditor.tsx

@@ -0,0 +1,30 @@
+import { PageEditorActionsCreators } from "../../containers/PageEditor/interfaces";
+
+const initialState = {
+  editorContent: {},
+  template: "BasicTemplate",
+  breadcrumb: [],
+  schema: {},
+  selectedContent: {},
+  tab: "content",
+  selectedEditorID: 0,
+  currentPageID: null,
+  currentPageStatus: null,
+  currentPageName: "",
+  currentPageLanguages: [],
+  isNewTranslation: false,
+  templateConfig: {},
+  selectedParent: null,
+  errors: [],
+  validated: false,
+  sitePageID: null,
+  userEditing: null,
+};
+
+// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+export default (state = initialState, action: { type: PageEditorActionsCreators }) => {
+  switch (action.type) {
+    default:
+      return state;
+  }
+};

package/src/api/sites.tsx

@@ -84,6 +84,11 @@ const SERVICES: { [key: string]: IServiceConfig } = {
     endpoint: ["/site/", "/pages/global/imports/bulk"],
     method: "POST",
   },
+  REMOVE_USERS_BULK: {
+    ...template,
+    endpoint: ["/site/", "/restrict"],
+    method: "PUT",
+  },
   REMOVE_PAGE: {
     ...template,
     endpoint: ["/site/", "/pages/global/imports/"],
@@ -119,8 +124,10 @@ const getStructuredSitePages = async (params: IGetSitePagesParams, structuredDat
 
   SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}${structuredData}${filters}deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
 
-  if (query && query.trim() !== "") SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&query=${query}`;
-  if (format) SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&format=${format}`;
+  if (query && query.trim() !== "")
+    SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&query=${query}`;
+  if (format)
+    SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl = SERVICES.GET_SITE_STRUCTURED_PAGES.dynamicUrl + `&format=${format}`;
 
   return sendRequest(SERVICES.GET_SITE_STRUCTURED_PAGES);
 };
@@ -136,13 +143,16 @@ const getSitePages = async (params: IGetSitePagesParams, filterQuery?: string):
   const filters = filterQuery ? `${filterQuery}&` : "?";
 
   SERVICES.GET_SITE_PAGES.dynamicUrl = `${host}${prefix}${siteID}${suffix}${filters}deleted=${deleted}&page=${page}&itemsPerPage=${itemsPerPage}`;
-  if (query && query.trim() !== "") SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&query=${query}`;
-  if (filterStructuredData) SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&filterStructuredData=${filterStructuredData}`;
+  if (query && query.trim() !== "")
+    SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&query=${query}`;
+  if (filterStructuredData)
+    SERVICES.GET_SITE_PAGES.dynamicUrl =
+      SERVICES.GET_SITE_PAGES.dynamicUrl + `&filterStructuredData=${filterStructuredData}`;
   if (format) SERVICES.GET_SITE_PAGES.dynamicUrl = SERVICES.GET_SITE_PAGES.dynamicUrl + `&format=${format}`;
 
   const dataHeader = {
-    ...(lang && { lang })
-  }
+    ...(lang && { lang }),
+  };
 
   return sendRequest(SERVICES.GET_SITE_PAGES, null, dataHeader);
 };
@@ -208,6 +218,17 @@ const removePage = async (siteId: number, pageId: number): Promise<AxiosResponse
   return sendRequest(SERVICES.REMOVE_PAGE);
 };
 
+const removeUsersBulk = async (siteId: number, users: number[]): Promise<AxiosResponse> => {
+  const {
+    host,
+    endpoint: [prefix, suffix],
+  } = SERVICES.REMOVE_USERS_BULK;
+
+  SERVICES.REMOVE_USERS_BULK.dynamicUrl = `${host}${prefix}${siteId}${suffix}`;
+
+  return sendRequest(SERVICES.REMOVE_USERS_BULK, { users });
+};
+
 const removePageBulk = async (siteID: number, ids: number[]): Promise<AxiosResponse> => {
   const {
     host,
@@ -317,4 +338,5 @@ export default {
   importPageBulk,
   removePage,
   removePageBulk,
+  removeUsersBulk,
 };

package/src/api/structuredData.tsx

@@ -108,7 +108,7 @@ const getDataContents = (params: IGetStructuredDataParams, siteID?: number | nul
 
   const url = siteID ? `${host}/site/${siteID}${endpoint}` : `${host}${endpoint}`;
 
-  SERVICES.GET_DATA_CONTENTS.dynamicUrl = `${url}${dataID}?page=${page}&itemsPerPage=${itemsPerPage}&pagination=${pagination}&deleted=${deleted}&includeDraft=${include_draft}`;
+  SERVICES.GET_DATA_CONTENTS.dynamicUrl = `${url}${dataID}?page=${page}&itemsPerPage=${itemsPerPage}&pagination=${pagination}&deleted=${deleted}&includeDraft=${include_draft}&relatedFields=true`;
   if (query && query.trim() !== "") SERVICES.GET_DATA_CONTENTS.dynamicUrl += `&query=${query}`;
   if (filterQuery) SERVICES.GET_DATA_CONTENTS.dynamicUrl += filterQuery;