From c1e2db8123421c074f3af21b8540c36ea2bab9f3 Mon Sep 17 00:00:00 2001
From: ahmetkuslular <ahmet.kuslular@hepsiburada.com>
Date: Fri, 4 Feb 2022 18:07:50 +0300
Subject: [PATCH] FIX code review issues

---
 jest.config.js                                |  7 +-
 src/render.js                                 | 11 +--
 src/universal/model/Renderer.js               | 10 +--
 src/universal/partials/Welcome/PartialList.js |  2 +-
 src/universal/partials/Welcome/styled.js      | 11 ++-
 src/universal/service/RenderService.js        | 11 ++-
 src/universal/service/getStates.js            | 73 +++----------------
 src/universal/utils/constants.js              | 11 ++-
 8 files changed, 47 insertions(+), 89 deletions(-)

diff --git a/jest.config.js b/jest.config.js
index 19e22c1..57b22a3 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,5 +1,3 @@
-// Jest configuration
-// https://facebook.github.io/jest/docs/en/configuration.html
 module.exports = {
   verbose: true,
   automock: false,
@@ -11,6 +9,11 @@ module.exports = {
     '!src/public/**',
     '!src/tools/**'
   ],
+  env: {
+    production: {
+      plugins: ['transform-es2015-modules-commonjs']
+    }
+  },
   coverageDirectory: '<rootDir>/coverage',
   globals: {
     window: true,
diff --git a/src/render.js b/src/render.js
index 4bf7c8b..4b75aef 100644
--- a/src/render.js
+++ b/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')
diff --git a/src/universal/model/Renderer.js b/src/universal/model/Renderer.js
index 1809867..731737e 100644
--- a/src/universal/model/Renderer.js
+++ b/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({
diff --git a/src/universal/partials/Welcome/PartialList.js b/src/universal/partials/Welcome/PartialList.js
index b406108..f227c18 100644
--- a/src/universal/partials/Welcome/PartialList.js
+++ b/src/universal/partials/Welcome/PartialList.js
@@ -16,7 +16,7 @@ const Welcome = () => {
       <Link href={item.previewUrl ? item.previewUrl : `${item.url}?preview`} target="_blank">
         <Name>{item.name}</Name>
         <Url>{item.url}</Url>
-        <Footer>
+        <Footer status={item.status}>
           <Label status={item.status}>
             {item.status} <Dot status={item.status} />
           </Label>
diff --git a/src/universal/partials/Welcome/styled.js b/src/universal/partials/Welcome/styled.js
index 020e4c9..423fa3c 100644
--- a/src/universal/partials/Welcome/styled.js
+++ b/src/universal/partials/Welcome/styled.js
@@ -24,11 +24,10 @@ export const ListItem = styled.li`
   display: inline-block;
   vertical-align: top;
   height: 120px;
-  width: 320px;
+  width: 240px;
   margin: 10px;
   cursor: pointer;
-  border-radius: 20px;
-  border: 1px solid ${({ status }) => (status && STATUS_COLOR[status]) || '#8dc63f'};
+  border-radius: 10px;
 
   position: relative;
   background-color: #fff;
@@ -38,14 +37,14 @@ export const ListItem = styled.li`
 
   :after {
     content: '';
-    border-radius: 20px;
+    border-radius: 10px;
     position: absolute;
     z-index: -1;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
-    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.3);
+    box-shadow: 0 5px 15px rgba(0, 0, 0, 0.1);
     opacity: 0;
     -webkit-transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
     transition: all 0.6s cubic-bezier(0.165, 0.84, 0.44, 1);
@@ -104,7 +103,7 @@ export const Footer = styled.span`
   right: 0;
   width: 100%;
   padding: 20px;
-  border-top: 1px solid #eee;
+  border-top: 1px solid ${({ status }) => (status && STATUS_COLOR[status]) || '#eeeeee'}50;
   font-size: 13px;
 `;
 
diff --git a/src/universal/service/RenderService.js b/src/universal/service/RenderService.js
index 0303b21..5bd9a48 100644
--- a/src/universal/service/RenderService.js
+++ b/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 '';
@@ -70,7 +73,7 @@ const isWithoutState = query => {
 };
 
 const isRequestDispatcher = query => {
-  return query.requestDispathcer === '' || query.requestDispathcer !== 'false';
+  return query.requestDispatcher === '' || query.requestDispatcher !== 'false';
 };
 
 const renderComponent = async (component, context, predefinedInitialState = null) => {
diff --git a/src/universal/service/getStates.js b/src/universal/service/getStates.js
index f1297d4..3c01b41 100644
--- a/src/universal/service/getStates.js
+++ b/src/universal/service/getStates.js
@@ -1,41 +1,13 @@
-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;
 };
@@ -43,27 +15,17 @@ const getCustomSetters = (component, context, data) => {
 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) {
+  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
   };
 };
 
diff --git a/src/universal/utils/constants.js b/src/universal/utils/constants.js
index 909bda4..a119311 100644
--- a/src/universal/utils/constants.js
+++ b/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
 };