[BACKLOG-17645] - Create a new default property to be able to disable…

… the environment+browser check

ui/src/main/java/org/pentaho/di/ui/core/PropsUI.java

@@ -109,6 +109,8 @@ public class PropsUI extends Props {
 
   private static final String LEGACY_PERSPECTIVE_MODE = "LegacyPerspectiveMode";
 
+  private static final String DISABLE_BROWSER_ENVIRONMENT_CHECK = "DisableBrowserEnvironmentCheck";
+
   private static List<GUIOption<Object>> editables;
 
   /**
@@ -1212,7 +1214,7 @@ public void setCanvasGridSize( int gridSize ) {
   }
 
   /**
-   * getSupportedVersion
+   * Gets the supported version of the requested software.
    *
    * @param property the key for the software version
    * @return an integer that represents the supported version for the software.
@@ -1221,6 +1223,15 @@ public int getSupportedVersion( String property ) {
     return Integer.parseInt( properties.getProperty( property ) );
   }
 
+  /**
+   * Ask if the browsing environment checks are disabled.
+   *
+   * @return 'true' if disabled 'false' otherwise.
+   */
+  public boolean isBrowserEnvironmentCheckDisabled() {
+    return "Y".equalsIgnoreCase( properties.getProperty( DISABLE_BROWSER_ENVIRONMENT_CHECK, "N" ) );
+  }
+
   public boolean isLegacyPerspectiveMode() {
     return "Y".equalsIgnoreCase( properties.getProperty( LEGACY_PERSPECTIVE_MODE, "N" ) );
   }

ui/src/main/java/org/pentaho/di/ui/spoon/Spoon.java

@@ -501,9 +501,9 @@ public class Spoon extends ApplicationWindow implements AddUndoPositionInterface
   // "Redo : not available \tCTRL-Y"
   private static final String REDO_UNAVAILABLE = BaseMessages.getString( PKG, "Spoon.Menu.Redo.NotAvailable" );
 
-  private static boolean unsupportedBrowserEnvironment;
+  private static Boolean unsupportedBrowserEnvironment;
 
-  private static boolean webkitUnavailable;
+  private static Boolean webkitUnavailable;
 
   private static String availableBrowser;
 
@@ -9121,6 +9121,12 @@ public void hideSplash() {
   }
 
   private void checkEnvironment() {
+    if ( EnvironmentUtils.getInstance().isBrowserEnvironmentCheckDisabled() ) {
+      webkitUnavailable = null;
+      unsupportedBrowserEnvironment = null;
+      availableBrowser = "";
+      return;
+    }
     webkitUnavailable = EnvironmentUtils.getInstance().isWebkitUnavailable();
     unsupportedBrowserEnvironment = EnvironmentUtils.getInstance().isUnsupportedBrowserEnvironment();
     availableBrowser = EnvironmentUtils.getInstance().getBrowserName();
@@ -9280,11 +9286,11 @@ public Composite getDesignParent() {
     return sashform;
   }
 
-  public static boolean isUnsupportedBrowserEnvironment() {
+  public static Boolean isUnsupportedBrowserEnvironment() {
     return unsupportedBrowserEnvironment;
   }
 
-  public static boolean isWebkitUnavailable() {
+  public static Boolean isWebkitUnavailable() {
     return webkitUnavailable;
   }
 

ui/src/main/java/org/pentaho/di/ui/util/EnvironmentUtils.java

@@ -50,8 +50,6 @@ public static synchronized EnvironmentUtils getInstance( ) {
   }
 
   /**
-   * isUnsupportedBrowserEnvironment
-   *
    * Checks the available browser to see if it is an unsupported one.
    *
    * @return 'true' if in a unSupported browser environment 'false' otherwise.
@@ -64,17 +62,15 @@ public synchronized boolean isUnsupportedBrowserEnvironment() {
     if ( userAgent == null ) {
       return true;
     }
-    return checkUserAgent( MSIE_PATTERN.matcher( userAgent ), getSupportedVersion("min.windows.browser.supported")  )
-      || checkUserAgent( SAFARI_PATTERN.matcher( userAgent ), getSupportedVersion("min.mac.browser.supported")  );
+    return checkUserAgent( MSIE_PATTERN.matcher( userAgent ), getSupportedVersion( "min.windows.browser.supported" )  )
+      || checkUserAgent( SAFARI_PATTERN.matcher( userAgent ), getSupportedVersion( "min.mac.browser.supported" )  );
   }
 
   private boolean checkUserAgent( Matcher matcher, int version ) {
     return  ( matcher.find() && Integer.parseInt( matcher.group( 1 ) ) < version );
   }
 
   /**
-   * getUserAgent
-   *
    * Ask for user Agent of the available browser.
    *
    * @return a string that contains the user agent of the browser.
@@ -93,8 +89,6 @@ protected String getUserAgent() {
   }
 
   /**
-   * isWebkitUnavailable
-   *
    * Checks the existence of the webkit library on ubuntu 16 or ubuntu 14 .
    *
    * @return 'true' if the webkit library is not present in ubuntu 16 or ubuntu 14 , 'false' otherwise.
@@ -104,14 +98,12 @@ public synchronized boolean isWebkitUnavailable() {
     String osName = getEnvironmentName();
     return  ( ( path == null || path.length() < 1 || !path.contains( "webkit" ) )
         &&
-        ( osName.contains( SUPPORTED_DISTRIBUTION_NAME + " " + getSupportedVersion("max.ubuntu.os.distribution.supported") )
+        ( osName.contains( SUPPORTED_DISTRIBUTION_NAME + " " + getSupportedVersion( "max.ubuntu.os.distribution.supported" ) )
             ||
-            osName.contains( SUPPORTED_DISTRIBUTION_NAME + " " + getSupportedVersion("min.ubuntu.os.distribution.supported") ) ) );
+            osName.contains( SUPPORTED_DISTRIBUTION_NAME + " " + getSupportedVersion( "min.ubuntu.os.distribution.supported" ) ) ) );
   }
 
   /**
-   * getWebkitPath
-   *
    * Ask for the path in the system for the webkit library.
    *
    * @return a string that contains the path or 'null' if not found.
@@ -121,8 +113,6 @@ protected String getWebkitPath() {
   }
 
   /**
-   * getOsName
-   *
    * Ask for the Operating system name.
    *
    * @return a string that contains the current Operating System.
@@ -140,8 +130,6 @@ protected String getOsName() {
   }
 
   /**
-   * getSupportedVersion
-   *
    * Gets the supported version of the required Property.
    *
    * @param property a string with the required property.
@@ -152,8 +140,15 @@ protected int getSupportedVersion( String property ) {
   }
 
   /**
-   * getLinuxDistribution
+   * Ask if the browsing environment checks are disabled.
    *
+   * @return 'true' if disabled 'false' otherwise.
+   */
+  public boolean isBrowserEnvironmentCheckDisabled() {
+    return PropsUI.getInstance().isBrowserEnvironmentCheckDisabled();
+  }
+
+  /**
    * Ask for the running linux distribution.
    *
    * @return a string that contains the distribution name or a empty string if it could not find the name.
@@ -184,8 +179,6 @@ protected BufferedReader getBufferedReaderFromProcess( Process p ) {
   }
 
   /**
-   * getBrowserName
-   *
    * Ask for the browser name.
    *
    * @return a String that contains the browser name.

ui/src/main/resources/org/pentaho/di/ui/core/default.properties

@@ -8,6 +8,7 @@ BackgroundColorB=255
 BackgroundColorG=255
 BackgroundColorR=255
 DefaultPreviewSize=1000
+DisableBrowserEnvironmentCheck=N
 EnableAntiAliasing=N
 FontFixedName=Courier
 GraphColorB=255