Skip to content

Commit 3109fce

Browse files
authored
Merge pull request #1719 from RedisInsight/fe/bugfix-RI-3726_profile_explain
RI-4162, RI-5159, RI-4101, Profile/Explain plugin bug fixes
2 parents 8c21aa2 + 3f73c80 commit 3109fce

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

redisinsight/ui/src/packages/ri-explain/src/Explain.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -435,9 +435,9 @@ function ExplainDraw({data, type, module, profilingTime}: {data: any, type: Core
435435
</div>
436436
{ profilingTime &&
437437
(
438-
module === ModuleType.Search ?
438+
module === ModuleType.Search &&
439439
(
440-
<div style={{ width: infoWidth }} className="ProfileInfo ProfileTimeInfo">
440+
<div className="ProfileInfo ProfileTimeInfo">
441441
{
442442
Object.keys(profilingTime).map(key => (
443443
<div className="Item">
@@ -448,10 +448,6 @@ function ExplainDraw({data, type, module, profilingTime}: {data: any, type: Core
448448
}
449449
</div>
450450
)
451-
:
452-
type === CoreType.Profile && (
453-
<div style={{ width: infoWidth }} className="ProfileInfo ProfileTimeMini">Total execution time: {profilingTime['Total Execution Time']} ms</div>
454-
)
455451
)}
456452
</div>
457453
</div>

redisinsight/ui/src/packages/ri-explain/src/parser.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -538,19 +538,23 @@ class Parser {
538538

539539
assertToken(TokenType.IDENTIFIER, this.CurrentToken?.T)
540540

541-
let identifier = this.CurrentToken.Data
541+
let identifiers: string[] = []
542542

543-
this.nextToken()
543+
while (this.CurrentToken?.T == TokenType.IDENTIFIER) {
544+
identifiers.push(this.CurrentToken.Data)
544545

545-
assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)
546+
this.nextToken()
546547

547-
this.nextToken()
548+
assertToken(TokenType.NEW_LINE, this.CurrentToken?.T)
549+
550+
this.nextToken()
551+
}
548552

549553
assertToken(TokenType.RBRACE, this.CurrentToken?.T)
550554

551555
this.nextToken()
552556

553-
return new Expr(identifier, EntityType.TAG, tagData)
557+
return new Expr(identifiers.join(", "), EntityType.TAG, tagData)
554558

555559
}
556560

redisinsight/ui/src/packages/ri-explain/src/styles/styles.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -284,6 +284,7 @@ body {
284284

285285
position: absolute;
286286
bottom: 0px;
287+
width: 100%;
287288
}
288289

289290
.ProfileTimeInfo {

0 commit comments

Comments
 (0)