Merge pull request #448 from dreamfactorysoftware/claude-scripted-service-patch

thekevinm · web-flow · commit 28cdc85483f4 · 2025-08-21T19:18:20.000-07:00
rebuild
diff --git a/dist/1326.9e5d3c0d4b2d6a47.js b/dist/1326.9e5d3c0d4b2d6a47.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.99380091d42587c0.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.1b31dd8117704925.js" type="module"></script></body>
+  <script src="runtime.1adb24c16ff25b9a.js" type="module"></script><script src="polyfills.def0190516b19e6b.js" type="module"></script><script src="main.1b31dd8117704925.js" type="module"></script></body>
 </html>
diff --git a/dist/runtime.1adb24c16ff25b9a.js b/dist/runtime.1adb24c16ff25b9a.js
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.html b/src/app/adf-services/df-service-details/df-service-details.component.html
@@ -717,7 +717,9 @@ <h4 class="text-center" style="color: black !important">
                   <mat-button-toggle value="0">JSON</mat-button-toggle>
                   <mat-button-toggle value="1">YAML</mat-button-toggle>
                 </mat-button-toggle-group>
-                <mat-label class="full-width">OpenAPI Service Definition (Optional)</mat-label>
+                <mat-label class="full-width"
+                  >OpenAPI Service Definition (Optional)</mat-label
+                >
 
                 <df-ace-editor
                   class="full-width"
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
@@ -308,25 +308,25 @@ export class DfServiceDetailsComponent implements OnInit {
             if (!data.config) {
               data.config = {};
             }
-            
+
             // Helper function to detect if content is likely an OpenAPI/Swagger spec
             const isLikelyOpenApiSpec = (content: string): boolean => {
               if (!content) return false;
               const trimmed = content.trim();
-              
+
               // Check for common OpenAPI/Swagger patterns
               const openApiPatterns = [
-                /^\s*\{?\s*["']?openapi["']?\s*:/i,  // JSON or YAML openapi field
-                /^\s*\{?\s*["']?swagger["']?\s*:/i,   // JSON or YAML swagger field
-                /^\s*openapi\s*:/im,                   // YAML format
-                /^\s*swagger\s*:/im,                   // YAML format
-                /["']paths["']\s*:\s*\{/i,             // JSON paths object
-                /^\s*paths\s*:/im                      // YAML paths
+                /^\s*\{?\s*["']?openapi["']?\s*:/i, // JSON or YAML openapi field
+                /^\s*\{?\s*["']?swagger["']?\s*:/i, // JSON or YAML swagger field
+                /^\s*openapi\s*:/im, // YAML format
+                /^\s*swagger\s*:/im, // YAML format
+                /["']paths["']\s*:\s*\{/i, // JSON paths object
+                /^\s*paths\s*:/im, // YAML paths
               ];
-              
+
               return openApiPatterns.some(pattern => pattern.test(trimmed));
             };
-            
+
             // Check if this is an old script service with content in the wrong place
             // Old structure: script content was in serviceDocByServiceId.content
             // New structure: script content should be in config.content, OpenAPI spec (if any) in serviceDocByServiceId.content
@@ -421,7 +421,7 @@ export class DfServiceDetailsComponent implements OnInit {
     this.isNetworkService = false;
     this.isScriptService = false;
     this.isFile = false;
-    
+
     // Find the service type to get its group
     const serviceType = this.serviceTypes.find(st => st.name === type);
     if (serviceType && serviceType.group) {
@@ -735,7 +735,8 @@ export class DfServiceDetailsComponent implements OnInit {
         related: 'service_doc_by_service_id',
       };
       // For script services, check if there's an OpenAPI spec
-      const openApiContent = this.getServiceDocByServiceIdControl('content')?.value;
+      const openApiContent =
+        this.getServiceDocByServiceIdControl('content')?.value;
       if (openApiContent && openApiContent.trim()) {
         serviceDoc = {
           content: openApiContent,
@@ -1003,7 +1004,8 @@ export class DfServiceDetailsComponent implements OnInit {
         // Remove content from config as it's moved to service_doc_by_service_id
         delete payload.config.content;
       } else if (this.isScriptService) {
-        const openApiContent = this.getServiceDocByServiceIdControl('content')?.value;
+        const openApiContent =
+          this.getServiceDocByServiceIdControl('content')?.value;
         if (openApiContent && openApiContent.trim()) {
           payload.service_doc_by_service_id = {
             content: openApiContent,
diff --git a/src/app/shared/services/df-loading-spinner.service.ts b/src/app/shared/services/df-loading-spinner.service.ts
@@ -18,9 +18,9 @@ export class DfLoadingSpinnerService {
     } else {
       this.activeCounter = Math.max(this.activeCounter - 1, 0);
     }
-    
+
     const shouldBeActive = this.activeCounter > 0;
-    
+
     // Only defer if the value is actually changing to avoid unnecessary timeouts
     // This prevents ExpressionChangedAfterItHasBeenCheckedError by ensuring
     // the value change happens after the current change detection cycle completes
