FIX code review issues

Author: ahmetkuslular

src/render.js

@@ -2,7 +2,7 @@ import xss from 'xss';
 
 import { matchUrlInRouteConfigs } from './universal/core/route/routeUtils';
 import Preview from './universal/components/Preview';
-import { HTTP_STATUS_CODES } from './universal/utils/constants';
+import { BLACKLIST_OUTPUT, HTTP_STATUS_CODES } from './universal/utils/constants';
 import metrics from './metrics';
 import {
   renderComponent,
@@ -13,6 +13,7 @@ import {
 } from './universal/service/RenderService';
 import Component from './universal/model/Component';
 import logger from './universal/utils/logger';
+import omit from 'lodash/omit';
 
 const appConfig = require('__APP_CONFIG__');
 
@@ -60,9 +61,9 @@ const render = async (req, res) => {
       scripts,
       activeComponent,
       componentName,
-      seoState,
       isPreviewQuery,
-      responseOptions
+      responseOptions,
+      ...responseData
     } = renderResponse;
 
     const statusCode = responseOptions?.isPartialContent
@@ -71,8 +72,8 @@ const render = async (req, res) => {
 
     if (!isPreview(context.query)) {
       const html = renderLinksAndScripts(output, '', '');
-
-      res.status(statusCode).json({ html, scripts, style: links, activeComponent, seoState });
+      const otherParams = omit(responseData, BLACKLIST_OUTPUT);
+      res.status(statusCode).json({ html, scripts, style: links, activeComponent, ...otherParams });
 
       metrics.fragmentRequestDurationMicroseconds
         .labels(componentName, isWithoutHTML(context.query) ? '1' : '0')

src/universal/model/Renderer.js

@@ -1,13 +1,7 @@
 import omit from 'lodash/omit';
 import { isPreview, renderComponent, renderLinksAndScripts } from '../service/RenderService';
+import { BLACKLIST_OUTPUT } from '../utils/constants';
 
-const blacklistOutput = [
-  'componentName',
-  'fullWidth',
-  'isMobileComponent',
-  'isPreviewQuery',
-  'responseOptions'
-];
 export default class Renderer {
   constructor(component, context) {
     this.component = component;
@@ -47,7 +41,7 @@ export default class Renderer {
     return new Promise(resolve => {
       renderComponent(this.component, this.context, this.initialState).then(response => {
         const { output, links, fullHtml, ...rest } = response;
-        const otherParams = omit(rest, blacklistOutput);
+        const otherParams = omit(rest, BLACKLIST_OUTPUT);
         const html = renderLinksAndScripts(output, '', '');
 
         resolve({

src/universal/service/RenderService.js

@@ -54,12 +54,15 @@ const isWithoutHTML = query => {
 };
 
 const isPreview = query => {
-  return query.preview === '';
+  if (query.preview || query.preview === '') {
+    return true;
+  }
+  return false;
 };
 
 const getPreviewLayout = query => {
-  if (query?.previewLayout) {
-    return query?.previewLayout;
+  if (isPreview(query)) {
+    return query?.preview;
   }
 
   return '';

src/universal/service/getStates.js

@@ -1,69 +1,31 @@
-import omit from 'lodash/omit';
-import camelCase from 'lodash/camelCase';
-
-const blacklistFunctionName = [
-  'getServerSideProps',
-  'getServicesWithMultiple',
-  'getInitialStateWithMultiple',
-  'setDependencies',
-  'setSeoState',
-  'setRedirection',
-  'setPageData'
-];
-
-const getCustomSetters = (component, context, data) => {
-  const pattern = new RegExp(`^set`);
-  const functions = omit(component, blacklistFunctionName);
+const getResponseData = (component, context, data) => {
   let result = {};
 
-  Object.entries(functions).forEach(entity => {
-    const [name, method] = entity;
-    const isValidName = pattern.test(name);
-    if (isValidName) {
-      const propertyName = camelCase(name.replace(pattern, ''));
-      let value = null;
-      if (typeof method === 'function') {
-        value = method(context, data);
-      } else {
-        value = method;
-      }
-
-      if (value) {
-        result = {
-          ...result,
-          [propertyName]: value
-        };
-      }
+  if (component.setResponseData) {
+    if (typeof component.setResponseData === 'function') {
+      result = component.setResponseData(context, data);
+    } else {
+      result = component.setResponseData;
     }
-  });
+  }
 
   return result;
 };
 
 const getStates = async (component, context, predefinedInitialState) => {
   const initialState = predefinedInitialState || { data: {} };
   let subComponentFiles = [];
-  let seoState = {};
   let responseOptions = {};
-  let dependencies = [];
-  let redirection = null;
-
-  if (component.setDependencies) {
-    dependencies = component.setDependencies(context);
-  }
+  const responseData = getResponseData(component, context, initialState.data);
 
   if (context.isWithoutState) {
-    return { initialState, seoState, dependencies, subComponentFiles, responseOptions };
+    return { initialState, subComponentFiles, responseOptions, ...responseData };
   }
 
   if (!predefinedInitialState && component.getServerSideProps) {
     initialState.data = await component.getServerSideProps(context);
   }
 
-  if (component?.setSeoState) {
-    seoState = component.setSeoState(initialState?.data) || {};
-  }
-
   if (initialState?.data?.subComponentFiles) {
     subComponentFiles = initialState?.data?.subComponentFiles || [];
   }
@@ -72,24 +34,11 @@ const getStates = async (component, context, predefinedInitialState) => {
     responseOptions = initialState?.data?.responseOptions || {};
   }
 
-  if (component.setRedirection) {
-    redirection = component.setRedirection(context, initialState.data);
-  }
-
-  if (component.setPageData) {
-    redirection = component.setPageData(context, initialState.data);
-  }
-
-  const setters = getCustomSetters(component, context, initialState.data);
-
   return {
     initialState,
-    seoState,
     subComponentFiles,
     responseOptions,
-    dependencies,
-    redirection,
-    ...setters
+    ...responseData
   };
 };
 

src/universal/utils/constants.js

@@ -25,11 +25,20 @@ const SERVICES = Object.freeze(
   }, {})
 );
 
+const BLACKLIST_OUTPUT = [
+  'componentName',
+  'fullWidth',
+  'isMobileComponent',
+  'isPreviewQuery',
+  'responseOptions'
+];
+
 export {
   HTTP_STATUS_CODES,
   WINDOW_GLOBAL_PARAMS,
   JSON_CONTENT_TYPE,
   CONTENT_TYPE_HEADER,
   REQUEST_TYPES_WITH_BODY,
-  SERVICES
+  SERVICES,
+  BLACKLIST_OUTPUT
 };