dreamfactorysoftware · thekevinm · Aug 11, 2025 · Aug 11, 2025
diff --git a/dist/1361.b86eff7134763666.js b/dist/1361.b86eff7134763666.js
diff --git a/dist/1361.f0aca451e18a0616.js b/dist/1361.f0aca451e18a0616.js
diff --git a/dist/4282.d33504c99a8fcb96.js → dist/4282.66b684ec688e672b.js b/dist/4282.d33504c99a8fcb96.js → dist/4282.66b684ec688e672b.js
diff --git a/dist/index.html b/dist/index.html
@@ -9,5 +9,5 @@
   <body class="mat-typography">
     <df-root></df-root>
     <script type="text/javascript" src="https://assets.calendly.com/assets/external/widget.js"></script>
-  <script src="runtime.1d08080781ca9bb3.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.81ab6796a46ade24.js" type="module"></script></body>
+  <script src="runtime.6c1d3ca2f59f96ab.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.3a61f19611b057ae.js" type="module"></script></body>
 </html>
diff --git a/dist/main.3a61f19611b057ae.js b/dist/main.3a61f19611b057ae.js
diff --git a/dist/main.81ab6796a46ade24.js b/dist/main.81ab6796a46ade24.js
diff --git a/dist/runtime.1d08080781ca9bb3.js → dist/runtime.6c1d3ca2f59f96ab.js b/dist/runtime.1d08080781ca9bb3.js → dist/runtime.6c1d3ca2f59f96ab.js
diff --git a/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts b/src/app/adf-services/df-manage-services/df-manage-services-table.component.ts
@@ -1,5 +1,5 @@
 import { LiveAnnouncer } from '@angular/cdk/a11y';
-import { Component, Inject } from '@angular/core';
+import { Component, Inject, OnInit } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TranslocoService } from '@ngneat/transloco';
@@ -27,7 +27,7 @@ import { catchError, throwError } from 'rxjs';
   standalone: true,
   imports: DfManageTableModules,
 })
