Merge pull request #268 from devtron-labs/chore/sync-packet-17

chore: sync packet 17

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.2.16",
+    "version": "0.2.17",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

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

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiff.scss

@@ -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/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx

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