Skip to content

Commit 2dce2a5

Browse files
authored
Merge pull request #2735 from devtron-labs/feat/open-doc-link
feat: implement draggable side panel with support to open doc links in iframe
2 parents 589f1db + 662d201 commit 2dce2a5

File tree

27 files changed

+425
-214
lines changed

27 files changed

+425
-214
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-3",
7+
"@devtron-labs/devtron-fe-common-lib": "1.14.1-pre-5",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/SelectMergeStrategy.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ const SelectMergeStrategy = ({
103103
{PatchStrategyTooltipInfo && <PatchStrategyTooltipInfo />}
104104
</OverrideStrategyTippyContent>
105105
}
106-
documentationLink="HOME_PAGE"
106+
documentationLink="DOC_HOME_PAGE"
107107
/>
108108

109109
{renderContent()}

src/Pages/GlobalConfigurations/DeploymentCharts/List/UploadChartModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ const UploadChartModal = ({ closeUploadPopup }: UploadChartModalType) => {
206206
docLinkKey="GLOBAL_CONFIG_CUSTOM_CHART_PRE_REQUISITES"
207207
text="View documentation"
208208
dataTestId="learn-more-about-custom-chart-pre-requisites-link"
209+
openInNewTab
209210
/>
210211
</div>
211212
</div>

src/components/CIPipelineN/PluginDetailHeader/PluginDetailHeader.component.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ const PluginDetailHeader = ({ handlePluginVersionChange }: PluginDetailHeaderPro
111111
interactive
112112
documentationLink={docLink as keyof typeof DOCUMENTATION}
113113
documentationLinkText="View documentation"
114-
isExternalLink
114+
isExternalLink={stepType !== PluginType.INLINE}
115+
openInNewTab
115116
>
116117
<button
117118
type="button"

src/components/CIPipelineN/Sidebar.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ export const Sidebar = ({
454454
docLinkKey={helpData.docLink}
455455
text={helpData.helpText}
456456
dataTestId="learn-more-about-ci-pipeline-workflow-editor-link"
457+
openInNewTab
457458
/>
458459
</div>
459460
)}

src/components/ciConfig/CIBuildpackBuildOptions.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ const BuilderTippy = () => {
160160
documentationLinkText={CI_BUILDPACK_OPTION_TEXTS.BuilderTippyContent.documentationLinkText}
161161
documentationLink="APP_CI_CONFIG_BUILD_WITHOUT_DOCKER"
162162
iconClassName="icon-dim-16 fcn-6 ml-4"
163+
openInNewTab
163164
/>
164165
)
165166
}

src/components/ciPipeline/Webhook/WebhookDetailsModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ export const WebhookDetailsModal = ({ close, isTemplateView }: WebhookDetailType
477477
docLinkKey="GLOBAL_CONFIG_API_TOKEN"
478478
text="How to generate API tokens?"
479479
dataTestId="learn-more-about-generating-api-tokens"
480+
openInNewTab
480481
/>
481482
)
482483
}

src/components/cluster/ClusterInfoStepsModal.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ export default function ClusterInfoStepsModal({ subTitle, command, clusterName }
107107
text="View documentation"
108108
dataTestId="cluster-info-step-view-documentation"
109109
showExternalIcon
110+
openInNewTab
110111
/>
111112
</div>
112113
</div>

src/components/common/Banner/Banner.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ import {
2424
ComponentSizeType,
2525
Icon,
2626
InfoBlockVariant,
27-
MotionDiv,
27+
InstallationType,
28+
motion,
2829
noop,
2930
setActionWithExpiry,
3031
useMainContext,
3132
} from '@devtron-labs/devtron-fe-common-lib'
3233

33-
import { InstallationType } from '@Components/v2/devtronStackManager/DevtronStackManager.type'
34-
3534
import { importComponentFromFELibrary } from '../helpers/Helpers'
3635
import { InteractiveCellText } from '../helpers/InteractiveCellText/InteractiveCellText'
3736
import { useOnline } from '../hooks'
@@ -179,7 +178,7 @@ export const Banner = () => {
179178
return (
180179
<AnimatePresence custom={!!bannerVariant}>
181180
{bannerVariant && config && (
182-
<MotionDiv
181+
<motion.div
183182
layout
184183
key={bannerVariant}
185184
variants={bannerVariants}
@@ -218,7 +217,7 @@ export const Banner = () => {
218217
showAriaLabelInTippy={false}
219218
/>
220219
)}
221-
</MotionDiv>
220+
</motion.div>
222221
)}
223222
</AnimatePresence>
224223
)
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.aside-drag {
2+
&__handle {
3+
height: 32px;
4+
background-color: var(--white-60);
5+
transition: all 0.2s;
6+
}
7+
8+
&:hover, &--dragging {
9+
.aside-drag__handle {
10+
height: 48px;
11+
background-color: var(--white);
12+
}
13+
}
14+
}

0 commit comments

Comments
 (0)