[DURACOM-344] refactor

Author: FrancescoMolinaro

config/config.example.yml

@@ -23,13 +23,9 @@ ssr:
   # Determining which styles are critical is a relatively expensive operation; this option is
   # disabled (false) by default to boost server performance at the expense of loading smoothness.
   inlineCriticalCss: false
-  # Path prefixes to disable SSR for. If the path the user is visiting starts with one of the excluded paths, it will be served directly in CSR.
-  # These should be limited to paths that might cause high consumption in resources (e.g. crawler on pages with many items to follow).
-  excludePaths: ['/browse/', '/community-list', '/search/', '/statistics' ]
-  # Regexes to be run against the URl of the page to check if SSR is allowed.
-  # This configuration offers more flexibility and precision than excludePaths as we can match more complex URLs.
-  # If the entire URL match any of the regexes it will be served directly in CSR.
-  ssrBlacklistRegexes: [ /^\/communities\/[0-9a-fA-F-]{36}(\/.*)?$/, /^\/collections\/[0-9a-fA-F-]{36}(\/.*)?$/]
+  # Regexes to be run against the path of the page to check if SSR is allowed.
+  # If the path match any of the regexes it will be served directly in CSR.
+  excludePathRegexes: [ /^\/communities\/[0-9a-fA-F-]{36}(\/.*)?$/, /^\/collections\/[0-9a-fA-F-]{36}(\/.*)?$/]
   # Whether to enable rendering of Search component on SSR.
   # If set to true the component will be included in the HTML returned from the server side rendering.
   # If set to false the component will not be included in the HTML returned from the server side rendering.

server.ts

@@ -221,7 +221,7 @@ export function app() {
  * The callback function to serve server side angular
  */
 function ngApp(req, res, next) {
-    if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || !isBlacklistedPathForSsr(req.url, req.path, environment.ssr.ssrBlacklistRegexes))) {
+    if (environment.ssr.enabled && req.method === 'GET' && (req.path === '/' || !isExcludedFromSsr(req.path, environment.ssr.excludePathRegexes))) {
     // Render the page to user via SSR (server side rendering)
     serverSideRender(req, res, next);
   } else {
@@ -628,14 +628,13 @@ function start() {
 }
 
 /**
- * Check if SSR should be skipped for url or path
+ * Check if SSR should be skipped for path
  *
- * @param url
  * @param path
- * @param blacklist
+ * @param excludePathRegexes
  */
-function isBlacklistedPathForSsr(url: string, path: string, blacklist: RegExp[]): boolean {
-  return blacklist.some((regex) => regex.test(url)) || environment.ssr.excludePaths.some(blacklistedPath => path.startsWith(blacklistedPath));
+function isExcludedFromSsr(path: string, excludePathRegexes: RegExp[]): boolean {
+  return excludePathRegexes.some((regex) => regex.test(path));
 }
 
 /*

src/config/ssr-config.interface.ts

@@ -39,14 +39,9 @@ export interface SSRConfig extends Config {
   replaceRestUrl: boolean;
 
   /**
-   * Paths to disable SSR for, to avoid some possible performance issue for specific pages.
+   * Regexes to match url's path and check if SSR is disabled for it.
    */
-  excludePaths: Array<string>;
-
-  /**
-   * Regexes to match url and check if SSR is enabled for it.
-   */
-  ssrBlacklistRegexes:  RegExp[];
+  excludePathRegexes:  RegExp[];
 
   /**
    * Whether to enable rendering of search component on SSR

src/environments/environment.production.ts

@@ -10,10 +10,13 @@ export const environment: Partial<BuildConfig> = {
     inlineCriticalCss: false,
     transferState: true,
     replaceRestUrl: true,
-    excludePaths: [ '/browse/', '/community-list', '/search/', '/statistics' ],
-    ssrBlacklistRegexes: [
+    excludePathRegexes: [
       /^\/communities\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
       /^\/collections\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
+      /^\/browse\//,
+      /^\/search$/,
+      /^\/community-list$/,
+      /^\/statistics$/,
     ],
     enableSearchComponent: false,
     enableBrowseComponent: false,

src/environments/environment.test.ts

@@ -14,10 +14,13 @@ export const environment: BuildConfig = {
     inlineCriticalCss: false,
     transferState: true,
     replaceRestUrl: false,
-    excludePaths: [ '/browse/', '/community-list', '/search/', '/statistics' ],
-    ssrBlacklistRegexes: [
+    excludePathRegexes: [
       /^\/communities\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
       /^\/collections\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
+      /^\/browse\//,
+      /^\/search$/,
+      /^\/community-list$/,
+      /^\/statistics$/,
     ],
     enableSearchComponent: false,
     enableBrowseComponent: false,

src/environments/environment.ts

@@ -15,10 +15,13 @@ export const environment: Partial<BuildConfig> = {
     inlineCriticalCss: false,
     transferState: true,
     replaceRestUrl: false,
-    excludePaths: [ '/browse/', '/community-list', '/search/', '/statistics' ],
-    ssrBlacklistRegexes: [
+    excludePathRegexes: [
       /^\/communities\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
       /^\/collections\/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\/browse(\/.*)?$/i,
+      /^\/browse\//,
+      /^\/search$/,
+      /^\/community-list$/,
+      /^\/statistics$/,
     ],
     enableSearchComponent: false,
     enableBrowseComponent: false,