fix OCO glitch

deploy-app.sh

@@ -15,11 +15,13 @@ az webapp config appsettings set --resource-group "rapid-prereview" --name "rapi
 
 ## https://docs.microsoft.com/en-us/azure/app-service/containers/configure-language-nodejs#run-with-pm2
 
-# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "npm run start:prod"
-
 # Azure App service will start the file with pm2
 az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "./dist/server.js"
 
+# to use without pm2:
+# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview" --startup-file "npm run start:prod"
+
+
 az webapp deployment source config-zip --resource-group "rapid-prereview" --name "rapid-prereview" --src app.zip
 
 rm app.zip

deploy-service.sh

@@ -12,7 +12,13 @@ zip -r service.zip *.json *.js dist/* src/* public/* views/* scripts/* test/*
 
 az webapp config appsettings set --resource-group "rapid-prereview" --name "rapid-prereview-service" --settings SCM_DO_BUILD_DURING_DEPLOYMENT=true
 
-az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "npm run start:service"
+## https://docs.microsoft.com/en-us/azure/app-service/containers/configure-language-nodejs#run-with-pm2
+
+# Azure App service will start the file with pm2
+az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "./dist/service.js"
+
+# to use without pm2:
+# az webapp config set --resource-group "rapid-prereview" --name "rapid-prereview-service" --startup-file "npm run start:service"
 
 az webapp deployment source config-zip --resource-group "rapid-prereview" --name "rapid-prereview-service" --src service.zip
 

package.json

@@ -140,7 +140,7 @@
   "homepage": "https://github.com/PREreview/rapid-prereview#readme",
   "devDependencies": {
     "@babel/cli": "^7.7.0",
-    "@babel/core": "^7.7.0",
+    "@babel/core": "^7.7.2",
     "@babel/node": "^7.7.0",
     "@babel/plugin-proposal-class-properties": "^7.7.0",
     "@babel/plugin-transform-async-to-generator": "^7.7.0",
@@ -169,7 +169,7 @@
     "pino-pretty": "^3.3.0",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
-    "postcss-nested": "^4.2.0",
+    "postcss-nested": "^4.2.1",
     "postcss-preset-env": "^6.7.0",
     "postcss-url": "^8.0.0",
     "prettier": "^1.18.2",
@@ -182,7 +182,7 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.7.0",
-    "@babel/runtime": "^7.7.1",
+    "@babel/runtime": "^7.7.2",
     "@cloudant/cloudant": "^4.2.2",
     "@reach/combobox": "^0.5.3",
     "@reach/dialog": "^0.5.4",

restart-app.sh

@@ -0,0 +1 @@
+az webapp restart --resource-group "rapid-prereview" --name "rapid-prereview"

restart-service.sh

@@ -0,0 +1 @@
+az webapp restart --resource-group "rapid-prereview" --name "rapid-prereview-service"

src/components/extension-fallback.js

@@ -34,8 +34,8 @@ export default function ExtensionFallback() {
         <object
           key={pdfUrl}
           data={pdfUrl}
-          type="" // we leave this empty since it seems to break pdf loading in safari
-          typemustmatch="true" // Note typeMustMatch doesn't seem to be currently supported by react
+          // type="application/pdf" commented out as it seems to break pdf loading in safari
+          // typemustmatch="true" commented out as it doesn't seem to be currently supported by react
         >
           {/* fallback text in case we can't load the PDF */}
           <PdfViewer pdfUrl={pdfUrl} />

src/components/header-bar.js

@@ -18,7 +18,7 @@ export default function HeaderBar({ onClickMenuButton }) {
         {!!onClickMenuButton && (
           <IconButton
             data-noclickoutside="true"
-            onClick={onClickMenuButton}
+            onClickCapture={onClickMenuButton}
             className="header-bar__menu-button"
           >
             <MdMenu

src/components/left-side-panel.js

@@ -16,7 +16,7 @@ export default function LeftSidePanel({
         return;
       }
 
-      if (!e.target.hasAttribute('data-noclickoutside')) {
+      if (!hasNoclickoutside(e.target)) {
         // outside click
         onClickOutside();
       }
@@ -50,3 +50,17 @@ LeftSidePanel.propTypes = {
   children: PropTypes.any,
   onClickOutside: PropTypes.func
 };
+
+function hasNoclickoutside(node) {
+  if (!node) return false;
+
+  let el = node;
+  while (el && el.hasAttribute) {
+    if (el.hasAttribute('data-noclickoutside')) {
+      return true;
+    }
+    el = el.parentElement;
+  }
+
+  return false;
+}