Skip to content

Commit 150d427

Browse files
committed
Merge branch 'main' of github.com:kyma-project/busola into ui5-migrate-v2
2 parents 34644e6 + 31d0526 commit 150d427

File tree

5 files changed

+53
-25
lines changed

5 files changed

+53
-25
lines changed

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"scripts": {
77
"start": "SSL_CERT_FILE=certs.pem NODE_ENV=development nodemon --exec babel-node index.js",
88
"build": "webpack --mode=production",
9-
"start:prod": "SSL_CERT_FILE=certs.pem NODE_ENV=production node backend-production.js",
9+
"start:prod": "SSL_CERT_FILE=certs.pem NODE_ENV=production node --max-http-header-size 24576 backend-production.js",
1010
"test": "jest"
1111
},
1212
"keywords": [],

src/components/Extensibility/components/Badge.js

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,23 @@ export function Badge({
7272

7373
type = TYPE_FALLBACK.get(type) || type;
7474

75+
const getTooltipContent = description => {
76+
if (tooltip && !tooltipError) {
77+
return tooltip;
78+
}
79+
if (!tooltip && !tooltipError) {
80+
return '';
81+
}
82+
return description;
83+
};
84+
7585
return isNil(value) ? (
7686
emptyLeafPlaceholder
7787
) : structure?.description ? (
7888
<StatusBadge
7989
autoResolveType={!type}
8090
type={type}
81-
tooltipContent={
82-
tooltip && !tooltipError ? tooltip : structure.description
83-
}
91+
tooltipContent={getTooltipContent(structure.description)}
8492
>
8593
{tExt(value)}
8694
</StatusBadge>

src/resources/Namespaces/ResourcesUsage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const ResourcesUsage = ({ namespace }) => {
138138
pollingInterval: 3300,
139139
},
140140
);
141-
141+
if (resourceQuotas?.length < 1) return null;
142142
return (
143143
<>
144144
<div className="item-wrapper tall">

tests/lighthouse/package-lock.json

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

tests/lighthouse/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"test": "npx playwright test"
99
},
1010
"devDependencies": {
11-
"@playwright/test": "^1.44.0",
11+
"@playwright/test": "^1.49.1",
1212
"lighthouse": "^12.0.0",
1313
"playwright": "^1.44.0",
1414
"playwright-lighthouse": "^4.0.0",

0 commit comments

Comments
 (0)