Clone Settings complete reimbursable export settings

src/app/app.module.ts

@@ -5,6 +5,7 @@ import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { JwtHelperService, JWT_OPTIONS } from '@auth0/angular-jwt';
 import { MatLegacySnackBarModule as MatSnackBarModule, MAT_LEGACY_SNACK_BAR_DEFAULT_OPTIONS as MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/legacy-snack-bar';
+import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
 
 import * as Sentry from '@sentry/angular';
 
@@ -24,7 +25,8 @@ import { GlobalErrorHandler } from './app.errorhandling';
     HttpClientModule,
     FormsModule,
     ReactiveFormsModule,
-    MatSnackBarModule
+    MatSnackBarModule,
+    MatDialogModule,
   ],
   providers: [
     {

src/app/auth/auth.module.ts

@@ -2,14 +2,13 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
-
 import { LoginComponent } from './login/login.component';
 import { LogoutComponent } from './logout/logout.component';
 import { FyleCallbackComponent } from './fyle-callback/fyle-callback.component';
 import { AuthComponent } from './auth.component';
 import { AuthRoutingModule } from './auth-routing.module';
-import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
 import { SharedLoginComponent } from './shared-login/shared-login.component';
+import { MatLegacyProgressSpinnerModule as MatProgressSpinnerModule } from '@angular/material/legacy-progress-spinner';
 
 
 @NgModule({
@@ -25,7 +24,8 @@ import { SharedLoginComponent } from './shared-login/shared-login.component';
     AuthRoutingModule,
     FlexLayoutModule,
     MatButtonModule,
-    MatProgressSpinnerModule
+    MatProgressSpinnerModule,
+    MatButtonModule
   ]
 })
 export class AuthModule { }

src/app/core/core.module.ts

@@ -1,12 +1,13 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-
+import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
 
 
 @NgModule({
   declarations: [],
   imports: [
-    CommonModule
+    CommonModule,
+    MatDialogModule
   ]
 })
 export class CoreModule { }

src/app/core/models/configuration/clone-setting.model.ts

@@ -0,0 +1,45 @@
+import { FormGroup } from "@angular/forms";
+import { AdvancedSettingGet, AdvancedSettingModel, AdvancedSettingPost } from "./advanced-setting.model";
+import { ExportSettingGet, ExportSettingModel, ExportSettingPost } from "./export-setting.model";
+import { ImportSettingGet, ImportSettingModel, ImportSettingPost } from "./import-setting.model";
+import { MappingSetting } from "../db/mapping-setting.model";
+import { EmployeeSettingGet, EmployeeSettingModel, EmployeeSettingPost } from "./employee-setting.model";
+
+export type CloneSetting = {
+    workspace_id: number,
+    export_settings: ExportSettingGet,
+    import_settings: ImportSettingGet,
+    advanced_settings: AdvancedSettingGet,
+    employee_mappings: EmployeeSettingGet
+}
+
+export type CloneSettingPost = {
+    export_settings: ExportSettingPost,
+    Import_settings: ImportSettingPost,
+    Advanced_settings: AdvancedSettingPost,
+    employee_mappings: EmployeeSettingPost
+}
+
+export type CloneSettingExist = {
+    is_available: boolean,
+    workspace_name: string
+}
+
+export class CloneSettingModel {
+    static constructPayload(cloneSettingsForm: FormGroup, customMappingSettings: MappingSetting[]): CloneSettingPost {
+
+        const exportSettingPayload = ExportSettingModel.constructPayload(cloneSettingsForm);
+        const importSettingPayload = ImportSettingModel.constructPayload(cloneSettingsForm, customMappingSettings);
+        const advancedSettingPayload = AdvancedSettingModel.constructPayload(cloneSettingsForm);
+        const employeeMappingPayload = EmployeeSettingModel.constructPayload(cloneSettingsForm);
+
+        const cloneSettingPayload: CloneSettingPost = {
+            export_settings: exportSettingPayload,
+            Import_settings: importSettingPayload,
+            Advanced_settings: advancedSettingPayload,
+            employee_mappings: employeeMappingPayload
+        };
+
+        return cloneSettingPayload;
+    }
+}

src/app/core/models/configuration/export-setting.model.ts

@@ -1,14 +1,18 @@
 import { UntypedFormGroup } from "@angular/forms";
-import { CorporateCreditCardExpensesObject, ExpenseGroupingFieldOption, ExpenseState, CCCExpenseState, ExportDateType, ReimbursableExpensesObject } from "../enum/enum.model";
+import { CorporateCreditCardExpensesObject, ExpenseGroupingFieldOption, ExpenseState, CCCExpenseState, ExportDateType, ReimbursableExpensesObject, AutoMapEmployee, EmployeeFieldMapping } from "../enum/enum.model";
 import { ExpenseGroupSettingGet, ExpenseGroupSettingPost } from "../db/expense-group-setting.model";
 import { DefaultDestinationAttribute, GeneralMapping } from "../db/general-mapping.model";
 import { SelectFormOption } from "../misc/select-form-option.model";
 
-export type ExportSettingWorkspaceGeneralSetting = {
+export type ExportSettingWorkspaceGeneralSettingPost = {
   reimbursable_expenses_object: ReimbursableExpensesObject | null,
   corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject | null
 }
 
+export interface ExportSettingWorkspaceGeneralSetting extends ExportSettingWorkspaceGeneralSettingPost {
+  is_simplify_report_closure_enabled: boolean
+}
+
 export type ExportSettingGeneralMapping = {
   bank_account: DefaultDestinationAttribute,
   default_ccc_account: DefaultDestinationAttribute,
@@ -20,7 +24,7 @@ export type ExportSettingGeneralMapping = {
 
 export type ExportSettingPost = {
   expense_group_settings: ExpenseGroupSettingPost,
-  workspace_general_settings: ExportSettingWorkspaceGeneralSetting,
+  workspace_general_settings: ExportSettingWorkspaceGeneralSettingPost,
   general_mappings: ExportSettingGeneralMapping
 }
 
@@ -32,7 +36,7 @@ export type ExportSettingGet = {
 }
 
 export interface ExportSettingFormOption extends SelectFormOption {
-  value: ExpenseState | CCCExpenseState | ReimbursableExpensesObject | CorporateCreditCardExpensesObject | ExpenseGroupingFieldOption | ExportDateType;
+  value: ExpenseState | CCCExpenseState | ReimbursableExpensesObject | CorporateCreditCardExpensesObject | ExpenseGroupingFieldOption | ExportDateType | AutoMapEmployee | EmployeeFieldMapping | null;
 }
 
 export class ExportSettingModel {

src/app/core/models/configuration/import-setting.model.ts

@@ -53,8 +53,9 @@ export interface ImportSettingFormOption extends SelectFormOption {
 
 export class ImportSettingModel {
   static constructPayload(importSettingsForm: UntypedFormGroup, customMappingSettings: MappingSetting[]): ImportSettingPost {
+
     const emptyDestinationAttribute = {id: null, name: null};
-    const employeeSettingPayload: ImportSettingPost = {
+    const importSettingPayload: ImportSettingPost = {
       workspace_general_settings: {
         import_categories: importSettingsForm.get('chartOfAccount')?.value,
         import_items: importSettingsForm.get('importItems')?.value,
@@ -67,7 +68,7 @@ export class ImportSettingModel {
       },
       mapping_settings: ImportSettingModel.formatMappingSettings(importSettingsForm.get('expenseFields')?.value, customMappingSettings)
     };
-    return employeeSettingPayload;
+    return importSettingPayload;
   }
 
   static formatChartOfAccounts(chartOfAccounts: {enabled: boolean, name: string}[]): string[] {

src/app/core/models/enum/enum.model.ts

@@ -182,7 +182,9 @@ export enum ClickEvent {
   UNMAPPED_MAPPINGS_FILTER = 'Unmapped Mappings Filter',
   MAPPED_MAPPINGS_FILTER = 'Mapped Mappings Filter',
   DISCONNECT_QBO = 'Disconnect QBO',
-  SYNC_DIMENSION = 'Sync Dimension'
+  SYNC_DIMENSION = 'Sync Dimension',
+  CLONE_SETTINGS_BACK = 'Clone Settings Back',
+  CLONE_SETTINGS_RESET = 'Clone Settings Reset'
 }
 
 export enum ProgressPhase {
@@ -197,7 +199,8 @@ export enum OnboardingStep {
   EXPORT_SETTINGS = 'Export Settings',
   IMPORT_SETTINGS = 'Import Settings',
   ADVANCED_SETTINGS = 'Advanced Settings',
-  ONBOARDING_DONE = 'Onboarding Done'
+  ONBOARDING_DONE = 'Onboarding Done',
+  CLONE_SETTINGS = 'Clone Settings'
 }
 
 export enum UpdateEvent {

src/app/core/models/misc/confirmation-dialog.model.ts

@@ -2,5 +2,6 @@ export type ConfirmationDialog = {
   title: string,
   primaryCtaText: string,
   contents: string,
-  hideSecondaryCTA?: boolean
+  hideSecondaryCTA?: boolean,
+  hideWarningIcon?: boolean
 };

src/app/core/services/configuration/clone-setting.service.spec.ts

@@ -0,0 +1,41 @@
+import { TestBed, getTestBed } from '@angular/core/testing';
+
+import { CloneSettingService } from './clone-setting.service';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import { mockCloneSettingsGet } from 'src/app/integration/onboarding/clone-settings/clone-settings.fixture';
+import { environment } from 'src/environments/environment';
+import { WorkspaceService } from '../workspace/workspace.service';
+
+describe('CloneSettingService', () => {
+  let service: CloneSettingService;
+  let injector: TestBed;
+  let httpMock: HttpTestingController;
+  const API_BASE_URL = environment.api_url;
+  const workspace_id = environment.tests.workspaceId;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        HttpClientTestingModule
+      ]
+    });
+    injector = getTestBed();
+    service = TestBed.inject(CloneSettingService);
+    httpMock = injector.inject(HttpTestingController);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should get Clone Settings', () => {
+    service.getCloneSettings().subscribe(value => {
+      expect(value).toEqual(mockCloneSettingsGet);
+    });
+    const req = httpMock.expectOne({
+      method: 'GET',
+      url: `${API_BASE_URL}/v2/workspaces/${workspace_id}/clone_settings/`
+    });
+    req.flush(mockCloneSettingsGet);
+  });
+});

src/app/core/services/configuration/clone-setting.service.ts

@@ -0,0 +1,31 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { CloneSetting, CloneSettingExist, CloneSettingPost } from '../../models/configuration/clone-setting.model';
+import { ApiService } from '../core/api.service';
+import { WorkspaceService } from '../workspace/workspace.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+
+export class CloneSettingService {
+
+  workspaceId = this.workspaceService.getWorkspaceId();
+
+  constructor(
+    private apiService: ApiService,
+    private workspaceService: WorkspaceService
+  ) { }
+
+  checkCloneSettingsExists(): Observable<CloneSettingExist> {
+    return this.apiService.get(`/user/clone_settings/exists/`, {});
+  }
+
+  getCloneSettings(): Observable<CloneSetting> {
+    return this.apiService.get(`/v2/workspaces/${this.workspaceId}/clone_settings/`, {});
+  }
+
+  saveCloneSettings(cloneSettingsPayload: CloneSettingPost): Observable<CloneSetting> {
+    return this.apiService.put(`/v2/workspaces/${this.workspaceId}/clone_settings/`, cloneSettingsPayload);
+  }
+}

src/app/core/services/configuration/export-setting.service.spec.ts

@@ -39,7 +39,8 @@ describe('ExportSettingService', () => {
       },
       workspace_general_settings: {
         reimbursable_expenses_object: ReimbursableExpensesObject.BILL,
-        corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject.BILL
+        corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject.BILL,
+        is_simplify_report_closure_enabled: true
       },
       general_mappings: {
         bank_account: { id: '1', name: 'Fyle' },
@@ -96,7 +97,8 @@ describe('ExportSettingService', () => {
       },
       workspace_general_settings: {
         reimbursable_expenses_object: ReimbursableExpensesObject.BILL,
-        corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject.BILL
+        corporate_credit_card_expenses_object: CorporateCreditCardExpensesObject.BILL,
+        is_simplify_report_closure_enabled: true
       },
       general_mappings: {
         bank_account: { id: '1', name: 'Fyle' },