Fix Windows server version lowercase

* fix OS format function to properly show iOS

* bring back windows check

src/components/PeerUpdate.tsx

@@ -197,6 +197,7 @@ const PeerUpdate = (props: any) => {
       os !== "" &&
       !os.toLowerCase().startsWith("darwin") &&
       !os.toLowerCase().startsWith("windows") &&
+      !os.toLowerCase().startsWith("ios") &&
       !os.toLowerCase().startsWith("android")
     );
   };

src/components/RouteAddNew.tsx

@@ -151,6 +151,7 @@ const RouteAddNew = (selectedPeer: any) => {
         !os.toLowerCase().startsWith("darwin") &&
         !os.toLowerCase().startsWith("windows") &&
         !os.toLowerCase().startsWith("android") &&
+        !os.toLowerCase().startsWith("ios") &&
         route &&
         !routes
           .filter((r) => r.network_id === route.network_id)

src/components/RoutePeerUpdate.tsx

@@ -100,6 +100,7 @@ const RoutePeerUpdate = () => {
       !os.toLowerCase().startsWith("darwin") &&
       !os.toLowerCase().startsWith("windows") &&
       !os.toLowerCase().startsWith("android") &&
+      !os.toLowerCase().startsWith("ios") &&
       route &&
       !routes
         .filter((r) => r.network_id === route.network_id)

src/components/RouteUpdate.tsx

@@ -96,6 +96,7 @@ const RouteAddNew = () => {
       !os.toLowerCase().startsWith("darwin") &&
       !os.toLowerCase().startsWith("windows") &&
       !os.toLowerCase().startsWith("android") &&
+      !os.toLowerCase().startsWith("ios") &&
       route &&
       !routes
         .filter((r) => r.network_id === route.network_id)

src/utils/common.js

@@ -1,15 +1,23 @@
 
 
 export const formatOS = (os) => {
-    if (os.startsWith("windows 10")) {
+    if (os.toLowerCase().startsWith("windows 10")) {
         return "Windows 10";
     }
 
+    if (os.toLowerCase().startsWith("windows server 10")) {
+        return "Windows Server";
+    }
+
     if (os.startsWith("Darwin")) {
         return os.replace("Darwin", "MacOS");
     }
-    // capitalize first letter
-    os = os.charAt(0).toUpperCase() + os.slice(1);
+
+    if (!os.startsWith("iOS")) {
+        // capitalize first letter
+        os = os.charAt(0).toUpperCase() + os.slice(1);
+    }
+
     return os;
 };
 

src/views/Activity.tsx

@@ -373,6 +373,9 @@ export const Activity = () => {
       case "account.setting.peer.login.expiration.enable":
       case "account.setting.peer.login.expiration.disable":
       case "account.setting.peer.login.expiration.update":
+      case "integration.create":
+      case "integration.update":
+      case "integration.delete":
         return renderMultiRowSpan("", "System setting");
       case "personal.access.token.create":
       case "personal.access.token.delete":

src/views/Settings.tsx

@@ -305,17 +305,20 @@ export const Settings = () => {
     const createSingleArrayForPolicy: any = [];
     policies.map((aControl: any) => {
       const cSingleAccessArray = aControl.allGroups ? aControl.allGroups : [];
-      aControl.rules[0].destinations.forEach((destination: any) => {
-        if (cSingleAccessArray.indexOf(destination.id) === -1) {
-          cSingleAccessArray.push(destination.id);
-        }
-      });
-
-      aControl.rules[0].sources.forEach((source: any) => {
-        if (cSingleAccessArray.indexOf(source.id) === -1) {
-          cSingleAccessArray.push(source.id);
-        }
-      });
+      if (aControl.rules[0].destinations) {
+        aControl.rules[0].destinations.forEach((destination: any) => {
+          if (cSingleAccessArray.indexOf(destination.id) === -1) {
+            cSingleAccessArray.push(destination.id);
+          }
+        });
+      }
+      if (aControl.rules[0].sources) {
+        aControl.rules[0].sources.forEach((source: any) => {
+          if (cSingleAccessArray.indexOf(source.id) === -1) {
+            cSingleAccessArray.push(source.id);
+          }
+        });
+      }
 
       aControl["cSingleAccessArray"] = cSingleAccessArray;
       createSingleArrayForPolicy.push(aControl);

src/views/SetupKeys.tsx

@@ -494,7 +494,6 @@ export const SetupKeys = () => {
                         value={optionValidAll}
                         optionType="button"
                         buttonStyle="solid"
-                        disabled={!dataTable?.length}
                       />
                       <Select
                         style={{ marginRight: "10px" }}