From 1f6693d866f6724cc03527c7365749440f03858e Mon Sep 17 00:00:00 2001
From: Yi-Jacob <jacobyideveloper@gmail.com>
Date: Wed, 8 May 2024 10:05:53 -0500
Subject: [PATCH] 215 - Add Refresh Schema Option

---
 .../df-cache/df-cache-table.component.ts         |  2 +-
 .../df-manage-tables-table.component.ts          |  9 +++++++--
 .../df-manage-services-table.component.ts        |  5 +++--
 .../df-manage-table.component.html               |  9 +++++++++
 .../df-manage-table/df-manage-table.component.ts | 16 +++++++++++++++-
 .../df-side-nav/df-side-nav.component.html       |  2 +-
 .../df-side-nav/df-side-nav.component.ts         |  5 +++--
 src/app/shared/services/df-base-crud.service.ts  |  3 +++
 src/app/shared/types/generic-http.ts             |  1 +
 src/app/shared/types/service.ts                  |  1 +
 10 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/app/adf-config/df-cache/df-cache-table.component.ts b/src/app/adf-config/df-cache/df-cache-table.component.ts
index fe49d22d..84d1c415 100644
--- a/src/app/adf-config/df-cache/df-cache-table.component.ts
+++ b/src/app/adf-config/df-cache/df-cache-table.component.ts
@@ -27,7 +27,7 @@ import { Actions } from 'src/app/shared/types/table';
 export class DfCacheTableComponent extends DfManageTableComponent<CacheRow> {
   constructor(
     @Inject(CACHE_SERVICE_TOKEN)
-    private cacheService: DfBaseCrudService,
+    cacheService: DfBaseCrudService,
     router: Router,
     activatedRoute: ActivatedRoute,
     liveAnnouncer: LiveAnnouncer,
diff --git a/src/app/adf-schema/df-manage-tables-table/df-manage-tables-table.component.ts b/src/app/adf-schema/df-manage-tables-table/df-manage-tables-table.component.ts
index 08ba6e71..f109e6d4 100644
--- a/src/app/adf-schema/df-manage-tables-table/df-manage-tables-table.component.ts
+++ b/src/app/adf-schema/df-manage-tables-table/df-manage-tables-table.component.ts
@@ -66,12 +66,17 @@ export class DfManageTablesTableComponent extends DfManageTableComponent<Databas
       };
     });
   }
