Skip to content

Commit f9ce8ed

Browse files
Merge pull request #491 from devtron-labs/fix/logs-renderer-style
feat: logs renderer to support spacing and escape characters
2 parents 1a34211 + 2404a62 commit f9ce8ed

File tree

5 files changed

+7
-9
lines changed

5 files changed

+7
-9
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.3.0-patch-3",
3+
"version": "1.3.0-patch-4",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Shared/Components/CICDHistory/LogStageAccordion.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ const LogStageAccordion = ({
9595
>
9696
<span
9797
ref={scrollIntoView}
98-
className="cn-4 col-2 lh-20 dc__text-align-end dc__word-break mono fs-14"
98+
className="cn-4 col-2 lh-20 dc__text-align-end dc__word-break mono fs-14 dc__user-select-none"
9999
data-contains-match={doesLineContainSearchMatch}
100100
>
101101
{logsIndex + 1}
102102
</span>
103-
<p
104-
className="mono fs-14 mb-0-imp cn-0 dc__word-break lh-20"
103+
<pre
104+
className="mono fs-14 mb-0-imp cn-0 dc__word-break lh-20 dc__unset-pre"
105105
// eslint-disable-next-line react/no-danger
106106
dangerouslySetInnerHTML={{
107107
__html: DOMPurify.sanitize(log),

src/Shared/Components/CICDHistory/LogsRenderer.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ const LogsRenderer = ({ triggerDetails, isBlobStorageConfigured, parentType, ful
196196

197197
const { registerShortcut, unregisterShortcut } = useRegisterShortcut()
198198

199-
const areStagesAvailable =
200-
(window._env_.FEATURE_STEP_WISE_LOGS_ENABLE && streamDataList[0]?.startsWith(LOGS_STAGE_IDENTIFIER)) || false
199+
const areStagesAvailable = streamDataList[0]?.startsWith(LOGS_STAGE_IDENTIFIER) || false
201200

202201
function createMarkup({
203202
log,

src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ export interface customEnv {
8282
FEATURE_SCOPED_VARIABLE_ENVIRONMENT_LIST_ENABLE?: boolean
8383
HIDE_NETWORK_STATUS_INTERFACE?: boolean
8484
SYSTEM_CONTROLLER_LISTING_TIMEOUT?: number
85-
FEATURE_STEP_WISE_LOGS_ENABLE?: boolean
8685
FEATURE_IMAGE_PROMOTION_ENABLE?: boolean
8786
FEATURE_CD_MANDATORY_PLUGINS_ENABLE?: boolean
8887
/**

0 commit comments

Comments
 (0)