Merge pull request #5629 from nickgros/PORTALS-2651

PORTALS-2651 - Account for removed bootstrap-4-backport

package.json

@@ -26,14 +26,13 @@
     "plotly.js": "^2.28.0",
     "prop-types": "^15.8.1",
     "react": "18.2.0",
-    "react-bootstrap": "^1.6.7",
     "react-dom": "18.2.0",
     "react-measure": "2.5.2",
     "react-plotly.js": "^2.6.0",
     "react-transition-group": "2.6.0",
     "sass": "^1.63.6",
     "spark-md5": "^3.0.2",
-    "synapse-react-client": "3.3.39",
+    "synapse-react-client": "3.3.40",
     "universal-cookie": "^4.0.4",
     "xss": "^1.0.15"
   },

pom.xml

@@ -491,10 +491,6 @@
                   file="${project.basedir}/node_modules/universal-cookie/umd/universalCookie.min.js"
                   tofile="src/main/webapp/generated/universalCookie.min.js"
                 />
-                <copy
-                  file="${project.basedir}/node_modules/react-bootstrap/dist/react-bootstrap.min.js"
-                  tofile="src/main/webapp/generated/react-bootstrap.min.js"
-                />
                 <copy
                   file="${project.basedir}/node_modules/prop-types/prop-types.min.js"
                   tofile="src/main/webapp/generated/prop-types.min.js"

src/main/webapp/Portal.html

@@ -196,7 +196,6 @@
       loadJs(cdnEndpoint + 'generated/plotly.min.js')
       loadJs(cdnEndpoint + 'generated/create-plotly-component.min.js')
       loadJs(cdnEndpoint + 'generated/universalCookie.min.js')
-      loadJs(cdnEndpoint + 'generated/react-bootstrap.min.js')
       loadJs(cdnEndpoint + 'generated/synapse-react-client.production.min.js') // We don't load SRC's scss because we include it in our own compiled scss
       loadJs(cdnEndpoint + 'generated/croppie.min.js')
       loadCss(cdnEndpoint + 'js/diff/diffview.css')

src/main/webapp/sass/swc.scss

@@ -13,8 +13,6 @@
   $primary-action-color: swc.$synapse-blue,
   $secondary-action-color: swc.$synapse-green,
   $primary-color-palette: swc.$synapse-primary-color-palette,
-  $secondary-color-palette: swc.$synapse-secondary-color-palette,
-  $bootstrap-4-danger-bg: swc.$synapse-red-error,
-  $bootstrap-4-danger-text-color: white
+  $secondary-color-palette: swc.$synapse-secondary-color-palette
 );
 @use 'synapse-react-client/dist/template_style/Index.scss';