Merge branch 'fix/ff' into 'release'

Enabling Optimizely through ad blockers.

See merge request theappsmith/internal-tools-client!667

app/client/docker/nginx-linux.conf

@@ -17,6 +17,10 @@ server {
        proxy_pass http://localhost:3000;
     }
 
+    location /f {
+       proxy_pass https://cdn.optimizely.com/;
+    }
+
     location /api {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-Host $host;
@@ -57,6 +61,10 @@ server {
     location / {
        proxy_pass http://localhost:3000;
     }
+    
+    location /f {
+       proxy_pass https://cdn.optimizely.com/;
+    }
 
     location /api {
         proxy_set_header X-Forwarded-Proto $scheme;

app/client/docker/nginx-mac.conf

@@ -15,6 +15,10 @@ server {
        proxy_pass http://host.docker.internal:3000;
     }
 
+    location /f {
+       proxy_pass https://cdn.optimizely.com/;
+    }
+    
     location /api {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_set_header X-Forwarded-Host $host;
@@ -55,6 +59,10 @@ server {
     location / {
        proxy_pass http://host.docker.internal:3000;
     }
+    
+    location /f {
+       proxy_pass https://cdn.optimizely.com/;
+    }
 
     location /api {
         proxy_set_header X-Forwarded-Proto $scheme;

app/client/netlify.toml

@@ -60,6 +60,12 @@
   force = true
   headers = { X-Forwarded-Host = "APP_HOST_PLACEHOLDER", X-Forwarded-Proto = "https" }
 
+[[redirects]]
+  from = "/f/*"
+  to = "https://cdn.optimizely.com/:splat"
+  status = 200
+  force = true
+
 # This must be the last redirect in the chain because it's a catch-all
 [[redirects]]
   from = "/*"

app/client/src/constants/ApiConstants.tsx

@@ -2,7 +2,7 @@ export type ContentType =
   | "application/json"
   | "application/x-www-form-urlencoded";
 
-export const REQUEST_TIMEOUT_MS = 10000;
+export const REQUEST_TIMEOUT_MS = 20000;
 export const DEFAULT_EXECUTE_ACTION_TIMEOUT_MS = 15000;
 export const DEFAULT_TEST_DATA_SOURCE_TIMEOUT_MS = 30000;
 

app/client/src/utils/featureFlags.ts

@@ -20,6 +20,11 @@ class FeatureFlag {
     if (featureFlagConfig.remoteConfig) {
       FeatureFlag.remote = optimizelySDK.createInstance({
         sdkKey: featureFlagConfig.remoteConfig.optimizely,
+        datafileOptions: {
+          autoUpdate: true,
+          updateInterval: 600000, // 10 minutes in milliseconds
+          urlTemplate: window.location.origin + "/f/datafiles/%s.json",
+        },
       });
       (FeatureFlag.remote as any).onReady().then(onInit);
     }