Skip to content

Commit 4183c33

Browse files
authored
Merge branch 'main' into busola-k8s
2 parents 25205d1 + 31d0526 commit 4183c33

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
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
@@ -71,15 +71,23 @@ export function Badge({
7171

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

74+
const getTooltipContent = description => {
75+
if (tooltip && !tooltipError) {
76+
return tooltip;
77+
}
78+
if (!tooltip && !tooltipError) {
79+
return '';
80+
}
81+
return description;
82+
};
83+
7484
return isNil(value) ? (
7585
emptyLeafPlaceholder
7686
) : structure?.description ? (
7787
<StatusBadge
7888
autoResolveType={!type}
7989
type={type}
80-
tooltipContent={
81-
tooltip && !tooltipError ? tooltip : structure.description
82-
}
90+
tooltipContent={getTooltipContent(structure.description)}
8391
>
8492
{tExt(value)}
8593
</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">

0 commit comments

Comments
 (0)