USEFULL/drone
1
0
Fork 0
mirror of https://github.com/harness/drone.git synced 2025-05-31 11:43:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: [code-763]: fix html encode issue (#333)

Browse Source
This commit is contained in:
Calvin Lee 2023-08-17 21:50:13 +00:00 committed by Harness
parent 7dd8c1d276
commit 69730994d8
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/src/i18n/strings.en.yaml
View File

@ -185,7 +185,7 @@ editNotAllowed: You must be on a branch to edit this file
newFileNotAllowed: You must be on a branch to create a new file newFileNotAllowed: You must be on a branch to create a new file
fileDeleted: '__path__ successfully deleted.' fileDeleted: '__path__ successfully deleted.'
newPullRequest: New Pull Request newPullRequest: New Pull Request
pullRequestEmpty: Here is no Pull Request. Try to pullRequestEmpty: There are no pull requests in your project. Click the button below to create a pull request.
comparingChanges: Comparing Changes comparingChanges: Comparing Changes
selectToViewMore: Select branch to view more here. selectToViewMore: Select branch to view more here.
createPullRequest: Create pull request createPullRequest: Create pull request
@ -388,7 +388,7 @@ repoEmptyMarkdownExisting: |
``` ```
You might need [to create an API token](CREATE_API_TOKEN_URL) in order to pull from or push into this repository. You might need [to create an API token](CREATE_API_TOKEN_URL) in order to pull from or push into this repository.
webhookEmpty: Here is no WebHooks. Try to webhookEmpty: There are no webhooks in your project. Click the button below to create a webhook.
compareEmptyDiffTitle: There isn't anything to compare compareEmptyDiffTitle: There isn't anything to compare
compareEmptyDiffMessage: Two branches are identical. compareEmptyDiffMessage: Two branches are identical.
noCommits: There is no commits noCommits: There is no commits
@ -475,15 +475,15 @@ creationDate: Creation Date
viewFiles: View Files viewFiles: View Files
tagger: Tagger tagger: Tagger
confirmDelete: Confirm delete confirmDelete: Confirm delete
tagEmpty: Here is no Tag. Try to tagEmpty: There are no tags in your project. Click the button below to create a tag.
newTag: New Tag newTag: New Tag
overview: Overview overview: Overview
fileTooLarge: File is too large to open. {download} fileTooLarge: File is too large to open. {download}
clickHereToDownload: Click here to download. clickHereToDownload: Click here to download.
viewFile: View the file at this point in the history viewFile: View the file at this point in the history
viewRepo: View the repository at this point in the history viewRepo: View the repository at this point in the history
hideCommitHistory: Renamed from {{file}} - Hide History hideCommitHistory: Renamed from {file} - Hide History
showCommitHistory: Renamed from {{file}} - Show History showCommitHistory: Renamed from {file} - Show History
noReviewers: No Reviewers noReviewers: No Reviewers
assignPeople: Assign people assignPeople: Assign people
add: Add + add: Add +

13
web/src/pages/Repository/RepositoryContent/FileContent/RenameContentHistory.tsx
View File

@ -1,5 +1,5 @@
import React, { useState } from 'react' import React, { useState } from 'react'
import { Icon, Text } from '@harness/uicore' import { Icon, Text, StringSubstitute } from '@harness/uicore'
import { useGet } from 'restful-react' import { useGet } from 'restful-react'
import cx from 'classnames' import cx from 'classnames'
import { ThreadSection } from 'components/ThreadSection/ThreadSection' import { ThreadSection } from 'components/ThreadSection/ThreadSection'
@ -55,6 +55,9 @@ const SingleFileRenameHistory = (props: {
const commitsData = commits?.commits const commitsData = commits?.commits
const showCommitHistory = isFileShown && commitsData && commitsData.length > 0 const showCommitHistory = isFileShown && commitsData && commitsData.length > 0
const vars = {
file: details.old_path
}
return ( return (
<ThreadSection <ThreadSection
hideGutter hideGutter
@ -62,9 +65,11 @@ const SingleFileRenameHistory = (props: {
contentClassName={css.contentSection} contentClassName={css.contentSection}
title={ title={
<Text padding={{ top: 'large' }} className={cx(css.hideText, css.lineDiv)} onClick={toggleCommitHistory}> <Text padding={{ top: 'large' }} className={cx(css.hideText, css.lineDiv)} onClick={toggleCommitHistory}>
{showCommitHistory <StringSubstitute
? getString('hideCommitHistory', { file: details.old_path }) str={showCommitHistory ? getString('hideCommitHistory') : getString('showCommitHistory')}
: getString('showCommitHistory', { file: details.old_path })} vars={vars}
/>
{showCommitHistory ? ( {showCommitHistory ? (
<Icon padding={'xsmall'} name={'main-chevron-up'} size={8}></Icon> <Icon padding={'xsmall'} name={'main-chevron-up'} size={8}></Icon>
) : ( ) : (