@serve.zone/dcrouter 13.1.3 → 13.3.0

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

@@ -0,0 +1,114 @@
+import * as appstate from '../../appstate.js';
+import { appRouter } from '../../router.js';
+import { viewHostCss } from '../shared/css.js';
+
+import {
+  DeesElement,
+  customElement,
+  html,
+  state,
+  css,
+  cssManager,
+  type TemplateResult,
+} from '@design.estate/dees-element';
+
+// Side-effect imports register the subview custom elements
+import './ops-view-security-overview.js';
+import './ops-view-security-blocked.js';
+import './ops-view-security-authentication.js';
+import './ops-view-security-emailsecurity.js';
+
+declare global {
+  interface HTMLElementTagNameMap {
+    'ops-view-security': OpsViewSecurity;
+  }
+}
+
+type TSecurityTab = 'overview' | 'blocked' | 'authentication' | 'emailsecurity';
+
+@customElement('ops-view-security')
+export class OpsViewSecurity extends DeesElement {
+  @state()
+  accessor selectedTab: TSecurityTab = 'overview';
+
+  private tabLabelMap: Record<TSecurityTab, string> = {
+    'overview':       'Overview',
+    'blocked':        'Blocked IPs',
+    'authentication': 'Authentication',
+    'emailsecurity':  'Email Security',
+  };
+
+  private labelToTab: Record<string, TSecurityTab> = {
+    'Overview':       'overview',
+    'Blocked IPs':    'blocked',
+    'Authentication': 'authentication',
+    'Email Security': 'emailsecurity',
+  };
+
+  private static isSecurityTab(s: string | null): s is TSecurityTab {
+    return s === 'overview' || s === 'blocked' || s === 'authentication' || s === 'emailsecurity';
+  }
+
+  constructor() {
+    super();
+    // Read initial subview from state (URL-driven)
+    const initialState = appstate.uiStatePart.getState()!;
+    if (OpsViewSecurity.isSecurityTab(initialState.activeSubview)) {
+      this.selectedTab = initialState.activeSubview;
+    }
+    // Subscribe to future changes (back/forward navigation, direct URL entry)
+    const sub = appstate.uiStatePart.select((s) => s.activeSubview).subscribe((sub) => {
+      if (OpsViewSecurity.isSecurityTab(sub) && sub !== this.selectedTab) {
+        this.selectedTab = sub;
+      }
+    });
+    this.rxSubscriptions.push(sub);
+  }
+
+  async firstUpdated() {
+    const toggle = this.shadowRoot!.querySelector('dees-input-multitoggle') as any;
+    if (toggle) {
+      const sub = toggle.changeSubject.subscribe(() => {
+        const tab = this.labelToTab[toggle.selectedOption];
+        if (tab && tab !== this.selectedTab) {
+          // Push URL → router updates state → subscription updates selectedTab
+          appRouter.navigateToView('security', tab);
+        }
+      });
+      this.rxSubscriptions.push(sub);
+    }
+  }
+
+  public static styles = [
+    cssManager.defaultStyles,
+    viewHostCss,
+    css`
+      dees-input-multitoggle {
+        margin-bottom: 24px;
+      }
+    `,
+  ];
+
+  public render(): TemplateResult {
+    return html`
+      <dees-heading level="2">Security</dees-heading>
+
+      <dees-input-multitoggle
+        .type=${'single'}
+        .options=${['Overview', 'Blocked IPs', 'Authentication', 'Email Security']}
+        .selectedOption=${this.tabLabelMap[this.selectedTab]}
+      ></dees-input-multitoggle>
+
+      ${this.renderTabContent()}
+    `;
+  }
+
+  private renderTabContent(): TemplateResult {
+    switch (this.selectedTab) {
+      case 'overview':       return html`<ops-view-security-overview></ops-view-security-overview>`;
+      case 'blocked':        return html`<ops-view-security-blocked></ops-view-security-blocked>`;
+      case 'authentication': return html`<ops-view-security-authentication></ops-view-security-authentication>`;
+      case 'emailsecurity':  return html`<ops-view-security-emailsecurity></ops-view-security-emailsecurity>`;
+    }
+  }
+}

package/ts_web/router.ts

@@ -3,9 +3,31 @@ import * as appstate from './appstate.js';
 
 const SmartRouter = plugins.domtools.plugins.smartrouter.SmartRouter;
 
-export const validViews = ['overview', 'network', 'emails', 'logs', 'routes', 'apitokens', 'configuration', 'security', 'certificates', 'remoteingress', 'vpn', 'sourceprofiles', 'networktargets', 'targetprofiles'] as const;
+// Flat top-level views (no subviews)
+const flatViews = ['overview', 'configuration', 'emails', 'logs', 'apitokens', 'certificates', 'remoteingress', 'vpn'] as const;
+
+// Tabbed views and their valid subviews
+const subviewMap: Record<string, readonly string[]> = {
+  network: ['activity', 'routes', 'sourceprofiles', 'networktargets', 'targetprofiles'] as const,
+  security: ['overview', 'blocked', 'authentication', 'emailsecurity'] as const,
+};
+
+// Default subview when user visits the bare parent URL
+const defaultSubview: Record<string, string> = {
+  network: 'activity',
+  security: 'overview',
+};
+
+export const validTopLevelViews = [...flatViews, ...Object.keys(subviewMap)] as const;
+export type TValidView = typeof validTopLevelViews[number];
+
+export function isValidView(view: string): boolean {
+  return (validTopLevelViews as readonly string[]).includes(view);
+}
 
