Updated NPM packages, fixed IP planner CIDR calculation, and added X-Frame-Options header for UI component

.gitignore

@@ -4,3 +4,4 @@
 NOTES.md
 TODO.md
 /logs
+/deployV2

docs/how-to/README.md

@@ -64,7 +64,7 @@ Place a checkmark next to the virtual networks you'd like to associate to the ta
 
 ## Reservations
 
-Currently, IP CIDR block reservations are not supported via the UI, but are supported programmatically via the API. Please the **Example API Calls** section for more information on how to create IP address block reservations.
+Currently, IP CIDR block reservations are not supported via the UI, but are supported programmatically via the API. Please see the **Example API Calls** section for more information on how to create IP address block reservations.
 
 ## vNETs, Subnets, and Endpoints
 

lb/nginx.dev.conf

@@ -21,6 +21,7 @@ http {
 
         # Frontend
         location / {
+            add_header X-Frame-Options "DENY";
             proxy_pass http://ui;
             proxy_intercept_errors on;
             proxy_set_header Host $http_host;

ui/package.json

@@ -3,16 +3,16 @@
   "version": "2.1.0",
   "private": true,
   "dependencies": {
-    "@azure/msal-browser": "^3.2.0",
-    "@azure/msal-react": "^2.0.4",
+    "@azure/msal-browser": "^3.3.0",
+    "@azure/msal-react": "^2.0.5",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@inovua/reactdatagrid-community": "^5.10.2",
-    "@mui/icons-material": "^5.14.12",
-    "@mui/lab": "^5.0.0-alpha.147",
-    "@mui/material": "^5.14.12",
+    "@mui/icons-material": "^5.14.14",
+    "@mui/lab": "^5.0.0-alpha.149",
+    "@mui/material": "^5.14.14",
     "@reduxjs/toolkit": "^1.9.7",
-    "@testing-library/jest-dom": "^6.1.3",
+    "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^14.0.0",
     "@testing-library/user-event": "^14.5.1",
     "axios": "^1.5.1",
@@ -26,7 +26,7 @@
     "react-dom": "^18.2.0",
     "react-draggable": "^4.4.6",
     "react-redux": "^8.1.3",
-    "react-router-dom": "^6.16.0",
+    "react-router-dom": "^6.17.0",
     "spinners-react": "^1.0.7",
     "web-vitals": "^3.5.0"
   },
@@ -48,11 +48,11 @@
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.1.0",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "serve": "^14.2.1",
-    "vite": "^4.4.11",
-    "vite-plugin-eslint2": "^4.1.0"
+    "vite": "^4.5.0",
+    "vite-plugin-eslint2": "^4.3.0"
   }
 }

ui/src/features/tools/utils/iputils.jsx

@@ -107,12 +107,12 @@ function possibleSubnets(obj, index, existingSubnetCIDR) {
   var allowed = allowedOctets();
   var addressBytes = obj.address.split('.', 4).map(num => parseInt(num, 10));
 
-  if((obj.netmask % 8 === 0) && (index % 8 === 0)) {
+  if((obj.netmask % 8 === 0) && (index % 8 === 0) && (index === obj.netmask)) {
     filteredOctets.push(addressBytes[pos]);
   } else if((obj.netmask % 8) <= sliceTo && index <= 24) {
     filteredOctets = allowed.slice((obj.netmask % 8), sliceTo);
     filteredOctets.push(addressBytes[2]);
-  } else if((obj.netmask % 8) <= sliceTo && index >= 24 && addressBytes[3] === 0) {
+  } else if(index >= 24 && addressBytes[2] === 0) {
     filteredOctets = allowed.slice((obj.netmask % 8), sliceTo);
     filteredOctets.push(addressBytes[3]);
   } else if(index >= 24 && addressBytes[3] === 0) {