Merge branch 'develop' into feat/integrate-scan-tool-url

Author: arunjaindev

package-lock.json

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

package.json

@@ -279,7 +279,7 @@ export const ImageTagsContainer = ({
     )
 
     const getBuildContextAdditionalContent = () => (
-        <div className="h-250 fs-13 dc__overflow-scroll p-12">
+        <div className="h-250 fs-13 dc__overflow-auto p-12">
             <div>Image labels allow you to tag container images with readable and relatable labels eg. v1.0.</div>
             <ul className="pl-20 mt-8">
                 <li>A label can only be added if a workflow has CD pipelines deploying to Production environments.</li>

src/Common/ImageTags.tsx

@@ -84,7 +84,7 @@ const ArtifactInfoModal = ({
                         <ICClose className="icon-dim-24 icon-use-fill-n6" />
                     </button>
                 </div>
-                <div className="flexbox-col flex-grow-1 dc__overflow-scroll bg__tertiary h-100">
+                <div className="flexbox-col flex-grow-1 dc__overflow-auto bg__tertiary h-100">
                     <APIResponseHandler
                         isLoading={isInfoLoading}
                         progressingProps={{

src/Shared/Components/ArtifactInfoModal/ArtifactInfoModal.component.tsx

@@ -160,7 +160,7 @@ const BulkOperationsResultModal = ({
                             ))}
                         </div>
 
-                        <div className="dc__overflow-scroll px-20">
+                        <div className="dc__overflow-auto px-20">
                             {sortedList.map((result, index, arr) => (
                                 <div
                                     className={`dc__grid py-10 fs-13 dc__gap-16 dc__align-items-start ${index === arr.length - 1 ? 'mb-20' : ''}`}

src/Shared/Components/BulkOperations/BulkOperationsResultModal.tsx

@@ -54,7 +54,7 @@ const SummaryTooltipCard = React.memo(
         ciMaterials,
         gitTriggers,
     }: SummaryTooltipCardType): JSX.Element => (
-        <div className="build-card-popup p-16 br-4 w-400 bg__primary mxh-300 dc__overflow-scroll">
+        <div className="build-card-popup p-16 br-4 w-400 bg__primary mxh-300 dc__overflow-auto">
             <span className="fw-6 fs-16 mb-4" style={{ color: colorMap[status.toLowerCase()] }}>
                 {status.toLowerCase() === 'cancelled' ? 'Aborted' : status}
             </span>
@@ -289,7 +289,7 @@ const Sidebar = React.memo(
         const reloadNextAfterBottom = () => {
             ReactGA.event({
                 category: 'pagination',
-                action: 'scroll',
+                action: 'auto',
                 label: `${type.toLowerCase()}-history`,
                 value: triggerHistory.size,
             })
@@ -371,7 +371,7 @@ const Sidebar = React.memo(
                     </div>
                 )}
 
-                <div className="flex column top left flex-grow-1 dc__hide-hscroll p-8" style={{ overflowY: 'auto' }}>
+                <div className="flex column top left flex-grow-1 dc__overflow-auto p-8">
                     {fetchIdData === FetchIdDataStatus.SUCCESS && (
                         <ViewAllCardsTile handleViewAllHistory={handleViewAllHistory} />
                     )}

src/Shared/Components/CICDHistory/Sidebar.tsx

@@ -261,7 +261,7 @@ export const DeploymentConfigDiffMain = ({
                     )}
                 </div>
             </div>
-            <div className="deployment-config-diff__main-content dc__overflow-y-auto">{renderContent()}</div>
+            <div className="deployment-config-diff__main-content dc__overflow-auto">{renderContent()}</div>
         </div>
     )
 }

src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx

@@ -76,7 +76,7 @@ const IframeElement = ({ URL, width, height, title, maxHeight, maxWidth }: Ifram
             {showFullScreen && (
                 <VisibleModal className="" close={handleExitFullScreen}>
                     <div
-                        className="dc__overflow-scroll br-8 dc__position-rel bg__primary custom-panel--iframe-element flexbox-col dc__content-space"
+                        className="dc__overflow-auto br-8 dc__position-rel bg__primary custom-panel--iframe-element flexbox-col dc__content-space"
                         onClick={stopPropagation}
                     >
                         <div className="flexbox dc__align-items-center dc__content-space dc__border-bottom py-20 px-16">

src/Shared/Components/IframeContainer/IframeElement.tsx

@@ -169,7 +169,7 @@ const SecurityModal: React.FC<SecurityModalPropsType> = ({
                 {/* NOTE: only show sidebar in AppDetails */}
                 {Sidebar && <Sidebar modalState={state} setModalState={setState} categoriesConfig={categoriesConfig} />}
                 <div className="dc__border-right-n1 h-100" />
-                <div className="dc__overflow-scroll flex-grow-1" style={{ width: '744px' }}>
+                <div className="dc__overflow-auto flex-grow-1" style={{ width: '744px' }}>
                     {selectedDetailViewData && renderDetailViewSubHeader()}
                     {data && renderInfoCardAndTable()}
                 </div>