From 4a2c36ebba9b0ffc220cffc12ea1587ec3047e84 Mon Sep 17 00:00:00 2001
From: Hoan Luu Huu <110280845+xquanluu@users.noreply.github.com>
Date: Tue, 19 Sep 2023 07:15:53 +0700
Subject: [PATCH] allow sip port is null (#323)

* allow sip port is null

* fix port placeholder when protocol is tls or tls/srtp
---
 src/api/types.ts                              |  3 +-
 .../internal/views/carriers/form.tsx          | 36 ++++++++++++++++---
 2 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/src/api/types.ts b/src/api/types.ts
index 5df8692..c421ca9 100644
--- a/src/api/types.ts
+++ b/src/api/types.ts
@@ -459,7 +459,6 @@ export interface PredefinedCarrier extends Carrier {
 export interface Gateway {
   voip_carrier_sid: string;
   ipv4: string;
-  port: number;
   netmask: number;
   inbound: number;
   outbound: number;
@@ -469,6 +468,7 @@ export interface SipGateway extends Gateway {
   sip_gateway_sid?: null | string;
   is_active: boolean;
   protocol?: string;
+  port: number | null;
   pad_crypto?: boolean;
 }
 
@@ -476,6 +476,7 @@ export interface SmppGateway extends Gateway {
   smpp_gateway_sid?: null | string;
   is_primary: boolean;
   use_tls: boolean;
+  port: number;
 }
 
 export interface Lcr {
diff --git a/src/containers/internal/views/carriers/form.tsx b/src/containers/internal/views/carriers/form.tsx
index a3d4f80..3d32133 100644
--- a/src/containers/internal/views/carriers/form.tsx
+++ b/src/containers/internal/views/carriers/form.tsx
@@ -22,6 +22,7 @@ import {
   FQDN,
   FQDN_TOP_LEVEL,
   INVALID,
+  IP,
   NETMASK_OPTIONS,
   SIP_GATEWAY_PROTOCOL_OPTIONS,
   TCP_MAX_PORT,
@@ -47,6 +48,8 @@ import {
   hasLength,
   isValidPort,
   disableDefaultTrunkRouting,
+  hasValue,
+  isNotBlank,
 } from "src/utils";
 
 import type {
@@ -236,7 +239,20 @@ export const CarrierForm = ({
     value: typeof sipGateways[number][keyof SipGateway]
   ) => {
     setSipGateways(
-      sipGateways.map((g, i) => (i === index ? { ...g, [key]: value } : g))
+      sipGateways.map((g, i) =>
+        i === index
+          ? {
+              ...g,
+              [key]: value,
+              // If Change to ipv4 and port is null, change port to 5060
+              ...(key === "ipv4" &&
+                value &&
+                typeof value === "string" &&
+                getIpValidationType(value) === IP &&
+                g.port === null && { port: 5060 }),
+            }
+          : g
+      )
     );
   };
 
@@ -409,7 +425,9 @@ export const CarrierForm = ({
     /** When to switch to `sip` tab */
 
     const emptySipIp = sipGateways.find((g) => g.ipv4.trim() === "");
-    const invalidSipPort = sipGateways.find((g) => !isValidPort(g.port));
+    const invalidSipPort = sipGateways.find(
+      (g) => hasValue(g.port) && !isValidPort(g.port)
+    );
     const sipGatewayValidation = getSipValidation();
 
     /** Empty SIP gateway */
@@ -962,13 +980,21 @@ export const CarrierForm = ({
                           type="number"
                           min="0"
                           max={TCP_MAX_PORT}
-                          placeholder={DEFAULT_SIP_GATEWAY.port.toString()}
-                          value={g.port}
+                          placeholder={
+                            g.protocol === "tls" || g.protocol === "tls/srtp"
+                              ? ""
+                              : DEFAULT_SIP_GATEWAY.port?.toString()
+                          }
+                          value={g.port === null ? "" : g.port}
                           onChange={(e) => {
                             updateSipGateways(
                               i,
                               "port",
-                              Number(e.target.value)
+                              g.outbound > 0 &&
+                                !isNotBlank(e.target.value) &&
+                                getIpValidationType(g.ipv4) !== IP
+                                ? null
+                                : Number(e.target.value)
                             );
                           }}
                           ref={(ref: HTMLInputElement) =>