Skip to content

Commit 2d880b4

Browse files
ADI-ROXXADI-ROXX
authored
Remove defaultProps from ErrorMessage & NewWindowIcon (#2609)
## Which problem is this PR solving? - Resolves #2596 ## Description of the changes - Wherever the default value was undefined, I have not added a default value for it since it is automatically undefined. ## How was this change tested? - npm run lint test ## Checklist - [x] I have read https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md - [x] I have signed all commits - [ ] I have added unit tests for the new functionality - [x] I have run lint and test steps successfully - for `jaeger`: `make lint test` - for `jaeger-ui`: `npm run lint` and `npm run test` --------- Signed-off-by: cs-308-2023 <[email protected]>
1 parent 2159753 commit 2d880b4

File tree

6 files changed

+21
-83
lines changed

6 files changed

+21
-83
lines changed

‎packages/jaeger-ui/src/components/DeepDependencies/Graph/DdgNodeContent/__snapshots__/index.test.js.snap‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,7 @@ exports[`<DdgNodeContent> omits the operation if it is null 1`] = `
155155
<span
156156
className="DdgNodeContent--actionsItemIconWrapper"
157157
>
158-
<NewWindowIcon
159-
isLarge={false}
160-
/>
158+
<NewWindowIcon />
161159
</span>
162160
<span
163161
className="DdgNodeContent--actionsItemText"
@@ -291,9 +289,7 @@ exports[`<DdgNodeContent> omits the operation if it is null 2`] = `
291289
<span
292290
className="DdgNodeContent--actionsItemIconWrapper"
293291
>
294-
<NewWindowIcon
295-
isLarge={false}
296-
/>
292+
<NewWindowIcon />
297293
</span>
298294
<span
299295
className="DdgNodeContent--actionsItemText"
@@ -442,9 +438,7 @@ exports[`<DdgNodeContent> renders correctly when decorationValue is a string 1`]
442438
<span
443439
className="DdgNodeContent--actionsItemIconWrapper"
444440
>
445-
<NewWindowIcon
446-
isLarge={false}
447-
/>
441+
<NewWindowIcon />
448442
</span>
449443
<span
450444
className="DdgNodeContent--actionsItemText"
@@ -593,9 +587,7 @@ exports[`<DdgNodeContent> renders correctly when decorationValue is a string 2`]
593587
<span
594588
className="DdgNodeContent--actionsItemIconWrapper"
595589
>
596-
<NewWindowIcon
597-
isLarge={false}
598-
/>
590+
<NewWindowIcon />
599591
</span>
600592
<span
601593
className="DdgNodeContent--actionsItemText"
@@ -744,9 +736,7 @@ exports[`<DdgNodeContent> renders correctly when given decorationProgressbar 1`]
744736
<span
745737
className="DdgNodeContent--actionsItemIconWrapper"
746738
>
747-
<NewWindowIcon
748-
isLarge={false}
749-
/>
739+
<NewWindowIcon />
750740
</span>
751741
<span
752742
className="DdgNodeContent--actionsItemText"
@@ -898,9 +888,7 @@ exports[`<DdgNodeContent> renders correctly when given decorationProgressbar 2`]
898888
<span
899889
className="DdgNodeContent--actionsItemIconWrapper"
900890
>
901-
<NewWindowIcon
902-
isLarge={false}
903-
/>
891+
<NewWindowIcon />
904892
</span>
905893
<span
906894
className="DdgNodeContent--actionsItemText"
@@ -1049,9 +1037,7 @@ exports[`<DdgNodeContent> renders correctly when isFocalNode = true and focalNod
10491037
<span
10501038
className="DdgNodeContent--actionsItemIconWrapper"
10511039
>
1052-
<NewWindowIcon
1053-
isLarge={false}
1054-
/>
1040+
<NewWindowIcon />
10551041
</span>
10561042
<span
10571043
className="DdgNodeContent--actionsItemText"
@@ -1159,9 +1145,7 @@ exports[`<DdgNodeContent> renders correctly when isFocalNode = true and focalNod
11591145
<span
11601146
className="DdgNodeContent--actionsItemIconWrapper"
11611147
>
1162-
<NewWindowIcon
1163-
isLarge={false}
1164-
/>
1148+
<NewWindowIcon />
11651149
</span>
11661150
<span
11671151
className="DdgNodeContent--actionsItemText"
@@ -1278,9 +1262,7 @@ exports[`<DdgNodeContent> renders the number of operations if there are multiple
12781262
<span
12791263
className="DdgNodeContent--actionsItemIconWrapper"
12801264
>
1281-
<NewWindowIcon
1282-
isLarge={false}
1283-
/>
1265+
<NewWindowIcon />
12841266
</span>
12851267
<span
12861268
className="DdgNodeContent--actionsItemText"
@@ -1446,9 +1428,7 @@ exports[`<DdgNodeContent> renders the number of operations if there are multiple
14461428
<span
14471429
className="DdgNodeContent--actionsItemIconWrapper"
14481430
>
1449-
<NewWindowIcon
1450-
isLarge={false}
1451-
/>
1431+
<NewWindowIcon />
14521432
</span>
14531433
<span
14541434
className="DdgNodeContent--actionsItemText"

‎packages/jaeger-ui/src/components/DeepDependencies/SidePanel/__snapshots__/DetailsPanel.test.js.snap‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ exports[`<SidePanel> render renders detailLink 1`] = `
7474
rel="noreferrer noopener"
7575
target="_blank"
7676
>
77-
<NewWindowIcon
78-
isLarge={false}
79-
/>
77+
<NewWindowIcon />
8078
</a>
8179
</Tooltip>
8280
</div>

‎packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/MetricCard.test.js.snap‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ exports[`MetricCard renders as expected when passCount is zero 1`] = `
3232
rel="noreferrer noopener"
3333
target="_blank"
3434
>
35-
<NewWindowIcon
36-
isLarge={false}
37-
/>
35+
<NewWindowIcon />
3836
</a>
3937
</Tooltip>
4038
</span>
@@ -109,9 +107,7 @@ exports[`MetricCard renders as expected with details 1`] = `
109107
rel="noreferrer noopener"
110108
target="_blank"
111109
>
112-
<NewWindowIcon
113-
isLarge={false}
114-
/>
110+
<NewWindowIcon />
115111
</a>
116112
</Tooltip>
117113
</span>
@@ -228,9 +224,7 @@ exports[`MetricCard renders as expected without details 1`] = `
228224
rel="noreferrer noopener"
229225
target="_blank"
230226
>
231-
<NewWindowIcon
232-
isLarge={false}
233-
/>
227+
<NewWindowIcon />
234228
</a>
235229
</Tooltip>
236230
</span>
@@ -305,9 +299,7 @@ exports[`MetricCard renders as expected without details 2`] = `
305299
rel="noreferrer noopener"
306300
target="_blank"
307301
>
308-
<NewWindowIcon
309-
isLarge={false}
310-
/>
302+
<NewWindowIcon />
311303
</a>
312304
</Tooltip>
313305
</span>

‎packages/jaeger-ui/src/components/QualityMetrics/__snapshots__/ScoreCard.test.js.snap‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@ exports[`ScoreCard renders as expected when score is below max 1`] = `
2525
target="_blank"
2626
>
2727
How to improve
28-
<NewWindowIcon
29-
isLarge={false}
30-
/>
28+
<NewWindowIcon />
3129
</a>
3230
</div>
3331
`;
@@ -57,9 +55,7 @@ exports[`ScoreCard renders as expected when score is max 1`] = `
5755
target="_blank"
5856
>
5957
Great! What does this mean
60-
<NewWindowIcon
61-
isLarge={false}
62-
/>
58+
<NewWindowIcon />
6359
</a>
6460
</div>
6561
`;
@@ -90,9 +86,7 @@ exports[`ScoreCard renders as expected when score is zero 1`] = `
9086
target="_blank"
9187
>
9288
How to improve
93-
<NewWindowIcon
94-
isLarge={false}
95-
/>
89+
<NewWindowIcon />
9690
</a>
9791
</div>
9892
`;

‎packages/jaeger-ui/src/components/common/ErrorMessage.tsx‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ function ErrorAttr({ name, value }: ErrorAttrProps) {
4848
);
4949
}
5050

51-
export function Message(props: SubPartProps) {
52-
const { className, error, wrap, wrapperClassName } = props;
51+
export function Message({ className, error, wrap = false, wrapperClassName }: SubPartProps) {
5352
const cssClass = `ErrorMessage--msg ${className || ''}`;
5453

5554
const msg =
@@ -66,15 +65,7 @@ export function Message(props: SubPartProps) {
6665
return msg;
6766
}
6867

69-
Message.defaultProps = {
70-
className: undefined,
71-
wrap: false,
72-
wrapperClassName: undefined,
73-
};
74-
75-
export function Details(props: SubPartProps) {
76-
const { className, error, wrap, wrapperClassName } = props;
77-
68+
export function Details({ className, error, wrap = false, wrapperClassName }: SubPartProps) {
7869
if (typeof error === 'string') {
7970
return null;
8071
}
@@ -113,12 +104,6 @@ export function Details(props: SubPartProps) {
113104
return details;
114105
}
115106

116-
Details.defaultProps = {
117-
className: undefined,
118-
wrap: false,
119-
wrapperClassName: undefined,
120-
};
121-
122107
export default function ErrorMessage({
123108
className,
124109
detailClassName,
@@ -140,9 +125,3 @@ export default function ErrorMessage({
140125
</div>
141126
);
142127
}
143-
144-
ErrorMessage.defaultProps = {
145-
className: undefined,
146-
detailClassName: undefined,
147-
messageClassName: undefined,
148-
};

‎packages/jaeger-ui/src/components/common/NewWindowIcon.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,7 @@ type Props = {
2222
isLarge?: boolean;
2323
};
2424

25-
export default function NewWindowIcon(props: Props) {
26-
const { isLarge, ...rest } = props;
25+
export default function NewWindowIcon({ isLarge = false, ...rest }: Props) {
2726
const cls = cx('NewWindowIcon', { 'is-large': isLarge });
2827
return <IoOpenOutline className={cls} {...rest} data-testid="NewWindowIcon" />;
2928
}
30-
31-
NewWindowIcon.defaultProps = {
32-
isLarge: false,
33-
};

0 commit comments

Comments
 (0)