Skip to content

Commit acaa547

Browse files
shivani170shivani170
authored
Merge pull request #1620 from devtron-labs/vite-exploration-prod-bug
fix: Vite exploration prod bug
2 parents 9bb1572 + 2b1b93d commit acaa547

File tree

62 files changed

+537
-321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+537
-321
lines changed

‎src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupListHeader.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ const PermissionGroupListHeader = ({
4949
</div>
5050
}
5151
>
52-
<HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />
52+
<div className="flex">
53+
<HelpOutlineIcon className="mw-20 icon-dim-20 fcn-6 cursor" />
54+
</div>
5355
</TippyCustomized>
5456
</div>
5557
<div className="flex dc__gap-8">

‎src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sListItemCard.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,10 +327,17 @@ export default function K8sListItemCard({
327327
{!selectedPermissionAction && (
328328
<span className="flex">
329329
<Tippy className="default-tt" arrow={false} placement="top" content="Duplicate">
330-
<Clone className="icon-dim-16 mr-8 fcn-6 cursor" onClick={() => editPermission('clone')} />
330+
<div className="flex">
331+
<Clone
332+
className="icon-dim-16 mr-8 fcn-6 cursor"
333+
onClick={() => editPermission('clone')}
334+
/>
335+
</div>
331336
</Tippy>
332337
<Tippy className="default-tt" arrow={false} placement="top" content="Delete">
333-
<Delete className="icon-dim-16 scn-6 cursor" onClick={() => editPermission('delete')} />
338+
<div className="flex">
339+
<Delete className="icon-dim-16 scn-6 cursor" onClick={() => editPermission('delete')} />
340+
</div>
334341
</Tippy>
335342
</span>
336343
)}

‎src/Pages/GlobalConfigurations/Authorization/shared/components/K8sObjectPermissions/K8sPermissons.tsx

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -84,22 +84,28 @@ export default function K8sPermissons({ k8sPermission, setK8sPermission }: K8sPe
8484
</span>
8585
<span className="flex right">
8686
<Tippy className="default-tt" arrow={false} placement="top" content="Duplicate">
87-
<Clone
88-
className="icon-dim-16 cursor fcn-6 mr-8"
89-
onClick={() => editPermission(element, 'clone', index)}
90-
/>
87+
<div className="flex">
88+
<Clone
89+
className="icon-dim-16 cursor fcn-6 mr-8"
90+
onClick={() => editPermission(element, 'clone', index)}
91+
/>
92+
</div>
9193
</Tippy>
9294
<Tippy className="default-tt" arrow={false} placement="top" content="Edit">
93-
<Edit
94-
className="icon-dim-16 cursor scn-6 mr-8"
95-
onClick={() => editPermission(element, 'edit', index)}
96-
/>
95+
<div className="flex">
96+
<Edit
97+
className="icon-dim-16 cursor scn-6 mr-8"
98+
onClick={() => editPermission(element, 'edit', index)}
99+
/>
100+
</div>
97101
</Tippy>
98102
<Tippy className="default-tt" arrow={false} placement="top" content="Delete">
99-
<Delete
100-
className="icon-dim-16 fcn-6 cursor"
101-
onClick={() => deletePermission(index)}
102-
/>
103+
<div className="flex">
104+
<Delete
105+
className="icon-dim-16 fcn-6 cursor"
106+
onClick={() => deletePermission(index)}
107+
/>
108+
</div>
103109
</Tippy>
104110
</span>
105111
</div>

‎src/components/ApplicationGroup/AppGroupAppFilter.components.tsx

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,17 @@ export const Option = (props): JSX.Element => {
9898
return (
9999
<div className="flex">
100100
<Tippy className="default-tt" arrow={false} content="Edit group">
101-
<Edit className="icon-dim-32 pt-8 pr-6 pb-8 pl-8 cursor" onClick={showEditPopup} />
101+
<div className="flex">
102+
<Edit className="icon-dim-32 pt-8 pr-6 pb-8 pl-8 cursor" onClick={showEditPopup} />
103+
</div>
102104
</Tippy>
103105
<Tippy className="default-tt" arrow={false} content="Delete group">
104-
<Trash className="scn-6 icon-dim-32 pt-8 pr-8 pb-8 pl-6 cursor" onClick={showDeletePopup} />
106+
<div className="flex">
107+
<Trash
108+
className="scn-6 icon-dim-32 pt-8 pr-8 pb-8 pl-6 cursor"
109+
onClick={showDeletePopup}
110+
/>
111+
</div>
105112
</Tippy>
106113
</div>
107114
)

‎src/components/ApplicationGroup/Details/TriggerView/EnvTriggerView.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2090,7 +2090,9 @@ export default function EnvTriggerView({ filteredAppIds, isVirtualEnv }: AppGrou
20902090
return (
20912091
<div className="flex">
20922092
<Tippy className="default-tt" arrow={false} placement="top" content="Clear selection">
2093-
<Close className="icon-dim-18 scr-5 mr-16 cursor mw-18" onClick={clearAppList} />
2093+
<div className="flex">
2094+
<Close className="icon-dim-18 scr-5 mr-16 cursor mw-18" onClick={clearAppList} />
2095+
</div>
20942096
</Tippy>
20952097
<div>
20962098
<div data-testid="selected-application-text" className="fs-13 fw-6 cn-9">

‎src/components/CIPipelineN/DockerArgs.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ const DockerArgs: FunctionComponent<DockerArgsProps> = ({ args, handleDockerArgs
105105
trigger="click"
106106
interactive
107107
>
108-
<QuestionIcon className="icon-dim-16 fcn-6 ml-4 cursor" />
108+
<div className="flex">
109+
<QuestionIcon className="icon-dim-16 fcn-6 ml-4 cursor" />
110+
</div>
109111
</TippyCustomized>
110112
</h3>
111113

‎src/components/CIPipelineN/InputPluginSelect.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ export const InputPluginSelection = ({
225225
{(variableData.refVariableStage ||
226226
(variableData?.variableType && variableData.variableType !== 'NEW')) && (
227227
<Tippy content={TIPPY_VAR_MSG} placement="bottom-start" animation="shift-away" arrow={false}>
228-
<Var className="dc__position-abs dc__left-6 icon-dim-18 icon-n4" />
228+
<div className="flex">
229+
<Var className="dc__position-abs dc__left-6 icon-dim-18 icon-n4" />
230+
</div>
229231
</Tippy>
230232
)}
231233
</PopupMenu.Button>

‎src/components/ClusterNodes/ClusterOverview.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,9 @@ function ClusterOverview({
321321
documentationLinkText="View metrics-server helm chart"
322322
documentationLink={`/dashboard${URLS.CHARTS_DISCOVER}/?appStoreName=metrics-server`}
323323
>
324-
<TippyIcon className="icon-dim-20 ml-8 cursor fcn-5" />
324+
<div className="flex">
325+
<TippyIcon className="icon-dim-20 ml-8 cursor fcn-5" />
326+
</div>
325327
</TippyCustomized>
326328
</>
327329
)

‎src/components/ClusterNodes/NodeActions/DrainNodeModal.tsx

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,9 @@ export default function DrainNodeModal({ name, version, kind, closePopup }: Node
149149
trigger="click"
150150
interactive
151151
>
152-
<QuestionIcon className="icon-dim-16 fcn-6 ml-8 cursor" onClick={stopPropagation} />
152+
<div className="flex">
153+
<QuestionIcon className="icon-dim-16 fcn-6 ml-8 cursor" onClick={stopPropagation} />
154+
</div>
153155
</TippyCustomized>
154156
</div>
155157
{DRAIN_NODE_OPTIONS.map((option) => {
@@ -176,10 +178,12 @@ export default function DrainNodeModal({ name, version, kind, closePopup }: Node
176178
trigger="click"
177179
interactive
178180
>
179-
<QuestionIcon
180-
className="drain-option-help-icon icon-dim-16 fcn-6 ml-8 cursor"
181-
onClick={stopPropagation}
182-
/>
181+
<div>
182+
<QuestionIcon
183+
className="drain-option-help-icon icon-dim-16 fcn-6 ml-8 cursor"
184+
onClick={stopPropagation}
185+
/>
186+
</div>
183187
</TippyCustomized>
184188
</div>
185189
)

‎src/components/ClusterNodes/NodeDetails.tsx

Lines changed: 30 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,16 @@ export default function NodeDetails({
267267
}}
268268
interactive
269269
>
270-
<Clipboard
271-
className="ml-8 mt-5 cursor hover-only icon-dim-16"
272-
onClick={() => {
273-
copyToClipboard(`${key}=${value || ''}`, () => {
274-
setCopied(true)
275-
})
276-
}}
277-
/>
270+
<div className="flex">
271+
<Clipboard
272+
className="ml-8 mt-5 cursor hover-only icon-dim-16"
273+
onClick={() => {
274+
copyToClipboard(`${key}=${value || ''}`, () => {
275+
setCopied(true)
276+
})
277+
}}
278+
/>
279+
</div>
278280
</Tippy>
279281
</div>
280282
)
@@ -323,14 +325,16 @@ export default function NodeDetails({
323325
}}
324326
interactive
325327
>
326-
<Clipboard
327-
className="ml-8 mt-5 cursor hover-only icon-dim-16"
328-
onClick={() => {
329-
copyToClipboard(key, () => {
330-
setCopied(true)
331-
})
332-
}}
333-
/>
328+
<div className="flex">
329+
<Clipboard
330+
className="ml-8 mt-5 cursor hover-only icon-dim-16"
331+
onClick={() => {
332+
copyToClipboard(key, () => {
333+
setCopied(true)
334+
})
335+
}}
336+
/>
337+
</div>
334338
</Tippy>
335339
</div>
336340
)
@@ -758,14 +762,16 @@ export default function NodeDetails({
758762
}}
759763
interactive
760764
>
761-
<Clipboard
762-
className="ml-5 mt-5 cursor hover-only icon-dim-14 mw-14"
763-
onClick={() => {
764-
copyToClipboard(pod.name, () => {
765-
setCopied(true)
766-
})
767-
}}
768-
/>
765+
<div className="flex">
766+
<Clipboard
767+
className="ml-5 mt-5 cursor hover-only icon-dim-14 mw-14"
768+
onClick={() => {
769+
copyToClipboard(pod.name, () => {
770+
setCopied(true)
771+
})
772+
}}
773+
/>
774+
</div>
769775
</Tippy>
770776
<ResourceBrowserActionMenu
771777
clusterId={clusterId}

0 commit comments

Comments
 (0)