FIX code review issues

Author: ahmetkuslular

config/emptyModule.js

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

config/string.js

@@ -33,12 +33,16 @@ function replaceString() {
     },
     {
       search: '__V_REQUEST_CONFIGS__',
-      replace: normalizeUrl(voltranConfig.routing.requestConfigs),
+      replace: normalizeUrl(
+        voltranConfig.routing.requestConfigs || path.resolve(__dirname, './emptyModule.js')
+      ),
       flags: 'g'
     },
     {
       search: '__V_PREVIEW_PAGES__',
-      replace: normalizeUrl(voltranConfig.routing.previewPages),
+      replace: normalizeUrl(
+        voltranConfig.routing.previewPages || path.resolve(__dirname, './emptyModule.js')
+      ),
       flags: 'g'
     },
     {

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,

lib/os.js

@@ -1,9 +1,13 @@
 const path = require('path');
 
 function normalizeUrl(url) {
-	const urlArray = url.split(path.sep);
-	
-  return urlArray.join('/');
+  if (url) {
+    const urlArray = url?.split(path.sep);
+
+    return urlArray.join('/');
+  }
+
+  return '';
 }
 
-module.exports = normalizeUrl;
+module.exports = normalizeUrl;

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/renderMultiple.js

@@ -201,7 +201,7 @@ async function getResponses(renderers) {
 
 async function getPreview(responses, requestCount, req) {
   const layoutName = getPreviewLayout(req.query);
-  const { layouts } = previewPages.default;
+  const { layouts = {} } = previewPages?.default || {};
   let PreviewFile = Preview;
 
   if (layouts[layoutName]) {

src/universal/components/RequestDispatcher/RequestDispatcher.js

@@ -6,7 +6,7 @@ import { isExitCondition } from './RequestDispatcher.utils';
 
 const requestConfigs = require('__V_REQUEST_CONFIGS__');
 
-const { effects = [] } = requestConfigs.default;
+const { effects = [] } = requestConfigs?.default || {};
 const requestPrefix = 'RequestDispatcher.';
 const responsePrefix = 'RequestDispatcher.Response.';
 

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/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>

src/universal/partials/Welcome/partials.js

@@ -3,15 +3,18 @@ import components from '../../core/route/components';
 const previewPages = require('__V_PREVIEW_PAGES__');
 
 const partials = [];
-
+const BLACKLIST = ['REQUEST_DISPATCHER'];
 Object.keys(components).forEach(path => {
   const info = components[path];
-  partials.push({
-    name: info.fragmentName,
-    url: path,
-    status: info.status
-  });
+  if (!BLACKLIST.includes(info.name)) {
+    partials.push({
+      name: info.fragmentName,
+      url: path,
+      status: info.status
+    });
+  }
 });
-partials.push(...previewPages.default.pages);
+const pages = previewPages?.default?.pages || [];
+partials.push(...pages);
 
 export default partials;