Fix configuration footer (#524)

* Fix configuration footer * fix clone setting
fylein · Feb 8, 2024 · 1861efe · 1861efe
1 parent db302a6
commit 1861efe
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 67 deletions.
diff --git a/...l-shared/business-central-export-settings/business-central-export-settings.component.html b/...l-shared/business-central-export-settings/business-central-export-settings.component.html
@@ -13,7 +13,7 @@
         </app-configuration-step-header>
     </div>
     <form [formGroup]="exportSettingForm">
-        <div class="tw-p-24-px">
+        <div class="tw-p-24-px tw-px-24-px tw-pb-24-px">
             <div class="tw-mb-16-px">
                 <div class="tw-rounded-lg tw-border-separator tw-border tw-bg-configuration-bg">
                     <app-configuration-toggle-field 
@@ -262,8 +262,6 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div>
             <app-configuration-step-footer 
                 [ctaText] = "!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING"
                 [showBackButton] = "isOnboarding"

diff --git a/...tacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html b/...tacct-onboarding/intacct-onboarding-connector/intacct-onboarding-connector.component.html
@@ -1,3 +1,3 @@
 <app-onboarding-steppers [onboardingSteps]="onboardingSteps"></app-onboarding-steppers>
 <app-intacct-connector (setupConnectionStatus)="setupConnectionStatus($event)" *ngIf="!isIntacctConnected"></app-intacct-connector>
-<app-intacct-location-entity *ngIf="isIntacctConnected"></app-intacct-location-entity>
+<app-intacct-location-entity *ngIf="isIntacctConnected"></app-intacct-location-entity>
diff --git a/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html b/...ons/intacct/intacct-shared/intacct-export-settings/intacct-export-settings.component.html
@@ -271,8 +271,6 @@ <h5 class="!tw-text-faded-text-color !tw-font-400 !tw-text-14-px tw-pt-6-px !tw-
                     </div>
                 </div>
             </div>
-        </div>
-        <div>
             <app-configuration-step-footer [ctaText] = "!saveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" (save)="save()" [isButtonDisabled]="!exportSettingsForm.valid"></app-configuration-step-footer>
         </div>
     </form>

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
@@ -503,8 +503,9 @@ <h4 class="tw-mb-12-px">Preview of the Description Field</h4>
             </div>
         </div>
     </div>
-
-    <app-configuration-step-footer [showResetButton]="true" [showBackButton]="true" [ctaText] = "!isSaveInProgress ? (ConfigurationCtaText.SAVE_AND_CONTINUE) : ConfigurationCtaText.SAVING" (save)="save()" (resetCloneSetting)="resetCloneSetting()" (navigateToPreviousStep)="navigateToPreviousStep()" [isButtonDisabled]="!employeeSettingForm.valid || !exportSettingForm.valid || !importSettingForm.valid || !advancedSettingForm.valid"></app-configuration-step-footer>
+    <div class="clone-setting--field-section">
+        <app-configuration-step-footer [showResetButton]="true" [showBackButton]="true" [ctaText] = "!isSaveInProgress ? (ConfigurationCtaText.SAVE_AND_CONTINUE) : ConfigurationCtaText.SAVING" (save)="save()" (resetCloneSetting)="resetCloneSetting()" (navigateToPreviousStep)="navigateToPreviousStep()" [isButtonDisabled]="!employeeSettingForm.valid || !exportSettingForm.valid || !importSettingForm.valid || !advancedSettingForm.valid"></app-configuration-step-footer>
+    </div>
 </div>
 
 <app-configuration-confirmation-dialog

diff --git a/...ge300-onboarding/sage300-onboarding-connector/sage300-onboarding-connector.component.html b/...ge300-onboarding/sage300-onboarding-connector/sage300-onboarding-connector.component.html
@@ -13,8 +13,8 @@
                 [contentText]="'Connect to your Sage 300 CRE account to establish a connection between ' + brandingConfig.brandName + ' and Sage 300 CRE. HH2 Identifier is required to connect Sage 300 CRE to '+ brandingConfig.brandName"
                 [redirectLink]="redirectLink"></app-configuration-step-header>
             </div>
-            <div class="tw-flex tw-justify-center tw-items-center">
-                <div class="tw-p-24-px">
+            <div class="tw-p-24-px tw-px-24-px tw-pb-24-px">
+                <div class="tw-flex tw-justify-center tw-items-center">
                     <form [formGroup]="connectSage300Form">
                         <div class="tw-mb-16-px">
                             <app-configuration-text-field [customErrorMessage]="'Please enter a valid HH2 Identifier.'" [form]="connectSage300Form" [formControllerName]="'companyID'" [isFieldMandatory]="true" [label]="'HH2 Identifier'" [placeholder]="'Enter HH2 Identifier'"></app-configuration-text-field>
@@ -27,10 +27,8 @@
                         </div>
                     </form>
                 </div>
-            </div>
-            <div>
                 <app-configuration-step-footer [ctaText]="!saveInProgress ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVING" (save)="save()" [isButtonDisabled]="!connectSage300Form.valid"></app-configuration-step-footer>
-             </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/...ons/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.html b/...ons/sage300/sage300-shared/sage300-export-settings/sage300-export-settings.component.html
@@ -13,7 +13,7 @@
         </app-configuration-step-header>
     </div>
     <form [formGroup]="exportSettingForm">
-        <div class="tw-p-24-px">
+        <div class="tw-p-24-px tw-px-24-px tw-pb-24-px">
             <div class="tw-mb-16-px">
                 <div class="tw-rounded-lg tw-border-separator tw-border tw-bg-configuration-bg">
                     <app-configuration-toggle-field 
@@ -253,8 +253,6 @@
                     </div>
                 </div>
             </div>
-        </div>
-        <div>
             <app-configuration-step-footer 
                 [ctaText] = "!isSaveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" 
                 [showBackButton] = "isOnboarding"

diff --git a/...mponents/configuration/configuration-step-footer/configuration-step-footer.component.html b/...mponents/configuration/configuration-step-footer/configuration-step-footer.component.html
@@ -1,13 +1,17 @@
 <div class="tw-flex tw-pt-24-px tw-border-t-border-tertiary" [ngClass]="!showBackButton ? 'tw-justify-end': 'tw-justify-between'">
-    <div *ngIf="showBackButton">
-        <button type="button" class="p-button outline-sm" (click)="navigate()">
-            <app-svg-icon *ngIf="brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-left-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pr-10-px tw-text-12-px tw-text-btn-cta'"></app-svg-icon>
-            Back
-        </button>
+    <div class="tw-flex" *ngIf="showBackButton">
+        <div>
+            <button type="button" class="p-button outline-sm" (click)="navigate()">
+                <app-svg-icon *ngIf="brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-left-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pr-10-px tw-text-12-px tw-text-btn-cta'"></app-svg-icon>
+                Back
+            </button>
+        </div>
 
-        <button *ngIf="showResetButton" type="button" class="p-button-raised tw-bg-white back-btn tw-ml-16-px" (click)="resetConfiguration()">
-            Reset Configuration
-        </button>
+        <div class="tw-ml-16-px">
+            <button *ngIf="showResetButton" type="button" class="p-button outline-sm" (click)="resetConfiguration()">
+                Reset Configuration
+            </button>
+        </div>
     </div>
     <div>
         <button *ngIf="ctaText !== 'Saving' && ctaText !== 'Syncing'" pButton type="button" class="p-button-raised" (click)="saveChanges()" [disabled]="isButtonDisabled">

diff --git a/src/app/shared/components/qbd/configuration/advanced-setting/advanced-setting.component.html b/src/app/shared/components/qbd/configuration/advanced-setting/advanced-setting.component.html
@@ -113,8 +113,6 @@
                         </div>
                     </div>
                 </div>
-            </div>
-            <div>
                 <app-configuration-step-footer [ctaText]="!saveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" [isButtonDisabled]="!advancedSettingsForm.valid || saveInProgress" (save)="save()"></app-configuration-step-footer>
             </div>
         </form>

diff --git a/src/app/shared/components/qbd/configuration/export-setting/export-setting.component.html b/src/app/shared/components/qbd/configuration/export-setting/export-setting.component.html
@@ -217,8 +217,6 @@ <h5 class="!tw-text-faded-text-color !tw-font-400 !tw-text-14-px tw-pt-6-px !tw-
                         </div>
                     </div>
                 </div>
-            </div>
-            <div>
                 <app-configuration-step-footer [ctaText]="!saveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" [isButtonDisabled]="!exportSettingsForm.valid || saveInProgress" (save)="save()"></app-configuration-step-footer>
             </div>
         </form>

diff --git a/src/app/shared/components/qbd/configuration/field-mapping/field-mapping.component.html b/src/app/shared/components/qbd/configuration/field-mapping/field-mapping.component.html
@@ -33,8 +33,6 @@
                         [formControllerName]="'classType'"></app-configuration-select-field>
                     </div>
                 </div> 
-            </div>
-            <div>
                 <app-configuration-step-footer [ctaText]="!saveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" [isButtonDisabled]="!fieldMappingForm.valid || saveInProgress" (save)="save()"></app-configuration-step-footer>
             </div>
         </form>

diff --git a/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.html b/src/app/shared/components/si/core/intacct-connector/intacct-connector.component.html
@@ -8,7 +8,7 @@
       [contentText]="'Connect to your Sage Intacct account to establish a connection between ' + brandingConfig.brandName + ' and Sage Intacct.'"
       [redirectLink]="redirectLink"></app-configuration-step-header>
    </div>
-   <div *ngIf="!isLoading">
+   <div *ngIf="!isLoading" class="tw-px-24-px tw-pb-24-px">
       <form [formGroup]="connectSageIntacctForm">
          <div class="tw-p-24-px">
            <div class="container">

diff --git a/.../shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html b/.../shared/components/si/core/intacct-location-entity/intacct-location-entity.component.html
@@ -10,46 +10,46 @@
       [redirectLink]="redirectLink">
     </app-configuration-step-header>
   </div>
-  <div class="tw-flex">
-    <div class="tw-w-40-vw tw-h-240-px tw-flex tw-flex-col tw-items-center tw-justify-center">
-      <h5 class="tw-text-14-px tw-font-500 align-center tw-text-sub-text-color tw-cursor-default">
-        {{ brandingConfig.brandName | uppercase }}
-      </h5>
-      <h3 [pTooltip]="fyleOrgName" [tooltipDisabled]="fyleOrgName.length < 26" tooltipPosition="left" tooltipStyleClass="left" class="tw-text-18-px tw-pt-18-px tw-whitespace-nowrap tw-cursor-default">
-        {{ fyleOrgName | trimCharacter: 26 }}
-      </h3>
-    </div>
-    <div class="tw-flex tw-justify-center tw-items-center tw-w-20-vw">
-      <div>
-        <img src="assets/gifs/disconnect.gif" height="100px" width="100px" alt="Disconnect GIF" />
+  <div class="tw-px-24-px tw-pb-24-px">
+    <div class="tw-flex">
+      <div class="tw-w-40-vw tw-h-240-px tw-flex tw-flex-col tw-items-center tw-justify-center">
+        <h5 class="tw-text-14-px tw-font-500 align-center tw-text-sub-text-color tw-cursor-default">
+          {{ brandingConfig.brandName | uppercase }}
+        </h5>
+        <h3 [pTooltip]="fyleOrgName" [tooltipDisabled]="fyleOrgName.length < 26" tooltipPosition="left" tooltipStyleClass="left" class="tw-text-18-px tw-pt-18-px tw-whitespace-nowrap tw-cursor-default">
+          {{ fyleOrgName | trimCharacter: 26 }}
+        </h3>
       </div>
-    </div>
-      <form class="tw-flex tw-flex-col tw-justify-center tw-items-center tw-w-40-vw" [formGroup]="locationEntityForm">
-        <div class="tw-whitespace-nowrap">
-          <div>
-            <h5 class="tw-text-14-px tw-font-500 tw-items-center tw-text-sub-text-color">
-            SAGE INTACCT
-          </h5>
-          </div>
+      <div class="tw-flex tw-justify-center tw-items-center tw-w-20-vw">
+        <div>
+          <img src="assets/gifs/disconnect.gif" height="100px" width="100px" alt="Disconnect GIF" />
         </div>
-          <div class="tw-pt-16-px">
-            <p-dropdown appendTo="body" (onChange)="patchFormValue($event)" class="tw-pl-7" *ngIf="!locationEntity?.location_entity_name" placeholder="Select Location Entity" formControllerName="locationEntity" [options]="locationEntityOptions" optionLabel="value">
-            </p-dropdown>
-        </div>
-          <h3 *ngIf="locationEntity" [pTooltip]="locationEntity.location_entity_name" [tooltipDisabled]="locationEntity.location_entity_name.length < 26" tooltipPosition="left" tooltipStyleClass="left" class="tw-text-18-px center-align-text tw-whitespace-nowrap tw-cursor-default">
-            {{ locationEntity.location_entity_name | trimCharacter: 26 }}
-          </h3>
-
-          <div *ngIf="!locationEntity" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-faded-text-color tw-text-center">
-            Please select a Location (Entity) from Sage Intacct to proceed further.
+      </div>
+        <form class="tw-flex tw-flex-col tw-justify-center tw-items-center tw-w-40-vw" [formGroup]="locationEntityForm">
+          <div class="tw-whitespace-nowrap">
+            <div>
+              <h5 class="tw-text-14-px tw-font-500 tw-items-center tw-text-sub-text-color">
+              SAGE INTACCT
+            </h5>
+            </div>
           </div>
-
-          <div *ngIf="isRefreshDimensionInProgress" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-faded-text-color tw-text-center">
-            Please hold on; we are fetching data from your Sage Intacct account, which may take a few seconds.
+            <div class="tw-pt-16-px">
+              <p-dropdown appendTo="body" (onChange)="patchFormValue($event)" class="tw-pl-7" *ngIf="!locationEntity?.location_entity_name" placeholder="Select Location Entity" formControllerName="locationEntity" [options]="locationEntityOptions" optionLabel="value">
+              </p-dropdown>
           </div>
-      </form>
-  </div>
-  <div>
+            <h3 *ngIf="locationEntity" [pTooltip]="locationEntity.location_entity_name" [tooltipDisabled]="locationEntity.location_entity_name.length < 26" tooltipPosition="left" tooltipStyleClass="left" class="tw-text-18-px center-align-text tw-whitespace-nowrap tw-cursor-default">
+              {{ locationEntity.location_entity_name | trimCharacter: 26 }}
+            </h3>
+
+            <div *ngIf="!locationEntity" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-faded-text-color tw-text-center">
+              Please select a Location (Entity) from Sage Intacct to proceed further.
+            </div>
+
+            <div *ngIf="isRefreshDimensionInProgress" class="tw-text-14-px tw-pt-16-px tw-w-300-px tw-text-faded-text-color tw-text-center">
+              Please hold on; we are fetching data from your Sage Intacct account, which may take a few seconds.
+            </div>
+        </form>
+    </div>
     <app-configuration-step-footer *ngIf="!locationEntity" [ctaText]="saveInProgress ? ConfigurationCtaText.SYNCING : ConfigurationCtaText.SAVE_AND_CONTINUE" (save)="save()" [isButtonDisabled]="!locationEntityForm.valid"></app-configuration-step-footer>
     <app-configuration-step-footer *ngIf="locationEntity" [ctaText]="saveInProgress ? ConfigurationCtaText.SYNCING : ConfigurationCtaText.CONTINUE" (save)="navigateToExportSetting()" [isButtonDisabled]="saveInProgress"></app-configuration-step-footer>
   </div>
-Original file line number
+Diff line change
@@ Expand Up @@
                         </div>
                     </div>
                 </div>
-            </div>
-            <div>
                 <app-configuration-step-footer [ctaText] = "!saveInProgress ? (isOnboarding ? ConfigurationCtaText.SAVE_AND_CONTINUE : ConfigurationCtaText.SAVE) : ConfigurationCtaText.SAVING" (save)="save()" [isButtonDisabled]="!exportSettingsForm.valid"></app-configuration-step-footer>
             </div>
         </form>
@@ Expand Down @@