feat: branding based conditions to feature flag #1179
+134
−115
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,7 +5,7 @@ import { ExportSettingGet } from "../intacct/intacct-configuration/export-settin | |
| import { QBOExportSettingGet } from "../qbo/qbo-configuration/qbo-export-setting.model"; | ||
| import { NetSuiteExportSettingGet } from "../netsuite/netsuite-configuration/netsuite-export-setting.model"; | ||
| import { IntacctConfiguration } from "../db/configuration.model"; | ||
| import { brandingConfig, brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config'; | ||
| export type EmailOption = { | ||
| email: string; | ||
| name: string; | ||
|
|
@@ -88,12 +88,12 @@ export class AdvancedSettingsModel { | |
| cccExportType = exportSettings.workspace_general_settings?.corporate_credit_card_expenses_object ?? undefined; | ||
| } | ||
|
|
||
| if (brandingFeatureConfig.featureFlags.advancedSettings.excludeCardNumberAndEmployeeNameInMemo) { | ||
| return defaultOptions.filter(option => option !== 'card_number' && option !== 'employee_name'); | ||
| } | ||
| if (cccExportType && ['netsuite', 'quickbooks online', 'sage intacct'].includes(appName.toLowerCase()) && !brandingFeatureConfig.featureFlags.advancedSettings.excludeCardNumberAndEmployeeNameInMemo) { | ||
| return defaultOptions; | ||
| } | ||
| return defaultOptions.filter(option => option !== 'card_number'); | ||
|
|
||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| import { FormGroup } from "@angular/forms"; | ||
| import { DefaultDestinationAttribute } from "../../db/destination-attribute.model"; | ||
| import { FyleField } from "../../enum/enum.model"; | ||
| import { brandingConfig, brandingFeatureConfig } from "src/app/branding/branding-config"; | ||
| import { ImportSettingsCustomFieldRow } from "../../common/import-settings.model"; | ||
|
|
||
| const emptyDestinationAttribute = { id: null, name: null }; | ||
|
|
@@ -88,7 +88,7 @@ export class ImportSettings { | |
|
|
||
| let isCategoryImportEnabled = false; | ||
|
|
||
| if (brandingFeatureConfig.featureFlags.importSettings.categoryImportEnabled) { | ||
|
There was a problem hiding this comment. name it |
||
| isCategoryImportEnabled = importSettingsForm.get('importCategories')?.value ? importSettingsForm.get('importCategories')?.value : false; | ||
| } else { | ||
| isCategoryImportEnabled = filteredExpenseFieldArray.filter((field: MappingSetting) => field.source_field === 'CATEGORY' && field.import_to_fyle).length > 0 ? true : false; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import { DefaultDestinationAttribute } from "../../db/destination-attribute.mode | |
| import { AppName, NetsuiteDefaultLevelOptions, NetsuitePaymentSyncDirection, PaymentSyncDirection } from "../../enum/enum.model"; | ||
| import { AdvancedSettingValidatorRule, AdvancedSettingsModel } from "../../common/advanced-settings.model"; | ||
| import { HelperUtility } from "../../common/helper.model"; | ||
| import { brandingConfig, brandingFeatureConfig } from "src/app/branding/branding-config"; | ||
| import { environment } from "src/environments/environment"; | ||
| import { NetSuiteExportSettingGet } from "./netsuite-export-setting.model"; | ||
|
|
||
|
|
@@ -75,7 +75,7 @@ export class NetsuiteAdvancedSettingModel extends HelperUtility { | |
| const defaultOptions = this.getDefaultMemoOptions(); | ||
| const cccExportType = exportSettings.configuration.corporate_credit_card_expenses_object; | ||
|
|
||
| if (brandingFeatureConfig.featureFlags.advancedSettings.excludeCardNumberAndEmployeeNameInMemo) { | ||
| return defaultOptions.filter(option => !['card_number', 'employee_name'].includes(option)); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -264,7 +264,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel { | |
| } | ||
|
|
||
| static getEmployeeFieldMapping(employeeFieldMapping: string): string { | ||
| return !brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee ? EmployeeFieldMapping.VENDOR : employeeFieldMapping; | ||
|
There was a problem hiding this comment. call is, |
||
| } | ||
|
|
||
| static mapAPIResponseToFormGroup(exportSettings: NetSuiteExportSettingGet | null): FormGroup { | ||
|
|
@@ -295,7 +295,7 @@ export class NetSuiteExportSettingModel extends ExportSettingModel { | |
| const emptyDestinationAttribute: DefaultDestinationAttribute = {id: null, name: null}; | ||
| const nameInJournalEntry = exportSettingsForm.get('nameInJournalEntry')?.value ? exportSettingsForm.get('nameInJournalEntry')?.value : NameInJournalEntry.EMPLOYEE; | ||
|
|
||
| if (!brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee) { | ||
| exportSettingsForm.controls.creditCardExpense.patchValue(true); | ||
| exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import { ImportSettingGeneralMapping } from "../../intacct/intacct-configuration | |
| import { XeroWorkspaceGeneralSetting } from "../db/xero-workspace-general-setting.model"; | ||
| import { ImportSettingMappingRow, ImportSettingsModel } from "../../common/import-settings.model"; | ||
| import { IntegrationField } from "../../db/mapping.model"; | ||
| import { brandingConfig, brandingFeatureConfig } from "src/app/branding/branding-config"; | ||
| import { ExportSettingModel } from "../../common/export-settings.model"; | ||
|
|
||
|
|
||
|
|
@@ -65,7 +65,7 @@ export class XeroImportSettingModel extends ImportSettingsModel { | |
|
|
||
| static mapAPIResponseToFormGroup(importSettings: XeroImportSettingGet | null, xeroFields: IntegrationField[], isCustomerPresent:boolean, destinationAttribute: DestinationAttribute[]): FormGroup { | ||
| let additionalOption: any[] = []; | ||
| if (brandingFeatureConfig.featureFlags.importSettings.disableCustomerSourceField && isCustomerPresent) { | ||
| const additionalMappingSetting = { | ||
| source_field: 'DISABLED_XERO_SOURCE_FIELD', | ||
| destination_field: XeroFyleField.CUSTOMER, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,7 +9,7 @@ import { ExportModuleRule, ExportSettingValidatorRule } from '../../models/sage3 | |
| import { SnakeCaseToSpaceCasePipe } from 'src/app/shared/pipes/snake-case-to-space-case.pipe'; | ||
| import { SkipExportValidatorRule, skipExportValidator } from '../../models/common/advanced-settings.model'; | ||
| import { StorageService } from './storage.service'; | ||
| import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config'; | ||
| import { SentenceCasePipe } from 'src/app/shared/pipes/sentence-case.pipe'; | ||
| import { TitleCasePipe } from '@angular/common'; | ||
| import { DefaultDestinationAttribute, DestinationAttribute } from '../../models/db/destination-attribute.model'; | ||
|
|
@@ -260,7 +260,7 @@ export class HelperService { | |
|
|
||
| sentenseCaseConversion(content: string) { | ||
| content = new SnakeCaseToSpaceCasePipe().transform(content); | ||
| return brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(content) : content; | ||
|
There was a problem hiding this comment.
|
||
| } | ||
|
|
||
| /** | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ import { IntacctConfigurationComponent } from './intacct-configuration.component | |
| import { IntacctExportSettingsComponent } from '../../intacct-shared/intacct-export-settings/intacct-export-settings.component'; | ||
| import { IntacctImportSettingsComponent } from '../../intacct-shared/intacct-import-settings/intacct-import-settings.component'; | ||
| import { IntacctAdvancedSettingsComponent } from '../../intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component'; | ||
| import { brandingConfig, brandingFeatureConfig } from 'src/app/branding/branding-config'; | ||
| import { IntacctC1ImportSettingsComponent } from '../../intacct-shared/intacct-c1-import-settings/intacct-c1-import-settings.component'; | ||
| import { IntacctConnectorComponent } from 'src/app/shared/components/si/core/intacct-connector/intacct-connector.component'; | ||
|
|
||
|
|
@@ -23,7 +23,7 @@ const routes: Routes = [ | |
| }, | ||
| { | ||
| path: 'import_settings', | ||
| component: !brandingFeatureConfig.featureFlags.importSettings.intacctC1ImportSettings ? IntacctImportSettingsComponent : IntacctC1ImportSettingsComponent | ||
|
There was a problem hiding this comment. use the same |
||
| }, | ||
| { | ||
| path: 'advanced_settings', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,7 +42,7 @@ export class IntacctMappingComponent implements OnInit { | |
| if (item.source_field !== FyleField.EMPLOYEE && item.source_field !== FyleField.CATEGORY) { | ||
| const mappingPage = new SnakeCaseToSpaceCasePipe().transform(item.source_field); | ||
| this.mappingPages.push({ | ||
| label: brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage), | ||
|
There was a problem hiding this comment. use |
||
| routerLink: `/integrations/intacct/main/mapping/${encodeURIComponent(item.source_field.toLowerCase())}` | ||
| }); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ | |
| </div> | ||
| <form [formGroup]="exportSettingsForm"> | ||
| <div class="tw-p-24-px" [ngClass]="{'tw-pt-0': !brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses}"> | ||
| <div *ngIf="!brandingFeatureConfig.featureFlags.allowForC1" class="tw-mb-16-px"> | ||
|
There was a problem hiding this comment. this should be a key inside export setting, |
||
| <div *ngIf="brandingFeatureConfig.featureFlags.exportSettings.reimbursableExpenses" class="tw-rounded-lg tw-border-separator tw-border tw-bg-configuration-bg"> | ||
| <app-configuration-toggle-field | ||
| [form]="exportSettingsForm" | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -392,7 +392,7 @@ export class IntacctExportSettingsComponent implements OnInit { | |
| } | ||
|
|
||
| private setupCCCGroupingWatcher(): void { | ||
| if (brandingFeatureConfig.featureFlags.exportSettings.cccExportGroupConfiguration) { | ||
|
There was a problem hiding this comment. let's not introduce a new key for this - along with date standardization we'll remove this condition. For now let it be === 'co' |
||
| this.updateCCCGroupingDateOptions(this.exportSettingsForm.get('cccExportGroup')?.value); | ||
| this.exportSettingsForm.controls.cccExportGroup.valueChanges.subscribe((cccExportGroup) => { | ||
| this.updateCCCGroupingDateOptions(cccExportGroup); | ||
|
|
@@ -484,7 +484,7 @@ export class IntacctExportSettingsComponent implements OnInit { | |
| splitExpenseGrouping: new FormControl(this.exportSettings?.expense_group_settings?.split_expense_grouping) | ||
| }); | ||
|
|
||
| if (!brandingFeatureConfig.featureFlags.exportSettings.isEmployeeMappingIsEmployee) { | ||
|
There was a problem hiding this comment. use |
||
| this.exportSettingsForm.controls.creditCardExpense.patchValue(true); | ||
| this.exportSettingsForm.controls.employeeFieldMapping.patchValue(FyleField.VENDOR); | ||
| } | ||
|
|
@@ -525,7 +525,7 @@ export class IntacctExportSettingsComponent implements OnInit { | |
| }); | ||
|
|
||
| this.exportSettingsForm.controls.cccExportGroup?.valueChanges.subscribe((cccExportGroup) => { | ||
| if (brandingFeatureConfig.featureFlags.exportSettings.cccDateConfiguration) { | ||
|
There was a problem hiding this comment. let's not introduce a new key for this - along with date standardization we'll remove this condition. For now let it be === 'fyle' |
||
| this.cccExpenseGroupingDateOptions = IntacctExportSettingModel.getExpenseGroupingDateOptions(); | ||
| this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(cccExportGroup, this.cccExpenseGroupingDateOptions); | ||
| if (this.exportSettingsForm?.value.cccExportType === IntacctCorporateCreditCardExpensesObject.CHARGE_CARD_TRANSACTION) { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -40,7 +40,7 @@ export class NetsuiteMappingComponent implements OnInit { | |
| if (item.source_field !== FyleField.EMPLOYEE && item.source_field !== FyleField.CATEGORY) { | ||
| const mappingPage = new SnakeCaseToSpaceCasePipe().transform(item.source_field); | ||
| this.mappingPages.push({ | ||
| label: brandingFeatureConfig.featureFlags.exportSettings.sentenseCaseConversion ? new SentenceCasePipe().transform(mappingPage) : new TitleCasePipe().transform(mappingPage), | ||
| routerLink: `/integrations/netsuite/main/mapping/${encodeURIComponent(item.source_field.toLowerCase())}` | ||
| }); | ||
| } | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not needed