From e1cdc148f79af72f61091b198cab58e98f2db229 Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Mon, 10 Jun 2024 16:13:18 -0400
Subject: [PATCH 1/2] #261 - Network Selector bug

---
 .../df-service-details.component.html         | 50 +++++++++++--------
 .../df-service-details.component.scss         | 15 ++++++
 .../df-script-editor.component.html           |  8 +--
 src/assets/img/databaseImages.json            |  2 +-
 4 files changed, 49 insertions(+), 26 deletions(-)

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
index 114c940d..c7b19511 100644
--- 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
@@ -207,13 +207,17 @@ <h4 class="text-center" style="color: black !important">
                       item.type === 'text' && item.name === 'content';
                       else dynamic
                     ">
-                    <df-script-editor
-                      [type]="getControl('type')"
-                      [storageServiceId]="getConfigControl('storageServiceId')"
-                      [storagePath]="getConfigControl('storagePath')"
-                      [content]="getConfigControl('content')"
-                      [cache]="serviceData ? serviceData.name : ''"
-                      class="full-width"></df-script-editor>
+                    <ng-container *ngIf="getConfigControl('storageServiceId')">
+                      <df-script-editor
+                        [type]="getControl('type')"
+                        [storageServiceId]="
+                          getConfigControl('storageServiceId')
+                        "
+                        [storagePath]="getConfigControl('storagePath')"
+                        [content]="getConfigControl('content')"
+                        [cache]="serviceData ? serviceData.name : ''"
+                        class="full-width"></df-script-editor>
+                    </ng-container>
                   </ng-container>
                   <ng-template #dynamic>
                     <df-dynamic-field
@@ -365,13 +369,15 @@ <h4 class="text-center" style="color: black !important">
                   <mat-button-toggle value="1">YAML</mat-button-toggle>
                 </mat-button-toggle-group>
                 <mat-label class="full-width">Service Definition</mat-label>
-                <df-script-editor
-                  [type]="getControl('type')"
-                  [storageServiceId]="getConfigControl('storageServiceId')"
-                  [storagePath]="getConfigControl('storagePath')"
-                  [content]="getConfigControl('serviceDefinition')"
-                  [cache]="serviceData ? serviceData.name : ''"
-                  class="full-width"></df-script-editor>
+                <ng-container *ngIf="getConfigControl('storageServiceId')">
+                  <df-script-editor
+                    [type]="getControl('type')"
+                    [storageServiceId]="getConfigControl('storageServiceId')"
+                    [storagePath]="getConfigControl('storagePath')"
+                    [content]="getConfigControl('serviceDefinition')"
+                    [cache]="serviceData ? serviceData.name : ''"
+                    class="full-width"></df-script-editor>
+                </ng-container>
                 <!-- <mat-form-field class="full-width" appearance="outline">
                   <mat-label>Service Definition</mat-label>
                   <textarea
@@ -399,13 +405,15 @@ <h4 class="text-center" style="color: black !important">
                     item.type === 'text' && item.name === 'content';
                     else dynamic
                   ">
-                  <df-script-editor
-                    [type]="getControl('type')"
-                    [storageServiceId]="getConfigControl('storageServiceId')"
-                    [storagePath]="getConfigControl('storagePath')"
-                    [content]="getConfigControl('content')"
-                    [cache]="serviceData ? serviceData.name : ''"
-                    class="full-width"></df-script-editor>
+                  <ng-container *ngIf="getConfigControl('storageServiceId')">
+                    <df-script-editor
+                      [type]="getControl('type')"
+                      [storageServiceId]="getConfigControl('storageServiceId')"
+                      [storagePath]="getConfigControl('storagePath')"
+                      [content]="getConfigControl('content')"
+                      [cache]="serviceData ? serviceData.name : ''"
+                      class="full-width"></df-script-editor>
+                  </ng-container>
                 </ng-container>
                 <ng-template #dynamic>
                   <df-dynamic-field