-export type TValidView = typeof validViews[number];
+export function isValidSubview(view: string, subview: string): boolean {
+  return subviewMap[view]?.includes(subview) ?? false;
+}
 
 class AppRouter {
   private router: InstanceType<typeof SmartRouter>;
@@ -25,10 +47,25 @@ class AppRouter {
   }
 
   private setupRoutes(): void {
-    for (const view of validViews) {
+    // Flat views
+    for (const view of flatViews) {
+      this.router.on(`/${view}`, async () => {
+        this.updateViewState(view, null);
+      });
+    }
+
+    // Tabbed views
+    for (const view of Object.keys(subviewMap)) {
+      // Bare parent → redirect to default subview
       this.router.on(`/${view}`, async () => {
-        this.updateViewState(view);
+        this.navigateTo(`/${view}/${defaultSubview[view]}`);
       });
+      // Each valid subview
+      for (const sub of subviewMap[view]) {
+        this.router.on(`/${view}/${sub}`, async () => {
+          this.updateViewState(view, sub);
+        });
+      }
     }
 
     // Root redirect
@@ -42,7 +79,9 @@ class AppRouter {
       if (this.suppressStateUpdate) return;
 
       const currentPath = window.location.pathname;
-      const expectedPath = `/${uiState.activeView}`;
+      const expectedPath = uiState.activeSubview
+        ? `/${uiState.activeView}/${uiState.activeSubview}`
+        : `/${uiState.activeView}`;
 
       if (currentPath !== expectedPath) {
         this.suppressStateUpdate = true;
@@ -57,25 +96,38 @@ class AppRouter {
 
     if (!path || path === '/') {
       this.router.pushUrl('/overview');
-    } else {
-      const segments = path.split('/').filter(Boolean);
-      const view = segments[0];
+      return;
+    }
+
+    const segments = path.split('/').filter(Boolean);
+    const view = segments[0];
+    const sub = segments[1];
 
-      if (validViews.includes(view as TValidView)) {
-        this.updateViewState(view as TValidView);
+    if (!isValidView(view)) {
+      this.router.pushUrl('/overview');
+      return;
+    }
+
+    if (subviewMap[view]) {
+      if (sub && isValidSubview(view, sub)) {
+        this.updateViewState(view, sub);
       } else {
-        this.router.pushUrl('/overview');
+        // Bare parent or invalid sub → default subview
+        this.router.pushUrl(`/${view}/${defaultSubview[view]}`);
       }
+    } else {
+      this.updateViewState(view, null);
     }
   }
 
-  private updateViewState(view: string): void {
+  private updateViewState(view: string, subview: string | null): void {
     this.suppressStateUpdate = true;
     const currentState = appstate.uiStatePart.getState()!;
-    if (currentState.activeView !== view) {
+    if (currentState.activeView !== view || currentState.activeSubview !== subview) {
       appstate.uiStatePart.setState({
         ...currentState,
         activeView: view,
+        activeSubview: subview,
       } as appstate.IUiState);
     }
     this.suppressStateUpdate = false;
@@ -85,11 +137,17 @@ class AppRouter {
     this.router.pushUrl(path);
   }
 
-  public navigateToView(view: string): void {
-    if (validViews.includes(view as TValidView)) {
-      this.navigateTo(`/${view}`);
-    } else {
+  public navigateToView(view: string, subview?: string): void {
+    if (!isValidView(view)) {
       this.navigateTo('/overview');
+      return;
+    }
+    if (subview && isValidSubview(view, subview)) {
+      this.navigateTo(`/${view}/${subview}`);
+    } else if (subviewMap[view]) {
+      this.navigateTo(`/${view}/${defaultSubview[view]}`);
+    } else {
+      this.navigateTo(`/${view}`);
     }
   }
 

package/dist_ts_web/elements/ops-view-security.d.ts

@@ -1,24 +0,0 @@
-import * as plugins from '../plugins.js';
-import * as appstate from '../appstate.js';
-import { DeesElement } from '@design.estate/dees-element';
-export declare class OpsViewSecurity extends DeesElement {
-    accessor statsState: appstate.IStatsState;
-    accessor selectedTab: 'overview' | 'blocked' | 'authentication' | 'email-security';
-    private tabLabelMap;
-    private labelToTab;
-    constructor();
-    firstUpdated(): Promise<void>;
-    static styles: plugins.deesElement.CSSResult[];
-    render(): plugins.deesElement.TemplateResult<1>;
-    private renderTabContent;
-    private renderOverview;
-    private renderBlockedIPs;
-    private renderAuthentication;
-    private renderEmailSecurity;
-    private calculateThreatLevel;
-    private getThreatScore;
-    private getSecurityEvents;
-    private clearBlockedIPs;
-    private unblockIP;
-    private saveEmailSecuritySettings;
-}