Merge pull request #265 from devtron-labs/fix/config-diff-compare-height

fix: config diff compare height

Author: RohitRaj011

src/Common/Pagination/Pagination.tsx

@@ -81,7 +81,6 @@ const Pagination = ({
     const pageNoIndex = pages.findIndex((page) => page.selected)
     const visiblePages = pages.filter((page) => page.isVisible)
     return (
-        // TODO: Remove pagination-wrapper from dashboard
         <div className={rootClassName || ''}>
             <div className="page-number">
                 {offset + 1} - {lastPageNo} of {size}

src/Common/Pagination/pagination.scss

@@ -14,15 +14,6 @@
  * limitations under the License.
  */
 
-.pagination-wrapper {
-    display: flex;
-    align-items: center;
-    padding: 0px 24px;
-    justify-content: space-between;
-    margin: 0px;
-    background-color: var(--white);
-}
-
 .pagination {
     margin-top: 16px;
     margin-bottom: 16px;
@@ -99,6 +90,7 @@
     background-color: var(--white);
     padding: 0px;
     user-select: none;
+    border: none;
 }
 
 .page__button--icon {

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.scss

@@ -20,5 +20,9 @@
     &__main-content {
         height: calc(100vh - 122px);
         overflow: auto;
+
+        &__comparison {
+            margin: 16px 0 0;
+        }
     }
 }

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx

@@ -147,20 +147,20 @@ export const DeploymentConfigDiffMain = ({
                             />
                         </>
                     ) : (
-                        <>
-                            <div className="bcn-1 deployment-diff__upper dc__top-radius-4 mt-16 ml-16 mr-16 dc__border-right dc__border-left dc__border-top">
+                        <div className="p-16">
+                            <div className="bcn-1 deployment-diff__upper dc__top-radius-4 dc__border-right dc__border-left dc__border-top">
                                 <div className="px-12 py-6 dc__border-right">{primaryHeading}</div>
                                 <div className="px-12 py-6">{secondaryHeading}</div>
                             </div>
                             <DeploymentHistoryDiffView
                                 baseTemplateConfiguration={secondaryList}
                                 currentConfiguration={primaryList}
                                 previousConfigAvailable
-                                rootClassName="m-16 mt-0-imp dc__no-top-radius dc__no-top-border"
-                                comparisonBodyClassName="m-16"
+                                rootClassName="m-0 dc__no-top-radius dc__no-top-border"
+                                comparisonBodyClassName="deployment-config-diff__main-content__comparison"
                                 sortOrder={sortingConfig?.sortOrder}
                             />
-                        </>
+                        </div>
                     )}
                 </DeploymentConfigDiffAccordion>
             )

src/Shared/constants.tsx

@@ -469,3 +469,5 @@ export enum SelectAllGroupedResourceIdentifiers {
     allExistingAndFutureProdEnvironments = '-2',
     allExistingAndFutureEnvironments = '-3',
 }
+
+export const TRIGGER_STATUS_PROGRESSING = ['progressing', 'initiating', 'running', 'starting']