diff --git a/src/app/adf-services/df-service-details/df-service-details.component.scss b/src/app/adf-services/df-service-details/df-service-details.component.scss
index 6b1b750b..6e6e50c1 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.scss
+++ b/src/app/adf-services/df-service-details/df-service-details.component.scss
@@ -150,4 +150,19 @@ mat-icon {
       }
     }
   }
+
+  .details-section {
+
+    ::ng-deep .mat-button-toggle-group {
+
+    
+   button {
+      background: inherit !important;
+
+      span {
+        color: #2d2d2d !important;
+      }
+    }
+  }
+  }
 }
diff --git a/src/app/shared/components/df-script-editor/df-script-editor.component.html b/src/app/shared/components/df-script-editor/df-script-editor.component.html
index 91779b97..2968dc9f 100644
--- a/src/app/shared/components/df-script-editor/df-script-editor.component.html
+++ b/src/app/shared/components/df-script-editor/df-script-editor.component.html
@@ -11,7 +11,7 @@
       mat-flat-button
       class="save-btn"
       (click)="fileInput.click()"
-      [disabled]="storageServiceId.getRawValue()">
+      [disabled]="!storageServiceId || !storageServiceId.getRawValue()">
       {{ 'desktopFile' | transloco }}
     </button>
     <button
@@ -19,7 +19,7 @@
       mat-flat-button
       class="save-btn"
       (click)="githubImport()"
-      [disabled]="storageServiceId.getRawValue()">
+      [disabled]="!storageServiceId || !storageServiceId.getRawValue()">
       {{ 'githubFile' | transloco }}
     </button>
   </div>
@@ -33,7 +33,7 @@
     </mat-select>
   </mat-form-field> -->
   <mat-form-field
-    *ngIf="!!storageServiceId.getRawValue()"
+    *ngIf="!storageServiceId || !storageServiceId.getRawValue()"
     class="dynamic-width"
     subscriptSizing="dynamic">
     <mat-label>{{ 'path' | transloco }}</mat-label>
@@ -45,7 +45,7 @@
       color="primary"
       type="button"
       (click)="viewLatest()"
-      [disabled]="!storagePath.getRawValue()">
+      [disabled]="!storageServiceId || !storageServiceId.getRawValue()">
       {{ 'scripts.viewLatest' | transloco }}
     </button>
     <button
diff --git a/src/assets/img/databaseImages.json b/src/assets/img/databaseImages.json
index c19bdc0f..d8d16664 100644
--- a/src/assets/img/databaseImages.json
+++ b/src/assets/img/databaseImages.json
@@ -105,7 +105,7 @@
       "label": "apache_hive"
     },
     {
-      "src": "https://assets-global.website-files.com/64ed8da8a866be7a702fbafb/64ed8da8a866be7a702fbb45_API%2520Logo%2520Container-9-p-500.webp",
+      "src": "https://cdn.prod.website-files.com/64ed8da8a866be7a702fbafb/663179140e764316a084735b_connector%20logo%20updated.png",
       "alt": "snowflake",
       "label": "snowflake"
     },

From 172b5c172c9a832f9b4371d3a1036853ad4acf2b Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Mon, 10 Jun 2024 16:14:25 -0400
Subject: [PATCH 2/2] cleanup

---
 .../df-service-details.component.scss               | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/app/adf-services/df-service-details/df-service-details.component.scss b/src/app/adf-services/df-service-details/df-service-details.component.scss
index 6e6e50c1..0d37b438 100644
--- a/src/app/adf-services/df-service-details/df-service-details.component.scss
+++ b/src/app/adf-services/df-service-details/df-service-details.component.scss
@@ -152,17 +152,14 @@ mat-icon {
   }
 
   .details-section {
-
     ::ng-deep .mat-button-toggle-group {
+      button {
+        background: inherit !important;
 
-    
-   button {
-      background: inherit !important;
-
-      span {
-        color: #2d2d2d !important;
+        span {
+          color: #2d2d2d !important;
+        }
       }
     }
   }
-  }
 }