feat: poc for date grouping #1174
Conversation
WalkthroughThis pull request introduces new static methods in the Changes
Suggested labels
Suggested reviewers
Poem
✨ Finishing Touches
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
|
PR description must contain a link to a ClickUp (case-insensitive) |
1 similar comment
|
PR description must contain a link to a ClickUp (case-insensitive) |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (3)
src/app/core/models/common/export-settings.model.ts (2)
112-135: Fix typo in function name.The function name should be plural to match its return type.
Apply this diff to fix the typo:
-static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { +static getReimbursableExpenseGroupingDateOptions(): SelectFormOption[] {
137-161: Clean up code style and improve type safety.The function has the following issues:
- Inconsistent spacing
- Use of 'this' in static context
- Unnecessary type assertion in filter callback
Apply this diff to improve the code:
-static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { - - const excludedDate = expenseGrouping === 'expense' - ? ExportDateType.LAST_SPENT_AT - : ExportDateType.SPENT_AT; - - if (exportType === 'CCC') { - return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); - } - - let dateOptions = this.getReimbursableExpenseGroupingDateOption(); - let filterOptions: ExportDateType[] = []; - - if (showApprovedDate) { - filterOptions.push(ExportDateType.VERIFIED_AT); - } else if (showVerificationDate) { - filterOptions.push(ExportDateType.APPROVED_AT); - } - - filterOptions.push(excludedDate); - - return dateOptions.filter((item): item is { label: string; value: ExportDateType } => - item.value !== null && !filterOptions.includes(item.value as ExportDateType)) +static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { + const excludedDate = expenseGrouping === 'expense' + ? ExportDateType.LAST_SPENT_AT + : ExportDateType.SPENT_AT; + + if (exportType === 'CCC') { + return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); + } + + const dateOptions = ExportSettingModel.getReimbursableExpenseGroupingDateOptions(); + const filterOptions: ExportDateType[] = []; + + if (showApprovedDate) { + filterOptions.push(ExportDateType.VERIFIED_AT); + } else if (showVerificationDate) { + filterOptions.push(ExportDateType.APPROVED_AT); + } + + filterOptions.push(excludedDate); + + return dateOptions.filter(item => item.value !== null && !filterOptions.includes(item.value));🧰 Tools
🪛 Biome (1.9.4)
[error] 144-144: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.(lint/complexity/noThisInStatic)
[error] 147-147: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.(lint/complexity/noThisInStatic)
🪛 ESLint
[error] 138-138: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 139-139: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: 'dateOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 148-148: 'filterOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 157-157: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 159-160: Missing semicolon.
(semi)
🪛 GitHub Check: lint
[failure] 138-138:
Trailing spaces not allowed
[failure] 139-139:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
'dateOptions' is never reassigned. Use 'const' instead
[failure] 148-148:
'filterOptions' is never reassigned. Use 'const' instead
[failure] 157-157:
Trailing spaces not allowed
[failure] 159-159:
Missing semicolon🪛 GitHub Actions: TypeScript Lint Check
[error] 138-138: Trailing spaces not allowed
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts (1)
344-359: Clean up commented code and fix semicolons.
- Remove commented code as it's tracked in version control.
- Add missing semicolons.
Apply this diff to clean up the code:
- // this.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); - // this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); - this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', this.exportSettingForm.controls.reimbursableExportGroup.value, true, false) + this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', this.exportSettingForm.controls.reimbursableExportGroup.value, true, false); - // // this.cccExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); - // // this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(creditCardExportGroup, this.cccExpenseGroupingDateOptions); - this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', creditCardExportGroup, true, false) + this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping('rem', creditCardExportGroup, true, false);🧰 Tools
🪛 ESLint
[error] 344-344: Comments should not begin with a lowercase character.
(capitalized-comments)
[error] 345-345: Comments should not begin with a lowercase character.
(capitalized-comments)
[error] 346-347: Missing semicolon.
(semi)
[error] 358-359: Missing semicolon.
(semi)
🪛 GitHub Check: lint
[failure] 344-344:
Comments should not begin with a lowercase character
[failure] 345-345:
Comments should not begin with a lowercase character
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/app/core/models/common/export-settings.model.ts(2 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts(2 hunks)
🧰 Additional context used
🪛 ESLint
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
[error] 344-344: Comments should not begin with a lowercase character.
(capitalized-comments)
[error] 345-345: Comments should not begin with a lowercase character.
(capitalized-comments)
[error] 346-347: Missing semicolon.
(semi)
src/app/core/models/common/export-settings.model.ts
[error] 138-138: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 139-139: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: 'dateOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 148-148: 'filterOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 157-157: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 159-160: Missing semicolon.
(semi)
🪛 GitHub Check: lint
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
[failure] 344-344:
Comments should not begin with a lowercase character
[failure] 345-345:
Comments should not begin with a lowercase character
src/app/core/models/common/export-settings.model.ts
[failure] 138-138:
Trailing spaces not allowed
[failure] 139-139:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
'dateOptions' is never reassigned. Use 'const' instead
[failure] 148-148:
'filterOptions' is never reassigned. Use 'const' instead
[failure] 157-157:
Trailing spaces not allowed
[failure] 159-159:
Missing semicolon
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 144-144: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 147-147: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
🪛 GitHub Actions: TypeScript Lint Check
src/app/core/models/common/export-settings.model.ts
[error] 138-138: Trailing spaces not allowed
🔇 Additional comments (2)
src/app/core/models/common/export-settings.model.ts (1)
91-110: LGTM! Well-structured date options for credit card expenses.The function provides a comprehensive set of date options for credit card expense grouping, with proper labels and values.
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts (1)
318-320: LGTM! Consistent usage of the new date grouping method.The method correctly utilizes
ExportSettingModel.dateGroupingwith appropriate parameters based on the export type.
|
PR description must contain a link to a ClickUp (case-insensitive) |
Screen.Recording.2025-02-05.at.3.28.06.PM.mov |
|
PR description must contain a link to a ClickUp (case-insensitive) |
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (2)
src/app/core/models/common/export-settings.model.ts (2)
112-135: Rename method for consistency.The method name should be plural to match other similar methods in the class.
- static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { + static getReimbursableExpenseGroupingDateOptions(): SelectFormOption[] {
137-137: Improve type safety of parameters.Consider using more specific types for the parameters:
- static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { + static dateGrouping( + exportType: 'CCC' | 'REIMBURSABLE', + expenseGrouping: ExpenseGroupingFieldOption, + showApprovedDate: boolean, + showVerificationDate: boolean + ): SelectFormOption[] {
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/app/core/models/common/export-settings.model.ts(2 hunks)
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 144-144: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 147-147: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
🪛 ESLint
src/app/core/models/common/export-settings.model.ts
[error] 138-138: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: 'dateOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 148-148: 'filterOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 158-158: Unexpected console statement.
(no-console)
[error] 158-159: Missing semicolon.
(semi)
[error] 161-162: Missing semicolon.
(semi)
[error] 163-163: Unexpected console statement.
(no-console)
[error] 163-164: Missing semicolon.
(semi)
[error] 164-164: Trailing spaces not allowed.
(no-trailing-spaces)
🪛 GitHub Check: lint
src/app/core/models/common/export-settings.model.ts
[failure] 138-138:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
'dateOptions' is never reassigned. Use 'const' instead
[failure] 148-148:
'filterOptions' is never reassigned. Use 'const' instead
[failure] 158-158:
Unexpected console statement
[failure] 158-158:
Missing semicolon
[failure] 161-161:
Missing semicolon
[failure] 163-163:
Unexpected console statement
[failure] 163-163:
Missing semicolon
🪛 GitHub Actions: TypeScript Lint Check
src/app/core/models/common/export-settings.model.ts
[error] 138-138: Trailing spaces not allowed
🔇 Additional comments (1)
src/app/core/models/common/export-settings.model.ts (1)
91-110: LGTM! Well-structured implementation of credit card date options.The method provides a clear and consistent set of date options for credit card expenses.
| static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | ||
|
|
||
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | ||
| ? ExportDateType.LAST_SPENT_AT | ||
| : ExportDateType.SPENT_AT; | ||
|
|
||
| if (exportType === 'CCC') { | ||
| return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | ||
| } | ||
|
|
||
| let dateOptions = this.getReimbursableExpenseGroupingDateOption(); | ||
| let filterOptions: ExportDateType[] = []; | ||
|
|
||
| if (showApprovedDate) { | ||
| filterOptions.push(ExportDateType.VERIFIED_AT); | ||
| } else if (showVerificationDate) { | ||
| filterOptions.push(ExportDateType.APPROVED_AT); | ||
| } | ||
|
|
||
| filterOptions.push(excludedDate); | ||
|
|
||
| console.log(filterOptions, excludedDate) | ||
|
|
||
| const d = dateOptions.filter((item): item is { label: string; value: ExportDateType } => | ||
| item.value !== null && !filterOptions.includes(item.value as ExportDateType)) | ||
|
|
||
| console.log(d) | ||
|
|
||
| return d; | ||
|
|
||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Clean up implementation and improve type safety.
The method has several issues that need to be addressed:
static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] {
-
const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID
- ? ExportDateType.LAST_SPENT_AT
+ ? ExportDateType.LAST_SPENT_AT
: ExportDateType.SPENT_AT;
-
+
if (exportType === 'CCC') {
- return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
+ return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
}
- let dateOptions = this.getReimbursableExpenseGroupingDateOption();
- let filterOptions: ExportDateType[] = [];
+ const dateOptions = ExportSettingModel.getReimbursableExpenseGroupingDateOptions();
+ const filterOptions: ExportDateType[] = [];
if (showApprovedDate) {
filterOptions.push(ExportDateType.VERIFIED_AT);
} else if (showVerificationDate) {
filterOptions.push(ExportDateType.APPROVED_AT);
}
filterOptions.push(excludedDate);
- console.log(filterOptions, excludedDate)
-
- const d = dateOptions.filter((item): item is { label: string; value: ExportDateType } =>
- item.value !== null && !filterOptions.includes(item.value as ExportDateType))
-
- console.log(d)
-
- return d;
+ return dateOptions.filter((item): item is { label: string; value: ExportDateType } =>
+ item.value !== null && !filterOptions.includes(item.value as ExportDateType));
}Changes made:
- Replaced
thiswith class name in static context - Removed debug console.log statements
- Fixed code style issues (trailing spaces, semicolons)
- Used const for variables that aren't reassigned
- Improved variable naming
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | |
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| if (exportType === 'CCC') { | |
| return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | |
| } | |
| let dateOptions = this.getReimbursableExpenseGroupingDateOption(); | |
| let filterOptions: ExportDateType[] = []; | |
| if (showApprovedDate) { | |
| filterOptions.push(ExportDateType.VERIFIED_AT); | |
| } else if (showVerificationDate) { | |
| filterOptions.push(ExportDateType.APPROVED_AT); | |
| } | |
| filterOptions.push(excludedDate); | |
| console.log(filterOptions, excludedDate) | |
| const d = dateOptions.filter((item): item is { label: string; value: ExportDateType } => | |
| item.value !== null && !filterOptions.includes(item.value as ExportDateType)) | |
| console.log(d) | |
| return d; | |
| } | |
| static dateGrouping(exportType:string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | |
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| if (exportType === 'CCC') { | |
| return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | |
| } | |
| const dateOptions = ExportSettingModel.getReimbursableExpenseGroupingDateOptions(); | |
| const filterOptions: ExportDateType[] = []; | |
| if (showApprovedDate) { | |
| filterOptions.push(ExportDateType.VERIFIED_AT); | |
| } else if (showVerificationDate) { | |
| filterOptions.push(ExportDateType.APPROVED_AT); | |
| } | |
| filterOptions.push(excludedDate); | |
| return dateOptions.filter((item): item is { label: string; value: ExportDateType } => | |
| item.value !== null && !filterOptions.includes(item.value as ExportDateType)); | |
| } |
🧰 Tools
🪛 Biome (1.9.4)
[error] 144-144: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 147-147: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
🪛 ESLint
[error] 138-138: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: 'dateOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 148-148: 'filterOptions' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 158-158: Unexpected console statement.
(no-console)
[error] 158-159: Missing semicolon.
(semi)
[error] 161-162: Missing semicolon.
(semi)
[error] 163-163: Unexpected console statement.
(no-console)
[error] 163-164: Missing semicolon.
(semi)
[error] 164-164: Trailing spaces not allowed.
(no-trailing-spaces)
🪛 GitHub Check: lint
[failure] 138-138:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
'dateOptions' is never reassigned. Use 'const' instead
[failure] 148-148:
'filterOptions' is never reassigned. Use 'const' instead
[failure] 158-158:
Unexpected console statement
[failure] 158-158:
Missing semicolon
[failure] 161-161:
Missing semicolon
[failure] 163-163:
Unexpected console statement
[failure] 163-163:
Missing semicolon
🪛 GitHub Actions: TypeScript Lint Check
[error] 138-138: Trailing spaces not allowed
| static getCreditCardExpenseGroupingDateOptions(): SelectFormOption[] { | ||
| return [ | ||
| { | ||
| label: 'Card Transaction Post Date', |
There was a problem hiding this comment.
Card transaction post date
| value: ExportDateType.SPENT_AT | ||
| }, | ||
| { | ||
| label: 'Last Spend date', |
| value: ExportDateType.LAST_SPENT_AT | ||
| }, | ||
| { | ||
| label: brandingContent.common.currentDate, |
| static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { | ||
| return [ | ||
| { | ||
| label: brandingContent.common.currentDate, |
| value: ExportDateType.APPROVED_AT | ||
| }, | ||
| { | ||
| label: 'Last Spend date', |
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
src/app/core/models/common/export-settings.model.ts (1)
102-102:⚠️ Potential issueFix typo in label text.
There's a typo in the label text: "Last dpend date" should be "Last spend date".
- label: 'Last dpend date', + label: 'Last spend date',
🧹 Nitpick comments (1)
src/app/core/models/common/export-settings.model.ts (1)
112-112: Maintain consistent method naming.The method name should be plural "Options" to maintain consistency with other similar methods in the class (e.g.,
getCreditCardExpenseGroupingDateOptions).- static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { + static getReimbursableExpenseGroupingDateOptions(): SelectFormOption[] {
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/app/core/models/common/export-settings.model.ts(2 hunks)
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 145-145: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 149-149: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
🪛 ESLint
src/app/core/models/common/export-settings.model.ts
[error] 139-139: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 150-150: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 157-157: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 159-159: Trailing spaces not allowed.
(no-trailing-spaces)
🪛 GitHub Check: lint
src/app/core/models/common/export-settings.model.ts
[failure] 139-139:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
Trailing spaces not allowed
[failure] 150-150:
Trailing spaces not allowed
[failure] 157-157:
Trailing spaces not allowed
[failure] 159-159:
Trailing spaces not allowed
🪛 GitHub Actions: TypeScript Lint Check
src/app/core/models/common/export-settings.model.ts
[error] 139-139: Trailing spaces not allowed.
| static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | ||
| // Determine the excluded date based on expenseGrouping | ||
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | ||
| ? ExportDateType.LAST_SPENT_AT | ||
| : ExportDateType.SPENT_AT; | ||
|
|
||
| // Handle CCC export type | ||
| if (exportType === 'CCC') { | ||
| return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | ||
| } | ||
|
|
||
| // Get base date options | ||
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); | ||
|
|
||
| // Determine filter options based on showApprovedDate and showVerificationDate | ||
| const filterOptions = [ | ||
| ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), | ||
| ...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []), | ||
| excludedDate | ||
| ]; | ||
|
|
||
| // Filter out excluded and unwanted dates | ||
| return dateOptions.filter(option => | ||
| option.value !== null && !filterOptions.includes(option.value as ExportDateType) | ||
| ); | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Improve type safety and code style.
The method has several issues that need to be addressed:
- Using
thisin static context - Code formatting issues
- Type safety for exportType parameter
Apply these changes:
- static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] {
+ static dateGrouping(
+ exportType: 'CCC' | 'REIMBURSABLE',
+ expenseGrouping: string,
+ showApprovedDate: boolean,
+ showVerificationDate: boolean
+ ): SelectFormOption[] {
const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID
- ? ExportDateType.LAST_SPENT_AT
+ ? ExportDateType.LAST_SPENT_AT
: ExportDateType.SPENT_AT;
if (exportType === 'CCC') {
- return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
+ return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
}
const dateOptions = this.getReimbursableExpenseGroupingDateOption();
+ // Filter out excluded and unwanted dates based on conditions
const filterOptions = [
...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []),
...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []),
excludedDate
];
- return dateOptions.filter(option =>
- option.value !== null && !filterOptions.includes(option.value as ExportDateType)
- );
+ return dateOptions.filter(option =>
+ option.value !== null && !filterOptions.includes(option.value as ExportDateType));
}Changes made:
- Added union type for
exportTypeparameter - Replaced
thiswith class name in static context - Fixed code formatting issues
- Added explanatory comment for filter logic
📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | |
| // Determine the excluded date based on expenseGrouping | |
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| // Handle CCC export type | |
| if (exportType === 'CCC') { | |
| return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | |
| } | |
| // Get base date options | |
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); | |
| // Determine filter options based on showApprovedDate and showVerificationDate | |
| const filterOptions = [ | |
| ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), | |
| ...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []), | |
| excludedDate | |
| ]; | |
| // Filter out excluded and unwanted dates | |
| return dateOptions.filter(option => | |
| option.value !== null && !filterOptions.includes(option.value as ExportDateType) | |
| ); | |
| } | |
| static dateGrouping( | |
| exportType: 'CCC' | 'REIMBURSABLE', | |
| expenseGrouping: string, | |
| showApprovedDate: boolean, | |
| showVerificationDate: boolean | |
| ): SelectFormOption[] { | |
| // Determine the excluded date based on expenseGrouping | |
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| // Handle CCC export type | |
| if (exportType === 'CCC') { | |
| return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | |
| } | |
| // Get base date options | |
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); | |
| // Filter out excluded and unwanted dates based on conditions | |
| const filterOptions = [ | |
| ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), | |
| ...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []), | |
| excludedDate | |
| ]; | |
| return dateOptions.filter(option => | |
| option.value !== null && !filterOptions.includes(option.value as ExportDateType)); | |
| } |
🧰 Tools
🪛 Biome (1.9.4)
[error] 145-145: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 149-149: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
🪛 ESLint
[error] 139-139: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 140-140: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 142-142: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 147-147: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 150-150: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 157-157: Trailing spaces not allowed.
(no-trailing-spaces)
[error] 159-159: Trailing spaces not allowed.
(no-trailing-spaces)
🪛 GitHub Check: lint
[failure] 139-139:
Trailing spaces not allowed
[failure] 140-140:
Trailing spaces not allowed
[failure] 142-142:
Trailing spaces not allowed
[failure] 147-147:
Trailing spaces not allowed
[failure] 150-150:
Trailing spaces not allowed
[failure] 157-157:
Trailing spaces not allowed
[failure] 159-159:
Trailing spaces not allowed
🪛 GitHub Actions: TypeScript Lint Check
[error] 139-139: Trailing spaces not allowed.
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
src/app/core/models/common/export-settings.model.ts (1)
102-102:⚠️ Potential issueFix typo in label text.
The label "Last dpend date" contains a typo and should be "Last spend date".
- label: 'Last dpend date', + label: 'Last spend date',
🧹 Nitpick comments (1)
src/app/core/models/common/export-settings.model.ts (1)
112-112: Fix method naming inconsistency.The method name should be plural (Options) to maintain consistency with
getCreditCardExpenseGroupingDateOptions().- static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { + static getReimbursableExpenseGroupingDateOptions(): SelectFormOption[] {
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/app/core/models/common/export-settings.model.ts(2 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts(2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 145-145: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 149-149: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
| static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | ||
| // Determine the excluded date based on expenseGrouping | ||
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | ||
| ? ExportDateType.LAST_SPENT_AT | ||
| : ExportDateType.SPENT_AT; | ||
|
|
||
| // Handle CCC export type | ||
| if (exportType === 'CCC') { | ||
| return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate); | ||
| } | ||
|
|
||
| // Get base date options | ||
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); | ||
|
|
||
| // Determine filter options based on showApprovedDate and showVerificationDate | ||
| const filterOptions = [ | ||
| ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), | ||
| ...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []), | ||
| excludedDate | ||
| ]; | ||
|
|
||
| // Filter out excluded and unwanted dates | ||
| return dateOptions.filter(option => | ||
| option.value !== null && !filterOptions.includes(option.value as ExportDateType) | ||
| ); | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Improve type safety and method naming.
The method has several areas for improvement:
- Using
thisin static context should be avoided exportTypeparameter should be strictly typed- Method name could be more descriptive
- static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] {
+ static getFilteredDateGroupingOptions(
+ exportType: 'CCC' | 'REIMBURSABLE',
+ expenseGrouping: string,
+ showApprovedDate: boolean,
+ showVerificationDate: boolean
+ ): SelectFormOption[] {
const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID
? ExportDateType.LAST_SPENT_AT
: ExportDateType.SPENT_AT;
if (exportType === 'CCC') {
- return this.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
+ return ExportSettingModel.getCreditCardExpenseGroupingDateOptions().filter(option => option.value !== excludedDate);
}
const dateOptions = this.getReimbursableExpenseGroupingDateOption();
const filterOptions = [
...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []),
...(showVerificationDate ? [ExportDateType.APPROVED_AT] : []),
excludedDate
];
return dateOptions.filter(option =>
option.value !== null && !filterOptions.includes(option.value as ExportDateType)
);
}Committable suggestion skipped: line range outside the PR's diff.
🧰 Tools
🪛 Biome (1.9.4)
[error] 145-145: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
[error] 149-149: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
| value: ExportDateType.POSTED_AT | ||
| }, | ||
| { | ||
| label: 'Spend date', | ||
| value: ExportDateType.SPENT_AT | ||
| }, | ||
| { | ||
| label: 'Last Spend date', | ||
| label: 'Last dpend date', |
|
|
||
| // Determine filter options based on showApprovedDate and showVerificationDate | ||
| const filterOptions = [ | ||
| ...(showApprovedDate ? [ExportDateType.VERIFIED_AT] : []), |
There was a problem hiding this comment.
isApprovedAtSelected same for verified at
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); | ||
|
|
||
| // Determine filter options based on showApprovedDate and showVerificationDate | ||
| const filterOptions = [ |
| } | ||
|
|
||
| // Get base date options | ||
| const dateOptions = this.getReimbursableExpenseGroupingDateOption(); |
There was a problem hiding this comment.
reimbursableDateOptions
| ]; | ||
| } | ||
|
|
||
| static dateGrouping(exportType: string, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { |
There was a problem hiding this comment.
have two different function for ccc and reim
| : ExportDateType.SPENT_AT; | ||
|
|
||
| // Handle CCC export type | ||
| if (exportType === 'CCC') { |
There was a problem hiding this comment.
isCoreCCCModule main credicard module (ccp, bank transaction, debit card)
| ]; | ||
| } | ||
|
|
||
| static getReimbursableExpenseGroupingDateOption(): SelectFormOption[] { |
There was a problem hiding this comment.
add all the options to single array and keep them poping out based on conditions
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (2)
src/app/core/models/common/export-settings.model.ts (2)
112-139: Rename method for clarity.The method name could be more descriptive to indicate it returns all available date options.
- static expenseGroupingDateOption(): SelectFormOption[] { + static getAllExpenseGroupingDateOptions(): SelectFormOption[] {
141-164: Improve method organization and naming.The method handles complex filtering logic and could benefit from the following improvements:
- Rename the method to better describe its purpose
- Extract the filtering logic into smaller helper methods for better maintainability
Consider refactoring like this:
- static dateGrouping( + static getFilteredDateGroupingOptions( exportType: FundSource, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean ): SelectFormOption[] { + const excludedDates = ExportSettingModel.getExcludedDates( + exportType, + expenseGrouping, + showApprovedDate, + showVerificationDate + ); + + const dateOptions = ExportSettingModel.expenseGroupingDateOption(); + return ExportSettingModel.filterDateOptionsByExclusions(dateOptions, excludedDates); + } + + private static getExcludedDates( + exportType: FundSource, + expenseGrouping: string, + showApprovedDate: boolean, + showVerificationDate: boolean + ): ExportDateType[] { + const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID + ? ExportDateType.LAST_SPENT_AT + : ExportDateType.SPENT_AT; + + const excludeApprovedAtOrVerified = showApprovedDate + ? ExportDateType.VERIFIED_AT + : (showVerificationDate ? ExportDateType.APPROVED_AT : null); + + const excludedPostedAt = exportType !== FundSource.CORPORATE_CARD + ? ExportDateType.POSTED_AT + : null; + + return [excludedDate, excludeApprovedAtOrVerified, excludedPostedAt].filter((date): date is ExportDateType => date !== null); + } + + private static filterDateOptionsByExclusions( + dateOptions: SelectFormOption[], + excludedDates: ExportDateType[] + ): SelectFormOption[] { + return dateOptions.filter(option => + option.value !== null && !excludedDates.includes(option.value as ExportDateType) + ); + }🧰 Tools
🪛 Biome (1.9.4)
[error] 158-158: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.(lint/complexity/noThisInStatic)
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/app/core/models/common/export-settings.model.ts(2 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts(3 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 158-158: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: unit-test
| value: ExportDateType.SPENT_AT | ||
| }, | ||
| { | ||
| label: 'Last dpend date', |
There was a problem hiding this comment.
Fix typo in label text.
The label "Last dpend date" contains a typo and should be "Last spend date".
- label: 'Last dpend date',
+ label: 'Last spend date',📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| label: 'Last dpend date', | |
| label: 'Last spend date', |
| const dateOptionsToBeExcluded = [excludedDate, excludeApprovedAtOrVerified, excludedPostedAt]; | ||
|
|
||
| // Get base date options | ||
| const dateOptions = this.expenseGroupingDateOption(); |
There was a problem hiding this comment.
Replace this with class name in static context.
Using this in a static context can be confusing. Use the class name instead.
- const dateOptions = this.expenseGroupingDateOption();
+ const dateOptions = ExportSettingModel.expenseGroupingDateOption();📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| const dateOptions = this.expenseGroupingDateOption(); | |
| const dateOptions = ExportSettingModel.expenseGroupingDateOption(); |
🧰 Tools
🪛 Biome (1.9.4)
[error] 158-158: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
| @@ -87,6 +88,81 @@ export class ExportSettingModel { | |||
|
|
|||
| } | |||
|
|
|||
| static getCreditCardExpenseGroupingDateOptions(): SelectFormOption[] { | |||
There was a problem hiding this comment.
remove this unused method
| ]; | ||
| } | ||
|
|
||
| static expenseGroupingDateOption(): SelectFormOption[] { |
There was a problem hiding this comment.
getExpenseGroupingDateOptions()
| ]; | ||
| } | ||
|
|
||
| static dateGrouping(exportType: FundSource, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { |
There was a problem hiding this comment.
constructExportDateOptions()
There was a problem hiding this comment.
expenseGrouping can be of ExpenseGroupingFieldOption type?
There was a problem hiding this comment.
isApprovedAtSelected, isVerifiedAtSelected
| static dateGrouping(exportType: FundSource, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | ||
|
|
||
| // Determine the excluded date based on expenseGrouping | ||
| const excludedDate = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID |
There was a problem hiding this comment.
excludedSpendDateOption
| : ExportDateType.SPENT_AT; | ||
|
|
||
| // Determine the excluded date based on customer choose | ||
| const excludeApprovedAtOrVerified = showApprovedDate ? ExportDateType.VERIFIED_AT : (showVerificationDate ? ExportDateType.APPROVED_AT : null); |
There was a problem hiding this comment.
excludedApprovedOrVerifiedOption
| this.exportSettingForm.controls.creditCardExportGroup.setValue(ExpenseGroupingFieldOption.EXPENSE_ID); | ||
| this.exportSettingForm.controls.creditCardExportGroup.disable(); | ||
|
|
||
| this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping(FundSource.CCC, this.exportSettingForm.controls.creditCardExportGroup.value, false, false); |
| } else { | ||
| this.cccExpenseGroupingDateOptions = this.reimbursableExpenseGroupingDateOptions.concat(); | ||
| this.cccExpenseGroupingDateOptions = ExportSettingModel.dateGrouping(FundSource.REIMBURSABLE, this.exportSettingForm.controls.creditCardExportGroup.value, false, false); | ||
| this.helperService.enableFormField(this.exportSettingForm, 'creditCardExportGroup'); | ||
| } | ||
| const allowedValues = this.cccExpenseGroupingDateOptions.map(option => option.value); |
| this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); | ||
| // This.reimbursableExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); | ||
| // This.reimbursableExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(reimbursableExportGroup, this.reimbursableExpenseGroupingDateOptions); | ||
| this.reimbursableExpenseGroupingDateOptions = ExportSettingModel.dateGrouping(FundSource.REIMBURSABLE, this.exportSettingForm.controls.reimbursableExportGroup.value, true, false); |
There was a problem hiding this comment.
true false should be sent based on the workspace setting
| }); | ||
|
|
||
| this.exportSettingForm.controls.creditCardExportType?.valueChanges.subscribe(creditCardExportType => { | ||
| this.updateCCCExpenseGroupingDateOptions(this.exportSettingForm.get('creditCardExportType')?.value); | ||
| this.updateCCCExpenseGroupingDateOptions(creditCardExportType); |
There was a problem hiding this comment.
this is not required anymore no? we can ignore cc export type watcher since we're dependent on grouping
| if (brandingConfig.brandId==='fyle' && this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE) { | ||
| this.cccExpenseGroupingDateOptions = QBOExportSettingModel.getReimbursableExpenseGroupingDateOptions(); | ||
| this.cccExpenseGroupingDateOptions = ExportSettingModel.constructGroupingDateOptions(creditCardExportGroup, this.cccExpenseGroupingDateOptions); | ||
| if (this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE) { |
There was a problem hiding this comment.
this needs an else case as well
if (ccc export type)
if (core ccc module) {}
else {}
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (3)
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts (3)
313-323: Improve code maintainability by extracting common logic.The method could be more concise by extracting the common call to
constructExportDateOptions.private updateCCCExpenseGroupingDateOptions(selectedValue: QBOCorporateCreditCardExpensesObject): void { + const fundSource = [QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE, QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE].includes(selectedValue) + ? FundSource.CCC + : FundSource.REIMBURSABLE; + if ([QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE, QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE].includes(selectedValue)) { this.exportSettingForm.controls.creditCardExportGroup.setValue(ExpenseGroupingFieldOption.EXPENSE_ID); this.exportSettingForm.controls.creditCardExportGroup.disable(); - - this.cccExpenseGroupingDateOptions = ExportSettingModel.constructExportDateOptions(FundSource.CCC, this.exportSettingForm.controls.creditCardExportGroup.value, false, false); - } else { - this.cccExpenseGroupingDateOptions = ExportSettingModel.constructExportDateOptions(FundSource.REIMBURSABLE, this.exportSettingForm.controls.creditCardExportGroup.value, false, false); - this.helperService.enableFormField(this.exportSettingForm, 'creditCardExportGroup'); } + + this.cccExpenseGroupingDateOptions = ExportSettingModel.constructExportDateOptions( + fundSource, + this.exportSettingForm.controls.creditCardExportGroup.value, + false, + false + ); + + if (!fundSource.includes(selectedValue)) { + this.helperService.enableFormField(this.exportSettingForm, 'creditCardExportGroup'); + } }
340-341: Simplify boolean assignments.The ternary operators for boolean assignments can be simplified using direct comparison.
- const isApprovedAtSelected = this.exportSettingForm.controls.reimbursableExportDate.value === ExportDateType.APPROVED_AT ? true : false; - const isVerifiedAtSelected = this.exportSettingForm.controls.reimbursableExportDate.value === ExportDateType.VERIFIED_AT ? true : false; + const isApprovedAtSelected = this.exportSettingForm.controls.reimbursableExportDate.value === ExportDateType.APPROVED_AT; + const isVerifiedAtSelected = this.exportSettingForm.controls.reimbursableExportDate.value === ExportDateType.VERIFIED_AT; - const isApprovedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.APPROVED_AT ? true : false; - const isVerifiedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.VERIFIED_AT ? true : false; + const isApprovedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.APPROVED_AT; + const isVerifiedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.VERIFIED_AT;Also applies to: 346-347
🧰 Tools
🪛 Biome (1.9.4)
[error] 340-340: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
[error] 341-341: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with(lint/complexity/noUselessTernary)
348-352: Improve readability of conditional logic.The conditional logic for handling different export types could be more readable by extracting the conditions into meaningful variables.
- if (this.exportSettingForm.get('creditCardExportType')?.value && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE && this.exportSettingForm.get('creditCardExportType')?.value !== QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE) { + const creditCardExportType = this.exportSettingForm.get('creditCardExportType')?.value; + const isCoreCCCModule = creditCardExportType === QBOCorporateCreditCardExpensesObject.CREDIT_CARD_PURCHASE || + creditCardExportType === QBOCorporateCreditCardExpensesObject.DEBIT_CARD_EXPENSE; + + if (creditCardExportType && !isCoreCCCModule) { this.cccExpenseGroupingDateOptions = ExportSettingModel.constructExportDateOptions(FundSource.REIMBURSABLE, creditCardExportGroup, isApprovedAtSelected, isVerifiedAtSelected); } else { this.cccExpenseGroupingDateOptions = ExportSettingModel.constructExportDateOptions(FundSource.CORPORATE_CARD, creditCardExportGroup, isApprovedAtSelected, isVerifiedAtSelected); }
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
src/app/core/models/common/export-settings.model.ts(2 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts(3 hunks)
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
[error] 340-340: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with
(lint/complexity/noUselessTernary)
[error] 341-341: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with
(lint/complexity/noUselessTernary)
[error] 346-346: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with
(lint/complexity/noUselessTernary)
[error] 347-347: Unnecessary use of boolean literals in conditional expression.
Simplify your code by directly assigning the result without using a ternary operator.
If your goal is negation, you may use the logical NOT (!) or double NOT (!!) operator for clearer and concise code.
Check for more details about NOT operator.
Unsafe fix: Remove the conditional expression with
(lint/complexity/noUselessTernary)
🔇 Additional comments (2)
src/app/core/models/common/export-settings.model.ts (2)
91-118: LGTM! Well-structured date options.The method provides a clear and comprehensive list of date options with user-friendly labels mapped to appropriate export date types.
120-143: LGTM! Well-organized filtering logic.The method has:
- Clear comments explaining each step
- Meaningful variable names
- Well-structured filtering logic
🧰 Tools
🪛 Biome (1.9.4)
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.(lint/complexity/noThisInStatic)
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedApprovedOrVerifiedOption, excludedPostedAtOption]; | ||
|
|
||
| // Get base date options | ||
| const unfilteredDateOptions = this.getExpenseGroupingDateOptions(); |
There was a problem hiding this comment.
Replace this with class name in static context.
Using this in a static context can be confusing. Use the class name instead.
- const unfilteredDateOptions = this.getExpenseGroupingDateOptions();
+ const unfilteredDateOptions = ExportSettingModel.getExpenseGroupingDateOptions();📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| const unfilteredDateOptions = this.getExpenseGroupingDateOptions(); | |
| const unfilteredDateOptions = ExportSettingModel.getExpenseGroupingDateOptions(); |
🧰 Tools
🪛 Biome (1.9.4)
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
| @@ -138,27 +117,27 @@ export class ExportSettingModel { | |||
| ]; | |||
| } | |||
|
|
|||
| static dateGrouping(exportType: FundSource, expenseGrouping: string, showApprovedDate: boolean, showVerificationDate: boolean): SelectFormOption[] { | |||
| static constructExportDateOptions(exportType: FundSource, expenseGrouping: ExpenseGroupingFieldOption, isApprovedAtSelected: boolean, isVerifiedAtSelected: boolean): SelectFormOption[] { | |||
There was a problem hiding this comment.
exportType can be isCoreCCCModule: boolean
| const isApprovedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.APPROVED_AT ? true : false; | ||
| const isVerifiedAtSelected = this.exportSettingForm.controls.creditCardExportDate.value === ExportDateType.VERIFIED_AT ? true : false; |
There was a problem hiding this comment.
same logic being repeated, move out to model so that all apps can use it
There was a problem hiding this comment.
also for ccc we've never used this, so safe to make it false false for ccc
There was a problem hiding this comment.
when we do this in model we don't need to send isApprovedAtSelected, isVerifiedAtSelected or any parameter we can directly send the form and check. can we do like this
There was a problem hiding this comment.
Actionable comments posted: 1
♻️ Duplicate comments (1)
src/app/core/models/common/export-settings.model.ts (1)
137-137:⚠️ Potential issueReplace
thiswith class name in static context.Using
thisin a static context can be confusing. Use the class name instead.- const unfilteredDateOptions = this.getExpenseGroupingDateOptions(); + const unfilteredDateOptions = ExportSettingModel.getExpenseGroupingDateOptions();🧰 Tools
🪛 Biome (1.9.4)
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.(lint/complexity/noThisInStatic)
🧹 Nitpick comments (3)
src/app/integrations/qbo/qbo.fixture.ts (1)
245-254: LGTM! New mock data added for date grouping options.The new mock data follows a consistent structure and uses the ExportDateType enum correctly.
Consider adding JSDoc comments to describe the purpose and structure of these mock constants:
+/** + * Mock data for CCC expense date grouping options. + * Used in export settings component tests. + */ export const mockCCCExpenseDateGrouping: SelectFormOption[] = [ {label: 'Export date', value: ExportDateType.CURRENT_DATE}, {label: 'Verification date', value: ExportDateType.VERIFIED_AT}, {label: 'Spend date', value: ExportDateType.SPENT_AT} ]; +/** + * Mock data for reimbursable expense date grouping options. + * Used in export settings component tests. + */ export const mockReimbursableExpenseDateGrouping: SelectFormOption[] = [ {label: 'Export date', value: ExportDateType.CURRENT_DATE}, {label: 'Spend date', value: ExportDateType.SPENT_AT} ];src/app/core/models/common/export-settings.model.ts (2)
120-120: Improve type safety for parameters.The
expenseGroupingparameter should be explicitly typed asExpenseGroupingFieldOption.- static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateGroupingValue: ExportDateType): SelectFormOption[] { + static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateGroupingValue: ExportDateType): SelectFormOption[] {
128-128: Simplify complex conditional logic.The long conditional expression could be simplified for better readability.
- const excludedApprovedOrVerifiedOption = exportDateGroupingValue === ExportDateType.APPROVED_AT ? [ExportDateType.VERIFIED_AT] : (exportDateGroupingValue === ExportDateType.VERIFIED_AT ? [ExportDateType.APPROVED_AT] : [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]); + let excludedApprovedOrVerifiedOption: ExportDateType[] = []; + if (exportDateGroupingValue === ExportDateType.APPROVED_AT) { + excludedApprovedOrVerifiedOption = [ExportDateType.VERIFIED_AT]; + } else if (exportDateGroupingValue === ExportDateType.VERIFIED_AT) { + excludedApprovedOrVerifiedOption = [ExportDateType.APPROVED_AT]; + } else { + excludedApprovedOrVerifiedOption = [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]; + }
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (4)
src/app/core/models/common/export-settings.model.ts(2 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts(3 hunks)src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts(3 hunks)src/app/integrations/qbo/qbo.fixture.ts(1 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.ts
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: unit-test
🔇 Additional comments (2)
src/app/integrations/qbo/qbo-shared/qbo-export-settings/qbo-export-settings.component.spec.ts (1)
709-709: LGTM! Test assertions updated to use more specific mock data.The test assertions have been updated to use dedicated mock data (
mockReimbursableExpenseDateGroupingandmockCCCExpenseDateGrouping) for date grouping options, which improves test clarity and maintainability.Also applies to: 730-730
src/app/core/models/common/export-settings.model.ts (1)
91-118: LGTM! Well-structured implementation of date options.The method provides a clear and consistent set of date options with descriptive labels and proper enum values.
| @@ -117,21 +117,21 @@ export class ExportSettingModel { | |||
| ]; | |||
| } | |||
|
|
|||
| static constructExportDateOptions(exportType: FundSource, expenseGrouping: ExpenseGroupingFieldOption, isApprovedAtSelected: boolean, isVerifiedAtSelected: boolean): SelectFormOption[] { | |||
| static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateGroupingValue: ExportDateType): SelectFormOption[] { | |||
There was a problem hiding this comment.
exportDateType: ExportDateType
|
|
||
| // Array of unwanted dates | ||
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedApprovedOrVerifiedOption, excludedPostedAtOption]; | ||
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedPostedAtOption].concat(excludedApprovedOrVerifiedOption); |
There was a problem hiding this comment.
why not [excludedSpendDateOption, excludedApprovedOrVerifiedOption, excludedPostedAtOption]?
There was a problem hiding this comment.
it is because is now an array, if we put array inside array it wooun't work as we expected.
it will be like [laste_spend_date, [approved_at, verified_at], posted_at]. with this if we use filter it will not work as expected
DhaaraniCIT
added
deploy
|
There was a problem hiding this comment.
Actionable comments posted: 2
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
src/app/core/models/common/export-settings.model.ts(2 hunks)
🧰 Additional context used
🪛 Biome (1.9.4)
src/app/core/models/common/export-settings.model.ts
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: staging_deploy
🔇 Additional comments (1)
src/app/core/models/common/export-settings.model.ts (1)
91-118: LGTM! Well-structured date options.The method provides a comprehensive list of date options with clear labels and corresponding enum values.
| import { DefaultDestinationAttribute, DestinationAttribute } from "../db/destination-attribute.model"; | ||
| import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model"; | ||
| import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, FundSource, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model"; |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Remove unused import.
The FundSource enum is imported but not used in the file. Remove it to keep the imports clean.
-import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, FundSource, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model";
+import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model";📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, FundSource, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model"; | |
| import { DestinationOptionKey, ExpenseGroupingFieldOption, ExportDateType, IntacctCorporateCreditCardExpensesObject, IntacctExportSettingDestinationOptionKey, IntacctReimbursableExpensesObject, NetsuiteExportSettingDestinationOptionKey, QboExportSettingDestinationOptionKey, SplitExpenseGrouping } from "../enum/enum.model"; |
| static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateType: ExportDateType): SelectFormOption[] { | ||
|
|
||
| // Determine the excluded date based on expenseGrouping | ||
| const excludedSpendDateOption = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | ||
| ? ExportDateType.LAST_SPENT_AT | ||
| : ExportDateType.SPENT_AT; | ||
|
|
||
| // Determine the excluded date based on customer choose | ||
| const excludedApprovedOrVerifiedOption = exportDateType === ExportDateType.APPROVED_AT ? [ExportDateType.VERIFIED_AT] : (exportDateType === ExportDateType.VERIFIED_AT ? [ExportDateType.APPROVED_AT] : [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]); | ||
|
|
||
| // Determine the excluded date based on export Type | ||
| const excludedPostedAtOption = !isCoreCCCModule ? ExportDateType.POSTED_AT : null; | ||
|
|
||
| // Array of unwanted dates | ||
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedPostedAtOption].concat(excludedApprovedOrVerifiedOption); | ||
|
|
||
| // Get base date options | ||
| const unfilteredDateOptions = this.getExpenseGroupingDateOptions(); | ||
|
|
||
| // Filter out excluded and unwanted dates | ||
| return unfilteredDateOptions.filter(option => | ||
| option.value !== null && !dateOptionsToBeExcluded.includes(option.value as ExportDateType) | ||
| ); | ||
| } |
There was a problem hiding this comment.
🛠️ Refactor suggestion
Fix static context and improve type safety.
The method has a well-documented logic flow with clear comments. However, there are a few improvements needed:
- Using
thisin a static context should be avoided - The
expenseGroupingparameter should be strictly typed
- static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateType: ExportDateType): SelectFormOption[] {
+ static constructExportDateOptions(
+ isCoreCCCModule: boolean,
+ expenseGrouping: ExpenseGroupingFieldOption,
+ exportDateType: ExportDateType
+ ): SelectFormOption[] {
// Determine the excluded date based on expenseGrouping
const excludedSpendDateOption = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID
? ExportDateType.LAST_SPENT_AT
: ExportDateType.SPENT_AT;
// Determine the excluded date based on customer choose
const excludedApprovedOrVerifiedOption = exportDateType === ExportDateType.APPROVED_AT ? [ExportDateType.VERIFIED_AT] : (exportDateType === ExportDateType.VERIFIED_AT ? [ExportDateType.APPROVED_AT] : [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]);
// Determine the excluded date based on export Type
const excludedPostedAtOption = !isCoreCCCModule ? ExportDateType.POSTED_AT : null;
// Array of unwanted dates
const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedPostedAtOption].concat(excludedApprovedOrVerifiedOption);
// Get base date options
- const unfilteredDateOptions = this.getExpenseGroupingDateOptions();
+ const unfilteredDateOptions = ExportSettingModel.getExpenseGroupingDateOptions();
// Filter out excluded and unwanted dates
return unfilteredDateOptions.filter(option =>
option.value !== null && !dateOptionsToBeExcluded.includes(option.value as ExportDateType)
);
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| static constructExportDateOptions(isCoreCCCModule: boolean, expenseGrouping: ExpenseGroupingFieldOption, exportDateType: ExportDateType): SelectFormOption[] { | |
| // Determine the excluded date based on expenseGrouping | |
| const excludedSpendDateOption = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| // Determine the excluded date based on customer choose | |
| const excludedApprovedOrVerifiedOption = exportDateType === ExportDateType.APPROVED_AT ? [ExportDateType.VERIFIED_AT] : (exportDateType === ExportDateType.VERIFIED_AT ? [ExportDateType.APPROVED_AT] : [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]); | |
| // Determine the excluded date based on export Type | |
| const excludedPostedAtOption = !isCoreCCCModule ? ExportDateType.POSTED_AT : null; | |
| // Array of unwanted dates | |
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedPostedAtOption].concat(excludedApprovedOrVerifiedOption); | |
| // Get base date options | |
| const unfilteredDateOptions = this.getExpenseGroupingDateOptions(); | |
| // Filter out excluded and unwanted dates | |
| return unfilteredDateOptions.filter(option => | |
| option.value !== null && !dateOptionsToBeExcluded.includes(option.value as ExportDateType) | |
| ); | |
| } | |
| static constructExportDateOptions( | |
| isCoreCCCModule: boolean, | |
| expenseGrouping: ExpenseGroupingFieldOption, | |
| exportDateType: ExportDateType | |
| ): SelectFormOption[] { | |
| // Determine the excluded date based on expenseGrouping | |
| const excludedSpendDateOption = expenseGrouping === ExpenseGroupingFieldOption.EXPENSE_ID | |
| ? ExportDateType.LAST_SPENT_AT | |
| : ExportDateType.SPENT_AT; | |
| // Determine the excluded date based on customer choose | |
| const excludedApprovedOrVerifiedOption = exportDateType === ExportDateType.APPROVED_AT | |
| ? [ExportDateType.VERIFIED_AT] | |
| : (exportDateType === ExportDateType.VERIFIED_AT | |
| ? [ExportDateType.APPROVED_AT] | |
| : [ExportDateType.APPROVED_AT, ExportDateType.VERIFIED_AT]); | |
| // Determine the excluded date based on export Type | |
| const excludedPostedAtOption = !isCoreCCCModule ? ExportDateType.POSTED_AT : null; | |
| // Array of unwanted dates | |
| const dateOptionsToBeExcluded = [excludedSpendDateOption, excludedPostedAtOption].concat(excludedApprovedOrVerifiedOption); | |
| // Get base date options | |
| const unfilteredDateOptions = ExportSettingModel.getExpenseGroupingDateOptions(); | |
| // Filter out excluded and unwanted dates | |
| return unfilteredDateOptions.filter(option => | |
| option.value !== null && !dateOptionsToBeExcluded.includes(option.value as ExportDateType) | |
| ); | |
| } |
🧰 Tools
🪛 Biome (1.9.4)
[error] 137-137: Using this in a static context can be confusing.
this refers to the class.
Unsafe fix: Use the class name instead.
(lint/complexity/noThisInStatic)
DhaaraniCIT
added
deploy
Description
feat: poc for date grouping
Clickup
https://app.clickup.com/t/
Summary by CodeRabbit
Summary by CodeRabbit