From 95b3c1f07367667c8412b7d7924b00cdd74a66af Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Tue, 27 Feb 2024 15:45:37 -0500
Subject: [PATCH 1/2] Updated logic when displaying table values and for
 setting passwords

---
 environments/environment.ts                        |  2 +-
 .../df-admin-details/df-admin-details.component.ts |  5 ++++-
 .../df-service-details/df-paywall-modal.html       |  4 ++--
 .../df-manage-table/df-manage-table.component.ts   | 14 +++++++++++---
 .../df-side-nav/df-side-nav.component.html         |  2 +-
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/environments/environment.ts b/environments/environment.ts
index 59b333fe..63670f25 100644
--- a/environments/environment.ts
+++ b/environments/environment.ts
@@ -1,3 +1,3 @@
 export const environment = {
-  dfApiKey: '6498a8ad1beb9d84d63035c5d1120c007fad6de706734db9689f8996707e0f7d',
+  dfApiKey: '6498a8ad1beb9d84d63035c5d1120c007fad6de706734db9689f8996707e0f7e',
 };
diff --git a/src/app/adf-admins/df-admin-details/df-admin-details.component.ts b/src/app/adf-admins/df-admin-details/df-admin-details.component.ts
index 5700a280..f5b9dba6 100644
--- a/src/app/adf-admins/df-admin-details/df-admin-details.component.ts
+++ b/src/app/adf-admins/df-admin-details/df-admin-details.component.ts
@@ -144,7 +144,10 @@ export class DfAdminDetailsComponent extends DfUserDetailsBaseComponent<UserProf
       this.adminService
         .update<GenericUpdateResponse, AdminProfile>(
           this.currentProfile.id,
-          data,
+          {
+            ...data,
+            password: this.userForm.value.password,
+          },
           {
             snackbarSuccess: 'admins.alerts.updateSuccess',
           }
diff --git a/src/app/adf-services/df-service-details/df-paywall-modal.html b/src/app/adf-services/df-service-details/df-paywall-modal.html
index d5925f29..27cbc03e 100644
--- a/src/app/adf-services/df-service-details/df-paywall-modal.html
+++ b/src/app/adf-services/df-service-details/df-paywall-modal.html
@@ -1,3 +1,4 @@
+<!-- eslint-disable prettier/prettier -->
 <div class="app-container" style="padding: 12px 20px">
   <h1 mat-dialog-title style="text-align: center">Unlock Service</h1>
   <mat-dialog-content>
@@ -12,8 +13,7 @@ <h4>{{ 'paywall.hostedTrial' | transloco }}</h4>
         <div class="dynamic-width">
           <h4>{{ 'paywall.ossVersion' | transloco }}</h4>
           <p>
-            {{ 'paywall.signup' | transloco
-            }}<a
+            {{ 'paywall.signup' | transloco }}<a
               href="https://genie.dreamfactory.com/?utm_source=platform&utm_medium=paywall&utm_campaign=hosted"
               target="_blank"
               >{{ 'paywall.trial' | transloco }}</a
diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.ts b/src/app/shared/components/df-manage-table/df-manage-table.component.ts
index 98ae97f1..1692d86e 100644
--- a/src/app/shared/components/df-manage-table/df-manage-table.component.ts
+++ b/src/app/shared/components/df-manage-table/df-manage-table.component.ts
@@ -211,9 +211,17 @@ export abstract class DfManageTableComponent<T>
   }
 
   viewRow(row: T): void {
-    this.router.navigate([`${(row as any).id}-${(row as any).name}`], {
-      relativeTo: this._activatedRoute,
-    });
+    // eslint-disable-next-line no-useless-escape
+    const regex = /\/api\-connections/;
+    if (this.router.url.match(regex)) {
+      this.router.navigate([`${(row as any).id}-${(row as any).name}`], {
+        relativeTo: this._activatedRoute,
+      });
+    } else {
+      this.router.navigate([`${(row as any).id}`], {
+        relativeTo: this._activatedRoute,
+      });
+    }
   }
 
   announceSortChange(sortState: any) {
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.html b/src/app/shared/components/df-side-nav/df-side-nav.component.html
index 43fe0bb6..45f0ed49 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.html
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.html
@@ -162,4 +162,4 @@ <h1 class="page-header">
       </mat-expansion-panel>
     </ng-template>
   </ng-container>
-</ng-template>
\ No newline at end of file
+</ng-template>

From a8e4375f38b0c70d44029e59cfe2c6627902ac14 Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Tue, 27 Feb 2024 15:50:28 -0500
Subject: [PATCH 2/2] revert changes on this file, not finished with it yet

---
 environments/environment.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/environments/environment.ts b/environments/environment.ts
index 63670f25..59b333fe 100644
--- a/environments/environment.ts
+++ b/environments/environment.ts
@@ -1,3 +1,3 @@
 export const environment = {
-  dfApiKey: '6498a8ad1beb9d84d63035c5d1120c007fad6de706734db9689f8996707e0f7e',
+  dfApiKey: '6498a8ad1beb9d84d63035c5d1120c007fad6de706734db9689f8996707e0f7d',
 };