-  refreshTable(limit?: number, offset?: number, filter?: string): void {
+  refreshTable(
+    limit?: number,
+    offset?: number,
+    filter?: string,
+    refresh?: boolean
+  ): void {
     const dbName = this._activatedRoute.snapshot.paramMap.get('name');
-
     this.service
       .get(`${dbName}/_schema`, {
         fields: ['name', 'label'].join(','),
+        refresh: refresh,
         limit,
         offset,
         filter,
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
index 4a578c17..c30065cd 100644
--- 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
@@ -110,7 +110,8 @@ export class DfManageServicesTableComponent extends DfManageTableComponent<Servi
   refreshTable(
     limit?: number | undefined,
     offset?: number | undefined,
-    filter?: string | undefined
+    filter?: string | undefined,
+    refresh?: true
   ): void {
     if (this.serviceTypes && this.serviceTypes.length !== 0) {
       filter = `${filter ? `${filter} and ` : ''}(type in ("${this.serviceTypes
@@ -120,12 +121,12 @@ export class DfManageServicesTableComponent extends DfManageTableComponent<Servi
     filter = `${filter ? `${filter} and ` : ''}(created_by_id is${
       !this.system ? ' not ' : ' '
     }null)`;
-
     this.serviceService
       .getAll<GenericListResponse<Service>>({
         limit,
         offset,
         filter,
+        refresh,
       })
       .subscribe(data => {
         this.dataSource.data = this.mapDataToTable(data.resource);
diff --git a/src/app/shared/components/df-manage-table/df-manage-table.component.html b/src/app/shared/components/df-manage-table/df-manage-table.component.html
index a4880881..8264bcfd 100644
--- a/src/app/shared/components/df-manage-table/df-manage-table.component.html
+++ b/src/app/shared/components/df-manage-table/df-manage-table.component.html
@@ -8,6 +8,15 @@
     type="button">
     <fa-icon [icon]="faPlus" size="xl"></fa-icon>
   </button>
+  <button
+    *ngIf="schema"
+    mat-mini-fab
+    color="alternate"
+    [attr.aria-label]="'importList' | transloco"
+    (click)="refreshSchema()"
+    type="button">
+    <fa-icon [icon]="faRefresh" size="xl"></fa-icon>
+  </button>
   <ng-content select="[topActions]"></ng-content>
   <div class="spacer"></div>
   <mat-form-field
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 0612c5d9..b0b30d6b 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
@@ -21,6 +21,7 @@ import {
   faTriangleExclamation,
   faCheckCircle,
   faXmarkCircle,
+  faRefresh,
 } from '@fortawesome/free-solid-svg-icons';
 import { TranslocoPipe, TranslocoService } from '@ngneat/transloco';
 import { MatDialog, MatDialogModule } from '@angular/material/dialog';
@@ -69,9 +70,11 @@ export abstract class DfManageTableComponent<T>
   faPlus = faPlus;
   faEllipsisV = faEllipsisV;
   faTriangleExclamation = faTriangleExclamation;
+  faRefresh = faRefresh;
   allowCreate = true;
   allowFilter = true;
   currentFilter = new FormControl('');
+  schema = false;
 
   abstract columns: Array<Column<T>>;
 
@@ -100,6 +103,7 @@ export abstract class DfManageTableComponent<T>
       },
     ],
   };
+  cacheService: any;
 
   constructor(
     protected router: Router,
@@ -112,6 +116,7 @@ export abstract class DfManageTableComponent<T>
   ngOnInit(): void {
     if (!this.tableData) {
       this.activatedRoute.data.subscribe(({ data }) => {
+        this.schema = this.router.url.includes('schema');
         if (data && data.resource) {
           this.dataSource.data = this.mapDataToTable(data.resource);
         }
@@ -175,7 +180,12 @@ export abstract class DfManageTableComponent<T>
 
   abstract mapDataToTable(data: Array<any>): Array<T>;
 
-  abstract refreshTable(limit?: number, offset?: number, filter?: string): void;
+  abstract refreshTable(
+    limit?: number,
+    offset?: number,
+    filter?: string,
+    refresh?: true
+  ): void;
 
   abstract filterQuery(value: string): string;
 
@@ -243,4 +253,8 @@ export abstract class DfManageTableComponent<T>
         !this.actions.default.disabled)
     );
   }
+
+  refreshSchema() {
+    this.refreshTable(undefined, undefined, undefined, true);
+  }
 }
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 081dfbaf..26bd2210 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
@@ -117,7 +117,7 @@ <h1 class="page-header">
                 </ng-template>
                 <ng-template #breadcrumbLabel>
                   <ng-container *ngIf="breadcrumb.translationKey; else label">
-                    <span>{{ breadcrumb.translationKey | transloco }}</span>
+                    <span>{{ breadcrumb.translationKey | transloco }} </span>
                   </ng-container>
                   <ng-template #label>
                     <span>{{ breadcrumb.label }}</span>
diff --git a/src/app/shared/components/df-side-nav/df-side-nav.component.ts b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
index cf039483..d4bea21f 100644
--- a/src/app/shared/components/df-side-nav/df-side-nav.component.ts
+++ b/src/app/shared/components/df-side-nav/df-side-nav.component.ts
@@ -17,6 +17,7 @@ import {
   faMagnifyingGlass,
   faPlus,
   faUser,
+  faRefresh,
 } from '@fortawesome/free-solid-svg-icons';
 import { routes } from 'src/app/routes';
 import {
@@ -38,7 +39,7 @@ import { UntilDestroy } from '@ngneat/until-destroy';
 import { CommonModule } from '@angular/common';
 import { DfSearchService } from '../../services/df-search.service';
 import { FormControl, ReactiveFormsModule } from '@angular/forms';
-import { HttpClient } from '@angular/common/http';
+
 @UntilDestroy({ checkProperties: true })
 @Component({
   selector: 'df-side-nav',
@@ -83,6 +84,7 @@ export class DfSideNavComponent implements OnInit {
   recents$ = this.searchService.recents$;
   smallScreen$ = this.breakpointService.isSmallScreen;
   faPlus = faPlus;
+  faRefresh = faRefresh;
 
   constructor(
     // public dialogRef: MatDialogRef<DfSearchDialogComponent>,
@@ -132,7 +134,6 @@ export class DfSideNavComponent implements OnInit {
           this.nav = accessibleRoutes(transformRoutes(routes), accessByTabs);
         } else {
           this.nav = transformRoutes(routes);
-          console.log('this.nav', this.nav);
         }
       });
     this.search.valueChanges
diff --git a/src/app/shared/services/df-base-crud.service.ts b/src/app/shared/services/df-base-crud.service.ts
index 4dfe2f62..7bd2c4de 100644
--- a/src/app/shared/services/df-base-crud.service.ts
+++ b/src/app/shared/services/df-base-crud.service.ts
@@ -183,6 +183,9 @@ export class DfBaseCrudService {
     if (options.includeCount !== undefined) {
       params.include_count = options.includeCount;
     }
+    if (options.refresh) {
+      params.refresh = options.refresh;
+    }
 
     if (options.additionalParams) {
       options.additionalParams.forEach(param => {
diff --git a/src/app/shared/types/generic-http.ts b/src/app/shared/types/generic-http.ts
index 917eea33..d8457131 100644
--- a/src/app/shared/types/generic-http.ts
+++ b/src/app/shared/types/generic-http.ts
@@ -41,6 +41,7 @@ export interface RequestOptions {
   additionalParams: KeyValuePair[];
   additionalHeaders: KeyValuePair[];
   includeCacheControl: boolean;
+  refresh: boolean;
 }
 
 export type GenericCreateResponse = GenericListResponse<{ id: number }>;
diff --git a/src/app/shared/types/service.ts b/src/app/shared/types/service.ts
index 55c5c452..868efa62 100644
--- a/src/app/shared/types/service.ts
+++ b/src/app/shared/types/service.ts
@@ -79,6 +79,7 @@ export interface Service {
   lastModifiedById: number | null;
   config: any;
   serviceDocByServiceId: number | null;
+  refresh: boolean;
 }
 
 export interface ServiceRow {