@serve.zone/dcrouter 12.4.0 → 12.5.2

package/ts_web/elements/ops-view-routes.ts

@@ -414,9 +414,9 @@ export class OpsViewRoutes extends DeesElement {
     const currentPorts = Array.isArray(route.match.ports)
       ? route.match.ports.map((p: any) => typeof p === 'number' ? String(p) : `${p.from}-${p.to}`).join(', ')
       : String(route.match.ports);
-    const currentDomains = route.match.domains
-      ? (Array.isArray(route.match.domains) ? route.match.domains.join(', ') : route.match.domains)
-      : '';
+    const currentDomains: string[] = route.match.domains
+      ? (Array.isArray(route.match.domains) ? route.match.domains : [route.match.domains])
+      : [];
     const firstTarget = route.action.targets?.[0];
     const currentTargetHost = firstTarget
       ? (Array.isArray(firstTarget.host) ? firstTarget.host[0] : firstTarget.host)
@@ -429,7 +429,8 @@ export class OpsViewRoutes extends DeesElement {
         <dees-form>
           <dees-input-text .key=${'name'} .label=${'Route Name'} .value=${route.name || ''} .required=${true}></dees-input-text>
           <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .value=${currentPorts} .required=${true}></dees-input-text>
-          <dees-input-text .key=${'domains'} .label=${'Domains (comma-separated, optional)'} .value=${currentDomains}></dees-input-text>
+          <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'} .value=${currentDomains}></dees-input-list>
+          <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'} .value=${route.priority != null ? String(route.priority) : ''}></dees-input-text>
           <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${merged.metadata?.securityProfileRef || ''}></dees-input-dropdown>
           <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${merged.metadata?.networkTargetRef || ''}></dees-input-dropdown>
           <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${currentTargetHost}></dees-input-text>
@@ -452,15 +453,16 @@ export class OpsViewRoutes extends DeesElement {
             if (!formData.name || !formData.ports) return;
 
             const ports = formData.ports.split(',').map((p: string) => parseInt(p.trim(), 10)).filter((p: number) => !isNaN(p));
-            const domains = formData.domains
-              ? formData.domains.split(',').map((d: string) => d.trim()).filter(Boolean)
-              : undefined;
+            const domains: string[] = Array.isArray(formData.domains)
+              ? formData.domains.filter(Boolean)
+              : [];
+            const priority = formData.priority ? parseInt(formData.priority, 10) : undefined;
 
             const updatedRoute: any = {
               name: formData.name,
               match: {
                 ports,
-                ...(domains && domains.length > 0 ? { domains } : {}),
+                ...(domains.length > 0 ? { domains } : {}),
               },
               action: {
                 type: 'forward',
@@ -471,6 +473,7 @@ export class OpsViewRoutes extends DeesElement {
                   },
                 ],
               },
+              ...(priority != null && !isNaN(priority) ? { priority } : {}),
             };
 
             const metadata: any = {};
@@ -523,7 +526,8 @@ export class OpsViewRoutes extends DeesElement {
         <dees-form>
           <dees-input-text .key=${'name'} .label=${'Route Name'} .required=${true}></dees-input-text>
           <dees-input-text .key=${'ports'} .label=${'Ports (comma-separated)'} .required=${true}></dees-input-text>
-          <dees-input-text .key=${'domains'} .label=${'Domains (comma-separated, optional)'}></dees-input-text>
+          <dees-input-list .key=${'domains'} .label=${'Domains'} .placeholder=${'Add domain...'}></dees-input-list>
+          <dees-input-text .key=${'priority'} .label=${'Priority (higher = matched first)'}></dees-input-text>
           <dees-input-dropdown .key=${'securityProfileRef'} .label=${'Security Profile'} .options=${profileOptions} .selectedKey=${''}></dees-input-dropdown>
           <dees-input-dropdown .key=${'networkTargetRef'} .label=${'Network Target'} .options=${targetOptions} .selectedKey=${''}></dees-input-dropdown>
           <dees-input-text .key=${'targetHost'} .label=${'Target Host (if no target selected)'} .value=${'localhost'}></dees-input-text>
@@ -546,15 +550,16 @@ export class OpsViewRoutes extends DeesElement {
             if (!formData.name || !formData.ports) return;
 
             const ports = formData.ports.split(',').map((p: string) => parseInt(p.trim(), 10)).filter((p: number) => !isNaN(p));
-            const domains = formData.domains
-              ? formData.domains.split(',').map((d: string) => d.trim()).filter(Boolean)
-              : undefined;
+            const domains: string[] = Array.isArray(formData.domains)
+              ? formData.domains.filter(Boolean)
+              : [];
+            const priority = formData.priority ? parseInt(formData.priority, 10) : undefined;
 
             const route: any = {
               name: formData.name,
               match: {
                 ports,
-                ...(domains && domains.length > 0 ? { domains } : {}),
+                ...(domains.length > 0 ? { domains } : {}),
               },
               action: {
                 type: 'forward',
@@ -565,6 +570,7 @@ export class OpsViewRoutes extends DeesElement {
                   },
                 ],
               },
+              ...(priority != null && !isNaN(priority) ? { priority } : {}),
             };
 
             // Build metadata if profile/target selected