Fix/bugs (#1434)

* fix: gitops config path can have dirs

* fix: domain value for system use popup

Author: mfshao

runWebpack.sh

@@ -108,7 +108,7 @@ gitops_config() {
         cp $copySource/*.* $copyDest/
       else
         echo "INFO: gitops_config - no $copySource in gitops"
-        rm -f $copyDest
+        rm -rf $copyDest
       fi
     done
   fi

src/Popup/SystemUseWarningPopup.jsx

@@ -3,29 +3,24 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import Popup from '../components/Popup';
 import { components } from '../params';
-import { hostname } from '../localconf';
+import { hostnameWithSubdomain } from '../localconf';
 import { updateSystemUseNotice } from '../actions';
 
 const handleAcceptWarning = () => {
   /**
    * If policy is accepted then set systemUseWarnPopup to false, hiding the
    * warning.
    */
-  // set a new cookie indicating we have accepted this policy
-
-  const hostnameParts = hostname.split('.');
-  const hLen = hostnameParts.length;
-  const hostnameNoSubdomain = (hLen > 2) ? hostnameParts.splice(hLen - 2).join('.') : hostname;
-  const domain = hostnameNoSubdomain.endsWith('/') ? hostnameNoSubdomain.slice(0, -1) : hostnameNoSubdomain;
 
+  // set a new cookie indicating we have accepted this policy
   const expiry = new Date();
   const defaultDays = 'expireUseMsgDays' in components.systemUse ? components.systemUse.expireUseMsgDays : 0;
 
   if (defaultDays === 0) { // session cookie
-    document.cookie = `systemUseWarning=yes; expires=0; path=/; domain=.${domain}`;
+    document.cookie = `systemUseWarning=yes; expires=0; path=/; domain=${hostnameWithSubdomain}`;
   } else {
     expiry.setTime(expiry.getTime() + (defaultDays * 1440 * 1 * 60 * 1000)); // number of days
-    document.cookie = `systemUseWarning=yes; expires=${expiry.toGMTString()}; path=/; domain=.${domain}`;
+    document.cookie = `systemUseWarning=yes; expires=${expiry.toGMTString()}; path=/; domain=${hostnameWithSubdomain}`;
   }
 
   return (dispatch) => dispatch(updateSystemUseNotice(false));