Skip to content

Commit 3f585fc

Browse files
RohitRaj011RohitRaj011
committed
Merge branch 'develop' of github.com:devtron-labs/devtron-fe-common-lib into feature/approval-policy-exceptions
2 parents 44c56ff + 376f2e6 commit 3f585fc

File tree

14 files changed

+80
-99
lines changed

14 files changed

+80
-99
lines changed

‎package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "1.10.9",
3+
"version": "1.10.15",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

‎src/Common/ImageTags.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ export const ImageTagsContainer = ({
297297

298298
if (newDescription === '' && displayedTags.length === 0 && !isEditing) {
299299
return tagsEditable ? (
300-
<div className="bg__primary mt-8 add-image-button">
300+
<div className="bg__primary mt-8 flexbox">
301301
<AddImageButton handleEditClick={handleEditClick} />
302302
</div>
303303
) : (
@@ -568,11 +568,13 @@ const AddImageButton = ({ handleEditClick }) => {
568568
}
569569

570570
return (
571-
<div className="add-tag-button flex pt-12 pr-12" data-testid="add-tags-button" onClick={handleClick}>
572-
<div className="lh-16 flex">
573-
<Add className="icon-dim-16 cn-6" />
574-
<span className="cn-7">Add labels/comment</span>
575-
</div>
576-
</div>
571+
<button
572+
className="dc__transparent px-8 py-4 flexbox dc__align-items-center dc__gap-4 dc__border-dashed--n3 br-4"
573+
data-testid="add-tags-button"
574+
onClick={handleClick}
575+
>
576+
<Add className="icon-dim-16 cn-6 dc__no-shrink" />
577+
<span className="cn-7 lh-16">Add labels/comment</span>
578+
</button>
577579
)
578580
}

‎src/Shared/Components/CICDHistory/Artifacts.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export const CIListItem = ({
9898
}`}
9999
data-testid="hover-on-report-artifact"
100100
>
101-
<div className="ci-artifacts-grid flex left">
101+
<div className="flex left dc__gap-12">
102102
<div className="bcn-1 flex br-4 icon-dim-40">
103103
<img src={type === 'report' ? folder : docker} className="icon-dim-20" alt="type" />
104104
</div>

‎src/Shared/Components/CICDHistory/DeploymentDetailSteps.tsx

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { ReactComponent as Arrow } from '../../../Assets/Icon/ic-arrow-forward.s
2929
import mechanicalOperation from '../../../Assets/Icon/ic-mechanical-operation.svg'
3030
import CDEmptyState from './CDEmptyState'
3131
import DeploymentStatusDetailBreakdown from './DeploymentStatusBreakdown'
32-
import { getIsApprovalPolicyConfigured, processDeploymentStatusDetailsData } from '../../Helpers'
32+
import { getHandleOpenURL, getIsApprovalPolicyConfigured, processDeploymentStatusDetailsData } from '../../Helpers'
3333

3434
let deploymentStatusTimer = null
3535
const DeploymentDetailSteps = ({
@@ -119,16 +119,15 @@ const DeploymentDetailSteps = ({
119119

120120
const redirectToDeploymentStatus = () => {
121121
if (isHelmApps) {
122-
history.push({
123-
pathname: `${URLS.APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}`,
124-
search: DEPLOYMENT_STATUS_QUERY_PARAM,
125-
})
122+
getHandleOpenURL(
123+
`${window.__BASE_URL__}${URLS.APP}/${URLS.DEVTRON_CHARTS}/${URLS.APP_DEPLOYMNENT_HISTORY}/${appId}/env/${envId}/${URLS.DETAILS}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
124+
)()
126125
return
127126
}
128-
history.push({
129-
pathname: `${URLS.APP}/${appId}/${URLS.APP_DETAILS}/${envId}/${URLS.APP_DETAILS_K8}`,
130-
search: DEPLOYMENT_STATUS_QUERY_PARAM,
131-
})
127+
128+
getHandleOpenURL(
129+
`${window.__BASE_URL__}${URLS.APP}/${appId}/${URLS.APP_DETAILS}/${envId}/${URLS.APP_DETAILS_K8}?${DEPLOYMENT_STATUS_QUERY_PARAM}`,
130+
)()
132131
}
133132

134133
const getDeploymentStatusDetails = () =>

‎src/Shared/Components/CICDHistory/TriggerOutput.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const HistoryLogs: React.FC<HistoryLogsProps> = ({
9292
const CDBuildReportUrl = `app/cd-pipeline/workflow/download/${appId}/${envId}/${pipelineId}/${triggerId}`
9393

9494
return (
95-
<div className="trigger-outputs-container flexbox-col flex-grow-1 h-100">
95+
<div className="trigger-outputs-container bg__tertiary flexbox-col flex-grow-1 h-100">
9696
{loading ? (
9797
<Progressing pageLoader />
9898
) : (

‎src/Shared/Components/DevtronLicenseCard/InstallationFingerprintInfo.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ClipboardButton } from '@Common/index'
22

3-
import { DOCUMENTATION_HOME_PAGE } from '@Common/Constants'
3+
import { DOCUMENTATION } from '@Common/Constants'
44
import { InfoIconTippy } from '..'
55
import { InstallFingerprintInfoProps } from './types'
66

@@ -15,7 +15,7 @@ const InstallationFingerprintInfo = ({ fingerprint, showHelpTooltip = false }: I
1515
documentationLinkText="Documentation"
1616
iconClassName="icon-dim-20 fcn-6"
1717
placement="right"
18-
documentationLink={DOCUMENTATION_HOME_PAGE}
18+
documentationLink={DOCUMENTATION.ENTERPRISE_LICENSE}
1919
/>
2020
)}
2121
</div>

‎src/Shared/Components/Header/HelpNav.tsx

Lines changed: 16 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ import { Fragment } from 'react'
1818
import ReactGA from 'react-ga4'
1919
import { NavLink } from 'react-router-dom'
2020
import { SliderButton } from '@typeform/embed-react'
21-
import { stopPropagation, DOCUMENTATION_HOME_PAGE, URLS, DISCORD_LINK } from '../../../Common'
21+
import { stopPropagation, URLS } from '../../../Common'
2222
import { InstallationType, HelpNavType, HelpOptionType } from './types'
23-
import { EnterpriseHelpOptions, OSSHelpOptions } from './constants'
2423
import { ReactComponent as GettingStartedIcon } from '../../../Assets/Icon/ic-onboarding.svg'
2524
import { ReactComponent as Feedback } from '../../../Assets/Icon/ic-feedback.svg'
26-
import { ReactComponent as Discord } from '../../../Assets/Icon/ic-discord-fill.svg'
27-
import { ReactComponent as File } from '../../../Assets/Icon/ic-file-text.svg'
2825
import { useMainContext } from '../../Providers'
2926
import { Icon } from '../Icon'
27+
import { getHelpOptions } from './utils'
3028

3129
const HelpNav = ({
3230
className,
@@ -38,22 +36,10 @@ const HelpNav = ({
3836
}: HelpNavType) => {
3937
const { currentServerInfo, handleOpenLicenseInfoDialog, licenseData } = useMainContext()
4038
const isEnterprise = currentServerInfo?.serverInfo?.installationType === InstallationType.ENTERPRISE
39+
const isTrial = licenseData?.isTrial ?? false
4140
const FEEDBACK_FORM_ID = `UheGN3KJ#source=${window.location.hostname}`
4241

43-
const CommonHelpOptions: HelpOptionType[] = [
44-
{
45-
name: 'View documentation',
46-
link: DOCUMENTATION_HOME_PAGE,
47-
icon: File,
48-
},
49-
50-
{
51-
name: 'Join discord community',
52-
link: DISCORD_LINK,
53-
icon: Discord,
54-
},
55-
...(isEnterprise ? EnterpriseHelpOptions : OSSHelpOptions),
56-
]
42+
const CommonHelpOptions: HelpOptionType[] = getHelpOptions(isEnterprise, isTrial)
5743

5844
const onClickGettingStarted = (): void => {
5945
setGettingStartedClicked(true)
@@ -114,17 +100,19 @@ const HelpNav = ({
114100
<div className="ml-12 cn-9 fs-14">{option.name}</div>
115101
</a>
116102
{/* licenseData is only set when showLicenseData is received true */}
117-
{isEnterprise && licenseData && index === 1 && (
103+
{isEnterprise && index === 1 && (
118104
<>
119-
<button
120-
type="button"
121-
className="dc__transparent help-card__option flexbox dc__align-items-center cn-9 dc__gap-12 fs-14"
122-
onClick={handleOpenLicenseDialog}
123-
data-testid="about-devtron"
124-
>
125-
<Icon name="ic-devtron" color="N600" size={20} />
126-
About Devtron
127-
</button>
105+
{licenseData && (
106+
<button
107+
type="button"
108+
className="dc__transparent help-card__option flexbox dc__align-items-center cn-9 dc__gap-12 fs-14"
109+
onClick={handleOpenLicenseDialog}
110+
data-testid="about-devtron"
111+
>
112+
<Icon name="ic-devtron" color="N600" size={20} />
113+
About Devtron
114+
</button>
115+
)}
128116
<div className="help__enterprise pl-8 pb-4-imp pt-4-imp dc__gap-12 flexbox dc__align-items-center h-28">
129117
Enterprise Support
130118
</div>

‎src/Shared/Components/Header/constants.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
import { OPEN_NEW_TICKET, RAISE_ISSUE, VIEW_ALL_TICKETS } from '@Shared/constants'
17+
import { CONTACT_SUPPORT_LINK, OPEN_NEW_TICKET, RAISE_ISSUE, VIEW_ALL_TICKETS } from '@Shared/constants'
1818
import { HelpOptionType } from './types'
1919
import { ReactComponent as Chat } from '../../../Assets/Icon/ic-chat-circle-dots.svg'
2020
import { ReactComponent as EditFile } from '../../../Assets/Icon/ic-edit-file.svg'
@@ -47,3 +47,11 @@ export const OSSHelpOptions: HelpOptionType[] = [
4747
icon: EditFile,
4848
},
4949
]
50+
51+
export const TrialHelpOptions: HelpOptionType[] = [
52+
{
53+
name: 'Request Support',
54+
link: CONTACT_SUPPORT_LINK,
55+
icon: EditFile,
56+
},
57+
]

‎src/Shared/Components/Header/utils.ts

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
* limitations under the License.
1515
*/
1616

17+
import { ReactComponent as File } from '@Icons/ic-file-text.svg'
18+
import { ReactComponent as Discord } from '@Icons/ic-discord-fill.svg'
1719
import { updatePostHogEvent } from './service'
18-
import { LOGIN_COUNT } from '../../../Common'
20+
import { DISCORD_LINK, DOCUMENTATION_HOME_PAGE, LOGIN_COUNT } from '../../../Common'
1921
import { DevtronLicenseInfo, LicenseStatus } from '../DevtronLicenseCard'
22+
import { EnterpriseHelpOptions, OSSHelpOptions, TrialHelpOptions } from './constants'
2023

2124
const millisecondsInDay = 86400000
2225
export const getDateInMilliseconds = (days) => 1 + new Date().valueOf() + (days ?? 0) * millisecondsInDay
@@ -37,3 +40,28 @@ export const setActionWithExpiry = (key: string, days: number): void => {
3740

3841
export const getIsShowingLicenseData = (licenseData: DevtronLicenseInfo) =>
3942
licenseData && (licenseData.licenseStatus !== LicenseStatus.ACTIVE || licenseData.isTrial)
43+
44+
const getInstallationSpecificHelpOptions = (isEnterprise: boolean, isTrial: boolean) => {
45+
if (isEnterprise) {
46+
return isTrial ? TrialHelpOptions : EnterpriseHelpOptions
47+
}
48+
return OSSHelpOptions
49+
}
50+
51+
export const getHelpOptions = (isEnterprise: boolean, isTrial: boolean) => {
52+
const HelpOptions = getInstallationSpecificHelpOptions(isEnterprise, isTrial)
53+
return [
54+
{
55+
name: 'View documentation',
56+
link: DOCUMENTATION_HOME_PAGE,
57+
icon: File,
58+
},
59+
60+
{
61+
name: 'Join discord community',
62+
link: DISCORD_LINK,
63+
icon: Discord,
64+
},
65+
...HelpOptions,
66+
]
67+
}

0 commit comments

Comments
 (0)