From 884bebcebd52dff07d613f14feee4454698a30e9 Mon Sep 17 00:00:00 2001 From: Ashwin Thanaraj <37061471+ashwin1111@users.noreply.github.com> Date: Fri, 8 Mar 2024 16:49:14 +0530 Subject: [PATCH] c1 QA Fixes - 10 (#634) * c1 QA Fixes - 10 * qa fixes * fix lint * minor * reset time --- run.sh | 1 - scripts/setup_env.js | 1 - src/app/app.component.html | 5 +- src/app/branding/branding-config.ts | 4 +- .../models/common/employee-settings.model.ts | 2 +- src/app/core/models/enum/enum.model.ts | 3 +- ...business-central-base-mapping.component.ts | 2 +- ...ess-central-export-settings.component.html | 2 +- .../intacct-base-mapping.component.ts | 2 +- .../qbo-base-mapping.component.ts | 2 +- .../qbo-clone-settings.component.html | 24 ++--- .../sage300-base-mapping.component.ts | 2 +- .../export-log-filter.component.html | 99 ++++++++++--------- .../generic-mapping-v2.component.scss | 2 +- .../mapping-filter.component.html | 4 +- .../zero-state/zero-state.component.html | 4 +- ...ero-state-with-illustration.component.html | 4 +- src/assets/icons/co/grv-checkmark-small.svg | 3 + .../co/grv-info-informational-medium.svg | 3 + src/assets/sprites/sprite.svg | 2 +- src/assets/themes/fyle/fdl.scss | 4 + src/styles.scss | 16 ++- tailwind.config.js | 2 + 23 files changed, 112 insertions(+), 81 deletions(-) create mode 100644 src/assets/icons/co/grv-checkmark-small.svg create mode 100644 src/assets/icons/co/grv-info-informational-medium.svg diff --git a/run.sh b/run.sh index e82ba923e..a4b333382 100644 --- a/run.sh +++ b/run.sh @@ -22,7 +22,6 @@ do sed -i $SED_EXTRA_ARGS "s?{{SENTRY_ENV}}?${SENTRY_ENV}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{CLARITY_PROJECT_ID}}?${CLARITY_PROJECT_ID}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{SEGMENT_ID}}?${SEGMENT_ID}?g" $f; - sed -i $SED_EXTRA_ARGS "s?{{QBO_CALLBACK_URL}}?${QBO_CALLBACK_URL}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{NS_CALLBACK_URL}}?${NS_CALLBACK_URL}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{XERO_CALLBACK_URL}}?${XERO_CALLBACK_URL}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{QBO_CLIENT_ID}}?${QBO_CLIENT_ID}?g" $f; diff --git a/scripts/setup_env.js b/scripts/setup_env.js index 13b6f45d0..c2e2cef61 100644 --- a/scripts/setup_env.js +++ b/scripts/setup_env.js @@ -16,7 +16,6 @@ const environment = { fyle_app_url: `${process.env.FYLE_APP_URL ? process.env.FYLE_APP_URL : '{{FYLE_APP_URL}}'}`, sentry_dsn: `${process.env.SENTRY_DSN ? process.env.SENTRY_DSN : '{{SENTRY_DSN}}'}`, sentry_env: `${process.env.SENTRY_ENV ? process.env.SENTRY_ENV : '{{SENTRY_ENV}}'}`, - qbo_callback_url: `${process.env.QBO_CALLBACK_URL ? process.env.QBO_CALLBACK_URL : '{{QBO_CALLBACK_URL}}'}`, ns_callback_url: `${process.env.NS_CALLBACK_URL ? process.env.NS_CALLBACK_URL : '{{NS_CALLBACK_URL}}'}`, xero_callback_url: `${process.env.XERO_CALLBACK_URL ? process.env.XERO_CALLBACK_URL : '{{XERO_CALLBACK_URL}}'}`, qbo_client_id: `${process.env.QBO_CLIENT_ID ? process.env.QBO_CLIENT_ID : '{{QBO_CLIENT_ID}}'}`, diff --git a/src/app/app.component.html b/src/app/app.component.html index a205803a4..31abab636 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -2,10 +2,11 @@ -
+
- + + {{ message.summary }}
diff --git a/src/app/branding/branding-config.ts b/src/app/branding/branding-config.ts index f96c08853..edd05499a 100644 --- a/src/app/branding/branding-config.ts +++ b/src/app/branding/branding-config.ts @@ -313,7 +313,7 @@ const content: ContentConfiguration = { accountsPayableSubLabel: ' to the selected Accounts Payable Account.', creditCardExpenseSubLabel: 'You could choose to export CCC expenses when they have been approved and are awaiting payment clearance, OR simply when they have been paid out.', creditCardExportTypeSubLabel: 'Expense can either be exported as single line items (Expense) or as a grouped report with multiple line items (Expense Report).', - journalOptionLabel: 'Name in Journal Entry (CCC)', + journalOptionLabel: 'Name in Journal Entry', journalOptionSubLabel: 'You can select either the \'Merchant Name\' or the \'Employee Name\' to appear in the \'Name\' field of your Journal Entries.' } }, @@ -490,7 +490,7 @@ const content: ContentConfiguration = { accountsPayableSubLabel: ' to the selected accounts payable Account.', creditCardExpenseSubLabel: 'You could choose to export ccc expenses when they have been approved and are awaiting payment clearance, or simply when they have been paid out.', creditCardExportTypeSubLabel: 'Expense can either be exported as single line items (expense) or as a grouped report with multiple line items (expense report).', - journalOptionLabel: 'Name in journal entry (ccc)', + journalOptionLabel: 'Name in journal entry', journalOptionSubLabel: 'You can select either the \'merchant name\' or the \'employee name\' to appear in the \'name\' field of your journal entries.' } }, diff --git a/src/app/core/models/common/employee-settings.model.ts b/src/app/core/models/common/employee-settings.model.ts index 03c50d1d9..9bdce6c2e 100644 --- a/src/app/core/models/common/employee-settings.model.ts +++ b/src/app/core/models/common/employee-settings.model.ts @@ -5,7 +5,7 @@ export class EmployeeSettingModel { static getEmployeeFieldMappingOptions(): SelectFormOption[] { return [ { - label: 'Employees', + label: 'Employee', value: FyleField.EMPLOYEE }, { diff --git a/src/app/core/models/enum/enum.model.ts b/src/app/core/models/enum/enum.model.ts index 53d3ebd33..671108fcd 100644 --- a/src/app/core/models/enum/enum.model.ts +++ b/src/app/core/models/enum/enum.model.ts @@ -37,7 +37,8 @@ export enum InAppIntegration { export enum ToastSeverity { SUCCESS = 'success', - ERROR = 'error' + ERROR = 'error', + INFO = 'info' } export enum UpdateEvent { diff --git a/src/app/integrations/business-central/business-central-main/business-central-mapping/business-central-base-mapping/business-central-base-mapping.component.ts b/src/app/integrations/business-central/business-central-main/business-central-mapping/business-central-base-mapping/business-central-base-mapping.component.ts index 225641104..51e0a7424 100644 --- a/src/app/integrations/business-central/business-central-main/business-central-mapping/business-central-base-mapping/business-central-base-mapping.component.ts +++ b/src/app/integrations/business-central/business-central-main/business-central-mapping/business-central-base-mapping/business-central-base-mapping.component.ts @@ -43,7 +43,7 @@ export class BusinessCentralBaseMappingComponent implements OnInit { this.isLoading = true; this.mappingService.triggerAutoMapEmployees().subscribe(() => { this.isLoading = false; - this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Auto mapping of employees may take few minutes'); + this.toastService.displayToastMessage(ToastSeverity.INFO, 'Auto mapping of employees may take few minutes'); }, () => { this.isLoading = false; this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again'); diff --git a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html index 84c9ded81..752aba1d0 100644 --- a/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html +++ b/src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html @@ -69,7 +69,7 @@ [formControllerName]="'reimbursableEmployeeMapping'">
-
+
{ this.isLoading = false; - this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Auto mapping of employees may take few minutes'); + this.toastService.displayToastMessage(ToastSeverity.INFO, 'Auto mapping of employees may take few minutes'); }, () => { this.isLoading = false; this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again'); diff --git a/src/app/integrations/qbo/qbo-main/qbo-mapping/qbo-base-mapping/qbo-base-mapping.component.ts b/src/app/integrations/qbo/qbo-main/qbo-mapping/qbo-base-mapping/qbo-base-mapping.component.ts index aed3a4349..a99f1e709 100644 --- a/src/app/integrations/qbo/qbo-main/qbo-mapping/qbo-base-mapping/qbo-base-mapping.component.ts +++ b/src/app/integrations/qbo/qbo-main/qbo-mapping/qbo-base-mapping/qbo-base-mapping.component.ts @@ -49,7 +49,7 @@ export class QboBaseMappingComponent implements OnInit { this.isLoading = true; this.mappingService.triggerAutoMapEmployees().subscribe(() => { this.isLoading = false; - this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Auto mapping of employees may take few minutes'); + this.toastService.displayToastMessage(ToastSeverity.INFO, 'Auto mapping of employees may take few minutes'); }, () => { this.isLoading = false; this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again'); diff --git a/src/app/integrations/qbo/qbo-onboarding/qbo-clone-settings/qbo-clone-settings.component.html b/src/app/integrations/qbo/qbo-onboarding/qbo-clone-settings/qbo-clone-settings.component.html index 652ab03fe..1075940dd 100644 --- a/src/app/integrations/qbo/qbo-onboarding/qbo-clone-settings/qbo-clone-settings.component.html +++ b/src/app/integrations/qbo/qbo-onboarding/qbo-clone-settings/qbo-clone-settings.component.html @@ -171,7 +171,7 @@
- - +
+ + +
diff --git a/src/app/integrations/sage300/sage300-main/sage300-mapping/sage300-base-mapping/sage300-base-mapping.component.ts b/src/app/integrations/sage300/sage300-main/sage300-mapping/sage300-base-mapping/sage300-base-mapping.component.ts index f57ee49d1..11ccea8e1 100644 --- a/src/app/integrations/sage300/sage300-main/sage300-mapping/sage300-base-mapping/sage300-base-mapping.component.ts +++ b/src/app/integrations/sage300/sage300-main/sage300-mapping/sage300-base-mapping/sage300-base-mapping.component.ts @@ -42,7 +42,7 @@ export class Sage300BaseMappingComponent implements OnInit { this.isLoading = true; this.mappingService.triggerAutoMapEmployees().subscribe(() => { this.isLoading = false; - this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Auto mapping of employees may take few minutes'); + this.toastService.displayToastMessage(ToastSeverity.INFO, 'Auto mapping of employees may take few minutes'); }, () => { this.isLoading = false; this.toastService.displayToastMessage(ToastSeverity.ERROR, 'Something went wrong, please try again'); diff --git a/src/app/shared/components/export-log/export-log-filter/export-log-filter.component.html b/src/app/shared/components/export-log/export-log-filter/export-log-filter.component.html index 00c3af4a2..d8057ba83 100644 --- a/src/app/shared/components/export-log/export-log-filter/export-log-filter.component.html +++ b/src/app/shared/components/export-log/export-log-filter/export-log-filter.component.html @@ -1,56 +1,61 @@
- +
- - -
-
- +
+
Date of export
+
+ + +
+
+ +
+
+ +
-
- -
-
-
-
- -
-
- +
+
+ +
+
+ +
-
-
- - {{brandingContent.dateRangeLabel}} - -
+
+ + {{brandingContent.dateRangeLabel}} + +
-
-
-

{{exportLogForm.value.start[0] ? (exportLogForm.value.start[0] | date): 'Start date'}}

- -

{{exportLogForm.value.start[1] ? (exportLogForm.value.start[1] | date) : 'End date'}}

- +
+
+

{{exportLogForm.value.start[0] ? (exportLogForm.value.start[0] | date): 'Start date'}}

+ +

{{exportLogForm.value.start[1] ? (exportLogForm.value.start[1] | date) : 'End date'}}

+ +
+
+ + +
+ {{date.day}}
-
- - -
- {{date.day}} -
- - -
- - + + +
+ + +
+
diff --git a/src/app/shared/components/helper/mapping/generic-mapping-v2/generic-mapping-v2.component.scss b/src/app/shared/components/helper/mapping/generic-mapping-v2/generic-mapping-v2.component.scss index 20f99e4c9..bdd46b23b 100644 --- a/src/app/shared/components/helper/mapping/generic-mapping-v2/generic-mapping-v2.component.scss +++ b/src/app/shared/components/helper/mapping/generic-mapping-v2/generic-mapping-v2.component.scss @@ -4,7 +4,7 @@ } :host ::ng-deep .mappingFilterDropdown .p-dropdown { - @apply tw-w-200-px #{!important} + @apply tw-w-200-px tw-h-40-px #{!important} } :host ::ng-deep .mapping-filter-applied .p-dropdown { diff --git a/src/app/shared/components/helper/mapping/mapping-filter/mapping-filter.component.html b/src/app/shared/components/helper/mapping/mapping-filter/mapping-filter.component.html index 3200df8ba..d9d9b7158 100644 --- a/src/app/shared/components/helper/mapping/mapping-filter/mapping-filter.component.html +++ b/src/app/shared/components/helper/mapping/mapping-filter/mapping-filter.component.html @@ -6,7 +6,7 @@

Status

-
+
@@ -19,7 +19,7 @@
-
+

All diff --git a/src/app/shared/components/helper/zero-state/zero-state.component.html b/src/app/shared/components/helper/zero-state/zero-state.component.html index d83e4497f..eb4801cc7 100644 --- a/src/app/shared/components/helper/zero-state/zero-state.component.html +++ b/src/app/shared/components/helper/zero-state/zero-state.component.html @@ -1,7 +1,7 @@

Zero State -

{{headerText}}

-

{{subHeaderText}}

+

{{headerText}}

+

{{subHeaderText}}

diff --git a/src/app/shared/components/qbd/core/zero-state-with-illustration/zero-state-with-illustration.component.html b/src/app/shared/components/qbd/core/zero-state-with-illustration/zero-state-with-illustration.component.html index 5162ac258..7a720fed5 100644 --- a/src/app/shared/components/qbd/core/zero-state-with-illustration/zero-state-with-illustration.component.html +++ b/src/app/shared/components/qbd/core/zero-state-with-illustration/zero-state-with-illustration.component.html @@ -2,8 +2,8 @@
-

{{mainText}}

-

{{subText}}

+

{{mainText}}

+

{{subText}}

diff --git a/src/assets/icons/co/grv-checkmark-small.svg b/src/assets/icons/co/grv-checkmark-small.svg new file mode 100644 index 000000000..026c7189f --- /dev/null +++ b/src/assets/icons/co/grv-checkmark-small.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/icons/co/grv-info-informational-medium.svg b/src/assets/icons/co/grv-info-informational-medium.svg new file mode 100644 index 000000000..9392141eb --- /dev/null +++ b/src/assets/icons/co/grv-info-informational-medium.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/sprites/sprite.svg b/src/assets/sprites/sprite.svg index cf19c32fb..9d0738d36 100644 --- a/src/assets/sprites/sprite.svg +++ b/src/assets/sprites/sprite.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/themes/fyle/fdl.scss b/src/assets/themes/fyle/fdl.scss index 37320ca20..439fc4e2b 100644 --- a/src/assets/themes/fyle/fdl.scss +++ b/src/assets/themes/fyle/fdl.scss @@ -394,5 +394,9 @@ --lv-meta-text-color: var(--text-muted); --input-default-border: var(--border-secondary); + + --checkbox-marked-icon-spacing: 5px; + + --qf-divider: var(--border-tertiary); } } diff --git a/src/styles.scss b/src/styles.scss index d1048d620..9da58f2c1 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -54,6 +54,10 @@ p { .pi-search { content: url('./assets/icons/co/grv-search-medium.svg') !important; } + + .pi-check { + content: url('./assets/icons/co/grv-checkmark-small.svg') !important; + } } [data-theme='fyle'] { @@ -408,7 +412,11 @@ p { } .p-checkbox .p-checkbox-box { - @apply tw-h-16-px tw-w-16-px tw-rounded-4-px tw-transition-none tw-border tw-border-checkbox-icon-color #{!important}; + @apply tw-h-16-px tw-w-16-px tw-rounded-5-px tw-transition-none tw-border-[1.5px] tw-border-checkbox-icon-color #{!important}; +} + +.p-checkbox-box { + @apply tw-border-[1.5px] #{!important}; } .p-multiselect-panel .p-multiselect-items .p-multiselect-item.p-highlight { @@ -428,7 +436,7 @@ p { } .p-checkbox .p-checkbox-box.p-highlight { - @apply tw-bg-checkbox-icon-selected-color tw-border-none tw-pb-5-px #{!important}; + @apply tw-bg-checkbox-icon-selected-color tw-border-none tw-pb-checkbox-marked-icon-spacing #{!important}; } .pi-check:before { @@ -481,6 +489,10 @@ p { @apply tw-border-none #{!important}; } +.p-toast .p-toast-message.p-toast-message-info { + @apply tw-border-none #{!important}; +} + .p-toast .p-toast-message .p-toast-message-content { @apply tw-border-0 tw-p-0 tw-text-white #{!important}; } diff --git a/tailwind.config.js b/tailwind.config.js index 7cd5ecb85..a62d7218e 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1063,6 +1063,7 @@ module.exports = { '128-px': '128px', '130-px': '130px', '168-px': '168px', + 'checkbox-marked-icon-spacing': 'var(--checkbox-marked-icon-spacing)', ...spacings }, margin: { @@ -1276,6 +1277,7 @@ module.exports = { borderRadius: { '0-px': '0px', '4-px': '4px', + '5-px': '5px', '6-px': '6px', '8-px': '8px', '10-px': '10px',