-export class DfManageServicesTableComponent extends DfManageTableComponent<ServiceRow> {
+export class DfManageServicesTableComponent extends DfManageTableComponent<ServiceRow> implements OnInit {
   serviceTypes: Array<ServiceType> = [];
   system = false;
   constructor(
@@ -40,11 +40,19 @@ export class DfManageServicesTableComponent extends DfManageTableComponent<Servi
     dialog: MatDialog
   ) {
     super(router, activatedRoute, liveAnnouncer, translateService, dialog);
-    this._activatedRoute.data.subscribe(({ system, data }) => {
-      this.serviceTypes = data.serviceTypes;
-      this.system = system;
-      this.allowCreate = !system;
-      if (system) {
+  }
+
+  override ngOnInit(): void {
+    // Call parent's ngOnInit first to set up the data source
+    super.ngOnInit();
+
+    // Then subscribe to route data for additional setup
+    this._activatedRoute.data.subscribe((routeData) => {
+      const { data } = routeData;
+      this.system = routeData['system'] || this._activatedRoute.snapshot.parent?.data?.['system'] || false;
+      this.serviceTypes = data?.serviceTypes;
+      this.allowCreate = !this.system;
+      if (this.system) {
         this.actions = {
           default: this.actions.default,
           additional:

diff --git a/src/app/adf-services/df-service-details/df-service-details.component.ts b/src/app/adf-services/df-service-details/df-service-details.component.ts
@@ -379,8 +379,13 @@ export class DfServiceDetailsComponent implements OnInit {
   }
 
   get subscriptionRequired() {
+    const serviceType = this.serviceForm.controls['type'].value;
+    // Local email service is open source and should not require subscription
+    if (serviceType === 'local_email') {
+      return false;
+    }
     return (
-      this.serviceForm.controls['type'].value && this.configSchema?.length === 0
+      serviceType && this.configSchema?.length === 0
     );
   }
 

diff --git a/src/app/adf-services/resolvers/services.resolver.ts b/src/app/adf-services/resolvers/services.resolver.ts
@@ -21,8 +21,8 @@ export const servicesResolver =
     const serviceTypeService = inject(SERVICE_TYPE_SERVICE_TOKEN);
     const servicesService = inject(SERVICES_SERVICE_TOKEN);
 
-    const system: boolean = route.data['system'];
-    const groups: Array<string> = route.data['groups'];
+    const system: boolean = route.data['system'] || route.parent?.data?.['system'] || false;
+    const groups: Array<string> = route.data['groups'] || route.parent?.data?.['groups'];
 
     if (groups) {
       const filteredGroups = groups.map(grp =>
@@ -44,7 +44,7 @@ export const servicesResolver =
               limit,
               sort: 'name',
               filter: `${
-                system ? '(created_by_id is not null) and ' : ''
+                system ? '(created_by_id is null) and (name != "api_docs") and ' : ''
               }(type in ("${serviceTypes.map(src => src.name).join('","')}"))${
                 filter ? ` and ${filter}` : ''
               }`,

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,7 +1,12 @@
 import { Component, OnInit } from '@angular/core';
 import { DfLoadingSpinnerService } from './shared/services/df-loading-spinner.service';
 import { NgIf, AsyncPipe } from '@angular/common';
-import { RouterOutlet, Router, ActivatedRoute, NavigationEnd } from '@angular/router';
+import {
+  RouterOutlet,
+  Router,
+  ActivatedRoute,
+  NavigationEnd,
+} from '@angular/router';
 import { DfSideNavComponent } from './shared/components/df-side-nav/df-side-nav.component';
 import { DfLicenseCheckService } from './shared/services/df-license-check.service';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
@@ -36,18 +41,16 @@ export class AppComponent implements OnInit {
   ngOnInit() {
     this.loggingService.log('AppComponent initialized');
     this.handleAuthentication();
-    
+
     // Monitor license check changes and redirect when disable_ui is true
-    this.licenseCheck$
-      .pipe(untilDestroyed(this))
-      .subscribe(licenseCheck => {
-        if (licenseCheck?.disableUi === 'true') {
-          // Force navigation to license-expired page
-          if (!this.router.url.includes(ROUTES.LICENSE_EXPIRED)) {
-            this.router.navigate([ROUTES.LICENSE_EXPIRED]);
-          }
+    this.licenseCheck$.pipe(untilDestroyed(this)).subscribe(licenseCheck => {
+      if (licenseCheck?.disableUi === 'true') {
+        // Force navigation to license-expired page
+        if (!this.router.url.includes(ROUTES.LICENSE_EXPIRED)) {
+          this.router.navigate([ROUTES.LICENSE_EXPIRED]);
         }
-      });
+      }
+    });
   }
 
   private handleAuthentication() {

diff --git a/src/app/shared/guards/global-license.guard.ts b/src/app/shared/guards/global-license.guard.ts
@@ -7,14 +7,17 @@ import { of } from 'rxjs';
 export const globalLicenseGuard: CanActivateFn = (route, state) => {
   const licenseCheckService = inject(DfLicenseCheckService);
   const router = inject(Router);
-  
+
   // Get the current license check value without triggering new API calls
   const licenseCheck = licenseCheckService.currentLicenseCheck;
-  
+
   // If disable_ui is true and we're not on the license-expired page, redirect
-  if (licenseCheck?.disableUi === 'true' && !state.url.includes(ROUTES.LICENSE_EXPIRED)) {
+  if (
+    licenseCheck?.disableUi === 'true' &&
+    !state.url.includes(ROUTES.LICENSE_EXPIRED)
+  ) {
     return of(router.createUrlTree([ROUTES.LICENSE_EXPIRED]));
   }
-  
+
   return of(true);
-};
+};
diff --git a/src/app/shared/guards/license.guard.ts b/src/app/shared/guards/license.guard.ts
@@ -9,7 +9,7 @@ export const licenseGuard = (route: ActivatedRouteSnapshot) => {
   const licenseCheckService = inject(DfLicenseCheckService);
   const router = inject(Router);
   const systemConfigDataService = inject(DfSystemConfigDataService);
-  
+
   // First check if we already have a license check result
   const currentLicenseCheck = licenseCheckService.currentLicenseCheck;
   if (currentLicenseCheck) {
@@ -32,7 +32,7 @@ export const licenseGuard = (route: ActivatedRouteSnapshot) => {
       return of(router.createUrlTree([ROUTES.HOME]));
     }
   }
-  
+
   return systemConfigDataService.environment$.pipe(
     take(1),
     switchMap(environment => {
@@ -72,7 +72,8 @@ export const licenseGuard = (route: ActivatedRouteSnapshot) => {
               catchError(error => {
                 // The error response is already handled in the service
                 // Check the current value after error
-                const errorLicenseCheck = licenseCheckService.currentLicenseCheck;
+                const errorLicenseCheck =
+                  licenseCheckService.currentLicenseCheck;
                 if (errorLicenseCheck?.disableUi === 'true') {
                   if (route?.routeConfig?.path !== ROUTES.LICENSE_EXPIRED) {
                     return of(router.createUrlTree([ROUTES.LICENSE_EXPIRED]));

diff --git a/src/app/shared/services/df-license-check.service.ts b/src/app/shared/services/df-license-check.service.ts
@@ -12,7 +12,7 @@ import { mapSnakeToCamel } from '../utilities/case';
 export class DfLicenseCheckService {
   private licenseCheckSubject = new BehaviorSubject<CheckResponse | null>(null);
   licenseCheck$ = this.licenseCheckSubject.asObservable();
-  
+
   get currentLicenseCheck(): CheckResponse | null {
     return this.licenseCheckSubject.value;
   }

diff --git a/src/app/shared/services/df-license-initializer.service.ts b/src/app/shared/services/df-license-initializer.service.ts
@@ -24,14 +24,16 @@ export class DfLicenseInitializerService {
         ) {
           // Check if we don't already have a license check result
           if (!this.licenseCheckService.currentLicenseCheck) {
-            return this.licenseCheckService.check(environment.platform.licenseKey as string).pipe(
-              map(() => true),
-              catchError(() => of(true)) // Continue even if check fails
-            );
+            return this.licenseCheckService
+              .check(environment.platform.licenseKey as string)
+              .pipe(
+                map(() => true),
+                catchError(() => of(true)) // Continue even if check fails
+              );
           }
         }
         return of(true);
       })
     );
   }
-}
+}