UAT fixes 2 (#797)

UAT fixes 2
fylein · May 15, 2024 · 62e12c6 · 62e12c6
1 parent 864e6dc
commit 62e12c6
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/.../dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts b/.../dashboard/dashboard-export-summary-section/dashboard-export-summary-section.component.ts
@@ -60,7 +60,11 @@ export class DashboardExportSummarySectionComponent implements OnInit {
   }
 
   private getExpenseGroups(limit: number, offset: number, status: AccountingExportStatus, lastExportedAt?: string | null): void {
-    this.exportLogService.getExpenseGroups((status as unknown as TaskLogState), limit, offset, null, lastExportedAt, '', this.appName).subscribe((accountingExportResponse: ExpenseGroupResponse) => {
+    const dateFilter:SelectedDateFilter = {
+      startDate: lastExportedAt ? new Date(lastExportedAt) : new Date(),
+      endDate: new Date()
+    };
+    this.exportLogService.getExpenseGroups((status as unknown as TaskLogState), limit, offset, lastExportedAt ? dateFilter : null, lastExportedAt, '', this.appName).subscribe((accountingExportResponse: ExpenseGroupResponse) => {
       const accountingExports: AccountingExportList[] = accountingExportResponse.results.map((accountingExport: ExpenseGroup) =>
         AccountingExportModel.parseExpenseGroupAPIResponseToExportLog(accountingExport, this.org_id, this.appName)
       );
@@ -69,7 +73,11 @@ export class DashboardExportSummarySectionComponent implements OnInit {
   }
 
   private getAccountingExports(limit: number, offset: number, status: AccountingExportStatus, lastExportedAt?: string | null) {
-    this.accountingExportService.getAccountingExports(this.accountingExportType, [status], null, limit, offset, null, lastExportedAt).subscribe(accountingExportResponse => {
+    const dateFilter:SelectedDateFilter = {
+      startDate: lastExportedAt ? new Date(lastExportedAt) : new Date(),
+      endDate: new Date()
+    };
+    this.accountingExportService.getAccountingExports(this.accountingExportType, [status], null, limit, offset, lastExportedAt ? dateFilter : null, lastExportedAt).subscribe(accountingExportResponse => {
       const accountingExports: AccountingExportList[] = accountingExportResponse.results.map((accountingExport: AccountingExport) =>
         AccountingExportModel.parseAPIResponseToExportLog(accountingExport, this.org_id)
       );
@@ -80,7 +88,6 @@ export class DashboardExportSummarySectionComponent implements OnInit {
   private setupAccountingExports(limit: number, offset: number, status: AccountingExportStatus) {
     if (this.accountingExportSummary) {
       const lastExportedAt = status === AccountingExportStatus.COMPLETE ? this.accountingExportSummary.last_exported_at : null;
-
       if (this.exportLogVersion === 'v1') {
         this.getExpenseGroups(limit, offset, status, lastExportedAt);
       } else {

diff --git a/...ared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.html b/...ared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.html
@@ -1,8 +1,8 @@
 <p-table [value]="filteredMappings" [tableStyle]="{ 'min-width': '50rem'}">
     <ng-template pTemplate="header">
         <tr>
-        <th class="!tw-pl-40-px">{{sourceField | snakeCaseToSpaceCase | titlecase}} in {{brandingConfig.brandName}}</th>
-        <th>{{destinationField | snakeCaseToSpaceCase | titlecase}} in {{appName}}</th>
+        <th class="!tw-pl-40-px">{{helper.sentenseCaseConversion(sourceField | snakeCaseToSpaceCase | titlecase)}} in {{brandingConfig.brandName}}</th>
+        <th>{{helper.sentenseCaseConversion(destinationField | snakeCaseToSpaceCase | titlecase)}} in {{appName}}</th>
         <th *ngIf="!isDashboardMappingResolve">Status</th>
         </tr>
     </ng-template>

diff --git a/...shared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.ts b/...shared/components/helper/mapping/generic-mapping-table/generic-mapping-table.component.ts
@@ -1,3 +1,4 @@
+import { TitleCasePipe } from '@angular/common';
 import { Component, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
 import { FormControl, FormGroup } from '@angular/forms';
 import { Subject, debounceTime, interval } from 'rxjs';
@@ -7,9 +8,11 @@ import { ExtendedGenericMapping } from 'src/app/core/models/db/extended-generic-
 import { GenericMapping, MappingClass } from 'src/app/core/models/db/generic-mapping.model';
 import { MappingStats } from 'src/app/core/models/db/mapping.model';
 import { AppName, IntacctCorporateCreditCardExpensesObject, FyleField, IntacctReimbursableExpensesObject, ToastSeverity } from 'src/app/core/models/enum/enum.model';
+import { HelperService } from 'src/app/core/services/common/helper.service';
 import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
 import { MappingService } from 'src/app/core/services/common/mapping.service';
 import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
+import { SentenceCasePipe } from 'src/app/shared/pipes/sentence-case.pipe';
 
 @Component({
   selector: 'app-generic-mapping-table',
@@ -67,7 +70,8 @@ export class GenericMappingTableComponent implements OnInit {
   constructor(
     private mappingService: MappingService,
     private toastService: IntegrationsToastService,
-    private workspaceService: WorkspaceService
+    private workspaceService: WorkspaceService,
+    public helper: HelperService
   ) { }
 
   isOverflowing(element: any, mapping: DestinationAttribute): string {

diff --git a/src/assets/scss/tab-secondary.scss b/src/assets/scss/tab-secondary.scss
@@ -19,7 +19,7 @@
 }
 
 :host ::ng-deep .p-tabmenu .p-tabmenu-nav .p-tabmenuitem:not(.p-highlight) .p-menuitem-link{
-    @apply tw-border-b-nav-tabs-active-border tw-text-nav-tabs-inactive-text-color tw-bg-nav-tabs-active-bg #{!important};
+    @apply tw-border-b-nav-tabs-active-border tw-text-nav-tabs-inactive-text-color tw-bg-nav-tabs-inactive-bg #{!important};
 }
 
 :host ::ng-deep .p-tabmenu .p-tabmenu-nav {

diff --git a/src/assets/themes/co/c1dl.scss b/src/assets/themes/co/c1dl.scss
@@ -689,6 +689,7 @@
     --nav-tabs-active-bg: #{$white};
     --nav-tabs-active-border: var(--border-secondary);
     --nav-tabs-inactive-text-color: var(--text-primary);
+    --nav-tabs-inactive-bg: var(--bg-disable-lighter);
     --nav-tabs-border: var(--border-secondary);
     --nav-tabs-hover: var(--text-primary);
     --nav-tabs-hover-bg: var(--bg-tertiary);

diff --git a/src/assets/themes/fyle/fdl.scss b/src/assets/themes/fyle/fdl.scss
@@ -266,6 +266,8 @@
 
     --nav-tabs-active-bg: transparent;
 
+    --nav-tabs-inactive-bg: transparent;
+
     --nav-tabs-inactive-text-color: var(--text-disable);
 
     --search-default-filled-text: var(--text-primary);

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -774,6 +774,7 @@ const componentVariables = {
   // Tabs - Nav Tabs (Secondary)
   'nav-tabs-active': 'var(--nav-tabs-active)',
   'nav-tabs-active-bg': 'var(--nav-tabs-active-bg)',
+  'nav-tabs-inactive-bg': 'var(--nav-tabs-inactive-bg)',
   'nav-tabs-active-border': 'var(--nav-tabs-active-border)',
   'nav-tabs-border': 'var(--nav-tabs-border)',
   'nav-tabs-hover': 'var(--nav-tabs-hover)',