From cba194cb535e4359e3723e540682950a059bd08f Mon Sep 17 00:00:00 2001
From: Ashwin Thanaraj <37061471+ashwin1111@users.noreply.github.com>
Date: Fri, 8 Mar 2024 13:52:56 +0530
Subject: [PATCH] Fix Fyle options in c1 import settings (#644)

---
 .../configuration-import-field.component.html                 | 2 +-
 .../configuration-import-field.component.ts                   | 3 +++
 .../configuration-step-header.component.html                  | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
index b9c8cb3eb..a47007587 100644
--- a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
+++ b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.html
@@ -76,7 +76,7 @@ <h5 *ngIf="!isCloneSettingView" class="!tw-text-text-muted tw-text-14-px !tw-fon
                         <app-svg-icon [isTextColorAllowed]="true" [svgSource]="'arrow-line'" [height]="'10px'" [width]="'100px'" [styleClasses]="'tw-self-center tw-text-border-secondary'"></app-svg-icon>
                     </div>
                     <div class="tw-w-28-vw">
-                        <p-dropdown [disabled]="expenseField.value.source_field === 'CATEGORY'" (onChange)="onDropdownChange($event, i)" appendTo="body" [options]="fyleFieldOptions" [placeholder]="'Choose ' + brandingConfig.brandName + ' Expense field'" formControlName="source_field"
+                        <p-dropdown [disabled]="expenseField.value.source_field === 'CATEGORY'" (onChange)="onDropdownChange($event, i)" appendTo="body" [options]="expenseField.value.source_field === 'CATEGORY' ? fyleFieldOptions: filteredFyleFields" [placeholder]="'Choose ' + brandingConfig.brandName + ' Expense field'" formControlName="source_field"
                         optionLabel="display_name" optionValue="attribute_type" [ngClass]="{'selectedItem': expenseField.value.source_field, 'selectedAccItem !tw-text-text-secondary': expenseField.value.source_field === 'CATEGORY', 'filterDropdown': !expenseField.value.source_field}" [dropdownIcon]="'pi pi-chevron-down ' + brandingConfig.brandId">
                             <ng-template let-option pTemplate="item">
                             <div [ngClass]="{'custom-option': option.attribute_type === 'custom_field'}" class="tw-align-middle">
diff --git a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts
index 5f5ced1f8..0a9c727e1 100644
--- a/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts
+++ b/src/app/shared/components/configuration/configuration-import-field/configuration-import-field.component.ts
@@ -42,6 +42,8 @@ export class ConfigurationImportFieldComponent implements OnInit {
 
   @Output() showWarningForDependentFields = new EventEmitter();
 
+  filteredFyleFields: FyleField[];
+
   showDependentFieldWarning: boolean;
 
   showAddButton: any;
@@ -130,6 +132,7 @@ export class ConfigurationImportFieldComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.filteredFyleFields = this.fyleFieldOptions.filter(option => option.attribute_type !== 'CATEGORY');
   }
 
 }
diff --git a/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html b/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html
index 2eb38536b..5934b4ed7 100644
--- a/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html
+++ b/src/app/shared/components/configuration/configuration-step-header/configuration-step-header.component.html
@@ -25,8 +25,8 @@ <h5 class="tw-text-text-muted tw-text-14-px tw-pt-8-px !tw-font-400 tw-text-pret
                 Sync
             </span>
         </button>
-        <div *ngIf="showSyncButton && !brandingFeatureConfig.isIconsInsideButtonAllowed">
-          <span (click)="refreshDimensions()" class="p-button primary-outline tw-mr-12-px" [pTooltip]="'If you are unable to find a required value, click the sync button to instantly retrieve the latest values from ' + appName">
+        <div *ngIf="showSyncButton && !brandingFeatureConfig.isIconsInsideButtonAllowed" tooltipPosition="bottom" [pTooltip]="'If you are unable to find a required value, click the sync button to instantly retrieve the latest values from ' + appName">
+          <span (click)="refreshDimensions()" class="p-button primary-outline tw-mr-12-px">
             Sync
         </span>
         </div>